diff --git a/api.go b/api.go index 8650cd251..be059e4f0 100644 --- a/api.go +++ b/api.go @@ -25,6 +25,8 @@ import ( fbcontext "github.com/featurebasedb/featurebase/v3/context" "github.com/featurebasedb/featurebase/v3/dax" "github.com/featurebasedb/featurebase/v3/dax/computer" + "github.com/featurebasedb/featurebase/v3/dax/storage" + "github.com/featurebasedb/featurebase/v3/logger" "github.com/featurebasedb/featurebase/v3/disco" "github.com/featurebasedb/featurebase/v3/rbf" diff --git a/api_directive.go b/api_directive.go index a5e8e72a2..1e321e781 100644 --- a/api_directive.go +++ b/api_directive.go @@ -9,6 +9,7 @@ import ( "github.com/featurebasedb/featurebase/v3/dax" "github.com/featurebasedb/featurebase/v3/dax/computer" + "github.com/featurebasedb/featurebase/v3/dax/storage" "github.com/featurebasedb/featurebase/v3/disco" "github.com/pkg/errors" ) diff --git a/audit_test.go b/audit_test.go index 5aabb1b14..79293e411 100644 --- a/audit_test.go +++ b/audit_test.go @@ -7,7 +7,7 @@ import ( "os" "reflect" - pilosa "github.com/featurebasedb/featurebase/v3" + "github.com/featurebasedb/featurebase/v3" "github.com/featurebasedb/featurebase/v3/testhook" ) diff --git a/cache_test.go b/cache_test.go index fb338fec8..8f19a44d3 100644 --- a/cache_test.go +++ b/cache_test.go @@ -6,7 +6,7 @@ import ( "reflect" "testing" - pilosa "github.com/featurebasedb/featurebase/v3" + "github.com/featurebasedb/featurebase/v3" ) // Ensure cache stays constrained to its configured size. diff --git a/cluster.go b/cluster.go index b60174636..6cc081e4c 100644 --- a/cluster.go +++ b/cluster.go @@ -12,6 +12,7 @@ import ( "github.com/featurebasedb/featurebase/v3/dax" "github.com/featurebasedb/featurebase/v3/dax/computer" + "github.com/featurebasedb/featurebase/v3/dax/storage" "github.com/featurebasedb/featurebase/v3/disco" "github.com/featurebasedb/featurebase/v3/logger" "github.com/featurebasedb/featurebase/v3/roaring" diff --git a/cmd/backup_tar.go b/cmd/backup_tar.go index 0f81d62b0..6c9612d77 100644 --- a/cmd/backup_tar.go +++ b/cmd/backup_tar.go @@ -2,8 +2,9 @@ package cmd import ( + "io" + "github.com/featurebasedb/featurebase/v3/ctl" - "github.com/featurebasedb/featurebase/v3/logger" "github.com/spf13/cobra" ) diff --git a/ctl/backup_tar.go b/ctl/backup_tar.go index 72115a591..043f0421f 100644 --- a/ctl/backup_tar.go +++ b/ctl/backup_tar.go @@ -21,7 +21,6 @@ import ( "github.com/featurebasedb/featurebase/v3/encoding/proto" "github.com/featurebasedb/featurebase/v3/logger" "github.com/featurebasedb/featurebase/v3/server" - "github.com/featurebasedb/featurebase/v3/vprint" "github.com/pkg/errors" ) diff --git a/dax/mds/client/client.go b/dax/mds/client/client.go index 55a758cd1..d105d1f1a 100644 --- a/dax/mds/client/client.go +++ b/dax/mds/client/client.go @@ -10,7 +10,6 @@ import ( "net/http" "github.com/featurebasedb/featurebase/v3/dax" - "github.com/featurebasedb/featurebase/v3/dax/mds/controller" mdshttp "github.com/featurebasedb/featurebase/v3/dax/mds/http" "github.com/featurebasedb/featurebase/v3/errors" "github.com/featurebasedb/featurebase/v3/logger" diff --git a/dax/mds/http/handler.go b/dax/mds/http/handler.go index 58582f040..32b46caf9 100644 --- a/dax/mds/http/handler.go +++ b/dax/mds/http/handler.go @@ -7,7 +7,6 @@ import ( "github.com/gorilla/mux" "github.com/featurebasedb/featurebase/v3/dax" "github.com/featurebasedb/featurebase/v3/dax/mds" - "github.com/featurebasedb/featurebase/v3/dax/mds/controller" ) func Handler(mds *mds.MDS) http.Handler { diff --git a/dax/queryer/orchestrator.go b/dax/queryer/orchestrator.go index 13562e736..84a1979e3 100644 --- a/dax/queryer/orchestrator.go +++ b/dax/queryer/orchestrator.go @@ -11,8 +11,6 @@ import ( featurebase "github.com/featurebasedb/featurebase/v3" "github.com/featurebasedb/featurebase/v3/dax" - "github.com/featurebasedb/featurebase/v3/dax/mds/controller" - "github.com/featurebasedb/featurebase/v3/dax/mds/schemar" "github.com/featurebasedb/featurebase/v3/errors" "github.com/featurebasedb/featurebase/v3/logger" "github.com/featurebasedb/featurebase/v3/pql" diff --git a/dax/queryer/schema_api.go b/dax/queryer/schema_api.go index ef8ab2fab..19405f832 100644 --- a/dax/queryer/schema_api.go +++ b/dax/queryer/schema_api.go @@ -5,7 +5,6 @@ import ( pilosa "github.com/featurebasedb/featurebase/v3" "github.com/featurebasedb/featurebase/v3/dax" - "github.com/featurebasedb/featurebase/v3/dax/mds/schemar" "github.com/featurebasedb/featurebase/v3/errors" ) diff --git a/dax/snapshotter/snapshotter.go b/dax/snapshotter/snapshotter.go index 7fdd0b799..b311b0e12 100644 --- a/dax/snapshotter/snapshotter.go +++ b/dax/snapshotter/snapshotter.go @@ -12,6 +12,7 @@ import ( "sync" "syscall" + "github.com/featurebasedb/featurebase/v3/dax/computer" "github.com/featurebasedb/featurebase/v3/errors" "github.com/featurebasedb/featurebase/v3/logger" ) diff --git a/dax/writelogger/writelogger.go b/dax/writelogger/writelogger.go index 3cb0a445d..2df249c48 100644 --- a/dax/writelogger/writelogger.go +++ b/dax/writelogger/writelogger.go @@ -11,6 +11,7 @@ import ( "sync" "syscall" + "github.com/featurebasedb/featurebase/v3/dax/computer" "github.com/featurebasedb/featurebase/v3/errors" "github.com/featurebasedb/featurebase/v3/logger" ) diff --git a/pilosa_test.go b/pilosa_test.go index 0d4264b8f..1b21e2e29 100644 --- a/pilosa_test.go +++ b/pilosa_test.go @@ -6,7 +6,7 @@ import ( "strings" "testing" - pilosa "github.com/featurebasedb/featurebase/v3" + "github.com/featurebasedb/featurebase/v3" _ "github.com/featurebasedb/featurebase/v3/test" ) diff --git a/row_test.go b/row_test.go index dfea01fcf..44e9712af 100644 --- a/row_test.go +++ b/row_test.go @@ -7,7 +7,7 @@ import ( "reflect" "testing" - pilosa "github.com/featurebasedb/featurebase/v3" + "github.com/featurebasedb/featurebase/v3" ) // Ensure a row can be merged diff --git a/server/server.go b/server/server.go index a22a55284..d951cdd25 100644 --- a/server/server.go +++ b/server/server.go @@ -737,7 +737,7 @@ func (m *Command) setupLogger() error { var f *logger.FileWriter var err error if m.Config.LogPath != "" { - f, err = logger.NewFileWriter(m.Config.LogPath, 0640) + f, err = logger.NewFileWriter(m.Config.LogPath) if err != nil { return errors.Wrap(err, "opening file") } diff --git a/sql3/planner/inbuiltfunctionsstring.go b/sql3/planner/inbuiltfunctionsstring.go index 9c5d80011..e5bee003f 100644 --- a/sql3/planner/inbuiltfunctionsstring.go +++ b/sql3/planner/inbuiltfunctionsstring.go @@ -5,6 +5,7 @@ import ( "github.com/featurebasedb/featurebase/v3/sql3" "github.com/featurebasedb/featurebase/v3/sql3/parser" + "github.com/featurebasedb/featurebase/v3/sql3/planner/types" ) func (p *ExecutionPlanner) analyseFunctionReverse(call *parser.Call, scope parser.Statement) (parser.Expr, error) { diff --git a/sql3/planner/opcreatetable.go b/sql3/planner/opcreatetable.go index 122dcc7df..0409d5176 100644 --- a/sql3/planner/opcreatetable.go +++ b/sql3/planner/opcreatetable.go @@ -8,6 +8,7 @@ import ( pilosa "github.com/featurebasedb/featurebase/v3" "github.com/featurebasedb/featurebase/v3/dax" + "github.com/featurebasedb/featurebase/v3/sql3" "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 374fb6207..e3715ac61 100644 --- a/sql3/planner/opdistinct.go +++ b/sql3/planner/opdistinct.go @@ -7,6 +7,9 @@ import ( "context" "fmt" + "github.com/featurebasedb/featurebase/v3/bufferpool" + "github.com/featurebasedb/featurebase/v3/extendiblehash" + "github.com/featurebasedb/featurebase/v3/sql3" "github.com/featurebasedb/featurebase/v3/sql3/planner/types" ) diff --git a/sql3/planner/opgroupby.go b/sql3/planner/opgroupby.go index 177b2b19a..6263cfd11 100644 --- a/sql3/planner/opgroupby.go +++ b/sql3/planner/opgroupby.go @@ -7,7 +7,6 @@ import ( "context" "fmt" - "github.com/featurebasedb/featurebase/v3/errors" "github.com/featurebasedb/featurebase/v3/sql3" "github.com/featurebasedb/featurebase/v3/sql3/planner/types" ) diff --git a/sql3/planner/oppqlaggregate.go b/sql3/planner/oppqlaggregate.go index 8756add7b..d1c85daf8 100644 --- a/sql3/planner/oppqlaggregate.go +++ b/sql3/planner/oppqlaggregate.go @@ -7,6 +7,7 @@ import ( "fmt" pilosa "github.com/featurebasedb/featurebase/v3" + "github.com/featurebasedb/featurebase/v3/dax" "github.com/featurebasedb/featurebase/v3/pql" "github.com/featurebasedb/featurebase/v3/sql3" "github.com/featurebasedb/featurebase/v3/sql3/parser" diff --git a/sql3/planner/oppqlgroupby.go b/sql3/planner/oppqlgroupby.go index 2afbd3dbb..86b444f94 100644 --- a/sql3/planner/oppqlgroupby.go +++ b/sql3/planner/oppqlgroupby.go @@ -7,6 +7,7 @@ import ( "fmt" pilosa "github.com/featurebasedb/featurebase/v3" + "github.com/featurebasedb/featurebase/v3/dax" "github.com/featurebasedb/featurebase/v3/pql" "github.com/featurebasedb/featurebase/v3/sql3" "github.com/featurebasedb/featurebase/v3/sql3/parser" diff --git a/sql3/planner/opsubquery.go b/sql3/planner/opsubquery.go index 105815c9c..e056df4ea 100644 --- a/sql3/planner/opsubquery.go +++ b/sql3/planner/opsubquery.go @@ -6,6 +6,7 @@ import ( "context" "fmt" + "github.com/featurebasedb/featurebase/v3/sql3" "github.com/featurebasedb/featurebase/v3/sql3/planner/types" ) diff --git a/translate_boltdb.go b/translate_boltdb.go index 9c5e3d303..7a3ccfbe7 100644 --- a/translate_boltdb.go +++ b/translate_boltdb.go @@ -1,6 +1,6 @@ // Copyright 2022 Molecula Corp. (DBA FeatureBase). // SPDX-License-Identifier: Apache-2.0 -package boltdb +package pilosa import ( "bytes" @@ -13,7 +13,6 @@ import ( "sync" "time" - pilosa "github.com/featurebasedb/featurebase/v3" "github.com/featurebasedb/featurebase/v3/roaring" "github.com/pkg/errors" bolt "go.etcd.io/bbolt" diff --git a/translate_boltdb_test.go b/translate_boltdb_test.go index ef9f0d2dd..5ca264f50 100644 --- a/translate_boltdb_test.go +++ b/translate_boltdb_test.go @@ -1,6 +1,6 @@ // Copyright 2022 Molecula Corp. (DBA FeatureBase). // SPDX-License-Identifier: Apache-2.0 -package boltdb_test +package pilosa_test import ( "bytes"