Skip to content

Commit cea0efa

Browse files
committed
refactor: flatten store/postgres into store package
Only Postgres is used as a store backend, so the extra nesting is unnecessary. Moves all files from store/postgres/ to store/ and renames the package from postgres to store.
1 parent 00f07a9 commit cea0efa

23 files changed

Lines changed: 33 additions & 33 deletions

cli/embed.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/raystack/compass/core/namespace"
1515
"github.com/raystack/compass/internal/config"
1616
compassserver "github.com/raystack/compass/internal/server"
17-
"github.com/raystack/compass/store/postgres"
17+
"github.com/raystack/compass/store"
1818
"github.com/spf13/cobra"
1919
)
2020

@@ -57,21 +57,21 @@ func runEmbed(ctx context.Context, cfg *config.Config, embedType string, batchSi
5757
slog.Info("embedding provider initialized", "provider", provider.Name())
5858

5959
// Init postgres
60-
pgClient, err := postgres.NewClient(cfg.DB)
60+
pgClient, err := store.NewClient(cfg.DB)
6161
if err != nil {
6262
return fmt.Errorf("connect to postgres: %w", err)
6363
}
6464
defer pgClient.Close()
6565

66-
embeddingRepo, err := postgres.NewEmbeddingRepository(pgClient)
66+
embeddingRepo, err := store.NewEmbeddingRepository(pgClient)
6767
if err != nil {
6868
return err
6969
}
7070

7171
ns := namespace.DefaultNamespace
7272

7373
if embedType == "all" || embedType == "entity" {
74-
entityRepo, err := postgres.NewEntityRepository(pgClient)
74+
entityRepo, err := store.NewEntityRepository(pgClient)
7575
if err != nil {
7676
return err
7777
}
@@ -81,7 +81,7 @@ func runEmbed(ctx context.Context, cfg *config.Config, embedType string, batchSi
8181
}
8282

8383
if embedType == "all" || embedType == "document" {
84-
docRepo, err := postgres.NewDocumentRepository(pgClient)
84+
docRepo, err := store.NewDocumentRepository(pgClient)
8585
if err != nil {
8686
return err
8787
}

internal/config/config.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ import (
66
"github.com/raystack/compass/core/embedding"
77
"github.com/raystack/compass/internal/client"
88
"github.com/raystack/compass/internal/telemetry"
9-
"github.com/raystack/compass/store/postgres"
9+
"github.com/raystack/compass/store"
1010
)
1111

1212
// Config is the root configuration for the compass application.
1313
type Config struct {
1414
LogLevel string `yaml:"log_level" mapstructure:"log_level" default:"info"`
1515
Telemetry telemetry.Config `mapstructure:"telemetry"`
16-
DB postgres.Config `mapstructure:"db"`
16+
DB store.Config `mapstructure:"db"`
1717
Service ServerConfig `mapstructure:"service"`
1818
Client client.Config `mapstructure:"client"`
1919
Embedding EmbeddingConfig `mapstructure:"embedding"`

internal/server/bootstrap.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"github.com/raystack/compass/internal/config"
2020
compassmcp "github.com/raystack/compass/internal/mcp"
2121
"github.com/raystack/compass/internal/telemetry"
22-
"github.com/raystack/compass/store/postgres"
22+
"github.com/raystack/compass/store"
2323
)
2424

2525
// InitLogger sets up the global slog logger with a JSON handler.
@@ -66,39 +66,39 @@ func Start(ctx context.Context, cfg *config.Config, version string) error {
6666
}()
6767

6868
// init user
69-
userRepository, err := postgres.NewUserRepository(pgClient)
69+
userRepository, err := store.NewUserRepository(pgClient)
7070
if err != nil {
7171
return fmt.Errorf("failed to create user repository: %w", err)
7272
}
7373
userService := user.NewService(userRepository)
7474

7575
// init star
76-
starRepository, err := postgres.NewStarRepository(pgClient)
76+
starRepository, err := store.NewStarRepository(pgClient)
7777
if err != nil {
7878
return fmt.Errorf("failed to create star repository: %w", err)
7979
}
8080
starService := star.NewService(starRepository)
8181

8282
// init namespace
83-
namespaceService := namespace.NewService(postgres.NewNamespaceRepository(pgClient), nil)
83+
namespaceService := namespace.NewService(store.NewNamespaceRepository(pgClient), nil)
8484

8585
// init entity system (Postgres-native: tsvector + pg_trgm + pgvector)
86-
entityRepo, err := postgres.NewEntityRepository(pgClient)
86+
entityRepo, err := store.NewEntityRepository(pgClient)
8787
if err != nil {
8888
return fmt.Errorf("failed to create entity repository: %w", err)
8989
}
90-
edgeRepo, err := postgres.NewEdgeRepository(pgClient)
90+
edgeRepo, err := store.NewEdgeRepository(pgClient)
9191
if err != nil {
9292
return fmt.Errorf("failed to create edge repository: %w", err)
9393
}
94-
entitySearchRepo, err := postgres.NewEntitySearchRepository(pgClient)
94+
entitySearchRepo, err := store.NewEntitySearchRepository(pgClient)
9595
if err != nil {
9696
return fmt.Errorf("failed to create entity search repository: %w", err)
9797
}
9898
entityService := entity.NewService(entityRepo, edgeRepo, entitySearchRepo)
9999

100100
// init document system
101-
docRepo, err := postgres.NewDocumentRepository(pgClient)
101+
docRepo, err := store.NewDocumentRepository(pgClient)
102102
if err != nil {
103103
return fmt.Errorf("failed to create document repository: %w", err)
104104
}
@@ -112,7 +112,7 @@ func Start(ctx context.Context, cfg *config.Config, version string) error {
112112
}
113113
slog.Info("embedding pipeline enabled", "provider", provider.Name())
114114

115-
embeddingRepo, err := postgres.NewEmbeddingRepository(pgClient)
115+
embeddingRepo, err := store.NewEmbeddingRepository(pgClient)
116116
if err != nil {
117117
return fmt.Errorf("failed to create embedding repository: %w", err)
118118
}
@@ -173,7 +173,7 @@ func Migrate(ctx context.Context, cfg *config.Config, version string) error {
173173
}
174174

175175
// create default namespace
176-
nsService := namespace.NewService(postgres.NewNamespaceRepository(pgClient), nil)
176+
nsService := namespace.NewService(store.NewNamespaceRepository(pgClient), nil)
177177
if _, err = nsService.GetByID(ctx, namespace.DefaultNamespace.ID); errors.Is(err, namespace.ErrNotFound) {
178178
if _, err := nsService.MigrateDefault(ctx); err != nil {
179179
return fmt.Errorf("problem with migration %w", err)
@@ -204,8 +204,8 @@ func MigrateDown(ctx context.Context, cfg *config.Config, version string) error
204204
return nil
205205
}
206206

207-
func initPostgres(cfg postgres.Config) (*postgres.Client, error) {
208-
pgClient, err := postgres.NewClient(cfg)
207+
func initPostgres(cfg store.Config) (*store.Client, error) {
208+
pgClient, err := store.NewClient(cfg)
209209
if err != nil {
210210
return nil, fmt.Errorf("error creating postgres client: %w", err)
211211
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package postgres
1+
package store
22

33
import (
44
"net"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package postgres
1+
package store
22

33
import (
44
"context"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package postgres
1+
package store
22

33
import (
44
"context"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package postgres
1+
package store
22

33
import (
44
"context"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package postgres
1+
package store
22

33
import (
44
"context"

store/postgres/entity_search_repository.go renamed to store/entity_search_repository.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package postgres
1+
package store
22

33
import (
44
"context"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package postgres
1+
package store
22

33
import "errors"
44

0 commit comments

Comments
 (0)