Skip to content

Commit efc1a5d

Browse files
reshkereshke
authored
refac (#591)
1 parent 341df43 commit efc1a5d

File tree

19 files changed

+488
-569
lines changed

19 files changed

+488
-569
lines changed

‎coordinator/provider/coordinator.go

+7-6
Original file line numberDiff line numberDiff line change
@@ -246,12 +246,13 @@ func (qc *qdbCoordinator) watchRouters(ctx context.Context) {
246246
case routerproto.RouterStatus_OPENED:
247247
spqrlog.Zero.Debug().Msg("router is opened")
248248

249+
/* TODO: check router metadata consistency */
250+
249251
/* Mark router as opened in qdb */
250252
err := qc.db.OpenRouter(ctx, internalR.ID)
251253
if err != nil {
252254
return err
253255
}
254-
// TODO: consistency checks
255256
}
256257
return nil
257258
}(); err != nil {
@@ -423,22 +424,22 @@ func (qc *qdbCoordinator) AddRouter(ctx context.Context, router *topology.Router
423424
}
424425

425426
// TODO : unit tests
426-
func (qc *qdbCoordinator) AddKeyRange(ctx context.Context, keyRange *kr.KeyRange) error {
427+
func (qc *qdbCoordinator) CreateKeyRange(ctx context.Context, keyRange *kr.KeyRange) error {
427428
// add key range to metadb
428429
spqrlog.Zero.Debug().
429430
Bytes("lower-bound", keyRange.LowerBound).
430431
Str("shard-id", keyRange.ShardID).
431432
Str("key-range-id", keyRange.ID).
432433
Msg("add key range")
433434

434-
err := ops.AddKeyRangeWithChecks(ctx, qc.db, keyRange)
435+
err := ops.CreateKeyRangeWithChecks(ctx, qc.db, keyRange)
435436
if err != nil {
436437
return err
437438
}
438439

439440
return qc.traverseRouters(ctx, func(cc *grpc.ClientConn) error {
440441
cl := routerproto.NewKeyRangeServiceClient(cc)
441-
resp, err := cl.AddKeyRange(ctx, &routerproto.AddKeyRangeRequest{
442+
resp, err := cl.CreateKeyRange(ctx, &routerproto.CreateKeyRangeRequest{
442443
KeyRangeInfo: keyRange.ToProto(),
443444
})
444445

@@ -615,7 +616,7 @@ func (qc *qdbCoordinator) Split(ctx context.Context, req *kr.SplitKeyRange) erro
615616
return err
616617
}
617618

618-
if err := ops.AddKeyRangeWithChecks(ctx, qc.db, krNew); err != nil {
619+
if err := ops.CreateKeyRangeWithChecks(ctx, qc.db, krNew); err != nil {
619620
return spqrerror.Newf(spqrerror.SPQR_KEYRANGE_ERROR, "failed to add a new key range: %s", err.Error())
620621
}
621622

@@ -926,7 +927,7 @@ func (qc *qdbCoordinator) SyncRouterMetadata(ctx context.Context, qRouter *topol
926927
}
927928

928929
for _, keyRange := range keyRanges {
929-
resp, err := krClient.AddKeyRange(ctx, &routerproto.AddKeyRangeRequest{
930+
resp, err := krClient.CreateKeyRange(ctx, &routerproto.CreateKeyRangeRequest{
930931
KeyRangeInfo: kr.KeyRangeFromDB(keyRange).ToProto(),
931932
})
932933

‎coordinator/provider/keyranges.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ type CoordinatorService struct {
1717
}
1818

1919
// TODO : unit tests
20-
func (c *CoordinatorService) AddKeyRange(ctx context.Context, request *protos.AddKeyRangeRequest) (*protos.ModifyReply, error) {
21-
err := c.impl.AddKeyRange(ctx, kr.KeyRangeFromProto(request.KeyRangeInfo))
20+
func (c *CoordinatorService) CreateKeyRange(ctx context.Context, request *protos.CreateKeyRangeRequest) (*protos.ModifyReply, error) {
21+
err := c.impl.CreateKeyRange(ctx, kr.KeyRangeFromProto(request.KeyRangeInfo))
2222
if err != nil {
2323
return nil, err
2424
}

‎pkg/clientinteractor/interactor.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ func (pi *PSQLInteractor) KeyRanges(krs []*kr.KeyRange) error {
245245
}
246246

247247
// TODO : unit tests
248-
func (pi *PSQLInteractor) AddKeyRange(ctx context.Context, keyRange *kr.KeyRange) error {
248+
func (pi *PSQLInteractor) CreateKeyRange(ctx context.Context, keyRange *kr.KeyRange) error {
249249
if err := pi.WriteHeader("add key range"); err != nil {
250250
spqrlog.Zero.Error().Err(err).Msg("")
251251
return err

‎pkg/coord/adapter.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package coord
22

33
import (
44
"context"
5+
56
"github.com/pg-sharding/spqr/pkg/models/tasks"
67

78
"github.com/pg-sharding/spqr/pkg/config"
@@ -90,9 +91,9 @@ func (a *Adapter) ListAllKeyRanges(ctx context.Context) ([]*kr.KeyRange, error)
9091
}
9192

9293
// TODO : unit tests
93-
func (a *Adapter) AddKeyRange(ctx context.Context, kr *kr.KeyRange) error {
94+
func (a *Adapter) CreateKeyRange(ctx context.Context, kr *kr.KeyRange) error {
9495
c := proto.NewKeyRangeServiceClient(a.conn)
95-
_, err := c.AddKeyRange(ctx, &proto.AddKeyRangeRequest{
96+
_, err := c.CreateKeyRange(ctx, &proto.CreateKeyRangeRequest{
9697
KeyRangeInfo: kr.ToProto(),
9798
})
9899
return err

‎pkg/coord/local/clocal.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ package local
33
import (
44
"context"
55
"fmt"
6-
"github.com/pg-sharding/spqr/pkg/models/tasks"
76
"math/rand"
87
"sync"
98

9+
"github.com/pg-sharding/spqr/pkg/models/tasks"
10+
1011
"github.com/pg-sharding/spqr/pkg/config"
1112
"github.com/pg-sharding/spqr/pkg/meta"
1213
"github.com/pg-sharding/spqr/pkg/models/datashards"
@@ -353,7 +354,7 @@ func (qr *LocalCoordinator) Split(ctx context.Context, req *kr.SplitKeyRange) er
353354
return err
354355
}
355356

356-
if err := ops.AddKeyRangeWithChecks(ctx, qr.qdb, krNew); err != nil {
357+
if err := ops.CreateKeyRangeWithChecks(ctx, qr.qdb, krNew); err != nil {
357358
return fmt.Errorf("failed to add a new key range: %w", err)
358359
}
359360

@@ -447,8 +448,8 @@ func (qr *LocalCoordinator) ListRouters(ctx context.Context) ([]*topology.Router
447448
}}, nil
448449
}
449450

450-
func (qr *LocalCoordinator) AddKeyRange(ctx context.Context, kr *kr.KeyRange) error {
451-
return ops.AddKeyRangeWithChecks(ctx, qr.qdb, kr)
451+
func (qr *LocalCoordinator) CreateKeyRange(ctx context.Context, kr *kr.KeyRange) error {
452+
return ops.CreateKeyRangeWithChecks(ctx, qr.qdb, kr)
452453
}
453454

454455
func (qr *LocalCoordinator) MoveKeyRange(ctx context.Context, kr *kr.KeyRange) error {

‎pkg/meta/meta.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package meta
33
import (
44
"context"
55
"fmt"
6+
67
"github.com/pg-sharding/spqr/pkg/client"
78
"github.com/pg-sharding/spqr/pkg/clientinteractor"
89
"github.com/pg-sharding/spqr/pkg/config"
@@ -163,11 +164,11 @@ func processCreate(ctx context.Context, astmt spqrparser.Statement, mngr EntityM
163164
return cli.ReportError(spqrerror.ShardingKeysRemoved)
164165
case *spqrparser.KeyRangeDefinition:
165166
req := kr.KeyRangeFromSQL(stmt)
166-
if err := mngr.AddKeyRange(ctx, req); err != nil {
167+
if err := mngr.CreateKeyRange(ctx, req); err != nil {
167168
spqrlog.Zero.Error().Err(err).Msg("Error when adding key range")
168169
return cli.ReportError(err)
169170
}
170-
return cli.AddKeyRange(ctx, req)
171+
return cli.CreateKeyRange(ctx, req)
171172
case *spqrparser.ShardDefinition:
172173
dataShard := datashards.NewDataShard(stmt.Id, &config.Shard{
173174
Hosts: stmt.Hosts,

‎pkg/models/kr/keyrangemgr.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ type KeyRangeMgr interface {
2323
GetKeyRange(ctx context.Context, krId string) (*KeyRange, error)
2424
ListKeyRanges(ctx context.Context, distribution string) ([]*KeyRange, error)
2525
ListAllKeyRanges(ctx context.Context) ([]*KeyRange, error)
26-
AddKeyRange(ctx context.Context, kr *KeyRange) error
26+
CreateKeyRange(ctx context.Context, kr *KeyRange) error
2727
LockKeyRange(ctx context.Context, krid string) (*KeyRange, error)
2828
UnlockKeyRange(ctx context.Context, krid string) error
2929
Split(ctx context.Context, split *SplitKeyRange) error

0 commit comments

Comments
 (0)