From d22bd9430f671d89996e6d04592581e1b5a1abce Mon Sep 17 00:00:00 2001 From: Joe Friedrich Date: Wed, 11 Jan 2023 18:59:24 +0000 Subject: [PATCH] fix import paths --- cmd/dataframe-csv-loader.go | 4 +- ctl/dataframe-csv-loader.go | 8 ++-- ctl/dataframe-csv-loader_test.go | 10 ++--- dax/computer/service/computer.go | 18 ++++----- dax/mds/controller/snapping_turtle.go | 2 +- dax/storage/encoding.go | 4 +- dax/storage/storage.go | 8 ++-- dax/storage/storage_test.go | 8 ++-- extendiblehash/extendiblehash.go | 2 +- extendiblehash/extendiblehash_test.go | 2 +- internal/clustertests/pause_node_test.go | 1 - server.go | 27 ++++++------- server/handler_test.go | 1 - server/server.go | 50 ++++++++++++------------ sql3/planner/compiledelete.go | 4 +- sql3/planner/ophaving.go | 4 +- sql3/planner/oppqldelete.go | 10 ++--- sql3/planner/oppqldistinctscan.go | 12 +++--- sql3/planner/oppqlfiltereddelete.go | 8 ++-- sql3/planner/opqltruncate.go | 8 ++-- sql3/test/defs/defs_distinct.go | 2 +- translate_boltdb_test.go | 1 - 22 files changed, 94 insertions(+), 100 deletions(-) diff --git a/cmd/dataframe-csv-loader.go b/cmd/dataframe-csv-loader.go index 592ecaa3e..a0f677ca5 100644 --- a/cmd/dataframe-csv-loader.go +++ b/cmd/dataframe-csv-loader.go @@ -2,8 +2,8 @@ package cmd import ( - "github.com/molecula/featurebase/v3/ctl" - "github.com/molecula/featurebase/v3/logger" + "github.com/featurebasedb/featurebase/v3/ctl" + "github.com/featurebasedb/featurebase/v3/logger" "github.com/spf13/cobra" ) diff --git a/ctl/dataframe-csv-loader.go b/ctl/dataframe-csv-loader.go index 17c252e23..10ccc9785 100644 --- a/ctl/dataframe-csv-loader.go +++ b/ctl/dataframe-csv-loader.go @@ -16,10 +16,10 @@ import ( "strings" "github.com/apache/arrow/go/v10/arrow" - pilosa "github.com/molecula/featurebase/v3" - "github.com/molecula/featurebase/v3/client" - "github.com/molecula/featurebase/v3/idk" - "github.com/molecula/featurebase/v3/logger" + pilosa "github.com/featurebasedb/featurebase/v3" + "github.com/featurebasedb/featurebase/v3/client" + "github.com/featurebasedb/featurebase/v3/idk" + "github.com/featurebasedb/featurebase/v3/logger" "github.com/pkg/errors" ) diff --git a/ctl/dataframe-csv-loader_test.go b/ctl/dataframe-csv-loader_test.go index b3cac1ac1..8280fc026 100644 --- a/ctl/dataframe-csv-loader_test.go +++ b/ctl/dataframe-csv-loader_test.go @@ -6,11 +6,11 @@ import ( "io" "testing" - pilosa "github.com/molecula/featurebase/v3" - "github.com/molecula/featurebase/v3/logger" - "github.com/molecula/featurebase/v3/server" - "github.com/molecula/featurebase/v3/test" - "github.com/molecula/featurebase/v3/testhook" + pilosa "github.com/featurebasedb/featurebase/v3" + "github.com/featurebasedb/featurebase/v3/logger" + "github.com/featurebasedb/featurebase/v3/server" + "github.com/featurebasedb/featurebase/v3/test" + "github.com/featurebasedb/featurebase/v3/testhook" ) func TestDataframeCsvLoaderCommand(t *testing.T) { diff --git a/dax/computer/service/computer.go b/dax/computer/service/computer.go index 776f9807f..63eb52c2a 100644 --- a/dax/computer/service/computer.go +++ b/dax/computer/service/computer.go @@ -7,16 +7,14 @@ import ( "net/http" featurebase "github.com/featurebasedb/featurebase/v3" - "github.com/featurebasedb/featurebase/v3/dax" - "github.com/featurebasedb/featurebase/v3/dax/computer" - mdsclient "github.com/featurebasedb/featurebase/v3/dax/mds/client" - "github.com/featurebasedb/featurebase/v3/dax/snapshotter" - snapshotterclient "github.com/featurebasedb/featurebase/v3/dax/snapshotter/client" - "github.com/featurebasedb/featurebase/v3/dax/writelogger" - writeloggerclient "github.com/featurebasedb/featurebase/v3/dax/writelogger/client" - "github.com/featurebasedb/featurebase/v3/errors" - "github.com/featurebasedb/featurebase/v3/logger" - fbserver "github.com/featurebasedb/featurebase/v3/server" + "github.com/featurebasedb/featurebase/v3/dax" + "github.com/featurebasedb/featurebase/v3/dax/computer" + mdsclient "github.com/featurebasedb/featurebase/v3/dax/mds/client" + "github.com/featurebasedb/featurebase/v3/dax/snapshotter" + "github.com/featurebasedb/featurebase/v3/dax/writelogger" + "github.com/featurebasedb/featurebase/v3/errors" + "github.com/featurebasedb/featurebase/v3/logger" + fbserver "github.com/featurebasedb/featurebase/v3/server" ) // Ensure type implements interface. diff --git a/dax/mds/controller/snapping_turtle.go b/dax/mds/controller/snapping_turtle.go index 153fba832..0af9e2dd7 100644 --- a/dax/mds/controller/snapping_turtle.go +++ b/dax/mds/controller/snapping_turtle.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/molecula/featurebase/v3/dax" + "github.com/featurebasedb/featurebase/v3/dax" ) func (c *Controller) snappingTurtleRoutine(period time.Duration, control chan struct{}) { diff --git a/dax/storage/encoding.go b/dax/storage/encoding.go index d372e6e31..3042da236 100644 --- a/dax/storage/encoding.go +++ b/dax/storage/encoding.go @@ -5,8 +5,8 @@ import ( "encoding/json" "io" - "github.com/molecula/featurebase/v3/dax" - "github.com/molecula/featurebase/v3/dax/computer" + "github.com/featurebasedb/featurebase/v3/dax" + "github.com/featurebasedb/featurebase/v3/dax/computer" ) // TODO this needs to be genericized and moved diff --git a/dax/storage/storage.go b/dax/storage/storage.go index 0b4739b7b..96dc17876 100644 --- a/dax/storage/storage.go +++ b/dax/storage/storage.go @@ -7,10 +7,10 @@ import ( "strings" "sync" - "github.com/molecula/featurebase/v3/dax" - "github.com/molecula/featurebase/v3/dax/computer" - "github.com/molecula/featurebase/v3/errors" - "github.com/molecula/featurebase/v3/logger" + "github.com/featurebasedb/featurebase/v3/dax" + "github.com/featurebasedb/featurebase/v3/dax/computer" + "github.com/featurebasedb/featurebase/v3/errors" + "github.com/featurebasedb/featurebase/v3/logger" ) // ResourceManager holds all the various Resources each of which is diff --git a/dax/storage/storage_test.go b/dax/storage/storage_test.go index 2ca1d0533..0b368569a 100644 --- a/dax/storage/storage_test.go +++ b/dax/storage/storage_test.go @@ -7,10 +7,10 @@ import ( "testing" - "github.com/molecula/featurebase/v3/dax" - "github.com/molecula/featurebase/v3/dax/snapshotter" - "github.com/molecula/featurebase/v3/dax/writelogger" - "github.com/molecula/featurebase/v3/logger" + "github.com/featurebasedb/featurebase/v3/dax" + "github.com/featurebasedb/featurebase/v3/dax/snapshotter" + "github.com/featurebasedb/featurebase/v3/dax/writelogger" + "github.com/featurebasedb/featurebase/v3/logger" "github.com/stretchr/testify/assert" ) diff --git a/extendiblehash/extendiblehash.go b/extendiblehash/extendiblehash.go index 7cd449961..ff18c97b1 100644 --- a/extendiblehash/extendiblehash.go +++ b/extendiblehash/extendiblehash.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - "github.com/molecula/featurebase/v3/bufferpool" + "github.com/featurebasedb/featurebase/v3/bufferpool" ) // ExtendibleHashTable is an extendible hash table implementation backed by a buffer diff --git a/extendiblehash/extendiblehash_test.go b/extendiblehash/extendiblehash_test.go index dc299846f..98d412e41 100644 --- a/extendiblehash/extendiblehash_test.go +++ b/extendiblehash/extendiblehash_test.go @@ -4,7 +4,7 @@ import ( "strconv" "testing" - "github.com/molecula/featurebase/v3/bufferpool" + "github.com/featurebasedb/featurebase/v3/bufferpool" "github.com/stretchr/testify/assert" ) diff --git a/internal/clustertests/pause_node_test.go b/internal/clustertests/pause_node_test.go index 09c566ee7..bb58dd3f7 100644 --- a/internal/clustertests/pause_node_test.go +++ b/internal/clustertests/pause_node_test.go @@ -16,7 +16,6 @@ import ( pilosa "github.com/featurebasedb/featurebase/v3" "github.com/featurebasedb/featurebase/v3/authn" - boltdb "github.com/featurebasedb/featurebase/v3/boltdb" "github.com/featurebasedb/featurebase/v3/disco" "github.com/featurebasedb/featurebase/v3/encoding/proto" "github.com/featurebasedb/featurebase/v3/net" diff --git a/server.go b/server.go index 9ffc9ccd6..67cbad129 100644 --- a/server.go +++ b/server.go @@ -17,20 +17,19 @@ import ( uuid "github.com/satori/go.uuid" - "github.com/featurebasedb/featurebase/v3/dax/computer" - "github.com/featurebasedb/featurebase/v3/dax/inmem" - "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" + daxstorage "github.com/featurebasedb/featurebase/v3/dax/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" _ "github.com/lib/pq" ) diff --git a/server/handler_test.go b/server/handler_test.go index ba1dd40d9..765de0c81 100644 --- a/server/handler_test.go +++ b/server/handler_test.go @@ -19,7 +19,6 @@ import ( "time" 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" diff --git a/server/server.go b/server/server.go index 937be4610..a22a55284 100644 --- a/server/server.go +++ b/server/server.go @@ -27,30 +27,30 @@ import ( "time" 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/dax" - "github.com/featurebasedb/featurebase/v3/dax/computer" - "github.com/featurebasedb/featurebase/v3/disco" - "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/systemlayer" - "github.com/featurebasedb/featurebase/v3/syswrap" - "github.com/featurebasedb/featurebase/v3/testhook" - "github.com/pelletier/go-toml" - "github.com/pkg/errors" - "golang.org/x/sync/errgroup" + "github.com/featurebasedb/featurebase/v3/authn" + "github.com/featurebasedb/featurebase/v3/authz" + "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/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/systemlayer" + "github.com/featurebasedb/featurebase/v3/syswrap" + "github.com/featurebasedb/featurebase/v3/testhook" + "github.com/pelletier/go-toml" + "github.com/pkg/errors" + "golang.org/x/sync/errgroup" ) type loggerLogger interface { @@ -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) + f, err = logger.NewFileWriter(m.Config.LogPath, 0640) if err != nil { return errors.Wrap(err, "opening file") } diff --git a/sql3/planner/compiledelete.go b/sql3/planner/compiledelete.go index 2faabeef0..2e253d4aa 100644 --- a/sql3/planner/compiledelete.go +++ b/sql3/planner/compiledelete.go @@ -3,8 +3,8 @@ package planner import ( - "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" ) // compileDeleteStatement compiles a parser.DeleteStatment AST into a PlanOperator diff --git a/sql3/planner/ophaving.go b/sql3/planner/ophaving.go index 83d092406..a4f71a54c 100644 --- a/sql3/planner/ophaving.go +++ b/sql3/planner/ophaving.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" ) // PlanOpHaving is a filter operator for the HAVING clause diff --git a/sql3/planner/oppqldelete.go b/sql3/planner/oppqldelete.go index 8a610050c..b4a6e40d8 100644 --- a/sql3/planner/oppqldelete.go +++ b/sql3/planner/oppqldelete.go @@ -6,11 +6,11 @@ import ( "context" "fmt" - "github.com/molecula/featurebase/v3/dax" - "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/dax" + "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" ) // PlanOpPQLConstRowDelete plan operator to delete rows from a table based on a single key. diff --git a/sql3/planner/oppqldistinctscan.go b/sql3/planner/oppqldistinctscan.go index 51ddfc7a3..ef4299cb4 100644 --- a/sql3/planner/oppqldistinctscan.go +++ b/sql3/planner/oppqldistinctscan.go @@ -8,12 +8,12 @@ import ( "strings" "time" - pilosa "github.com/molecula/featurebase/v3" - "github.com/molecula/featurebase/v3/dax" - "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/dax" + "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/oppqlfiltereddelete.go b/sql3/planner/oppqlfiltereddelete.go index 75aeac0b1..d76feaca4 100644 --- a/sql3/planner/oppqlfiltereddelete.go +++ b/sql3/planner/oppqlfiltereddelete.go @@ -6,10 +6,10 @@ import ( "context" "fmt" - "github.com/molecula/featurebase/v3/dax" - "github.com/molecula/featurebase/v3/pql" - "github.com/molecula/featurebase/v3/sql3" - "github.com/molecula/featurebase/v3/sql3/planner/types" + "github.com/featurebasedb/featurebase/v3/dax" + "github.com/featurebasedb/featurebase/v3/pql" + "github.com/featurebasedb/featurebase/v3/sql3" + "github.com/featurebasedb/featurebase/v3/sql3/planner/types" ) // PlanOpPQLFilteredDelete plan operator to delete rows from a table based on a filter expression. diff --git a/sql3/planner/opqltruncate.go b/sql3/planner/opqltruncate.go index a3ebd7ec4..3e89abf3f 100644 --- a/sql3/planner/opqltruncate.go +++ b/sql3/planner/opqltruncate.go @@ -6,10 +6,10 @@ import ( "context" "fmt" - "github.com/molecula/featurebase/v3/dax" - "github.com/molecula/featurebase/v3/pql" - "github.com/molecula/featurebase/v3/sql3" - "github.com/molecula/featurebase/v3/sql3/planner/types" + "github.com/featurebasedb/featurebase/v3/dax" + "github.com/featurebasedb/featurebase/v3/pql" + "github.com/featurebasedb/featurebase/v3/sql3" + "github.com/featurebasedb/featurebase/v3/sql3/planner/types" ) // TODO (pok) we should look at a drop and recreate, or an actual truncate PQL op diff --git a/sql3/test/defs/defs_distinct.go b/sql3/test/defs/defs_distinct.go index 8e425d597..9bd80ca24 100644 --- a/sql3/test/defs/defs_distinct.go +++ b/sql3/test/defs/defs_distinct.go @@ -1,6 +1,6 @@ package defs -import "github.com/molecula/featurebase/v3/pql" +import "github.com/featurebasedb/featurebase/v3/pql" // distinct tests var distinctTests = TableTest{ diff --git a/translate_boltdb_test.go b/translate_boltdb_test.go index f9aeac3c7..ef9f0d2dd 100644 --- a/translate_boltdb_test.go +++ b/translate_boltdb_test.go @@ -12,7 +12,6 @@ import ( "time" pilosa "github.com/featurebasedb/featurebase/v3" - "github.com/featurebasedb/featurebase/v3/boltdb" "github.com/featurebasedb/featurebase/v3/disco" "github.com/featurebasedb/featurebase/v3/roaring" "github.com/featurebasedb/featurebase/v3/testhook"