Refactoring. Get rid of the util folder and move files.

flanglet · Jan 26, 2024 · 711bf1c · 711bf1c
1 parent 6904395
commit 711bf1c
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 24 deletions.
diff --git a/v2/benchmark/Entropy_test.go b/v2/benchmark/Entropy_test.go
@@ -23,7 +23,7 @@ import (
 	kanzi "github.com/flanglet/kanzi-go/v2"
 	"github.com/flanglet/kanzi-go/v2/bitstream"
 	"github.com/flanglet/kanzi-go/v2/entropy"
-	"github.com/flanglet/kanzi-go/v2/util"
+	"github.com/flanglet/kanzi-go/v2/internal"
 )
 
 func BenchmarkExpGolomb(b *testing.B) {
@@ -112,7 +112,7 @@ func testEntropySpeed(b *testing.B, name string) error {
 		size := 50000
 		values1 := make([]byte, size)
 		values2 := make([]byte, size)
-		var bs util.BufferStream
+		var bs internal.BufferStream
 
 		for ii := 0; ii < iter; ii++ {
 			idx := jj

diff --git a/v2/benchmark/Hash_test.go b/v2/benchmark/Hash_test.go
@@ -19,7 +19,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/flanglet/kanzi-go/v2/util/hash"
+	"github.com/flanglet/kanzi-go/v2/hash"
 )
 
 func BenchmarkXXHash32b(b *testing.B) {

diff --git a/v2/bitstream/DefaultBitstream_test.go b/v2/bitstream/DefaultBitstream_test.go
@@ -23,7 +23,7 @@ import (
 	"testing"
 
 	kanzi "github.com/flanglet/kanzi-go/v2"
-	"github.com/flanglet/kanzi-go/v2/util"
+	"github.com/flanglet/kanzi-go/v2/internal"
 )
 
 const (
@@ -58,7 +58,7 @@ func testCorrectnessAligned1() error {
 
 	// Check correctness of read() and written()
 	for t := 1; t <= 32; t++ {
-		var bs util.BufferStream
+		var bs internal.BufferStream
 		obs, _ := NewDefaultOutputBitStream(&bs, 16384)
 		fmt.Println()
 		obs.WriteBits(0x0123456789ABCDEF, uint(t))
@@ -85,7 +85,7 @@ func testCorrectnessAligned1() error {
 	}
 
 	for test := 1; test <= 10; test++ {
-		var bs util.BufferStream
+		var bs internal.BufferStream
 		obs, _ := NewDefaultOutputBitStream(&bs, 16384)
 		dbgobs, _ := NewDebugOutputBitStream(obs, os.Stdout)
 		dbgobs.ShowByte(true)
@@ -168,7 +168,7 @@ func testCorrectnessMisaligned1() error {
 
 	// Check correctness of read() and written()
 	for t := 1; t <= 32; t++ {
-		var bs util.BufferStream
+		var bs internal.BufferStream
 		obs, _ := NewDefaultOutputBitStream(&bs, 16384)
 		dbgobs, _ := NewDebugOutputBitStream(obs, os.Stdout)
 		dbgobs.ShowByte(true)
@@ -200,7 +200,7 @@ func testCorrectnessMisaligned1() error {
 	}
 
 	for test := 1; test <= 10; test++ {
-		var bs util.BufferStream
+		var bs internal.BufferStream
 		obs, _ := NewDefaultOutputBitStream(&bs, 16384)
 		dbgobs, _ := NewDebugOutputBitStream(obs, os.Stdout)
 		dbgobs.ShowByte(true)
@@ -288,7 +288,7 @@ func testCorrectnessAligned2() error {
 	output := make([]byte, 100)
 
 	for test := 1; test <= 10; test++ {
-		var bs util.BufferStream
+		var bs internal.BufferStream
 		obs, _ := NewDefaultOutputBitStream(&bs, 16384)
 		dbgobs, _ := NewDebugOutputBitStream(obs, os.Stdout)
 		dbgobs.ShowByte(true)
@@ -371,7 +371,7 @@ func testCorrectnessMisaligned2() error {
 	output := make([]byte, 100)
 
 	for test := 1; test <= 10; test++ {
-		var bs util.BufferStream
+		var bs internal.BufferStream
 		obs, _ := NewDefaultOutputBitStream(&bs, 16384)
 		dbgobs, _ := NewDebugOutputBitStream(obs, os.Stdout)
 		dbgobs.ShowByte(true)

diff --git a/v2/entropy/Entropy_test.go b/v2/entropy/Entropy_test.go
@@ -24,7 +24,7 @@ import (
 
 	kanzi "github.com/flanglet/kanzi-go/v2"
 	"github.com/flanglet/kanzi-go/v2/bitstream"
-	"github.com/flanglet/kanzi-go/v2/util"
+	"github.com/flanglet/kanzi-go/v2/internal"
 )
 
 func TestHuffman(b *testing.T) {
@@ -146,7 +146,7 @@ func testEntropyCorrectness(name string) error {
 
 		println()
 		fmt.Printf("\nEncoded: \n")
-		var bs util.BufferStream
+		var bs internal.BufferStream
 		obs, _ := bitstream.NewDefaultOutputBitStream(&bs, 16384)
 		dbgbs, _ := bitstream.NewDebugOutputBitStream(obs, os.Stdout)
 		dbgbs.ShowByte(true)

diff --git a/v2/util/hash/XXHash32.go → v2/hash/XXHash32.go b/v2/util/hash/XXHash32.go → v2/hash/XXHash32.go
diff --git a/v2/util/hash/XXHash64.go → v2/hash/XXHash64.go b/v2/util/hash/XXHash64.go → v2/hash/XXHash64.go
diff --git a/v2/util/BufferStream.go → v2/internal/BufferStream.go b/v2/util/BufferStream.go → v2/internal/BufferStream.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package util
+package internal
 
 import (
 	"errors"

diff --git a/v2/internal/Global.go b/v2/internal/Global.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package kanzi
+package internal
 
 import (
 	"errors"

diff --git a/v2/internal/Magic.go b/v2/internal/Magic.go
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package kanzi
+package internal
 
 import (
 	"encoding/binary"

diff --git a/v2/io/CompressedStream.go b/v2/io/CompressedStream.go
@@ -28,10 +28,9 @@ import (
 	kanzi "github.com/flanglet/kanzi-go/v2"
 	"github.com/flanglet/kanzi-go/v2/bitstream"
 	"github.com/flanglet/kanzi-go/v2/entropy"
-	internal "github.com/flanglet/kanzi-go/v2/internal"
+	"github.com/flanglet/kanzi-go/v2/internal"
 	"github.com/flanglet/kanzi-go/v2/transform"
-	"github.com/flanglet/kanzi-go/v2/util"
-	"github.com/flanglet/kanzi-go/v2/util/hash"
+	"github.com/flanglet/kanzi-go/v2/hash"
 )
 
 // Write to/read from bitstream using a 2 step process:
@@ -710,7 +709,7 @@ func (this *encodingTask) encode(res *encodingTaskResult) {
 	}
 
 	// Create a bitstream local to the task
-	bufStream := util.NewBufferStream(data[0:0:cap(data)])
+	bufStream := internal.NewBufferStream(data[0:0:cap(data)])
 	obs, _ := bitstream.NewDefaultOutputBitStream(bufStream, 16384)
 
 	// Write block 'header' (mode + compressed length)
@@ -1517,7 +1516,7 @@ func (this *decodingTask) decode(res *decodingTaskResult) {
 
 	// All the code below is concurrent
 	// Create a bitstream local to the task
-	bufStream := util.NewBufferStream(data[0:r])
+	bufStream := internal.NewBufferStream(data[0:r])
 	ibs, _ := bitstream.NewDefaultInputBitStream(bufStream, 16384)
 
 	mode := byte(ibs.ReadBits(8))

diff --git a/v2/transform/ROLZCodec.go b/v2/transform/ROLZCodec.go
@@ -25,8 +25,7 @@ import (
 	kanzi "github.com/flanglet/kanzi-go/v2"
 	"github.com/flanglet/kanzi-go/v2/bitstream"
 	"github.com/flanglet/kanzi-go/v2/entropy"
-	internal "github.com/flanglet/kanzi-go/v2/internal"
-	"github.com/flanglet/kanzi-go/v2/util"
+	"github.com/flanglet/kanzi-go/v2/internal"
 )
 
 // Implementation of a Reduced Offset Lempel Ziv transform
@@ -522,7 +521,7 @@ func (this *rolzCodec1) Forward(src, dst []byte) (uint, uint, error) {
 			litIdx += litLen
 		}
 
-		var os util.BufferStream
+		var os internal.BufferStream
 
 		// Scope to deallocate resources early
 		{
@@ -621,7 +620,7 @@ func (this *rolzCodec1) Inverse(src, dst []byte) (uint, uint, error) {
 		sizeChunk = _ROLZ_CHUNK_SIZE
 	}
 
-	var is util.BufferStream
+	var is internal.BufferStream
 	dstEnd := int(binary.BigEndian.Uint32(src[0:])) - 4
 
 	if dstEnd <= 0 || dstEnd > len(dst) {