Skip to content

ING-1495: When creating/dropping a primary idx, call consistency helpers with '#primary' #365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DemetrisChr merged 1 commit into from
Apr 27, 2026
Merged

ING-1495: When creating/dropping a primary idx, call consistency helpers with '#primary' #365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions gateway/dataimpl/server_v1/queryadminserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ func (s *QueryIndexAdminServer) CreatePrimaryIndex(
BucketName: in.BucketName,
ScopeName: scopeName,
CollectionName: collectionName,
IndexName: in.GetName(),
IndexName: indexName,
OnBehalfOf: oboInfo,
})
if err != nil {
Expand Down Expand Up @@ -402,11 +402,18 @@ func (s *QueryIndexAdminServer) DropPrimaryIndex(
return nil, errSt.Err()
}

var indexName string
if in.Name == nil {
indexName = "#primary"
} else {
indexName = *in.Name
}

err := agent.DropPrimaryIndex(ctx, &cbqueryx.DropPrimaryIndexOptions{
BucketName: in.BucketName,
ScopeName: in.GetScopeName(),
CollectionName: in.GetCollectionName(),
IndexName: in.GetName(),
IndexName: indexName,
IgnoreIfNotExists: in.GetIgnoreIfMissing(),
OnBehalfOf: oboInfo,
})
Expand Down Expand Up @@ -465,7 +472,7 @@ func (s *QueryIndexAdminServer) DropPrimaryIndex(
BucketName: in.BucketName,
ScopeName: scopeName,
CollectionName: collectionName,
IndexName: in.GetName(),
IndexName: indexName,
OnBehalfOf: oboInfo,
})
if err != nil {
Expand Down
47 changes: 47 additions & 0 deletions gateway/test/query_mgmt_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,53 @@ func (s *GatewayOpsTestSuite) TestQueryManagement() {
}

s.Run("PrimaryIndex", func() {
s.Run("CreateAndDropWithUnsetName", func() {
creds := s.basicRpcCreds

// First let's attempt a drop in case the primary index exists already
{
resp, err := queryAdminClient.DropPrimaryIndex(context.Background(),
&admin_query_v1.DropPrimaryIndexRequest{
Name: nil,
BucketName: s.bucketName,
ScopeName: &s.scopeName,
CollectionName: &s.collectionName,
IgnoreIfMissing: &trueBool,
},
grpc.PerRPCCredentials(creds))

requireRpcSuccess(s.T(), resp, err)
}

// Create the index
{
resp, err := queryAdminClient.CreatePrimaryIndex(context.Background(),
&admin_query_v1.CreatePrimaryIndexRequest{
BucketName: s.bucketName,
Name: nil,
ScopeName: &s.scopeName,
CollectionName: &s.collectionName,
},
grpc.PerRPCCredentials(creds))

requireRpcSuccess(s.T(), resp, err)
}

// Drop it again, this time without IgnoreIfMissing, it must exist.
{
resp, err := queryAdminClient.DropPrimaryIndex(context.Background(),
&admin_query_v1.DropPrimaryIndexRequest{
Name: nil,
BucketName: s.bucketName,
ScopeName: &s.scopeName,
CollectionName: &s.collectionName,
},
grpc.PerRPCCredentials(creds))

requireRpcSuccess(s.T(), resp, err)
}
})

indexName := uuid.NewString()

s.Run("Create", func() {
Expand Down
Loading