Skip to content

Commit

Permalink
consolidate proto files
Browse files Browse the repository at this point in the history
  • Loading branch information
@gernest
gernest committed Feb 23, 2024
1 parent ce2525f commit 55dd8fc
Show file tree
Hide file tree
Showing 43 changed files with 4,056 additions and 3,661 deletions.
886 changes: 0 additions & 886 deletions gen/go/staples/v1/scan.pb.go
View file

This file was deleted.

1,111 changes: 0 additions & 1,111 deletions gen/go/staples/v1/staples.pb.go
View file

This file was deleted.

1,398 changes: 0 additions & 1,398 deletions gen/go/staples/v1/stats.pb.go
View file

This file was deleted.

659 changes: 659 additions & 0 deletions gen/go/vince/v1/config.pb.go
View file

Large diffs are not rendered by default.

182 changes: 91 additions & 91 deletions gen/go/events/v1/events.pb.go → gen/go/vince/v1/events.pb.go
View file

Large diffs are not rendered by default.

613 changes: 613 additions & 0 deletions gen/go/vince/v1/store.pb.go
View file

Large diffs are not rendered by default.

2,508 changes: 2,508 additions & 0 deletions gen/go/vince/v1/vince.pb.go
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion gen/staples/v1/scan.swagger.json → gen/vince/v1/config.swagger.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"swagger": "2.0",
"info": {
"title": "staples/v1/scan.proto",
"title": "vince/v1/config.proto",
"version": "version not set"
},
"consumes": [
Expand Down
2 changes: 1 addition & 1 deletion gen/events/v1/events.swagger.json → gen/vince/v1/events.swagger.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"swagger": "2.0",
"info": {
"title": "events/v1/events.proto",
"title": "vince/v1/events.proto",
"version": "version not set"
},
"consumes": [
Expand Down
2 changes: 1 addition & 1 deletion gen/staples/v1/stats.swagger.json → gen/vince/v1/store.swagger.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"swagger": "2.0",
"info": {
"title": "staples/v1/stats.proto",
"title": "vince/v1/store.proto",
"version": "version not set"
},
"consumes": [
Expand Down
2 changes: 1 addition & 1 deletion gen/staples/v1/staples.swagger.json → gen/vince/v1/vince.swagger.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"swagger": "2.0",
"info": {
"title": "staples/v1/staples.proto",
"title": "vince/v1/vince.proto",
"version": "version not set"
},
"consumes": [
Expand Down
2 changes: 1 addition & 1 deletion internal/api/api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"strings"
"sync"

v1 "github.com/vinceanalytics/vince/gen/go/staples/v1"
v1 "github.com/vinceanalytics/vince/gen/go/vince/v1"
"github.com/vinceanalytics/vince/internal/buffers"
"github.com/vinceanalytics/vince/internal/guard"
"github.com/vinceanalytics/vince/internal/logger"
Expand Down
2 changes: 1 addition & 1 deletion internal/closter/events/build.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/apache/arrow/go/v15/arrow"
"github.com/apache/arrow/go/v15/arrow/array"
"github.com/apache/arrow/go/v15/arrow/memory"
v1 "github.com/vinceanalytics/vince/gen/go/events/v1"
v1 "github.com/vinceanalytics/vince/gen/go/vince/v1"
"google.golang.org/protobuf/reflect/protoreflect"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/closter/events/build_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/apache/arrow/go/v15/arrow/memory"
"github.com/stretchr/testify/require"
v1 "github.com/vinceanalytics/vince/gen/go/events/v1"
v1 "github.com/vinceanalytics/vince/gen/go/vince/v1"
)

func TestBuild(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions internal/closter/events/event.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"time"

"github.com/cespare/xxhash/v2"
v1 "github.com/vinceanalytics/vince/gen/go/events/v1"
staplesv1 "github.com/vinceanalytics/vince/gen/go/staples/v1"
staplesv1 "github.com/vinceanalytics/vince/gen/go/vince/v1"
v1 "github.com/vinceanalytics/vince/gen/go/vince/v1"
"github.com/vinceanalytics/vince/internal/geo"
"github.com/vinceanalytics/vince/internal/logger"
"github.com/vinceanalytics/vince/internal/ref"
Expand Down
2 changes: 1 addition & 1 deletion internal/closter/events/pool.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package events
import (
"sync"

v1 "github.com/vinceanalytics/vince/gen/go/events/v1"
v1 "github.com/vinceanalytics/vince/gen/go/vince/v1"
)

var onePool = &sync.Pool{New: func() any { return new(v1.Data) }}
Expand Down
2 changes: 1 addition & 1 deletion internal/closter/events/sample.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/apache/arrow/go/v15/arrow"
"github.com/apache/arrow/go/v15/arrow/memory"
v1 "github.com/vinceanalytics/vince/gen/go/events/v1"
v1 "github.com/vinceanalytics/vince/gen/go/vince/v1"
"google.golang.org/protobuf/encoding/protojson"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"github.com/apache/arrow/go/v15/arrow/memory"
"github.com/bufbuild/protovalidate-go"
"github.com/urfave/cli/v3"
v1 "github.com/vinceanalytics/vince/gen/go/staples/v1"
v1 "github.com/vinceanalytics/vince/gen/go/vince/v1"
"github.com/vinceanalytics/vince/internal/api"
"github.com/vinceanalytics/vince/internal/db"
"github.com/vinceanalytics/vince/internal/geo"
Expand Down
2 changes: 1 addition & 1 deletion internal/columns/columns.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package columns

import (
v1 "github.com/vinceanalytics/vince/gen/go/staples/v1"
v1 "github.com/vinceanalytics/vince/gen/go/vince/v1"
)

var Event = v1.Filters_event.String()
Expand Down
2 changes: 1 addition & 1 deletion internal/db/persistance.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"github.com/apache/arrow/go/v15/parquet/pqarrow"
"github.com/dgraph-io/badger/v4"
"github.com/oklog/ulid/v2"
v1 "github.com/vinceanalytics/vince/gen/go/staples/v1"
v1 "github.com/vinceanalytics/vince/gen/go/vince/v1"
"github.com/vinceanalytics/vince/internal/buffers"
"github.com/vinceanalytics/vince/internal/index"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/filters/filters.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package filters

import (
"github.com/blevesearch/vellum/regexp"
v1 "github.com/vinceanalytics/vince/gen/go/staples/v1"
v1 "github.com/vinceanalytics/vince/gen/go/vince/v1"
)

func Projection(p v1.Property) v1.Filters_Projection {
Expand Down
2 changes: 1 addition & 1 deletion internal/guard/guard.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"sync"

v1 "github.com/vinceanalytics/vince/gen/go/staples/v1"
v1 "github.com/vinceanalytics/vince/gen/go/vince/v1"
"github.com/vinceanalytics/vince/internal/tenant"
"golang.org/x/time/rate"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/index/column.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/RoaringBitmap/roaring"
"github.com/apache/arrow/go/v15/arrow/array"
"github.com/blevesearch/vellum"
v1 "github.com/vinceanalytics/vince/gen/go/staples/v1"
v1 "github.com/vinceanalytics/vince/gen/go/vince/v1"
"github.com/vinceanalytics/vince/internal/filters"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/index/file.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (

"github.com/RoaringBitmap/roaring"
"github.com/klauspost/compress/zstd"
v1 "github.com/vinceanalytics/vince/gen/go/staples/v1"
v1 "github.com/vinceanalytics/vince/gen/go/vince/v1"
"github.com/vinceanalytics/vince/internal/buffers"
"github.com/vinceanalytics/vince/internal/filters"
"github.com/vinceanalytics/vince/internal/logger"
Expand Down
2 changes: 1 addition & 1 deletion internal/index/index.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package index
import (
"github.com/RoaringBitmap/roaring"
"github.com/apache/arrow/go/v15/arrow"
v1 "github.com/vinceanalytics/vince/gen/go/staples/v1"
v1 "github.com/vinceanalytics/vince/gen/go/vince/v1"
"github.com/vinceanalytics/vince/internal/filters"
)

Expand Down
2 changes: 1 addition & 1 deletion internal/index/primary/primary.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"sort"
"sync"

v1 "github.com/vinceanalytics/vince/gen/go/staples/v1"
v1 "github.com/vinceanalytics/vince/gen/go/vince/v1"
"github.com/vinceanalytics/vince/internal/db"
"github.com/vinceanalytics/vince/internal/index"
"google.golang.org/protobuf/proto"
Expand Down
2 changes: 1 addition & 1 deletion internal/load/load.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (

"github.com/dop251/goja"
"github.com/urfave/cli/v3"
v1 "github.com/vinceanalytics/vince/gen/go/staples/v1"
v1 "github.com/vinceanalytics/vince/gen/go/vince/v1"
"github.com/vinceanalytics/vince/internal/ref"
"github.com/vinceanalytics/vince/ua"
"google.golang.org/protobuf/encoding/protojson"
Expand Down
2 changes: 1 addition & 1 deletion internal/lsm/lsm.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/dgraph-io/ristretto"
"github.com/docker/go-units"
"github.com/oklog/ulid/v2"
v1 "github.com/vinceanalytics/vince/gen/go/staples/v1"
v1 "github.com/vinceanalytics/vince/gen/go/vince/v1"
"github.com/vinceanalytics/vince/internal/closter/events"
"github.com/vinceanalytics/vince/internal/columns"
"github.com/vinceanalytics/vince/internal/db"
Expand Down
2 changes: 1 addition & 1 deletion internal/request/request.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"net/http"

"github.com/bufbuild/protovalidate-go"
v1 "github.com/vinceanalytics/vince/gen/go/staples/v1"
v1 "github.com/vinceanalytics/vince/gen/go/vince/v1"
"github.com/vinceanalytics/vince/internal/logger"
"google.golang.org/protobuf/encoding/protojson"
"google.golang.org/protobuf/proto"
Expand Down
4 changes: 2 additions & 2 deletions internal/session/session.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/apache/arrow/go/v15/arrow"
"github.com/apache/arrow/go/v15/arrow/memory"
"github.com/dgraph-io/ristretto"
eventsv1 "github.com/vinceanalytics/vince/gen/go/events/v1"
v1 "github.com/vinceanalytics/vince/gen/go/staples/v1"
eventsv1 "github.com/vinceanalytics/vince/gen/go/vince/v1"
v1 "github.com/vinceanalytics/vince/gen/go/vince/v1"
"github.com/vinceanalytics/vince/internal/closter/events"
"github.com/vinceanalytics/vince/internal/db"
"github.com/vinceanalytics/vince/internal/index"
Expand Down
2 changes: 1 addition & 1 deletion internal/stats/aggregate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"time"

"github.com/apache/arrow/go/v15/arrow"
v1 "github.com/vinceanalytics/vince/gen/go/staples/v1"
v1 "github.com/vinceanalytics/vince/gen/go/vince/v1"
"github.com/vinceanalytics/vince/internal/logger"
"github.com/vinceanalytics/vince/internal/request"
"github.com/vinceanalytics/vince/internal/session"
Expand Down
2 changes: 1 addition & 1 deletion internal/stats/breakdown.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/apache/arrow/go/v15/arrow"
"github.com/apache/arrow/go/v15/arrow/array"
"github.com/apache/arrow/go/v15/arrow/compute"
v1 "github.com/vinceanalytics/vince/gen/go/staples/v1"
v1 "github.com/vinceanalytics/vince/gen/go/vince/v1"
"github.com/vinceanalytics/vince/internal/logger"
"github.com/vinceanalytics/vince/internal/request"
"github.com/vinceanalytics/vince/internal/session"
Expand Down
2 changes: 1 addition & 1 deletion internal/stats/common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"
"time"

v1 "github.com/vinceanalytics/vince/gen/go/staples/v1"
v1 "github.com/vinceanalytics/vince/gen/go/vince/v1"
"github.com/vinceanalytics/vince/internal/logger"
"github.com/vinceanalytics/vince/internal/timeutil"
"google.golang.org/grpc/codes"
Expand Down
2 changes: 1 addition & 1 deletion internal/stats/compute.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/apache/arrow/go/v15/arrow/bitutil"
"github.com/apache/arrow/go/v15/arrow/compute"
"github.com/apache/arrow/go/v15/arrow/math"
v1 "github.com/vinceanalytics/vince/gen/go/staples/v1"
v1 "github.com/vinceanalytics/vince/gen/go/vince/v1"
"github.com/vinceanalytics/vince/internal/columns"
"github.com/vinceanalytics/vince/internal/filters"
"github.com/vinceanalytics/vince/internal/logger"
Expand Down
2 changes: 1 addition & 1 deletion internal/stats/current_visitors.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"net/http"
"time"

v1 "github.com/vinceanalytics/vince/gen/go/staples/v1"
v1 "github.com/vinceanalytics/vince/gen/go/vince/v1"
"github.com/vinceanalytics/vince/internal/logger"
"github.com/vinceanalytics/vince/internal/request"
"github.com/vinceanalytics/vince/internal/session"
Expand Down
2 changes: 1 addition & 1 deletion internal/stats/timeseries.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/apache/arrow/go/v15/arrow"
"github.com/apache/arrow/go/v15/arrow/array"
v1 "github.com/vinceanalytics/vince/gen/go/staples/v1"
v1 "github.com/vinceanalytics/vince/gen/go/vince/v1"
"github.com/vinceanalytics/vince/internal/columns"
"github.com/vinceanalytics/vince/internal/logger"
"github.com/vinceanalytics/vince/internal/request"
Expand Down
2 changes: 1 addition & 1 deletion internal/tenant/tenants.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"net/url"

v1 "github.com/vinceanalytics/vince/gen/go/staples/v1"
v1 "github.com/vinceanalytics/vince/gen/go/vince/v1"
)

const Default = "staples"
Expand Down
2 changes: 1 addition & 1 deletion internal/timeutil/time_bucket.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package timeutil
import (
"time"

v1 "github.com/vinceanalytics/vince/gen/go/staples/v1"
v1 "github.com/vinceanalytics/vince/gen/go/vince/v1"
"github.com/vinceanalytics/vince/internal/logger"
)

Expand Down
82 changes: 0 additions & 82 deletions proto/staples/v1/scan.proto
View file

This file was deleted.

Loading

0 comments on commit 55dd8fc

Please sign in to comment.