Move value package to parser/json

xichen2020 · Dec 3, 2018 · 333ff2b · 333ff2b
1 parent 131a6e7
commit 333ff2b
Show file tree

Hide file tree

Showing 20 changed files with 11 additions and 11 deletions.
diff --git a/generated/generics/generate.go b/generated/generics/generate.go
@@ -1,8 +1,8 @@
-//go:generate sh -c "cat $GOPATH/src/$PACKAGE/x/pool/generic_pool.go | awk '/^package/{i++}i' | genny -out=$GOPATH/src/$PACKAGE/value/value_pool.gen.go -pkg=value gen \"ValuePoolOptions=PoolOptions valuePoolMetrics=poolMetrics ValuePool=Pool GenericValue=*Value\""
-//go:generate sh -c "cat $GOPATH/src/$PACKAGE/x/pool/generic_pool.go | awk '/^package/{i++}i' | genny -out=$GOPATH/src/$PACKAGE/value/value_array_pool.gen.go -pkg=value gen \"ValuePoolOptions=ArrayPoolOptions valuePoolMetrics=arrayPoolMetrics ValuePool=ArrayPool GenericValue=Array\""
-//go:generate sh -c "cat $GOPATH/src/$PACKAGE/x/pool/generic_bucketized_pool.go | awk '/^package/{i++}i' | genny -out=$GOPATH/src/$PACKAGE/value/bucketized_value_array_pool.gen.go -pkg=value gen \"ValueBucket=ArrayBucket ValuePoolOptions=ArrayPoolOptions ValuePool=ArrayPool valueBucketByCapacity=arrayBucketByCapacity bucketPool=arrayBucketPool BucketizedValuePool=BucketizedArrayPool GenericValue=Array\""
-//go:generate sh -c "cat $GOPATH/src/$PACKAGE/x/pool/generic_pool.go | awk '/^package/{i++}i' | genny -out=$GOPATH/src/$PACKAGE/value/kv_array_pool.gen.go -pkg=value gen \"ValuePoolOptions=KVArrayPoolOptions valuePoolMetrics=kvArrayPoolMetrics ValuePool=KVArrayPool GenericValue=KVArray\""
-//go:generate sh -c "cat $GOPATH/src/$PACKAGE/x/pool/generic_bucketized_pool.go | awk '/^package/{i++}i' | genny -out=$GOPATH/src/$PACKAGE/value/bucketized_kv_array_pool.gen.go -pkg=value gen \"ValueBucket=KVArrayBucket ValuePoolOptions=KVArrayPoolOptions ValuePool=KVArrayPool valueBucketByCapacity=kvArrayBucketByCapacity bucketPool=kvArrayBucketPool BucketizedValuePool=BucketizedKVArrayPool GenericValue=KVArray\""
+//go:generate sh -c "cat $GOPATH/src/$PACKAGE/x/pool/generic_pool.go | awk '/^package/{i++}i' | genny -out=$GOPATH/src/$PACKAGE/parser/json/value/value_pool.gen.go -pkg=value gen \"ValuePoolOptions=PoolOptions valuePoolMetrics=poolMetrics ValuePool=Pool GenericValue=*Value\""
+//go:generate sh -c "cat $GOPATH/src/$PACKAGE/x/pool/generic_pool.go | awk '/^package/{i++}i' | genny -out=$GOPATH/src/$PACKAGE/parser/json/value/value_array_pool.gen.go -pkg=value gen \"ValuePoolOptions=ArrayPoolOptions valuePoolMetrics=arrayPoolMetrics ValuePool=ArrayPool GenericValue=Array\""
+//go:generate sh -c "cat $GOPATH/src/$PACKAGE/x/pool/generic_bucketized_pool.go | awk '/^package/{i++}i' | genny -out=$GOPATH/src/$PACKAGE/parser/json/value/bucketized_value_array_pool.gen.go -pkg=value gen \"ValueBucket=ArrayBucket ValuePoolOptions=ArrayPoolOptions ValuePool=ArrayPool valueBucketByCapacity=arrayBucketByCapacity bucketPool=arrayBucketPool BucketizedValuePool=BucketizedArrayPool GenericValue=Array\""
+//go:generate sh -c "cat $GOPATH/src/$PACKAGE/x/pool/generic_pool.go | awk '/^package/{i++}i' | genny -out=$GOPATH/src/$PACKAGE/parser/json/value/kv_array_pool.gen.go -pkg=value gen \"ValuePoolOptions=KVArrayPoolOptions valuePoolMetrics=kvArrayPoolMetrics ValuePool=KVArrayPool GenericValue=KVArray\""
+//go:generate sh -c "cat $GOPATH/src/$PACKAGE/x/pool/generic_bucketized_pool.go | awk '/^package/{i++}i' | genny -out=$GOPATH/src/$PACKAGE/parser/json/value/bucketized_kv_array_pool.gen.go -pkg=value gen \"ValueBucket=KVArrayBucket ValuePoolOptions=KVArrayPoolOptions ValuePool=KVArrayPool valueBucketByCapacity=kvArrayBucketByCapacity bucketPool=kvArrayBucketPool BucketizedValuePool=BucketizedKVArrayPool GenericValue=KVArray\""
 //go:generate sh -c "cat $GOPATH/src/$PACKAGE/x/pool/generic_pool.go | awk '/^package/{i++}i' | genny -out=$GOPATH/src/$PACKAGE/parser/json/parser_pool.gen.go -pkg=json gen \"ValuePoolOptions=ParserPoolOptions valuePoolMetrics=parserPoolMetrics ValuePool=ParserPool GenericValue=Parser\""
 
 package generics
diff --git a/parser/json/parser.go b/parser/json/parser.go
@@ -8,7 +8,7 @@ import (
 	"unicode/utf16"
 	"unicode/utf8"
 
-	"github.com/xichen2020/eventdb/value"
+	"github.com/xichen2020/eventdb/parser/json/value"
 	"github.com/xichen2020/eventdb/x/unsafe"
 )
 

diff --git a/parser/json/parser_benchmark_test.go b/parser/json/parser_benchmark_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/xichen2020/eventdb/value"
+	"github.com/xichen2020/eventdb/parser/json/value"
 	"github.com/xichen2020/eventdb/x/unsafe"
 
 	"github.com/stretchr/testify/require"

diff --git a/parser/json/parser_test.go b/parser/json/parser_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	"github.com/xichen2020/eventdb/value"
+	"github.com/xichen2020/eventdb/parser/json/value"
 )
 
 func TestParseError(t *testing.T) {

diff --git a/value/bucketized_kv_array_pool.gen.go → ...son/value/bucketized_kv_array_pool.gen.go b/value/bucketized_kv_array_pool.gen.go → ...son/value/bucketized_kv_array_pool.gen.go
diff --git a/value/bucketized_value_array_pool.gen.go → .../value/bucketized_value_array_pool.gen.go b/value/bucketized_value_array_pool.gen.go → .../value/bucketized_value_array_pool.gen.go
diff --git a/value/iterator.go → parser/json/value/iterator.go b/value/iterator.go → parser/json/value/iterator.go
diff --git a/value/iterator_test.go → parser/json/value/iterator_test.go b/value/iterator_test.go → parser/json/value/iterator_test.go
diff --git a/value/kv_array_pool.gen.go → parser/json/value/kv_array_pool.gen.go b/value/kv_array_pool.gen.go → parser/json/value/kv_array_pool.gen.go
diff --git a/value/object.go → parser/json/value/object.go b/value/object.go → parser/json/value/object.go
diff --git a/value/object_test.go → parser/json/value/object_test.go b/value/object_test.go → parser/json/value/object_test.go
diff --git a/value/type.go → parser/json/value/type.go b/value/type.go → parser/json/value/type.go
diff --git a/value/type_test.go → parser/json/value/type_test.go b/value/type_test.go → parser/json/value/type_test.go
diff --git a/value/value.go → parser/json/value/value.go b/value/value.go → parser/json/value/value.go
diff --git a/value/value_array_pool.gen.go → parser/json/value/value_array_pool.gen.go b/value/value_array_pool.gen.go → parser/json/value/value_array_pool.gen.go
diff --git a/value/value_pool.gen.go → parser/json/value/value_pool.gen.go b/value/value_pool.gen.go → parser/json/value/value_pool.gen.go
diff --git a/value/value_test.go → parser/json/value/value_test.go b/value/value_test.go → parser/json/value/value_test.go
diff --git a/server/http/handlers/options.go b/server/http/handlers/options.go
@@ -2,7 +2,7 @@ package handlers
 
 import (
 	"github.com/xichen2020/eventdb/parser/json"
-	"github.com/xichen2020/eventdb/value"
+	"github.com/xichen2020/eventdb/parser/json/value"
 )
 
 // IDFn determines the ID of a JSON event.

diff --git a/server/http/handlers/service.go b/server/http/handlers/service.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/xichen2020/eventdb/event"
 	"github.com/xichen2020/eventdb/parser/json"
+	"github.com/xichen2020/eventdb/parser/json/value"
 	"github.com/xichen2020/eventdb/storage"
-	"github.com/xichen2020/eventdb/value"
 
 	xerrors "github.com/m3db/m3x/errors"
 )

diff --git a/tools/benchdb/main.go b/tools/benchdb/main.go
@@ -14,9 +14,9 @@ import (
 
 	"github.com/xichen2020/eventdb/event"
 	"github.com/xichen2020/eventdb/parser/json"
+	"github.com/xichen2020/eventdb/parser/json/value"
 	"github.com/xichen2020/eventdb/sharding"
 	"github.com/xichen2020/eventdb/storage"
-	"github.com/xichen2020/eventdb/value"
 
 	"github.com/m3db/m3cluster/shard"
 	"github.com/m3db/m3x/log"