Fixed some import issues resulting from syncing the private repo

api.go

@@ -23,7 +23,6 @@ import (
 	"time"
 
 	"github.com/featurebasedb/featurebase/v3/disco"
-	"github.com/featurebasedb/featurebase/v3/ingest"
 	"github.com/featurebasedb/featurebase/v3/rbf"
 
 	//"github.com/featurebasedb/featurebase/v3/pg"

batch/batch.go

@@ -1,6 +1,5 @@
-// Copyright 2022 Molecula Corp. (DBA FeatureBase).
-// SPDX-License-Identifier: Apache-2.0
-package client
+// Package batch provides tooling to prepare batches of records for ingest.
+package batch
 
 import (
 	"bytes"
@@ -11,8 +10,9 @@ import (
 	"time"
 
 	featurebase "github.com/featurebasedb/featurebase/v3"
-	"github.com/featurebasedb/featurebase/v3/client/egpool"
+	"github.com/featurebasedb/featurebase/v3/batch/egpool"
 	"github.com/featurebasedb/featurebase/v3/logger"
+	"github.com/featurebasedb/featurebase/v3/pql"
 	"github.com/featurebasedb/featurebase/v3/roaring"
 	"github.com/pkg/errors"
 )
@@ -716,7 +716,7 @@ func (b *Batch) Add(rec Row) error {
 	return nil
 }
 
-// ErrBatchNowFull — similar to io.EOF — is a marker error to notify the user of
+// ErrBatchNowFull — similar to io.EOF — is a marker error to notify the user of
 // a batch that it is time to call Import.
 var ErrBatchNowFull = errors.New("batch is now full - you cannot add any more records (though the one you just added was accepted)")
 

batch/batch_test.go

@@ -10,9 +10,9 @@ import (
 	"testing"
 	"time"
 
-	featurebase "github.com/molecula/featurebase/v3"
-	"github.com/molecula/featurebase/v3/client"
-	"github.com/molecula/featurebase/v3/pql"
+	featurebase "github.com/featurebasedb/featurebase/v3"
+	"github.com/featurebasedb/featurebase/v3/client"
+	"github.com/featurebasedb/featurebase/v3/pql"
 	"github.com/stretchr/testify/assert"
 
 	"github.com/pkg/errors"

batch/convert.go

@@ -3,8 +3,8 @@ package batch
 import (
 	"time"
 
-	featurebase "github.com/molecula/featurebase/v3"
-	"github.com/molecula/featurebase/v3/errors"
+	featurebase "github.com/featurebasedb/featurebase/v3"
+	"github.com/featurebasedb/featurebase/v3/errors"
 )
 
 var (

batch/egpool/egpool_test.go

@@ -6,7 +6,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/featurebasedb/featurebase/v3/client/egpool"
+	"github.com/featurebasedb/featurebase/v3/batch/egpool"
 )
 
 func TestEGPool(t *testing.T) {

batch/importer.go

@@ -5,10 +5,10 @@ import (
 	"time"
 
 	"github.com/golang/protobuf/proto" //nolint:staticcheck
-	featurebase "github.com/molecula/featurebase/v3"
-	featurebaseproto "github.com/molecula/featurebase/v3/encoding/proto"
-	"github.com/molecula/featurebase/v3/pb"
-	"github.com/molecula/featurebase/v3/roaring"
+	featurebase "github.com/featurebasedb/featurebase/v3"
+	featurebaseproto "github.com/featurebasedb/featurebase/v3/encoding/proto"
+	"github.com/featurebasedb/featurebase/v3/pb"
+	"github.com/featurebasedb/featurebase/v3/roaring"
 	"github.com/pkg/errors"
 )
 

batch/metrics.go

@@ -1,6 +1,6 @@
 // Copyright 2022 Molecula Corp. (DBA FeatureBase).
 // SPDX-License-Identifier: Apache-2.0
-package client
+package batch
 
 const (
 	// MetricBatchImportDurationSeconds records the full time of the

client/api.go

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

client/importer.go

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

cluster.go

@@ -9,7 +9,6 @@ import (
 	"time"
 
 	"github.com/featurebasedb/featurebase/v3/disco"
-	"github.com/featurebasedb/featurebase/v3/ingest"
 	"github.com/featurebasedb/featurebase/v3/logger"
 	"github.com/featurebasedb/featurebase/v3/roaring"
 	"github.com/pkg/errors"

cmd/badloader/badloader.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 main
 
 import (
@@ -8,16 +7,17 @@ import (
 	"context"
 	"fmt"
 	"io"
+	"os"
+	"strconv"
+	"strings"
+	"time"
+
 	gohttp "net/http"
 
 	pilosa "github.com/featurebasedb/featurebase/v3"
 	"github.com/featurebasedb/featurebase/v3/encoding/proto"
 	pnet "github.com/featurebasedb/featurebase/v3/net"
 	"github.com/featurebasedb/featurebase/v3/vprint"
-
-	"os"
-	"strconv"
-	"strings"
 )
 
 func UploadTar(srcFile string, client *pilosa.InternalClient) error {

encoding/proto/proto.go

@@ -10,7 +10,6 @@ import (
 	"github.com/gogo/protobuf/proto"
 	pilosa "github.com/featurebasedb/featurebase/v3"
 	"github.com/featurebasedb/featurebase/v3/disco"
-	"github.com/featurebasedb/featurebase/v3/ingest"
 	pnet "github.com/featurebasedb/featurebase/v3/net"
 	"github.com/featurebasedb/featurebase/v3/pb"
 	"github.com/featurebasedb/featurebase/v3/pql"

encoding/proto/proto_test.go

@@ -7,7 +7,6 @@ import (
 	"testing"
 
 	pilosa "github.com/featurebasedb/featurebase/v3"
-	"github.com/featurebasedb/featurebase/v3/ingest"
 	"github.com/featurebasedb/featurebase/v3/pb"
 )
 

fragment.go

@@ -19,10 +19,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/cespare/xxhash"
-	"github.com/featurebasedb/featurebase/v3/disco"
 	"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"

handler.go

@@ -1,13 +1,12 @@
-// Copyright 2022 Molecula Corp. (DBA FeatureBase).
-// SPDX-License-Identifier: Apache-2.0
+// Copyright 2021 Molecula Corp. All rights reserved.
 package pilosa
 
 import (
 	"encoding/json"
 	"math/bits"
 	"time"
 
-	"github.com/featurebasedb/featurebase/v3/ingest"
+	"github.com/featurebasedb/featurebase/v3/shardwidth"
 	"github.com/featurebasedb/featurebase/v3/tracing"
 	"github.com/pkg/errors"
 )

handler_test.go

@@ -5,7 +5,7 @@ import (
 	"math/rand"
 	"testing"
 
-	pilosa "github.com/molecula/featurebase/v3"
+	pilosa "github.com/featurebasedb/featurebase/v3"
 )
 
 func TestSortToShards(t *testing.T) {

http_handler.go

@@ -31,7 +31,6 @@ import (
 	"github.com/featurebasedb/featurebase/v3/authn"
 	"github.com/featurebasedb/featurebase/v3/authz"
 	"github.com/featurebasedb/featurebase/v3/disco"
-	"github.com/featurebasedb/featurebase/v3/ingest"
 	"github.com/featurebasedb/featurebase/v3/logger"
 	"github.com/featurebasedb/featurebase/v3/monitor"
 	"github.com/featurebasedb/featurebase/v3/pql"

internal_client.go

@@ -21,7 +21,6 @@ import (
 
 	"github.com/featurebasedb/featurebase/v3/authn"
 	"github.com/featurebasedb/featurebase/v3/disco"
-	"github.com/featurebasedb/featurebase/v3/ingest"
 	"github.com/featurebasedb/featurebase/v3/logger"
 	pnet "github.com/featurebasedb/featurebase/v3/net"
 	"github.com/featurebasedb/featurebase/v3/tracing"

iterator.go

@@ -5,7 +5,6 @@ package pilosa
 import (
 	"fmt"
 
-	"github.com/featurebasedb/featurebase/v3/roaring"
 )
 
 // iterator is an interface for looping over row/column pairs.

querycontext/query_context.go

@@ -5,7 +5,7 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/molecula/featurebase/v3/roaring"
+	"github.com/featurebasedb/featurebase/v3/roaring"
 )
 
 // QueryContext represents the lifespan of a query or similar thing which

querycontext/query_context_test.go

@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	rbfcfg "github.com/molecula/featurebase/v3/rbf/cfg"
+	rbfcfg "github.com/featurebasedb/featurebase/v3/rbf/cfg"
 	"golang.org/x/sync/errgroup"
 )
 

querycontext/rbf.go

@@ -10,9 +10,9 @@ import (
 	"runtime"
 	"sync"
 
-	"github.com/molecula/featurebase/v3/rbf"
-	rbfcfg "github.com/molecula/featurebase/v3/rbf/cfg"
-	"github.com/molecula/featurebase/v3/roaring"
+	"github.com/featurebasedb/featurebase/v3/rbf"
+	rbfcfg "github.com/featurebasedb/featurebase/v3/rbf/cfg"
+	"github.com/featurebasedb/featurebase/v3/roaring"
 )
 
 // rbfDBQueryContexts represents an actual backend DB, and a map of the

querycontext/rbf_test.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/molecula/featurebase/v3/roaring"
+	"github.com/featurebasedb/featurebase/v3/roaring"
 )
 
 func TestRbfWrite(t *testing.T) {

querycontext/reduce_err_test.go

@@ -5,7 +5,7 @@ import (
 	"sync/atomic"
 	"testing"
 
-	"github.com/molecula/featurebase/v3/roaring"
+	"github.com/featurebasedb/featurebase/v3/roaring"
 )
 
 type oopsieWrapper struct {

rbf.go

@@ -16,7 +16,6 @@ import (
 	txkey "github.com/featurebasedb/featurebase/v3/short_txkey"
 	"github.com/featurebasedb/featurebase/v3/storage"
 
-	"github.com/featurebasedb/featurebase/v3/vprint"
 	"github.com/pkg/errors"
 )