diff --git a/api.go b/api.go index 5e7bfa418..9150cb14a 100644 --- a/api.go +++ b/api.go @@ -29,12 +29,12 @@ import ( "github.com/featurebasedb/featurebase/v3/logger" "github.com/featurebasedb/featurebase/v3/disco" "github.com/featurebasedb/featurebase/v3/rbf" + "github.com/prometheus/client_golang/prometheus" //"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/cache.go b/cache.go index 4577d69c9..156826180 100644 --- a/cache.go +++ b/cache.go @@ -13,7 +13,6 @@ import ( "github.com/featurebasedb/featurebase/v3/lru" pb "github.com/featurebasedb/featurebase/v3/proto" - "github.com/featurebasedb/featurebase/v3/stats" "github.com/pkg/errors" ) diff --git a/cli/cli.go b/cli/cli.go index bc717624f..c9b4ca9da 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -14,8 +14,6 @@ import ( "github.com/jedib0t/go-pretty/table" "github.com/jedib0t/go-pretty/text" featurebase "github.com/featurebasedb/featurebase/v3" - "github.com/featurebasedb/featurebase/v3/dax" - queryerhttp "github.com/featurebasedb/featurebase/v3/dax/queryer/http" "github.com/featurebasedb/featurebase/v3/cli/fbcloud" "github.com/featurebasedb/featurebase/v3/logger" "github.com/pkg/errors" diff --git a/client/client.go b/client/client.go index 2dca46206..954cde9d7 100644 --- a/client/client.go +++ b/client/client.go @@ -29,7 +29,6 @@ import ( "github.com/featurebasedb/featurebase/v3/pb" "github.com/featurebasedb/featurebase/v3/pql" "github.com/featurebasedb/featurebase/v3/roaring" - "github.com/featurebasedb/featurebase/v3/stats" "github.com/featurebasedb/featurebase/v3/vprint" "github.com/opentracing/opentracing-go" "github.com/pkg/errors" diff --git a/cmd/cli.go b/cmd/cli.go index d37d8c100..3a97ad47d 100644 --- a/cmd/cli.go +++ b/cmd/cli.go @@ -2,7 +2,7 @@ package cmd import ( - "github.com/featurebasedb/featurebase/v3/ctl" + "github.com/featurebasedb/featurebase/v3/cli" "github.com/featurebasedb/featurebase/v3/logger" "github.com/spf13/cobra" ) diff --git a/dax/queryer/orchestrator.go b/dax/queryer/orchestrator.go index 5d6ce48c9..75069b940 100644 --- a/dax/queryer/orchestrator.go +++ b/dax/queryer/orchestrator.go @@ -11,10 +11,10 @@ import ( featurebase "github.com/featurebasedb/featurebase/v3" "github.com/featurebasedb/featurebase/v3/dax" + "github.com/prometheus/client_golang/prometheus" "github.com/featurebasedb/featurebase/v3/errors" "github.com/featurebasedb/featurebase/v3/logger" "github.com/featurebasedb/featurebase/v3/pql" - "github.com/featurebasedb/featurebase/v3/stats" "github.com/featurebasedb/featurebase/v3/tracing" "golang.org/x/sync/errgroup" ) diff --git a/dax/queryer/queryer.go b/dax/queryer/queryer.go index 8b052d2db..ad2e5cd4e 100644 --- a/dax/queryer/queryer.go +++ b/dax/queryer/queryer.go @@ -22,7 +22,6 @@ import ( "github.com/featurebasedb/featurebase/v3/sql3/parser" "github.com/featurebasedb/featurebase/v3/sql3/planner" plannertypes "github.com/featurebasedb/featurebase/v3/sql3/planner/types" - "github.com/featurebasedb/featurebase/v3/stats" "github.com/featurebasedb/featurebase/v3/systemlayer" uuid "github.com/satori/go.uuid" ) diff --git a/field.go b/field.go index bd21f63ea..4647aaa5c 100644 --- a/field.go +++ b/field.go @@ -18,7 +18,6 @@ import ( "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/fragment.go b/fragment.go index a8731d605..3ba4a2df9 100644 --- a/fragment.go +++ b/fragment.go @@ -24,7 +24,6 @@ import ( "github.com/featurebasedb/featurebase/v3/pql" "github.com/featurebasedb/featurebase/v3/roaring" "github.com/featurebasedb/featurebase/v3/shardwidth" - "github.com/featurebasedb/featurebase/v3/stats" "github.com/featurebasedb/featurebase/v3/testhook" "github.com/featurebasedb/featurebase/v3/tracing" "github.com/featurebasedb/featurebase/v3/vprint" diff --git a/holder.go b/holder.go index ba079cc9b..b7e127750 100644 --- a/holder.go +++ b/holder.go @@ -18,7 +18,6 @@ import ( "github.com/featurebasedb/featurebase/v3/logger" rbfcfg "github.com/featurebasedb/featurebase/v3/rbf/cfg" "github.com/featurebasedb/featurebase/v3/roaring" - "github.com/featurebasedb/featurebase/v3/stats" "github.com/featurebasedb/featurebase/v3/storage" "github.com/featurebasedb/featurebase/v3/testhook" "github.com/featurebasedb/featurebase/v3/vprint" diff --git a/http_handler.go b/http_handler.go index d775554c3..142daabe1 100644 --- a/http_handler.go +++ b/http_handler.go @@ -46,6 +46,7 @@ import ( "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" + "github.com/featurebasedb/featurebase/v3/wireprotocol" dto "github.com/prometheus/client_model/go" "github.com/prometheus/prom2json" uuid "github.com/satori/go.uuid" diff --git a/idk/ingest.go b/idk/ingest.go index bf77905bd..ab4a9b640 100644 --- a/idk/ingest.go +++ b/idk/ingest.go @@ -34,9 +34,7 @@ import ( "github.com/featurebasedb/featurebase/v3/idk/mds" "github.com/featurebasedb/featurebase/v3/logger" "github.com/featurebasedb/featurebase/v3/pql" - "github.com/featurebasedb/featurebase/v3/prometheus" proto "github.com/featurebasedb/featurebase/v3/proto" - "github.com/featurebasedb/featurebase/v3/stats" "github.com/pkg/errors" prom "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" diff --git a/index.go b/index.go index 6914f7197..ae6d18e84 100644 --- a/index.go +++ b/index.go @@ -17,7 +17,6 @@ import ( "github.com/featurebasedb/featurebase/v3/disco" "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/pkg/errors" "github.com/prometheus/client_golang/prometheus" diff --git a/lattice/src/services/__mocks__/eventServices.tsx b/lattice/src/services/__mocks__/eventServices.tsx index a6203b244..0fb72dece 100644 --- a/lattice/src/services/__mocks__/eventServices.tsx +++ b/lattice/src/services/__mocks__/eventServices.tsx @@ -10,3 +10,4 @@ const pilosa = { }; module.exports.pilosa = pilosa; +export {}; diff --git a/server.go b/server.go index 5bbff5f76..1a02fc5d1 100644 --- a/server.go +++ b/server.go @@ -27,7 +27,6 @@ import ( "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/grpc.go b/server/grpc.go index cecfa3bea..8090e60b3 100644 --- a/server/grpc.go +++ b/server/grpc.go @@ -22,7 +22,6 @@ import ( pb "github.com/featurebasedb/featurebase/v3/proto" vdsm_pb "github.com/featurebasedb/featurebase/v3/proto/vdsm" "github.com/featurebasedb/featurebase/v3/sql" - "github.com/featurebasedb/featurebase/v3/stats" "github.com/improbable-eng/grpc-web/go/grpcweb" "github.com/pkg/errors" "google.golang.org/grpc" diff --git a/server/server.go b/server/server.go index 7fa2d2904..1af669555 100644 --- a/server/server.go +++ b/server/server.go @@ -39,11 +39,9 @@ import ( "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/systemlayer" "github.com/featurebasedb/featurebase/v3/syswrap" "github.com/featurebasedb/featurebase/v3/testhook" diff --git a/sql3/planner/compilealtertable.go b/sql3/planner/compilealtertable.go index 30767a1f6..cff677f89 100644 --- a/sql3/planner/compilealtertable.go +++ b/sql3/planner/compilealtertable.go @@ -6,12 +6,10 @@ import ( "context" "strings" - pilosa "github.com/featurebasedb/featurebase/v3" "github.com/featurebasedb/featurebase/v3/dax" "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" ) type alterOperation int64 diff --git a/sql3/planner/compilebulkinsert.go b/sql3/planner/compilebulkinsert.go index 466df5040..ce80d024b 100644 --- a/sql3/planner/compilebulkinsert.go +++ b/sql3/planner/compilebulkinsert.go @@ -14,7 +14,10 @@ import ( "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" + goerrors "github.com/pkg/errors" + + + ) // compileBulkInsertStatement compiles a BULK INSERT statement into a diff --git a/sql3/planner/compiledroptable.go b/sql3/planner/compiledroptable.go index 2d70b8cfd..96b9f7ee1 100644 --- a/sql3/planner/compiledroptable.go +++ b/sql3/planner/compiledroptable.go @@ -10,7 +10,6 @@ import ( "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" ) // compileDropTableStatement compiles a DROP TABLE statement into a diff --git a/sql3/planner/compileinsert.go b/sql3/planner/compileinsert.go index 06eaf11af..4b6ae33dd 100644 --- a/sql3/planner/compileinsert.go +++ b/sql3/planner/compileinsert.go @@ -11,7 +11,6 @@ import ( "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" ) // compileInsertStatement compiles an INSERT statement into a PlanOperator. diff --git a/sql3/planner/executionplanner.go b/sql3/planner/executionplanner.go index 265203d5e..46657ee97 100644 --- a/sql3/planner/executionplanner.go +++ b/sql3/planner/executionplanner.go @@ -12,10 +12,13 @@ import ( "strings" pilosa "github.com/featurebasedb/featurebase/v3" + "github.com/featurebasedb/featurebase/v3/dax" + "github.com/featurebasedb/featurebase/v3/errors" "github.com/featurebasedb/featurebase/v3/logger" "github.com/featurebasedb/featurebase/v3/sql3" "github.com/featurebasedb/featurebase/v3/sql3/parser" "github.com/featurebasedb/featurebase/v3/sql3/planner/types" + "golang.org/x/sync/errgroup" ) func isTableNotFoundError(err error) bool { diff --git a/sql3/planner/opbulkinsert.go b/sql3/planner/opbulkinsert.go index 01f905c85..294e65f0f 100644 --- a/sql3/planner/opbulkinsert.go +++ b/sql3/planner/opbulkinsert.go @@ -17,6 +17,7 @@ import ( "github.com/PaesslerAG/gval" "github.com/PaesslerAG/jsonpath" + 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" diff --git a/sql3/planner/oppqldistinctscan.go b/sql3/planner/oppqldistinctscan.go index 3ff84d0c6..e1f6d51e8 100644 --- a/sql3/planner/oppqldistinctscan.go +++ b/sql3/planner/oppqldistinctscan.go @@ -14,7 +14,6 @@ import ( "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" ) // PlanOpPQLDistinctScan plan operator handles a PQL distinct scan diff --git a/sql3/planner/oppqltablescan.go b/sql3/planner/oppqltablescan.go index a56261871..2b9eba57a 100644 --- a/sql3/planner/oppqltablescan.go +++ b/sql3/planner/oppqltablescan.go @@ -13,7 +13,6 @@ import ( "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" ) // PlanOpPQLTableScan plan operator handles a PQL table scan diff --git a/view.go b/view.go index 8be79bb17..c71d5cea6 100644 --- a/view.go +++ b/view.go @@ -16,7 +16,6 @@ import ( "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/vprint" "github.com/pkg/errors"