Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions coordinator/mock/mock_coordinator.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 46 additions & 0 deletions coordinator/pkg/clustered_coord.go
Original file line number Diff line number Diff line change
Expand Up @@ -2644,6 +2644,52 @@ func (qc *ClusteredCoordinator) SyncReferenceRelations(ctx context.Context, relN
})
}

// AlterReferenceRelationStorage implements meta.EntityMgr.
func (qc *ClusteredCoordinator) AlterReferenceRelationStorageAdvanced(ctx context.Context, relName *rfqn.RelationFQN, shs []string) error {
rel, err := qc.GetReferenceRelation(ctx, relName)
if err != nil {
return err
}
shardsExSet := make(map[string]struct{})
shardsToAdd := make([]string, 0)
shardsIntersect := make([]string, 0)
for _, sh := range rel.ShardIds {
shardsExSet[sh] = struct{}{}
}
for _, sh := range shs {
if _, ok := shardsExSet[sh]; !ok {
shardsToAdd = append(shardsToAdd, sh)
} else if ok {
shardsIntersect = append(shardsIntersect, sh)
}
}

if len(shardsIntersect) < len(rel.ShardIds) {
// We need to drop shards
if err := qc.db.AlterReferenceRelationStorage(ctx, relName, shardsIntersect); err != nil {
return fmt.Errorf("failed to alter reference relation storage: failed to remove excess shards in coordinator: %s", err)
}
if err := qc.traverseRouters(ctx, func(cc *grpc.ClientConn) error {
c := proto.NewReferenceRelationsServiceClient(cc)
_, err := c.AlterReferenceRelationStorage(ctx, &proto.AlterReferenceRelationStorageRequest{
Relation: rfqn.RelationFQNToProto(relName),
ShardIds: shardsIntersect,
})
return err
}); err != nil {
return fmt.Errorf("failed to alter reference relation storage: failed to remove excess shards in routers: %s", err)
}
}

rels := []*rfqn.RelationFQN{relName}
for _, sh := range shardsToAdd {
if err := qc.SyncReferenceRelations(ctx, rels, sh); err != nil {
return fmt.Errorf("failed to alter reference relation storage: failed to sync relation on shard \"%s\": %s", sh, err)
}
}
return nil
}

// TODO: unit tests
func (qc *ClusteredCoordinator) DropReferenceRelation(ctx context.Context,
relName *rfqn.RelationFQN) error {
Expand Down
9 changes: 9 additions & 0 deletions coordinator/provider/rrelations.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,12 @@ func (rr *ReferenceRelationServer) DropReferenceRelations(ctx context.Context, r
}
return nil, nil
}

func (rr *ReferenceRelationServer) AlterReferenceRelationStorageAdvanced(ctx context.Context, req *protos.AlterReferenceRelationStorageRequest) (*emptypb.Empty, error) {
err := rr.impl.AlterReferenceRelationStorage(ctx, &rfqn.RelationFQN{
RelationName: req.Relation.RelationName,
SchemaName: req.Relation.SchemaName,
}, req.ShardIds)

return nil, err
}
10 changes: 10 additions & 0 deletions pkg/coord/adapter.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,16 @@ func (a *Adapter) AlterReferenceRelationStorage(ctx context.Context, relName *rf
return fmt.Errorf("AlterReferenceRelationStorage should not be used in proxy adapter")
}

// AlterReferenceRelationStorage implements meta.EntityMgr.
func (a *Adapter) AlterReferenceRelationStorageAdvanced(ctx context.Context, relName *rfqn.RelationFQN, shs []string) error {
c := proto.NewReferenceRelationsServiceClient(a.conn)
_, err := c.AlterReferenceRelationStorageAdvanced(ctx, &proto.AlterReferenceRelationStorageRequest{
Relation: rfqn.RelationFQNToProto(relName),
ShardIds: shs,
})
return err
}

// CreateReferenceRelation implements meta.EntityMgr.
func (a *Adapter) CreateReferenceRelation(ctx context.Context, r *rrelation.ReferenceRelation, entry []*rrelation.AutoIncrementEntry) error {
c := proto.NewReferenceRelationsServiceClient(a.conn)
Expand Down
5 changes: 0 additions & 5 deletions pkg/coord/clocal.go
Original file line number Diff line number Diff line change
Expand Up @@ -440,11 +440,6 @@ func (lc *LocalInstanceMetadataMgr) StopMoveTaskGroup(_ context.Context, _ strin
return ErrNotCoordinator
}

// AlterReferenceRelationStorage implements meta.EntityMgr.
func (lc *LocalInstanceMetadataMgr) AlterReferenceRelationStorage(ctx context.Context, relName *rfqn.RelationFQN, shs []string) error {
return lc.qdb.AlterReferenceRelationStorage(ctx, relName, shs)
}

// SyncReferenceRelations implements meta.EntityMgr.
func (lc *LocalInstanceMetadataMgr) SyncReferenceRelations(ctx context.Context, ids []*rfqn.RelationFQN, destShard string) error {
return ErrNotCoordinator
Expand Down
7 changes: 6 additions & 1 deletion pkg/coord/coord.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,16 @@ func NewCoordinator(q qdb.XQDB, d qdb.DCStateKeeper) Coordinator {
}
}

// AlterReferenceRelationStorage implements meta.EntityMgr.
// AlterReferenceRelationStorage alters shards, on which reference relation is contained.
func (lc *Coordinator) AlterReferenceRelationStorage(ctx context.Context, relName *rfqn.RelationFQN, shs []string) error {
return lc.qdb.AlterReferenceRelationStorage(ctx, relName, shs)
}

// AlterReferenceRelationStorage implements meta.EntityMgr.
func (lc *Coordinator) AlterReferenceRelationStorageAdvanced(ctx context.Context, relName *rfqn.RelationFQN, shs []string) error {
return ErrNotCoordinator
}

// SyncReferenceRelations implements meta.EntityMgr.
func (lc *Coordinator) SyncReferenceRelations(ctx context.Context, relNames []*rfqn.RelationFQN, destShard string) error {
for _, qualName := range relNames {
Expand Down
11 changes: 11 additions & 0 deletions pkg/meta/meta.go
Original file line number Diff line number Diff line change
Expand Up @@ -1181,6 +1181,17 @@ func ProcMetadataCommand(ctx context.Context,
}},
}

return tts, nil
case *spqrparser.AlterReferenceTableStorage:
if err := mgr.AlterReferenceRelationStorageAdvanced(ctx, stmt.RelationSelector, stmt.Shards); err != nil {
return nil, err
}
tts := &tupleslot.TupleTableSlot{
Desc: engine.GetVPHeader("relation", "shard"),
}
for _, sh := range stmt.Shards {
tts.WriteDataRow(stmt.RelationSelector.String(), sh)
}
return tts, nil
default:
return nil, ErrUnknownCoordinatorCommand
Expand Down
14 changes: 14 additions & 0 deletions pkg/mock/meta/mock_meta.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pkg/models/rrelation/rmgr.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,5 @@ type ReferenceRelationMgr interface {

/* Method for cluster-wide reference relation data replication */
SyncReferenceRelations(ctx context.Context, ids []*rfqn.RelationFQN, destShard string) error
AlterReferenceRelationStorageAdvanced(ctx context.Context, relName *rfqn.RelationFQN, shs []string) error
}
21 changes: 12 additions & 9 deletions pkg/protos/reference_relation.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 43 additions & 5 deletions pkg/protos/reference_relation_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions protos/reference_relation.proto
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,5 @@ service ReferenceRelationsService {
rpc AlterReferenceRelationStorage(AlterReferenceRelationStorageRequest) returns (google.protobuf.Empty) {}

rpc SyncReferenceRelations(SyncReferenceRelationsRequest) returns (google.protobuf.Empty) {}
rpc AlterReferenceRelationStorageAdvanced(AlterReferenceRelationStorageRequest) returns (google.protobuf.Empty) {}
}
30 changes: 0 additions & 30 deletions qdb/mock/qdb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading