diff --git a/client/main_test.go b/client/main_test.go index 4d9cd99cd..f4e370bba 100644 --- a/client/main_test.go +++ b/client/main_test.go @@ -9,7 +9,7 @@ import ( "net/http" _ "net/http/pprof" - "github.com/molecula/featurebase/v3/testhook" + "github.com/featurebasedb/featurebase/v3/testhook" ) func TestMain(m *testing.M) { diff --git a/executor_internal_test.go b/executor_internal_test.go index 1a2cc4a45..9db7d253c 100644 --- a/executor_internal_test.go +++ b/executor_internal_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "github.com/molecula/featurebase/v3/pql" + "github.com/featurebasedb/featurebase/v3/pql" ) // AssertEqual checks a given RowIdentifiers against expected values. diff --git a/field.go b/field.go index 9f76c0add..1037cf877 100644 --- a/field.go +++ b/field.go @@ -16,11 +16,11 @@ import ( "sync" "time" - "github.com/molecula/featurebase/v3/pql" - "github.com/molecula/featurebase/v3/roaring" - "github.com/molecula/featurebase/v3/stats" - "github.com/molecula/featurebase/v3/testhook" - "github.com/molecula/featurebase/v3/tracing" + "github.com/featurebasedb/featurebase/v3/pql" + "github.com/featurebasedb/featurebase/v3/roaring" + "github.com/featurebasedb/featurebase/v3/stats" + "github.com/featurebasedb/featurebase/v3/testhook" + "github.com/featurebasedb/featurebase/v3/tracing" "github.com/pkg/errors" ) diff --git a/field_internal_test.go b/field_internal_test.go index ff4511225..59907ca30 100644 --- a/field_internal_test.go +++ b/field_internal_test.go @@ -12,10 +12,10 @@ import ( "testing" "time" - "github.com/molecula/featurebase/v3/pql" - "github.com/molecula/featurebase/v3/roaring" - "github.com/molecula/featurebase/v3/shardwidth" - . "github.com/molecula/featurebase/v3/vprint" // nolint:staticcheck + "github.com/featurebasedb/featurebase/v3/pql" + "github.com/featurebasedb/featurebase/v3/roaring" + "github.com/featurebasedb/featurebase/v3/shardwidth" + . "github.com/featurebasedb/featurebase/v3/vprint" // nolint:staticcheck ) // CorruptAMutex breaks a mutex in order to test the mutex-corruption stuff. diff --git a/field_test.go b/field_test.go index 2c91b489c..4e26d4902 100644 --- a/field_test.go +++ b/field_test.go @@ -13,12 +13,7 @@ import ( "github.com/featurebasedb/featurebase/v3/pql" "github.com/featurebasedb/featurebase/v3/roaring" "github.com/featurebasedb/featurebase/v3/test" - "github.com/featurebasedb/featurebase/v3/testhook" "github.com/google/go-cmp/cmp" - pilosa "github.com/molecula/featurebase/v3" - "github.com/molecula/featurebase/v3/pql" - "github.com/molecula/featurebase/v3/roaring" - "github.com/molecula/featurebase/v3/test" "github.com/pkg/errors" ) diff --git a/go.mod b/go.mod index ea67c1be5..a82844842 100644 --- a/go.mod +++ b/go.mod @@ -54,7 +54,7 @@ require ( github.com/spf13/cobra v1.2.1 github.com/spf13/pflag v1.0.5 github.com/spf13/viper v1.8.1 - github.com/stretchr/testify v1.7.1 + github.com/stretchr/testify v1.8.0 github.com/uber/jaeger-client-go v2.25.0+incompatible github.com/uber/jaeger-lib v2.4.1+incompatible // indirect github.com/zeebo/blake3 v0.2.3 @@ -136,7 +136,7 @@ require ( github.com/spf13/afero v1.6.0 // indirect github.com/spf13/cast v1.3.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect - github.com/stretchr/objx v0.2.0 // indirect + github.com/stretchr/objx v0.4.0 // indirect github.com/subosito/gotenv v1.2.0 // indirect github.com/tklauser/go-sysconf v0.3.10 // indirect github.com/tklauser/numcpus v0.4.0 // indirect @@ -169,7 +169,7 @@ require ( google.golang.org/protobuf v1.28.0 // indirect gopkg.in/ini.v1 v1.62.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect - gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect nhooyr.io/websocket v1.8.6 // indirect ) diff --git a/go.sum b/go.sum index a7089611e..c8702f55b 100644 --- a/go.sum +++ b/go.sum @@ -993,6 +993,8 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0 h1:Hbg2NidpLE8veEBkEZTL3CvlkUIVzuU9jDplZO54c48= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -1003,6 +1005,8 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ= @@ -1672,6 +1676,8 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gorm.io/driver/mysql v1.0.1/go.mod h1:KtqSthtg55lFp3S5kUXqlGaelnWpKitn4k1xZTnoiPw= gorm.io/driver/postgres v1.0.0/go.mod h1:wtMFcOzmuA5QigNsgEIb7O5lhvH1tHAF1RbWmLWV4to= gorm.io/driver/sqlserver v1.0.4/go.mod h1:ciEo5btfITTBCj9BkoUVDvgQbUdLWQNqdFY5OGuGnRg= diff --git a/holder_test.go b/holder_test.go index f6cc800f6..ead88e2c8 100644 --- a/holder_test.go +++ b/holder_test.go @@ -11,9 +11,9 @@ import ( "testing" "time" - pilosa "github.com/molecula/featurebase/v3" - "github.com/molecula/featurebase/v3/pql" - "github.com/molecula/featurebase/v3/test" + pilosa "github.com/featurebasedb/featurebase/v3" + "github.com/featurebasedb/featurebase/v3/pql" + "github.com/featurebasedb/featurebase/v3/test" "github.com/pkg/errors" ) diff --git a/index_test.go b/index_test.go index fe6b9ed0d..b291165e6 100644 --- a/index_test.go +++ b/index_test.go @@ -11,10 +11,10 @@ import ( "testing" "time" - pilosa "github.com/molecula/featurebase/v3" - "github.com/molecula/featurebase/v3/disco" - "github.com/molecula/featurebase/v3/pql" - "github.com/molecula/featurebase/v3/test" + pilosa "github.com/featurebasedb/featurebase/v3" + "github.com/featurebasedb/featurebase/v3/disco" + "github.com/featurebasedb/featurebase/v3/pql" + "github.com/featurebasedb/featurebase/v3/test" "github.com/pkg/errors" ) diff --git a/server/handler_test.go b/server/handler_test.go index 6ebc6ade3..18070be4d 100644 --- a/server/handler_test.go +++ b/server/handler_test.go @@ -18,13 +18,13 @@ import ( "testing" "time" - pilosa "github.com/molecula/featurebase/v3" - "github.com/molecula/featurebase/v3/boltdb" - "github.com/molecula/featurebase/v3/encoding/proto" - "github.com/molecula/featurebase/v3/pql" - pb "github.com/molecula/featurebase/v3/proto" - "github.com/molecula/featurebase/v3/server" - "github.com/molecula/featurebase/v3/test" + pilosa "github.com/featurebasedb/featurebase/v3" + "github.com/featurebasedb/featurebase/v3/boltdb" + "github.com/featurebasedb/featurebase/v3/encoding/proto" + "github.com/featurebasedb/featurebase/v3/pql" + pb "github.com/featurebasedb/featurebase/v3/proto" + "github.com/featurebasedb/featurebase/v3/server" + "github.com/featurebasedb/featurebase/v3/test" "google.golang.org/grpc" ) diff --git a/sql/main_test.go b/sql/main_test.go index 99079412c..77ba1de2b 100644 --- a/sql/main_test.go +++ b/sql/main_test.go @@ -9,7 +9,7 @@ import ( "net/http" _ "net/http/pprof" - "github.com/molecula/featurebase/v3/testhook" + "github.com/featurebasedb/featurebase/v3/testhook" ) func TestMain(m *testing.M) { diff --git a/sql3/main_test.go b/sql3/main_test.go index 9412199d4..317cc8681 100644 --- a/sql3/main_test.go +++ b/sql3/main_test.go @@ -9,7 +9,7 @@ import ( "net/http" _ "net/http/pprof" - "github.com/molecula/featurebase/v3/testhook" + "github.com/featurebasedb/featurebase/v3/testhook" ) func TestMain(m *testing.M) { diff --git a/sql3/planner/expressionagg.go b/sql3/planner/expressionagg.go index b6a1a0ecd..15fbcba68 100644 --- a/sql3/planner/expressionagg.go +++ b/sql3/planner/expressionagg.go @@ -7,10 +7,10 @@ import ( "fmt" "reflect" - "github.com/molecula/featurebase/v3/pql" - "github.com/molecula/featurebase/v3/sql3" - "github.com/molecula/featurebase/v3/sql3/parser" - "github.com/molecula/featurebase/v3/sql3/planner/types" + "github.com/featurebasedb/featurebase/v3/pql" + "github.com/featurebasedb/featurebase/v3/sql3" + "github.com/featurebasedb/featurebase/v3/sql3/parser" + "github.com/featurebasedb/featurebase/v3/sql3/planner/types" ) // aggregator for the COUNT function diff --git a/sql3/planner/inbuiltfunctionstable.go b/sql3/planner/inbuiltfunctionstable.go index 41e7e55c6..f4527df7e 100644 --- a/sql3/planner/inbuiltfunctionstable.go +++ b/sql3/planner/inbuiltfunctionstable.go @@ -1,8 +1,8 @@ package planner import ( - "github.com/molecula/featurebase/v3/sql3" - "github.com/molecula/featurebase/v3/sql3/parser" + "github.com/featurebasedb/featurebase/v3/sql3" + "github.com/featurebasedb/featurebase/v3/sql3/parser" ) // TODO (pok) this needs to go somewhere diff --git a/sql3/planner/main_test.go b/sql3/planner/main_test.go index 49993e6c9..c2c9c47bd 100644 --- a/sql3/planner/main_test.go +++ b/sql3/planner/main_test.go @@ -9,7 +9,7 @@ import ( "net/http" _ "net/http/pprof" - "github.com/molecula/featurebase/v3/testhook" + "github.com/featurebasedb/featurebase/v3/testhook" ) func TestMain(m *testing.M) { diff --git a/sql3/planner/memoryobj.go b/sql3/planner/memoryobj.go index cdbfdcf35..784127149 100644 --- a/sql3/planner/memoryobj.go +++ b/sql3/planner/memoryobj.go @@ -5,8 +5,8 @@ package planner import ( "hash/maphash" - "github.com/molecula/featurebase/v3/sql3" - "github.com/molecula/featurebase/v3/sql3/planner/types" + "github.com/featurebasedb/featurebase/v3/sql3" + "github.com/featurebasedb/featurebase/v3/sql3/planner/types" ) var prototypeHash maphash.Hash diff --git a/sql3/planner/opbulkinsert.go b/sql3/planner/opbulkinsert.go index 4522bb25b..cbeb33adc 100644 --- a/sql3/planner/opbulkinsert.go +++ b/sql3/planner/opbulkinsert.go @@ -12,10 +12,10 @@ import ( "strconv" "time" - pilosa "github.com/molecula/featurebase/v3" - "github.com/molecula/featurebase/v3/sql3" - "github.com/molecula/featurebase/v3/sql3/parser" - "github.com/molecula/featurebase/v3/sql3/planner/types" + pilosa "github.com/featurebasedb/featurebase/v3" + "github.com/featurebasedb/featurebase/v3/sql3" + "github.com/featurebasedb/featurebase/v3/sql3/parser" + "github.com/featurebasedb/featurebase/v3/sql3/planner/types" ) // bulkInsertMappedColumn specifies a mapping from the source diff --git a/sql3/planner/opfilter.go b/sql3/planner/opfilter.go index 1a5a8aacf..65f71888f 100644 --- a/sql3/planner/opfilter.go +++ b/sql3/planner/opfilter.go @@ -6,8 +6,8 @@ import ( "context" "fmt" - "github.com/molecula/featurebase/v3/sql3" - "github.com/molecula/featurebase/v3/sql3/planner/types" + "github.com/featurebasedb/featurebase/v3/sql3" + "github.com/featurebasedb/featurebase/v3/sql3/planner/types" ) // PlanOpFilter is a filter operator diff --git a/sql3/planner/opgroupby.go b/sql3/planner/opgroupby.go index 65deb4f6c..86ef5eb6d 100644 --- a/sql3/planner/opgroupby.go +++ b/sql3/planner/opgroupby.go @@ -8,9 +8,9 @@ import ( "hash/maphash" "log" - "github.com/molecula/featurebase/v3/errors" - "github.com/molecula/featurebase/v3/sql3" - "github.com/molecula/featurebase/v3/sql3/planner/types" + "github.com/featurebasedb/featurebase/v3/errors" + "github.com/featurebasedb/featurebase/v3/sql3" + "github.com/featurebasedb/featurebase/v3/sql3/planner/types" ) // PlanOpGroupBy handles the GROUP BY clause diff --git a/sql3/planner/oprelalias.go b/sql3/planner/oprelalias.go index 1b775b4f7..7aa13ee9a 100644 --- a/sql3/planner/oprelalias.go +++ b/sql3/planner/oprelalias.go @@ -6,8 +6,8 @@ import ( "context" "fmt" - "github.com/molecula/featurebase/v3/sql3" - "github.com/molecula/featurebase/v3/sql3/planner/types" + "github.com/featurebasedb/featurebase/v3/sql3" + "github.com/featurebasedb/featurebase/v3/sql3/planner/types" ) // PlanOpRelAlias implements an alias for a relation diff --git a/sql3/planner/optablevaluedfunction.go b/sql3/planner/optablevaluedfunction.go index b603b3dff..63660c0af 100644 --- a/sql3/planner/optablevaluedfunction.go +++ b/sql3/planner/optablevaluedfunction.go @@ -6,9 +6,9 @@ import ( "context" "fmt" - "github.com/molecula/featurebase/v3/sql3" - "github.com/molecula/featurebase/v3/sql3/parser" - "github.com/molecula/featurebase/v3/sql3/planner/types" + "github.com/featurebasedb/featurebase/v3/sql3" + "github.com/featurebasedb/featurebase/v3/sql3/parser" + "github.com/featurebasedb/featurebase/v3/sql3/planner/types" ) // PlanOpTableValuedFunction is an operator for a subquery diff --git a/sql3/planner/planoptimizer.go b/sql3/planner/planoptimizer.go index 065dc3484..b0126efd7 100644 --- a/sql3/planner/planoptimizer.go +++ b/sql3/planner/planoptimizer.go @@ -9,10 +9,10 @@ import ( "reflect" "strings" - "github.com/molecula/featurebase/v3/errors" - "github.com/molecula/featurebase/v3/sql3" - "github.com/molecula/featurebase/v3/sql3/parser" - "github.com/molecula/featurebase/v3/sql3/planner/types" + "github.com/featurebasedb/featurebase/v3/errors" + "github.com/featurebasedb/featurebase/v3/sql3" + "github.com/featurebasedb/featurebase/v3/sql3/parser" + "github.com/featurebasedb/featurebase/v3/sql3/planner/types" ) //TODO(pok) push order by down as far as possible diff --git a/sql3/sql_defs_aggregate_test.go b/sql3/sql_defs_aggregate_test.go index f8dc88cb9..497ce62b5 100644 --- a/sql3/sql_defs_aggregate_test.go +++ b/sql3/sql_defs_aggregate_test.go @@ -5,7 +5,7 @@ import ( "github.com/featurebasedb/featurebase/v3/sql3/parser" ) -// aggregate function tests +//aggregate function tests var countTests = tableTest{ table: tbl( "count_test", @@ -50,19 +50,6 @@ var countTests = tableTest{ ), compare: compareExactUnordered, }, - { - sqls: sqls( - "SELECT COUNT(i1) as a, COUNT(i2) as b FROM count_test", - ), - expHdrs: hdrs( - hdr("a", fldTypeInt), - hdr("b", fldTypeInt), - ), - expRows: rows( - row(int64(6), int64(2)), - ), - compare: compareExactUnordered, - }, { sqls: sqls( "SELECT COUNT(*) + 10 - 11 * 2 AS count_rows FROM count_test", diff --git a/stats/main_test.go b/stats/main_test.go index 11b29175f..066b2d5f3 100644 --- a/stats/main_test.go +++ b/stats/main_test.go @@ -9,7 +9,7 @@ import ( "net/http" _ "net/http/pprof" - "github.com/molecula/featurebase/v3/testhook" + "github.com/featurebasedb/featurebase/v3/testhook" ) func TestMain(m *testing.M) { diff --git a/test/index.go b/test/index.go index f8cd34756..3677d0a00 100644 --- a/test/index.go +++ b/test/index.go @@ -6,8 +6,8 @@ import ( "context" "testing" - pilosa "github.com/molecula/featurebase/v3" - "github.com/molecula/featurebase/v3/testhook" + pilosa "github.com/featurebasedb/featurebase/v3" + "github.com/featurebasedb/featurebase/v3/testhook" ) // Index represents a test wrapper for pilosa.Index. diff --git a/test/main_test.go b/test/main_test.go index 34b9c743d..ae5c0de4b 100644 --- a/test/main_test.go +++ b/test/main_test.go @@ -9,7 +9,7 @@ import ( "net/http" _ "net/http/pprof" - "github.com/molecula/featurebase/v3/testhook" + "github.com/featurebasedb/featurebase/v3/testhook" ) func TestMain(m *testing.M) {