fix import paths and import cycles

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"
 

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"
 )

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"
 )
 

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.

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"

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"
 )
 

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"
 )
 

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"

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 {

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"

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"
 )
 

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"
 )

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"
 )

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"
 )
 

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

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")
 		}

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) {

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"
 )

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"
 )
 

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"
 )

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"

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"

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"
 )
 

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"

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"