From d84b80b79510359fb1404bd13f91ad64173e8a8b Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Wed, 23 May 2018 03:23:47 -0700
Subject: [PATCH] similar changes as master

---
 weed/compress/compression_test.go    | 45 ----------------------------
 weed/compress/delta_binary_pack32.go | 32 --------------------
 weed/glide.lock                      |  6 ----
 weed/glide.yaml                      |  4 ---
 4 files changed, 87 deletions(-)
 delete mode 100644 weed/compress/compression_test.go
 delete mode 100644 weed/compress/delta_binary_pack32.go

diff --git a/weed/compress/compression_test.go b/weed/compress/compression_test.go
deleted file mode 100644
index 83b7c0055..000000000
--- a/weed/compress/compression_test.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package compress
-
-import (
-	"math/rand"
-	"testing"
-)
-
-func TestSortedData(t *testing.T) {
-	data := make([]int32, 102400)
-	for i := 1; i < len(data); i++ {
-		data[i] = data[i-1] + rand.Int31n(15)
-	}
-	testCompressAndUncompress(t, data, "Sorted data")
-}
-
-func TestUnsortedData(t *testing.T) {
-	data := make([]int32, 102400)
-	for i := 0; i < len(data); i++ {
-		data[i] = rand.Int31n(255)
-	}
-	testCompressAndUncompress(t, data, "Unsorted data")
-}
-
-func testCompressAndUncompress(t *testing.T, data []int32, desc string) {
-
-	compressed_data, err := Compress32(data)
-	if err != nil {
-		t.Fatal("Compress error", err.Error())
-	}
-	uncompressed_data, err := Uncompress32(compressed_data, make([]int32, len(data)*2))
-	if err != nil {
-		t.Fatal("Compress error", err.Error())
-	}
-	if len(uncompressed_data) != len(data) {
-		t.Fatal("Len differs", len(data), len(uncompressed_data))
-	}
-	for i := 0; i < len(data); i++ {
-		if data[i] != uncompressed_data[i] {
-			t.Fatal("Data differs:", i, data[i], uncompressed_data[i])
-		}
-	}
-
-	println(desc, " Data length:", len(data), " => Compressed length:", len(compressed_data))
-
-}
diff --git a/weed/compress/delta_binary_pack32.go b/weed/compress/delta_binary_pack32.go
deleted file mode 100644
index 1da0e427a..000000000
--- a/weed/compress/delta_binary_pack32.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package compress
-
-import (
-	"github.com/dataence/encoding/cursor"
-	"github.com/dataence/encoding/delta/bp32"
-)
-
-// Compress compresses in[]int32 to out[]int32
-func Compress32(in []int32) (out []int32, err error) {
-	out = make([]int32, len(in)*2)
-	inpos := cursor.New()
-	outpos := cursor.New()
-
-	if err = bp32.New().Compress(in, inpos, len(in), out, outpos); err != nil {
-		return nil, err
-	}
-
-	return out[:outpos.Get()], nil
-}
-
-// Uncompress uncompresses in[]int32 to out[]int32
-func Uncompress32(in []int32, buffer []int32) (out []int32, err error) {
-	out = buffer
-	inpos := cursor.New()
-	outpos := cursor.New()
-
-	if err = bp32.New().Uncompress(in, inpos, len(in), out, outpos); err != nil {
-		return nil, err
-	}
-
-	return out[:outpos.Get()], nil
-}
diff --git a/weed/glide.lock b/weed/glide.lock
index 52bdedc54..ad0e1bf8e 100644
--- a/weed/glide.lock
+++ b/weed/glide.lock
@@ -12,12 +12,6 @@ imports:
   version: 5f7ddd8f479583daf05879d3d3b174aa202c8fb7
   subpackages:
   - protobuf
-- name: github.com/dataence/encoding
-  version: b90e310a0325f9b765b4be7220df3642ad93ad8d
-  subpackages:
-  - bitpacking
-  - cursor
-  - delta/bp32
 - name: github.com/dgrijalva/jwt-go
   version: 06ea1031745cb8b3dab3f6a236daf2b0aa468b7e
 - name: github.com/disintegration/imaging
diff --git a/weed/glide.yaml b/weed/glide.yaml
index 36737fb21..7903a6728 100644
--- a/weed/glide.yaml
+++ b/weed/glide.yaml
@@ -6,10 +6,6 @@ import:
 - package: github.com/boltdb/bolt
   version: ^1.3.1
 - package: github.com/chrislusf/raft
-- package: github.com/dataence/encoding
-  subpackages:
-  - cursor
-  - delta/bp32
 - package: github.com/dgrijalva/jwt-go
   version: ^3.2.0
 - package: github.com/disintegration/imaging