From e47bdb78899c63d38df5c566575774523ec45eba Mon Sep 17 00:00:00 2001 From: Seebs Date: Fri, 2 Sep 2022 10:57:06 -0500 Subject: [PATCH] cleaned up sync from private repo --- api.go | 12 ++++----- api_test.go | 14 +++++----- cluster_internal_test.go | 6 ++--- cmd/backup_tar.go | 2 +- cmd/cli.go | 2 +- cmd/featurebase-parse-sql/main.go | 2 +- cmd/restore_tar.go | 2 +- ctl/backup_tar.go | 10 +++---- ctl/backup_tar_test.go | 2 +- ctl/cli.go | 2 +- ctl/import_test.go | 2 +- ctl/restore_tar.go | 8 +++--- ctl/restore_tar_test.go | 2 +- dbshard_test.go | 6 ++--- errors/errors_test.go | 2 +- executor_test.go | 12 ++------- http_handler.go | 12 +-------- internal_client_test.go | 14 +++++----- server.go | 20 +++++++------- server/server.go | 36 +++++++++++++------------- sql/handler_test.go | 6 ++--- sql3/errors.go | 4 +-- sql3/interfaces.go | 4 +-- sql3/parser/ast_test.go | 2 +- sql3/parser/astdatatype.go | 2 +- sql3/parser/parser_test.go | 2 +- sql3/parser/scanner_test.go | 2 +- sql3/parser/token_test.go | 2 +- sql3/planner/compilealtertable.go | 6 ++--- sql3/planner/compilebulkinsert.go | 8 +++--- sql3/planner/compilecreatetable.go | 10 +++---- sql3/planner/compiledroptable.go | 8 +++--- sql3/planner/compileinsert.go | 8 +++--- sql3/planner/compileselect.go | 8 +++--- sql3/planner/compileshow.go | 8 +++--- sql3/planner/executionplanner.go | 8 +++--- sql3/planner/executionplanner_test.go | 12 ++++----- sql3/planner/expression.go | 8 +++--- sql3/planner/expressionagg.go | 6 ++--- sql3/planner/expressionanalyzer.go | 4 +-- sql3/planner/expressionanalyzercall.go | 4 +-- sql3/planner/expressionpql.go | 8 +++--- sql3/planner/expressiontypes.go | 6 ++--- sql3/planner/inbuiltfunctionsdate.go | 4 +-- sql3/planner/inbuiltfunctionsset.go | 4 +-- sql3/planner/memoryobj.go | 2 +- sql3/planner/opaltertable.go | 4 +-- sql3/planner/opbulkinsert.go | 2 +- sql3/planner/opcreatetable.go | 4 +-- sql3/planner/opdistinct.go | 2 +- sql3/planner/opdroptable.go | 4 +-- sql3/planner/opfeaturebasecolumns.go | 6 ++--- sql3/planner/opfeaturebasetables.go | 6 ++--- sql3/planner/opgroupby.go | 4 +-- sql3/planner/opinsert.go | 10 +++---- sql3/planner/opnestedloops.go | 4 +-- sql3/planner/opnulltable.go | 2 +- sql3/planner/oporderby.go | 6 ++--- sql3/planner/oppqlaggregate.go | 10 +++---- sql3/planner/oppqlgroupby.go | 10 +++---- sql3/planner/oppqlmultiaggregate.go | 2 +- sql3/planner/oppqlmultigroupby.go | 2 +- sql3/planner/opprojection.go | 4 +-- sql3/planner/opquery.go | 4 +-- sql3/planner/opsubquery.go | 2 +- sql3/planner/optablescan.go | 10 +++---- sql3/planner/optop.go | 2 +- sql3/planner/planoptimizer.go | 4 +-- sql3/planner/planwalker.go | 2 +- sql3/planner/types/operator.go | 2 +- sql3/planner/types/planexpression.go | 2 +- sql3/sql_definitions_test.go | 2 +- sql3/sql_defs_aggregate_test.go | 4 +-- sql3/sql_defs_cast_test.go | 2 +- sql3/sql_defs_groupby_test.go | 4 +-- sql3/sql_test.go | 10 +++---- sql3/test/helpers.go | 4 +-- test/glue.go | 2 +- test/holder.go | 6 ++--- test/pilosa.go | 8 +++--- translator_test.go | 8 +++--- tx_test.go | 6 ++--- 82 files changed, 231 insertions(+), 249 deletions(-) diff --git a/api.go b/api.go index 9fbd00fa6..9758e6d35 100644 --- a/api.go +++ b/api.go @@ -26,12 +26,12 @@ import ( "github.com/featurebasedb/featurebase/v3/ingest" "github.com/featurebasedb/featurebase/v3/rbf" - //"github.com/molecula/featurebase/v3/pg" - "github.com/molecula/featurebase/v3/pql" - "github.com/molecula/featurebase/v3/roaring" - planner_types "github.com/molecula/featurebase/v3/sql3/planner/types" - "github.com/molecula/featurebase/v3/stats" - "github.com/molecula/featurebase/v3/tracing" + //"github.com/featurebasedb/featurebase/v3/pg" + "github.com/featurebasedb/featurebase/v3/pql" + "github.com/featurebasedb/featurebase/v3/roaring" + planner_types "github.com/featurebasedb/featurebase/v3/sql3/planner/types" + "github.com/featurebasedb/featurebase/v3/stats" + "github.com/featurebasedb/featurebase/v3/tracing" "github.com/pkg/errors" "golang.org/x/sync/errgroup" ) diff --git a/api_test.go b/api_test.go index 3fc6f464c..632768e37 100644 --- a/api_test.go +++ b/api_test.go @@ -22,14 +22,14 @@ import ( "testing" "time" + pilosa "github.com/featurebasedb/featurebase/v3" + "github.com/featurebasedb/featurebase/v3/authn" + "github.com/featurebasedb/featurebase/v3/roaring" + "github.com/featurebasedb/featurebase/v3/server" + "github.com/featurebasedb/featurebase/v3/shardwidth" + "github.com/featurebasedb/featurebase/v3/test" + . "github.com/featurebasedb/featurebase/v3/vprint" // nolint:staticcheck "github.com/golang-jwt/jwt" - pilosa "github.com/molecula/featurebase/v3" - "github.com/molecula/featurebase/v3/authn" - "github.com/molecula/featurebase/v3/roaring" - "github.com/molecula/featurebase/v3/server" - "github.com/molecula/featurebase/v3/shardwidth" - "github.com/molecula/featurebase/v3/test" - . "github.com/molecula/featurebase/v3/vprint" // nolint:staticcheck "golang.org/x/sync/errgroup" ) diff --git a/cluster_internal_test.go b/cluster_internal_test.go index beef097e0..c8f738699 100644 --- a/cluster_internal_test.go +++ b/cluster_internal_test.go @@ -10,9 +10,9 @@ import ( "testing/quick" "time" - "github.com/molecula/featurebase/v3/disco" - pnet "github.com/molecula/featurebase/v3/net" - "github.com/molecula/featurebase/v3/roaring" + "github.com/featurebasedb/featurebase/v3/disco" + pnet "github.com/featurebasedb/featurebase/v3/net" + "github.com/featurebasedb/featurebase/v3/roaring" ) // Ensure the cluster can fairly distribute partitions across the nodes. diff --git a/cmd/backup_tar.go b/cmd/backup_tar.go index e480a487c..d96a6fd0d 100644 --- a/cmd/backup_tar.go +++ b/cmd/backup_tar.go @@ -5,7 +5,7 @@ import ( "context" "io" - "github.com/molecula/featurebase/v3/ctl" + "github.com/featurebasedb/featurebase/v3/ctl" "github.com/spf13/cobra" ) diff --git a/cmd/cli.go b/cmd/cli.go index d3e236c03..df3e1a658 100644 --- a/cmd/cli.go +++ b/cmd/cli.go @@ -5,7 +5,7 @@ import ( "context" "io" - "github.com/molecula/featurebase/v3/ctl" + "github.com/featurebasedb/featurebase/v3/ctl" "github.com/spf13/cobra" ) diff --git a/cmd/featurebase-parse-sql/main.go b/cmd/featurebase-parse-sql/main.go index 1a214a78c..c9785cba2 100644 --- a/cmd/featurebase-parse-sql/main.go +++ b/cmd/featurebase-parse-sql/main.go @@ -10,7 +10,7 @@ import ( "os" "strings" - "github.com/molecula/featurebase/v3/sql3/parser" + "github.com/featurebasedb/featurebase/v3/sql3/parser" ) func main() { diff --git a/cmd/restore_tar.go b/cmd/restore_tar.go index 563487429..e27c5f3bc 100644 --- a/cmd/restore_tar.go +++ b/cmd/restore_tar.go @@ -5,7 +5,7 @@ import ( "context" "io" - "github.com/molecula/featurebase/v3/ctl" + "github.com/featurebasedb/featurebase/v3/ctl" "github.com/spf13/cobra" ) diff --git a/ctl/backup_tar.go b/ctl/backup_tar.go index 86d68edb6..7420f4324 100644 --- a/ctl/backup_tar.go +++ b/ctl/backup_tar.go @@ -13,11 +13,11 @@ import ( "path" "time" - pilosa "github.com/molecula/featurebase/v3" - "github.com/molecula/featurebase/v3/authn" - "github.com/molecula/featurebase/v3/disco" - "github.com/molecula/featurebase/v3/encoding/proto" - "github.com/molecula/featurebase/v3/server" + pilosa "github.com/featurebasedb/featurebase/v3" + "github.com/featurebasedb/featurebase/v3/authn" + "github.com/featurebasedb/featurebase/v3/disco" + "github.com/featurebasedb/featurebase/v3/encoding/proto" + "github.com/featurebasedb/featurebase/v3/server" "github.com/pkg/errors" ) diff --git a/ctl/backup_tar_test.go b/ctl/backup_tar_test.go index 2c996d965..a7bda565a 100644 --- a/ctl/backup_tar_test.go +++ b/ctl/backup_tar_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/molecula/featurebase/v3/test" + "github.com/featurebasedb/featurebase/v3/test" ) func TestBackupTarCommand_Run(t *testing.T) { diff --git a/ctl/cli.go b/ctl/cli.go index a1eaad6ea..922645435 100644 --- a/ctl/cli.go +++ b/ctl/cli.go @@ -10,9 +10,9 @@ import ( "strings" "github.com/chzyer/readline" + featurebase "github.com/featurebasedb/featurebase/v3" "github.com/jedib0t/go-pretty/table" "github.com/jedib0t/go-pretty/text" - featurebase "github.com/molecula/featurebase/v3" "github.com/pkg/errors" ) diff --git a/ctl/import_test.go b/ctl/import_test.go index 3364d3efe..f1c660ed2 100644 --- a/ctl/import_test.go +++ b/ctl/import_test.go @@ -302,7 +302,7 @@ func TestImportCommand_KeyReplication(t *testing.T) { // Read body and unmarshal response. exp := `{"results":[50]}` + "\n" - if body, err := ioutil.ReadAll(resp.Body); err != nil { + if body, err := io.ReadAll(resp.Body); err != nil { return fmt.Errorf("reading: %s", err) } else if !reflect.DeepEqual(body, []byte(exp)) { return fmt.Errorf("expected: %s, but got: %s", exp, body) diff --git a/ctl/restore_tar.go b/ctl/restore_tar.go index 33b581906..618b77994 100644 --- a/ctl/restore_tar.go +++ b/ctl/restore_tar.go @@ -16,10 +16,10 @@ import ( "strings" "time" - pilosa "github.com/molecula/featurebase/v3" - "github.com/molecula/featurebase/v3/authn" - "github.com/molecula/featurebase/v3/disco" - "github.com/molecula/featurebase/v3/server" + pilosa "github.com/featurebasedb/featurebase/v3" + "github.com/featurebasedb/featurebase/v3/authn" + "github.com/featurebasedb/featurebase/v3/disco" + "github.com/featurebasedb/featurebase/v3/server" "github.com/pkg/errors" "golang.org/x/sync/errgroup" ) diff --git a/ctl/restore_tar_test.go b/ctl/restore_tar_test.go index ebe4868ae..04b2e1b29 100644 --- a/ctl/restore_tar_test.go +++ b/ctl/restore_tar_test.go @@ -7,7 +7,7 @@ import ( "strings" "testing" - "github.com/molecula/featurebase/v3/test" + "github.com/featurebasedb/featurebase/v3/test" ) func TestRestoreTarCommand_Run(t *testing.T) { diff --git a/dbshard_test.go b/dbshard_test.go index f3945cb9a..fb96d0f65 100644 --- a/dbshard_test.go +++ b/dbshard_test.go @@ -7,9 +7,9 @@ import ( "fmt" "testing" - pilosa "github.com/molecula/featurebase/v3" - "github.com/molecula/featurebase/v3/test" - . "github.com/molecula/featurebase/v3/vprint" // nolint:staticcheck + pilosa "github.com/featurebasedb/featurebase/v3" + "github.com/featurebasedb/featurebase/v3/test" + . "github.com/featurebasedb/featurebase/v3/vprint" // nolint:staticcheck ) func TestAPI_SimplerOneNode_ImportColumnKey(t *testing.T) { diff --git a/errors/errors_test.go b/errors/errors_test.go index 0f0a4ab8d..6e0b59fc6 100644 --- a/errors/errors_test.go +++ b/errors/errors_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/molecula/featurebase/v3/errors" + "github.com/featurebasedb/featurebase/v3/errors" "github.com/stretchr/testify/assert" ) diff --git a/executor_test.go b/executor_test.go index 331080feb..85b5ec4d6 100644 --- a/executor_test.go +++ b/executor_test.go @@ -11,6 +11,7 @@ import ( "flag" "fmt" "io" + "io/ioutil" "math" "math/rand" _ "net/http/pprof" @@ -24,7 +25,6 @@ import ( "github.com/davecgh/go-spew/spew" pilosa "github.com/featurebasedb/featurebase/v3" - "github.com/featurebasedb/featurebase/v3/boltdb" "github.com/featurebasedb/featurebase/v3/ctl" "github.com/featurebasedb/featurebase/v3/disco" "github.com/featurebasedb/featurebase/v3/pql" @@ -33,16 +33,8 @@ import ( "github.com/featurebasedb/featurebase/v3/test" "github.com/featurebasedb/featurebase/v3/testhook" . "github.com/featurebasedb/featurebase/v3/vprint" // nolint:staticcheck + . "github.com/featurebasedb/featurebase/v3/vprint" // nolint:staticcheck "github.com/google/go-cmp/cmp" - pilosa "github.com/molecula/featurebase/v3" - "github.com/molecula/featurebase/v3/ctl" - "github.com/molecula/featurebase/v3/disco" - "github.com/molecula/featurebase/v3/pql" - "github.com/molecula/featurebase/v3/proto" - "github.com/molecula/featurebase/v3/server" - "github.com/molecula/featurebase/v3/test" - "github.com/molecula/featurebase/v3/testhook" - . "github.com/molecula/featurebase/v3/vprint" // nolint:staticcheck "github.com/pkg/errors" ) diff --git a/http_handler.go b/http_handler.go index 1f80a5f6d..02ffe0520 100644 --- a/http_handler.go +++ b/http_handler.go @@ -36,22 +36,12 @@ import ( "github.com/featurebasedb/featurebase/v3/monitor" "github.com/featurebasedb/featurebase/v3/pql" "github.com/featurebasedb/featurebase/v3/rbf" + "github.com/featurebasedb/featurebase/v3/sql3/planner/types" "github.com/featurebasedb/featurebase/v3/storage" "github.com/featurebasedb/featurebase/v3/tracing" "github.com/felixge/fgprof" "github.com/gorilla/handlers" "github.com/gorilla/mux" - "github.com/molecula/featurebase/v3/authn" - "github.com/molecula/featurebase/v3/authz" - "github.com/molecula/featurebase/v3/disco" - "github.com/molecula/featurebase/v3/ingest" - "github.com/molecula/featurebase/v3/logger" - "github.com/molecula/featurebase/v3/monitor" - "github.com/molecula/featurebase/v3/pql" - "github.com/molecula/featurebase/v3/rbf" - "github.com/molecula/featurebase/v3/sql3/planner/types" - "github.com/molecula/featurebase/v3/storage" - "github.com/molecula/featurebase/v3/tracing" "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus/promhttp" dto "github.com/prometheus/client_model/go" diff --git a/internal_client_test.go b/internal_client_test.go index 97bf4d61f..445a6d3fb 100644 --- a/internal_client_test.go +++ b/internal_client_test.go @@ -15,13 +15,13 @@ import ( "time" "github.com/davecgh/go-spew/spew" - pilosa "github.com/molecula/featurebase/v3" - "github.com/molecula/featurebase/v3/authn" - "github.com/molecula/featurebase/v3/disco" - "github.com/molecula/featurebase/v3/encoding/proto" - "github.com/molecula/featurebase/v3/pql" - "github.com/molecula/featurebase/v3/test" - "github.com/molecula/featurebase/v3/vprint" + pilosa "github.com/featurebasedb/featurebase/v3" + "github.com/featurebasedb/featurebase/v3/authn" + "github.com/featurebasedb/featurebase/v3/disco" + "github.com/featurebasedb/featurebase/v3/encoding/proto" + "github.com/featurebasedb/featurebase/v3/pql" + "github.com/featurebasedb/featurebase/v3/test" + "github.com/featurebasedb/featurebase/v3/vprint" "github.com/pkg/errors" "github.com/ricochet2200/go-disk-usage/du" ) diff --git a/server.go b/server.go index dc09cbb95..80bb2131f 100644 --- a/server.go +++ b/server.go @@ -17,16 +17,16 @@ import ( uuid "github.com/satori/go.uuid" - "github.com/molecula/featurebase/v3/disco" - "github.com/molecula/featurebase/v3/logger" - pnet "github.com/molecula/featurebase/v3/net" - rbfcfg "github.com/molecula/featurebase/v3/rbf/cfg" - "github.com/molecula/featurebase/v3/roaring" - "github.com/molecula/featurebase/v3/sql3" - "github.com/molecula/featurebase/v3/sql3/parser" - planner_types "github.com/molecula/featurebase/v3/sql3/planner/types" - "github.com/molecula/featurebase/v3/stats" - "github.com/molecula/featurebase/v3/storage" + "github.com/featurebasedb/featurebase/v3/disco" + "github.com/featurebasedb/featurebase/v3/logger" + pnet "github.com/featurebasedb/featurebase/v3/net" + rbfcfg "github.com/featurebasedb/featurebase/v3/rbf/cfg" + "github.com/featurebasedb/featurebase/v3/roaring" + "github.com/featurebasedb/featurebase/v3/sql3" + "github.com/featurebasedb/featurebase/v3/sql3/parser" + planner_types "github.com/featurebasedb/featurebase/v3/sql3/planner/types" + "github.com/featurebasedb/featurebase/v3/stats" + "github.com/featurebasedb/featurebase/v3/storage" "github.com/pkg/errors" "golang.org/x/sync/errgroup" diff --git a/server/server.go b/server/server.go index 6604398f7..5bf99e76a 100644 --- a/server/server.go +++ b/server/server.go @@ -28,24 +28,24 @@ import ( "golang.org/x/sync/errgroup" - pilosa "github.com/molecula/featurebase/v3" - "github.com/molecula/featurebase/v3/authn" - "github.com/molecula/featurebase/v3/authz" - "github.com/molecula/featurebase/v3/boltdb" - "github.com/molecula/featurebase/v3/encoding/proto" - petcd "github.com/molecula/featurebase/v3/etcd" - "github.com/molecula/featurebase/v3/gcnotify" - "github.com/molecula/featurebase/v3/gopsutil" - "github.com/molecula/featurebase/v3/logger" - pnet "github.com/molecula/featurebase/v3/net" - "github.com/molecula/featurebase/v3/prometheus" - "github.com/molecula/featurebase/v3/sql3" - "github.com/molecula/featurebase/v3/sql3/planner" - "github.com/molecula/featurebase/v3/statik" - "github.com/molecula/featurebase/v3/stats" - "github.com/molecula/featurebase/v3/statsd" - "github.com/molecula/featurebase/v3/syswrap" - "github.com/molecula/featurebase/v3/testhook" + pilosa "github.com/featurebasedb/featurebase/v3" + "github.com/featurebasedb/featurebase/v3/authn" + "github.com/featurebasedb/featurebase/v3/authz" + "github.com/featurebasedb/featurebase/v3/boltdb" + "github.com/featurebasedb/featurebase/v3/encoding/proto" + petcd "github.com/featurebasedb/featurebase/v3/etcd" + "github.com/featurebasedb/featurebase/v3/gcnotify" + "github.com/featurebasedb/featurebase/v3/gopsutil" + "github.com/featurebasedb/featurebase/v3/logger" + pnet "github.com/featurebasedb/featurebase/v3/net" + "github.com/featurebasedb/featurebase/v3/prometheus" + "github.com/featurebasedb/featurebase/v3/sql3" + "github.com/featurebasedb/featurebase/v3/sql3/planner" + "github.com/featurebasedb/featurebase/v3/statik" + "github.com/featurebasedb/featurebase/v3/stats" + "github.com/featurebasedb/featurebase/v3/statsd" + "github.com/featurebasedb/featurebase/v3/syswrap" + "github.com/featurebasedb/featurebase/v3/testhook" "github.com/pelletier/go-toml" "github.com/pkg/errors" ) diff --git a/sql/handler_test.go b/sql/handler_test.go index 705feb427..698a12577 100644 --- a/sql/handler_test.go +++ b/sql/handler_test.go @@ -7,9 +7,9 @@ import ( "math" "testing" - pilosa "github.com/molecula/featurebase/v3" - "github.com/molecula/featurebase/v3/sql" - "github.com/molecula/featurebase/v3/test" + pilosa "github.com/featurebasedb/featurebase/v3" + "github.com/featurebasedb/featurebase/v3/sql" + "github.com/featurebasedb/featurebase/v3/test" "vitess.io/vitess/go/vt/sqlparser" ) diff --git a/sql3/errors.go b/sql3/errors.go index 827971491..c75af0f98 100644 --- a/sql3/errors.go +++ b/sql3/errors.go @@ -4,8 +4,8 @@ import ( "fmt" "runtime" - "github.com/molecula/featurebase/v3/errors" - "github.com/molecula/featurebase/v3/sql3/parser" + "github.com/featurebasedb/featurebase/v3/errors" + "github.com/featurebasedb/featurebase/v3/sql3/parser" ) const ( diff --git a/sql3/interfaces.go b/sql3/interfaces.go index 399449e8e..ee22cce56 100644 --- a/sql3/interfaces.go +++ b/sql3/interfaces.go @@ -4,8 +4,8 @@ package sql3 import ( "context" - "github.com/molecula/featurebase/v3/sql3/parser" - "github.com/molecula/featurebase/v3/sql3/planner/types" + "github.com/featurebasedb/featurebase/v3/sql3/parser" + "github.com/featurebasedb/featurebase/v3/sql3/planner/types" ) type CompilePlanner interface { diff --git a/sql3/parser/ast_test.go b/sql3/parser/ast_test.go index a5b87843a..843604d21 100644 --- a/sql3/parser/ast_test.go +++ b/sql3/parser/ast_test.go @@ -6,8 +6,8 @@ import ( "strings" "testing" + "github.com/featurebasedb/featurebase/v3/sql3/parser" "github.com/go-test/deep" - "github.com/molecula/featurebase/v3/sql3/parser" ) func TestExprString(t *testing.T) { diff --git a/sql3/parser/astdatatype.go b/sql3/parser/astdatatype.go index 7844fd564..c08ce2720 100644 --- a/sql3/parser/astdatatype.go +++ b/sql3/parser/astdatatype.go @@ -5,7 +5,7 @@ import ( "math" "strings" - "github.com/molecula/featurebase/v3/pql" + "github.com/featurebasedb/featurebase/v3/pql" ) const ( diff --git a/sql3/parser/parser_test.go b/sql3/parser/parser_test.go index c96c9676a..29ad1be1b 100644 --- a/sql3/parser/parser_test.go +++ b/sql3/parser/parser_test.go @@ -5,8 +5,8 @@ import ( "strings" "testing" + "github.com/featurebasedb/featurebase/v3/sql3/parser" "github.com/go-test/deep" - "github.com/molecula/featurebase/v3/sql3/parser" ) func TestParser_ParseNonNullColumnConstraints(t *testing.T) { diff --git a/sql3/parser/scanner_test.go b/sql3/parser/scanner_test.go index 2991c6665..c253247f6 100644 --- a/sql3/parser/scanner_test.go +++ b/sql3/parser/scanner_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/molecula/featurebase/v3/sql3/parser" + "github.com/featurebasedb/featurebase/v3/sql3/parser" ) func TestScanner_Scan(t *testing.T) { diff --git a/sql3/parser/token_test.go b/sql3/parser/token_test.go index 137f633c9..021be7c38 100644 --- a/sql3/parser/token_test.go +++ b/sql3/parser/token_test.go @@ -4,7 +4,7 @@ package parser_test import ( "testing" - "github.com/molecula/featurebase/v3/sql3/parser" + "github.com/featurebasedb/featurebase/v3/sql3/parser" ) func TestPos_String(t *testing.T) { diff --git a/sql3/planner/compilealtertable.go b/sql3/planner/compilealtertable.go index 17d6c9026..15fe6b50a 100644 --- a/sql3/planner/compilealtertable.go +++ b/sql3/planner/compilealtertable.go @@ -5,9 +5,9 @@ package planner import ( "strings" - "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" ) type alterOperation int64 diff --git a/sql3/planner/compilebulkinsert.go b/sql3/planner/compilebulkinsert.go index be384fd32..6bfe0d9d7 100644 --- a/sql3/planner/compilebulkinsert.go +++ b/sql3/planner/compilebulkinsert.go @@ -5,10 +5,10 @@ package planner import ( "context" - 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" "github.com/pkg/errors" ) diff --git a/sql3/planner/compilecreatetable.go b/sql3/planner/compilecreatetable.go index 23d038b86..75c057d73 100644 --- a/sql3/planner/compilecreatetable.go +++ b/sql3/planner/compilecreatetable.go @@ -7,11 +7,11 @@ import ( "strings" "time" - pilosa "github.com/molecula/featurebase/v3" - "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" + pilosa "github.com/featurebasedb/featurebase/v3" + "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" ) type createTableField struct { diff --git a/sql3/planner/compiledroptable.go b/sql3/planner/compiledroptable.go index 1d3a9ad27..6bf0e81ad 100644 --- a/sql3/planner/compiledroptable.go +++ b/sql3/planner/compiledroptable.go @@ -5,10 +5,10 @@ package planner import ( "context" - 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" "github.com/pkg/errors" ) diff --git a/sql3/planner/compileinsert.go b/sql3/planner/compileinsert.go index 85c5d0fb2..e8fcaa5b6 100644 --- a/sql3/planner/compileinsert.go +++ b/sql3/planner/compileinsert.go @@ -6,10 +6,10 @@ import ( "context" "strings" - 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" "github.com/pkg/errors" ) diff --git a/sql3/planner/compileselect.go b/sql3/planner/compileselect.go index 2e2365eb4..b209e5ecc 100644 --- a/sql3/planner/compileselect.go +++ b/sql3/planner/compileselect.go @@ -5,10 +5,10 @@ package planner import ( "context" - 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" "github.com/pkg/errors" ) diff --git a/sql3/planner/compileshow.go b/sql3/planner/compileshow.go index 821aae654..7d0243355 100644 --- a/sql3/planner/compileshow.go +++ b/sql3/planner/compileshow.go @@ -5,10 +5,10 @@ package planner import ( "context" - 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" "github.com/pkg/errors" ) diff --git a/sql3/planner/executionplanner.go b/sql3/planner/executionplanner.go index 63978095d..b4cb27947 100644 --- a/sql3/planner/executionplanner.go +++ b/sql3/planner/executionplanner.go @@ -7,10 +7,10 @@ import ( "encoding/json" "log" - 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" ) // PlannerScope holds scope for the planner diff --git a/sql3/planner/executionplanner_test.go b/sql3/planner/executionplanner_test.go index 0f1d7d1ea..59b12ad76 100644 --- a/sql3/planner/executionplanner_test.go +++ b/sql3/planner/executionplanner_test.go @@ -8,13 +8,13 @@ import ( "testing" "time" + pilosa "github.com/featurebasedb/featurebase/v3" + "github.com/featurebasedb/featurebase/v3/pql" + "github.com/featurebasedb/featurebase/v3/sql3/parser" + planner_types "github.com/featurebasedb/featurebase/v3/sql3/planner/types" + sql_test "github.com/featurebasedb/featurebase/v3/sql3/test" + "github.com/featurebasedb/featurebase/v3/test" "github.com/google/go-cmp/cmp" - pilosa "github.com/molecula/featurebase/v3" - "github.com/molecula/featurebase/v3/pql" - "github.com/molecula/featurebase/v3/sql3/parser" - planner_types "github.com/molecula/featurebase/v3/sql3/planner/types" - sql_test "github.com/molecula/featurebase/v3/sql3/test" - "github.com/molecula/featurebase/v3/test" "github.com/stretchr/testify/assert" ) diff --git a/sql3/planner/expression.go b/sql3/planner/expression.go index 1cf1c5b8d..5244f9168 100644 --- a/sql3/planner/expression.go +++ b/sql3/planner/expression.go @@ -11,10 +11,10 @@ import ( "strings" "time" - "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" ) // coerceValue coerces a value from a source type to a target type. If the types do not allow a conversion diff --git a/sql3/planner/expressionagg.go b/sql3/planner/expressionagg.go index c8f04dae4..1d74e041f 100644 --- a/sql3/planner/expressionagg.go +++ b/sql3/planner/expressionagg.go @@ -7,9 +7,9 @@ import ( "fmt" "reflect" - "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" ) // aggregator for the COUNT function diff --git a/sql3/planner/expressionanalyzer.go b/sql3/planner/expressionanalyzer.go index 3d3c0180c..46b4a20ce 100644 --- a/sql3/planner/expressionanalyzer.go +++ b/sql3/planner/expressionanalyzer.go @@ -3,8 +3,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" ) // analyze a parser.Expr. returns the analyzed parser.Expr diff --git a/sql3/planner/expressionanalyzercall.go b/sql3/planner/expressionanalyzercall.go index f560a3d4b..c95288e40 100644 --- a/sql3/planner/expressionanalyzercall.go +++ b/sql3/planner/expressionanalyzercall.go @@ -5,8 +5,8 @@ package planner import ( "strings" - "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" ) // analyze a *parser.Call and return the parser.Expr diff --git a/sql3/planner/expressionpql.go b/sql3/planner/expressionpql.go index 1f8b4cec7..7baf32312 100644 --- a/sql3/planner/expressionpql.go +++ b/sql3/planner/expressionpql.go @@ -7,10 +7,10 @@ import ( "strconv" "strings" - "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" ) // generatePQLCallFromExpr returns a *pql.Call tree for a given plan expression diff --git a/sql3/planner/expressiontypes.go b/sql3/planner/expressiontypes.go index 8e0e33bce..b8c4353c2 100644 --- a/sql3/planner/expressiontypes.go +++ b/sql3/planner/expressiontypes.go @@ -6,9 +6,9 @@ import ( "strconv" "strings" - pilosa "github.com/molecula/featurebase/v3" - "github.com/molecula/featurebase/v3/sql3" - "github.com/molecula/featurebase/v3/sql3/parser" + pilosa "github.com/featurebasedb/featurebase/v3" + "github.com/featurebasedb/featurebase/v3/sql3" + "github.com/featurebasedb/featurebase/v3/sql3/parser" ) // takes a *pilosa.FieldInfo and returns a sql data type diff --git a/sql3/planner/inbuiltfunctionsdate.go b/sql3/planner/inbuiltfunctionsdate.go index ef9eb41e5..1522bd7e7 100644 --- a/sql3/planner/inbuiltfunctionsdate.go +++ b/sql3/planner/inbuiltfunctionsdate.go @@ -4,8 +4,8 @@ import ( "strings" "time" - "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" ) const intervalYear = "YY" diff --git a/sql3/planner/inbuiltfunctionsset.go b/sql3/planner/inbuiltfunctionsset.go index 6d41dc146..3c0b5a058 100644 --- a/sql3/planner/inbuiltfunctionsset.go +++ b/sql3/planner/inbuiltfunctionsset.go @@ -3,8 +3,8 @@ package planner import ( "strings" - "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" ) func (n *callPlanExpression) EvaluateSetContains(currentRow []interface{}) (interface{}, error) { diff --git a/sql3/planner/memoryobj.go b/sql3/planner/memoryobj.go index 770c7f916..a39117465 100644 --- a/sql3/planner/memoryobj.go +++ b/sql3/planner/memoryobj.go @@ -2,7 +2,7 @@ package planner -import "github.com/molecula/featurebase/v3/sql3/planner/types" +import "github.com/featurebasedb/featurebase/v3/sql3/planner/types" // RowCache is a cache of rows used during row iteration type RowCache interface { diff --git a/sql3/planner/opaltertable.go b/sql3/planner/opaltertable.go index 5ec3585b6..237d29112 100644 --- a/sql3/planner/opaltertable.go +++ b/sql3/planner/opaltertable.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" ) // PlanOpAlterTable plan operator to alter a table. diff --git a/sql3/planner/opbulkinsert.go b/sql3/planner/opbulkinsert.go index 64b4f9fc4..3bc67e545 100644 --- a/sql3/planner/opbulkinsert.go +++ b/sql3/planner/opbulkinsert.go @@ -6,7 +6,7 @@ import ( "context" "fmt" - "github.com/molecula/featurebase/v3/sql3/planner/types" + "github.com/featurebasedb/featurebase/v3/sql3/planner/types" ) // PlanOpBulkInsert plan operator to handle INSERT. diff --git a/sql3/planner/opcreatetable.go b/sql3/planner/opcreatetable.go index 129291951..6fa4af132 100644 --- a/sql3/planner/opcreatetable.go +++ b/sql3/planner/opcreatetable.go @@ -6,8 +6,8 @@ import ( "context" "fmt" - pilosa "github.com/molecula/featurebase/v3" - "github.com/molecula/featurebase/v3/sql3/planner/types" + pilosa "github.com/featurebasedb/featurebase/v3" + "github.com/featurebasedb/featurebase/v3/sql3/planner/types" "github.com/pkg/errors" ) diff --git a/sql3/planner/opdistinct.go b/sql3/planner/opdistinct.go index 2284856eb..03ede8067 100644 --- a/sql3/planner/opdistinct.go +++ b/sql3/planner/opdistinct.go @@ -5,7 +5,7 @@ package planner import ( "fmt" - "github.com/molecula/featurebase/v3/sql3/planner/types" + "github.com/featurebasedb/featurebase/v3/sql3/planner/types" ) // PlanOpDistinct plan operator handles DISTINCT diff --git a/sql3/planner/opdroptable.go b/sql3/planner/opdroptable.go index f32844854..14bfd96c6 100644 --- a/sql3/planner/opdroptable.go +++ b/sql3/planner/opdroptable.go @@ -6,8 +6,8 @@ import ( "context" "fmt" - pilosa "github.com/molecula/featurebase/v3" - "github.com/molecula/featurebase/v3/sql3/planner/types" + pilosa "github.com/featurebasedb/featurebase/v3" + "github.com/featurebasedb/featurebase/v3/sql3/planner/types" ) // PlanOpDropTable plan operator to drop a table. diff --git a/sql3/planner/opfeaturebasecolumns.go b/sql3/planner/opfeaturebasecolumns.go index 9d2690dbc..ac4e6151c 100644 --- a/sql3/planner/opfeaturebasecolumns.go +++ b/sql3/planner/opfeaturebasecolumns.go @@ -7,9 +7,9 @@ import ( "fmt" "time" - pilosa "github.com/molecula/featurebase/v3" - "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/parser" + "github.com/featurebasedb/featurebase/v3/sql3/planner/types" ) // PlanOpFeatureBaseColumns wraps an Index that is returned from schemaAPI.Schema(). diff --git a/sql3/planner/opfeaturebasetables.go b/sql3/planner/opfeaturebasetables.go index 8bd1d67c6..15c6511ac 100644 --- a/sql3/planner/opfeaturebasetables.go +++ b/sql3/planner/opfeaturebasetables.go @@ -7,9 +7,9 @@ import ( "fmt" "time" - pilosa "github.com/molecula/featurebase/v3" - "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/parser" + "github.com/featurebasedb/featurebase/v3/sql3/planner/types" ) // PlanOpFeatureBaseTables wraps a []*IndexInfo that is returned from diff --git a/sql3/planner/opgroupby.go b/sql3/planner/opgroupby.go index 843845892..978e76785 100644 --- a/sql3/planner/opgroupby.go +++ b/sql3/planner/opgroupby.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" ) // PlanOpGroupBy handles the GROUP BY clause diff --git a/sql3/planner/opinsert.go b/sql3/planner/opinsert.go index 551a100c7..ea2ea17b2 100644 --- a/sql3/planner/opinsert.go +++ b/sql3/planner/opinsert.go @@ -8,11 +8,11 @@ import ( "strings" "time" - pilosa "github.com/molecula/featurebase/v3" - "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" + pilosa "github.com/featurebasedb/featurebase/v3" + "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" ) // PlanOpInsert plan operator to handle INSERT. diff --git a/sql3/planner/opnestedloops.go b/sql3/planner/opnestedloops.go index 5dcaecfb2..364261a2d 100644 --- a/sql3/planner/opnestedloops.go +++ b/sql3/planner/opnestedloops.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" ) // PlanOpNestedLoops plan operator handles a join diff --git a/sql3/planner/opnulltable.go b/sql3/planner/opnulltable.go index 66e16f7ab..7825bfd62 100644 --- a/sql3/planner/opnulltable.go +++ b/sql3/planner/opnulltable.go @@ -6,7 +6,7 @@ import ( "context" "fmt" - "github.com/molecula/featurebase/v3/sql3/planner/types" + "github.com/featurebasedb/featurebase/v3/sql3/planner/types" ) // PlanOpNullTable is an operator for a null table diff --git a/sql3/planner/oporderby.go b/sql3/planner/oporderby.go index 3e8b3e26c..23e26f6f3 100644 --- a/sql3/planner/oporderby.go +++ b/sql3/planner/oporderby.go @@ -8,9 +8,9 @@ import ( "sort" "time" - "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" ) // orderByOrder is the direction of the order by (ascending or descending). diff --git a/sql3/planner/oppqlaggregate.go b/sql3/planner/oppqlaggregate.go index 2fb998460..62183457d 100644 --- a/sql3/planner/oppqlaggregate.go +++ b/sql3/planner/oppqlaggregate.go @@ -6,11 +6,11 @@ import ( "context" "fmt" - pilosa "github.com/molecula/featurebase/v3" - "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" + pilosa "github.com/featurebasedb/featurebase/v3" + "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" ) // PlanOpPQLAggregate plan operator handles a single pql aggregate diff --git a/sql3/planner/oppqlgroupby.go b/sql3/planner/oppqlgroupby.go index 4417cc03c..3cab51ae5 100644 --- a/sql3/planner/oppqlgroupby.go +++ b/sql3/planner/oppqlgroupby.go @@ -6,11 +6,11 @@ import ( "context" "fmt" - pilosa "github.com/molecula/featurebase/v3" - "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" + pilosa "github.com/featurebasedb/featurebase/v3" + "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" ) // PlanOpPQLGroupBy plan operator handles a PQL group by with a single aggregate diff --git a/sql3/planner/oppqlmultiaggregate.go b/sql3/planner/oppqlmultiaggregate.go index b43edd766..72f718f0c 100644 --- a/sql3/planner/oppqlmultiaggregate.go +++ b/sql3/planner/oppqlmultiaggregate.go @@ -6,7 +6,7 @@ import ( "context" "fmt" - "github.com/molecula/featurebase/v3/sql3/planner/types" + "github.com/featurebasedb/featurebase/v3/sql3/planner/types" ) // PlanOpPQLMultiAggregate plan operator handles executing multiple 'sibling' pql aggregate queries diff --git a/sql3/planner/oppqlmultigroupby.go b/sql3/planner/oppqlmultigroupby.go index 0f646c7ce..5392e7ff6 100644 --- a/sql3/planner/oppqlmultigroupby.go +++ b/sql3/planner/oppqlmultigroupby.go @@ -6,7 +6,7 @@ import ( "context" "fmt" - "github.com/molecula/featurebase/v3/sql3/planner/types" + "github.com/featurebasedb/featurebase/v3/sql3/planner/types" ) // PlanOpPQLMultiGroupBy plan operator handles executing multiple 'sibling' pql group by queries diff --git a/sql3/planner/opprojection.go b/sql3/planner/opprojection.go index 4e05250cf..9ec703bcc 100644 --- a/sql3/planner/opprojection.go +++ b/sql3/planner/opprojection.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" ) // PlanOpProjection handles row projection and expression evaluation diff --git a/sql3/planner/opquery.go b/sql3/planner/opquery.go index fb4196ae0..c755919c3 100644 --- a/sql3/planner/opquery.go +++ b/sql3/planner/opquery.go @@ -4,8 +4,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" ) // PlanOpQuery is a query - this is the root node of an execution plan diff --git a/sql3/planner/opsubquery.go b/sql3/planner/opsubquery.go index aec295751..743166c96 100644 --- a/sql3/planner/opsubquery.go +++ b/sql3/planner/opsubquery.go @@ -6,7 +6,7 @@ import ( "context" "fmt" - "github.com/molecula/featurebase/v3/sql3/planner/types" + "github.com/featurebasedb/featurebase/v3/sql3/planner/types" ) // PlanOpSubquery is an operator for a subquery diff --git a/sql3/planner/optablescan.go b/sql3/planner/optablescan.go index a8848475b..73c5856e6 100644 --- a/sql3/planner/optablescan.go +++ b/sql3/planner/optablescan.go @@ -6,11 +6,11 @@ import ( "context" "fmt" - pilosa "github.com/molecula/featurebase/v3" - "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" + pilosa "github.com/featurebasedb/featurebase/v3" + "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" "github.com/pkg/errors" ) diff --git a/sql3/planner/optop.go b/sql3/planner/optop.go index 06b6d010e..1562036fe 100644 --- a/sql3/planner/optop.go +++ b/sql3/planner/optop.go @@ -6,7 +6,7 @@ import ( "context" "fmt" - "github.com/molecula/featurebase/v3/sql3/planner/types" + "github.com/featurebasedb/featurebase/v3/sql3/planner/types" ) // PlanOpTop implements the TOP operator diff --git a/sql3/planner/planoptimizer.go b/sql3/planner/planoptimizer.go index 145187b78..742b129ab 100644 --- a/sql3/planner/planoptimizer.go +++ b/sql3/planner/planoptimizer.go @@ -8,8 +8,8 @@ import ( "reflect" "strings" - "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" ) //TODO(pok) push order by down as far as possible diff --git a/sql3/planner/planwalker.go b/sql3/planner/planwalker.go index 49052d189..fe1c2d89b 100644 --- a/sql3/planner/planwalker.go +++ b/sql3/planner/planwalker.go @@ -1,7 +1,7 @@ package planner import ( - "github.com/molecula/featurebase/v3/sql3/planner/types" + "github.com/featurebasedb/featurebase/v3/sql3/planner/types" ) // PlanVisitor visits nodes in the plan. diff --git a/sql3/planner/types/operator.go b/sql3/planner/types/operator.go index 9b491d9a5..1b1a548fe 100644 --- a/sql3/planner/types/operator.go +++ b/sql3/planner/types/operator.go @@ -5,7 +5,7 @@ import ( "errors" "fmt" - "github.com/molecula/featurebase/v3/sql3/parser" + "github.com/featurebasedb/featurebase/v3/sql3/parser" ) // PlanOperator is a node in an execution plan. diff --git a/sql3/planner/types/planexpression.go b/sql3/planner/types/planexpression.go index 6cfc0b871..0e6390a9b 100644 --- a/sql3/planner/types/planexpression.go +++ b/sql3/planner/types/planexpression.go @@ -3,7 +3,7 @@ package types import ( "context" - "github.com/molecula/featurebase/v3/sql3/parser" + "github.com/featurebasedb/featurebase/v3/sql3/parser" ) //TODO(pok) we can get rid of this - we have expression types for all of these now... diff --git a/sql3/sql_definitions_test.go b/sql3/sql_definitions_test.go index a2a18d828..0c780a686 100644 --- a/sql3/sql_definitions_test.go +++ b/sql3/sql_definitions_test.go @@ -4,7 +4,7 @@ package sql3_test import ( "time" - "github.com/molecula/featurebase/v3/pql" + "github.com/featurebasedb/featurebase/v3/pql" ) // tableTests is the list of tests which get run by TestSQL_Execute in diff --git a/sql3/sql_defs_aggregate_test.go b/sql3/sql_defs_aggregate_test.go index d52b11007..497ce62b5 100644 --- a/sql3/sql_defs_aggregate_test.go +++ b/sql3/sql_defs_aggregate_test.go @@ -1,8 +1,8 @@ package sql3_test import ( - "github.com/molecula/featurebase/v3/pql" - "github.com/molecula/featurebase/v3/sql3/parser" + "github.com/featurebasedb/featurebase/v3/pql" + "github.com/featurebasedb/featurebase/v3/sql3/parser" ) //aggregate function tests diff --git a/sql3/sql_defs_cast_test.go b/sql3/sql_defs_cast_test.go index d144c9f41..3971a95aa 100644 --- a/sql3/sql_defs_cast_test.go +++ b/sql3/sql_defs_cast_test.go @@ -3,7 +3,7 @@ package sql3_test import ( "time" - "github.com/molecula/featurebase/v3/pql" + "github.com/featurebasedb/featurebase/v3/pql" ) func expectedCastTime() time.Time { diff --git a/sql3/sql_defs_groupby_test.go b/sql3/sql_defs_groupby_test.go index 1f4ad4d2f..937cc9ab9 100644 --- a/sql3/sql_defs_groupby_test.go +++ b/sql3/sql_defs_groupby_test.go @@ -1,8 +1,8 @@ package sql3_test import ( - "github.com/molecula/featurebase/v3/pql" - "github.com/molecula/featurebase/v3/sql3/parser" + "github.com/featurebasedb/featurebase/v3/pql" + "github.com/featurebasedb/featurebase/v3/sql3/parser" ) //groupby tests diff --git a/sql3/sql_test.go b/sql3/sql_test.go index a8d638213..a6f22c87a 100644 --- a/sql3/sql_test.go +++ b/sql3/sql_test.go @@ -9,11 +9,11 @@ import ( "testing" "time" - pilosa "github.com/molecula/featurebase/v3" - "github.com/molecula/featurebase/v3/sql3/parser" - planner_types "github.com/molecula/featurebase/v3/sql3/planner/types" - sql_test "github.com/molecula/featurebase/v3/sql3/test" - "github.com/molecula/featurebase/v3/test" + pilosa "github.com/featurebasedb/featurebase/v3" + "github.com/featurebasedb/featurebase/v3/sql3/parser" + planner_types "github.com/featurebasedb/featurebase/v3/sql3/planner/types" + sql_test "github.com/featurebasedb/featurebase/v3/sql3/test" + "github.com/featurebasedb/featurebase/v3/test" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/sql3/test/helpers.go b/sql3/test/helpers.go index e1a9b6bf7..65c6fc4fb 100644 --- a/sql3/test/helpers.go +++ b/sql3/test/helpers.go @@ -5,8 +5,8 @@ import ( "context" "testing" - pilosa "github.com/molecula/featurebase/v3" - planner_types "github.com/molecula/featurebase/v3/sql3/planner/types" + pilosa "github.com/featurebasedb/featurebase/v3" + planner_types "github.com/featurebasedb/featurebase/v3/sql3/planner/types" ) // MustQueryRows returns the row results as a slice of []interface{}, along with the columns. diff --git a/test/glue.go b/test/glue.go index 60853bfb2..32b4eca1e 100644 --- a/test/glue.go +++ b/test/glue.go @@ -8,7 +8,7 @@ import ( "sync" "testing" - "github.com/molecula/featurebase/v3/testhook" + "github.com/featurebasedb/featurebase/v3/testhook" ) // glue lets us make a thing which isn't a testing.TB, but can be passed diff --git a/test/holder.go b/test/holder.go index fd7acbf67..409a64fb9 100644 --- a/test/holder.go +++ b/test/holder.go @@ -7,9 +7,9 @@ import ( "testing" "time" - pilosa "github.com/molecula/featurebase/v3" - "github.com/molecula/featurebase/v3/pql" - "github.com/molecula/featurebase/v3/testhook" + pilosa "github.com/featurebasedb/featurebase/v3" + "github.com/featurebasedb/featurebase/v3/pql" + "github.com/featurebasedb/featurebase/v3/testhook" ) // Holder is a test wrapper for pilosa.Holder. diff --git a/test/pilosa.go b/test/pilosa.go index 0bb0c3336..bb105efe1 100644 --- a/test/pilosa.go +++ b/test/pilosa.go @@ -14,10 +14,10 @@ import ( "testing" "time" - pilosa "github.com/molecula/featurebase/v3" - "github.com/molecula/featurebase/v3/disco" - "github.com/molecula/featurebase/v3/encoding/proto" - "github.com/molecula/featurebase/v3/server" + pilosa "github.com/featurebasedb/featurebase/v3" + "github.com/featurebasedb/featurebase/v3/disco" + "github.com/featurebasedb/featurebase/v3/encoding/proto" + "github.com/featurebasedb/featurebase/v3/server" ) // ////////////////////////////////////////////////////////////////////////////////// diff --git a/translator_test.go b/translator_test.go index 8553a4389..d3d2fac67 100644 --- a/translator_test.go +++ b/translator_test.go @@ -11,11 +11,11 @@ import ( "testing" "time" + pilosa "github.com/featurebasedb/featurebase/v3" + "github.com/featurebasedb/featurebase/v3/disco" + "github.com/featurebasedb/featurebase/v3/mock" + "github.com/featurebasedb/featurebase/v3/test" "github.com/google/go-cmp/cmp" - pilosa "github.com/molecula/featurebase/v3" - "github.com/molecula/featurebase/v3/disco" - "github.com/molecula/featurebase/v3/mock" - "github.com/molecula/featurebase/v3/test" "github.com/pkg/errors" "golang.org/x/sync/errgroup" ) diff --git a/tx_test.go b/tx_test.go index 460eba8f9..a79a82e79 100644 --- a/tx_test.go +++ b/tx_test.go @@ -7,9 +7,9 @@ import ( "fmt" "testing" - pilosa "github.com/molecula/featurebase/v3" - "github.com/molecula/featurebase/v3/test" - . "github.com/molecula/featurebase/v3/vprint" // nolint:staticcheck + pilosa "github.com/featurebasedb/featurebase/v3" + "github.com/featurebasedb/featurebase/v3/test" + . "github.com/featurebasedb/featurebase/v3/vprint" // nolint:staticcheck ) func queryIRABit(m0api *pilosa.API, acctOwnerID uint64, iraField string, iraRowID uint64, index string) (bit bool) {