Sync from private repo to commit 12d608c

api.go

@@ -22,11 +22,11 @@ import (
 	"sync"
 	"time"
 
-	fbcontext "github.com/molecula/featurebase/v3/context"
-	"github.com/molecula/featurebase/v3/dax"
-	"github.com/molecula/featurebase/v3/dax/computer"
-	"github.com/molecula/featurebase/v3/disco"
-	"github.com/molecula/featurebase/v3/rbf"
+	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/disco"
+	"github.com/featurebasedb/featurebase/v3/rbf"
 
 	//"github.com/featurebasedb/featurebase/v3/pg"
 	"github.com/featurebasedb/featurebase/v3/pql"

api_directive.go

@@ -7,9 +7,9 @@ import (
 	"log"
 	"sync"
 
-	"github.com/molecula/featurebase/v3/dax"
-	"github.com/molecula/featurebase/v3/dax/computer"
-	"github.com/molecula/featurebase/v3/disco"
+	"github.com/featurebasedb/featurebase/v3/dax"
+	"github.com/featurebasedb/featurebase/v3/dax/computer"
+	"github.com/featurebasedb/featurebase/v3/disco"
 	"github.com/pkg/errors"
 )
 

api_directive_test.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"testing"
 
-	pilosa "github.com/molecula/featurebase/v3"
-	"github.com/molecula/featurebase/v3/dax"
-	daxtest "github.com/molecula/featurebase/v3/dax/test"
-	"github.com/molecula/featurebase/v3/test"
+	pilosa "github.com/featurebasedb/featurebase/v3"
+	"github.com/featurebasedb/featurebase/v3/dax"
+	daxtest "github.com/featurebasedb/featurebase/v3/dax/test"
+	"github.com/featurebasedb/featurebase/v3/test"
 	"github.com/stretchr/testify/assert"
 )
 

apply.go

@@ -16,9 +16,9 @@ import (
 	"github.com/apache/arrow/go/v10/parquet/file"
 	"github.com/apache/arrow/go/v10/parquet/pqarrow"
 	"github.com/gomem/gomem/pkg/dataframe"
-	"github.com/molecula/featurebase/v3/pql"
-	"github.com/molecula/featurebase/v3/tracing"
-	"github.com/molecula/featurebase/v3/vprint"
+	"github.com/featurebasedb/featurebase/v3/pql"
+	"github.com/featurebasedb/featurebase/v3/tracing"
+	"github.com/featurebasedb/featurebase/v3/vprint"
 	"github.com/pkg/errors"
 
 	ivy "robpike.io/ivy/arrow"

arrow.go

@@ -12,8 +12,8 @@ import (
 	"github.com/apache/arrow/go/v10/arrow/array"
 	"github.com/apache/arrow/go/v10/arrow/memory"
 	"github.com/gomem/gomem/pkg/dataframe"
-	"github.com/molecula/featurebase/v3/pql"
-	"github.com/molecula/featurebase/v3/tracing"
+	"github.com/featurebasedb/featurebase/v3/pql"
+	"github.com/featurebasedb/featurebase/v3/tracing"
 	"github.com/pkg/errors"
 )
 

batch/batch.go

@@ -10,12 +10,12 @@ import (
 	"sync"
 	"time"
 
-	featurebase "github.com/molecula/featurebase/v3"
-	"github.com/molecula/featurebase/v3/batch/egpool"
-	"github.com/molecula/featurebase/v3/dax"
-	"github.com/molecula/featurebase/v3/logger"
-	"github.com/molecula/featurebase/v3/pql"
-	"github.com/molecula/featurebase/v3/roaring"
+	featurebase "github.com/featurebasedb/featurebase/v3"
+	"github.com/featurebasedb/featurebase/v3/batch/egpool"
+	"github.com/featurebasedb/featurebase/v3/dax"
+	"github.com/featurebasedb/featurebase/v3/logger"
+	"github.com/featurebasedb/featurebase/v3/pql"
+	"github.com/featurebasedb/featurebase/v3/roaring"
 	"github.com/pkg/errors"
 )
 

client/api.go

@@ -3,10 +3,10 @@ package client
 import (
 	"context"
 
-	featurebase "github.com/molecula/featurebase/v3"
-	"github.com/molecula/featurebase/v3/client/types"
-	"github.com/molecula/featurebase/v3/dax"
-	"github.com/molecula/featurebase/v3/errors"
+	featurebase "github.com/featurebasedb/featurebase/v3"
+	"github.com/featurebasedb/featurebase/v3/client/types"
+	"github.com/featurebasedb/featurebase/v3/dax"
+	"github.com/featurebasedb/featurebase/v3/errors"
 )
 
 var _ featurebase.SchemaAPI = &schemaAPI{}

client/client.go

@@ -1,5 +1,4 @@
-// Copyright 2022 Molecula Corp. (DBA FeatureBase).
-// SPDX-License-Identifier: Apache-2.0
+// Copyright 2021 Molecula Corp. All rights reserved.
 // package ctl contains all pilosa subcommands other than 'server'. These are
 // generally administration, testing, and debugging tools.
 package client
@@ -21,25 +20,17 @@ import (
 	"sync"
 	"time"
 
+	"github.com/golang/protobuf/proto" //nolint:staticcheck
 	pilosa "github.com/featurebasedb/featurebase/v3"
+	"github.com/featurebasedb/featurebase/v3/client/types"
 	fbproto "github.com/featurebasedb/featurebase/v3/encoding/proto" // TODO use this everywhere and get rid of proto import
 	"github.com/featurebasedb/featurebase/v3/logger"
 	pnet "github.com/featurebasedb/featurebase/v3/net"
 	"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/golang/protobuf/proto" //nolint:staticcheck
-	pilosa "github.com/molecula/featurebase/v3"
-	"github.com/molecula/featurebase/v3/client/types"
-	fbproto "github.com/molecula/featurebase/v3/encoding/proto" // TODO use this everywhere and get rid of proto import
-	"github.com/molecula/featurebase/v3/logger"
-	pnet "github.com/molecula/featurebase/v3/net"
-	"github.com/molecula/featurebase/v3/pb"
-	"github.com/molecula/featurebase/v3/pql"
-	"github.com/molecula/featurebase/v3/roaring"
-	"github.com/molecula/featurebase/v3/stats"
-	"github.com/molecula/featurebase/v3/vprint"
+	"github.com/featurebasedb/featurebase/v3/vprint"
 	"github.com/opentracing/opentracing-go"
 	"github.com/pkg/errors"
 	"golang.org/x/sync/errgroup"

client/client_it_test.go

@@ -9,13 +9,13 @@ import (
 	"testing"
 	"time"
 
-	featurebase "github.com/molecula/featurebase/v3"
-	client_types "github.com/molecula/featurebase/v3/client/types"
-	"github.com/molecula/featurebase/v3/disco"
-	pnet "github.com/molecula/featurebase/v3/net"
-	"github.com/molecula/featurebase/v3/roaring"
-	"github.com/molecula/featurebase/v3/shardwidth"
-	"github.com/molecula/featurebase/v3/test"
+	featurebase "github.com/featurebasedb/featurebase/v3"
+	client_types "github.com/featurebasedb/featurebase/v3/client/types"
+	"github.com/featurebasedb/featurebase/v3/disco"
+	pnet "github.com/featurebasedb/featurebase/v3/net"
+	"github.com/featurebasedb/featurebase/v3/roaring"
+	"github.com/featurebasedb/featurebase/v3/shardwidth"
+	"github.com/featurebasedb/featurebase/v3/test"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/sync/errgroup"
 )

client/importer.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"time"
 
-	featurebase "github.com/molecula/featurebase/v3"
-	"github.com/molecula/featurebase/v3/dax"
-	"github.com/molecula/featurebase/v3/roaring"
+	featurebase "github.com/featurebasedb/featurebase/v3"
+	"github.com/featurebasedb/featurebase/v3/dax"
+	"github.com/featurebasedb/featurebase/v3/roaring"
 	"github.com/pkg/errors"
 )
 

client/orm.go

@@ -14,8 +14,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/molecula/featurebase/v3/client/types"
-	"github.com/molecula/featurebase/v3/pql"
+	"github.com/featurebasedb/featurebase/v3/client/types"
+	"github.com/featurebasedb/featurebase/v3/pql"
 	"github.com/pkg/errors"
 )
 

client/orm_test.go

@@ -14,9 +14,9 @@ import (
 	"testing"
 	"time"
 
-	pilosa "github.com/molecula/featurebase/v3"
-	clienttypes "github.com/molecula/featurebase/v3/client/types"
-	"github.com/molecula/featurebase/v3/pql"
+	pilosa "github.com/featurebasedb/featurebase/v3"
+	clienttypes "github.com/featurebasedb/featurebase/v3/client/types"
+	"github.com/featurebasedb/featurebase/v3/pql"
 	"github.com/pkg/errors"
 )
 

cluster.go

@@ -9,11 +9,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/molecula/featurebase/v3/dax"
-	"github.com/molecula/featurebase/v3/dax/computer"
-	"github.com/molecula/featurebase/v3/disco"
-	"github.com/molecula/featurebase/v3/logger"
-	"github.com/molecula/featurebase/v3/roaring"
+	"github.com/featurebasedb/featurebase/v3/dax"
+	"github.com/featurebasedb/featurebase/v3/dax/computer"
+	"github.com/featurebasedb/featurebase/v3/disco"
+	"github.com/featurebasedb/featurebase/v3/logger"
+	"github.com/featurebasedb/featurebase/v3/roaring"
 	"github.com/pkg/errors"
 	"golang.org/x/sync/errgroup"
 )

cmd/auth_token.go

@@ -3,8 +3,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"
 )
 

cmd/backup.go

@@ -3,8 +3,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"
 )
 

cmd/backup_tar.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"
 )
 

cmd/chksum.go

@@ -3,8 +3,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"
 )
 

cmd/cli.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"
 )
 

cmd/dax.go

@@ -4,8 +4,8 @@ package cmd
 import (
 	"io"
 
-	"github.com/molecula/featurebase/v3/ctl"
-	"github.com/molecula/featurebase/v3/dax/server"
+	"github.com/featurebasedb/featurebase/v3/ctl"
+	"github.com/featurebasedb/featurebase/v3/dax/server"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )

cmd/export.go

@@ -5,8 +5,8 @@ package cmd
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/molecula/featurebase/v3/ctl"
-	"github.com/molecula/featurebase/v3/logger"
+	"github.com/featurebasedb/featurebase/v3/ctl"
+	"github.com/featurebasedb/featurebase/v3/logger"
 )
 
 var Exporter *ctl.ExportCommand

cmd/generate_config.go

@@ -5,8 +5,8 @@ package cmd
 import (
 	"github.com/spf13/cobra"
 
-	"github.com/molecula/featurebase/v3/ctl"
-	"github.com/molecula/featurebase/v3/logger"
+	"github.com/featurebasedb/featurebase/v3/ctl"
+	"github.com/featurebasedb/featurebase/v3/logger"
 )
 
 var generateConf *ctl.GenerateConfigCommand

cmd/import.go

@@ -7,10 +7,10 @@ import (
 	"fmt"
 	"strconv"
 
-	pilosa "github.com/molecula/featurebase/v3"
-	"github.com/molecula/featurebase/v3/ctl"
-	"github.com/molecula/featurebase/v3/logger"
-	"github.com/molecula/featurebase/v3/pql"
+	pilosa "github.com/featurebasedb/featurebase/v3"
+	"github.com/featurebasedb/featurebase/v3/ctl"
+	"github.com/featurebasedb/featurebase/v3/logger"
+	"github.com/featurebasedb/featurebase/v3/pql"
 	"github.com/spf13/cobra"
 )
 

cmd/import_test.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"
 
-	pilosa "github.com/molecula/featurebase/v3"
+	pilosa "github.com/featurebasedb/featurebase/v3"
 
 	"github.com/featurebasedb/featurebase/v3/cmd"
 	"github.com/featurebasedb/featurebase/v3/pql"

cmd/keygen.go

@@ -3,8 +3,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"
 )
 

cmd/rbf.go

@@ -7,8 +7,8 @@ import (
 	"fmt"
 	"strconv"
 
-	"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"
 )
 

cmd/restore.go

@@ -3,8 +3,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"
 )
 

cmd/restore_tar.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"
 )
 

cmd/root.go

@@ -9,9 +9,9 @@ import (
 	"io"
 	"strings"
 
-	pilosa "github.com/molecula/featurebase/v3"
-	"github.com/molecula/featurebase/v3/ctl"
-	"github.com/molecula/featurebase/v3/logger"
+	pilosa "github.com/featurebasedb/featurebase/v3"
+	"github.com/featurebasedb/featurebase/v3/ctl"
+	"github.com/featurebasedb/featurebase/v3/logger"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"

cmd/root_test.go

@@ -11,8 +11,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/molecula/featurebase/v3/cmd"
-	"github.com/molecula/featurebase/v3/testhook"
+	"github.com/featurebasedb/featurebase/v3/cmd"
+	"github.com/featurebasedb/featurebase/v3/testhook"
 	"github.com/spf13/cobra"
 )