ddl f

storage/gcp/gcp.go

@@ -37,7 +37,6 @@ import (
 	"io"
 	"net/http"
 	"os"
-	"regexp"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -539,17 +538,14 @@ func newSpannerSequencer(ctx context.Context, spannerDB string, maxOutstanding u
 //     This table coordinates integration of the batches of entries stored in
 //     Seq into the committed tree state.
 func (s *spannerSequencer) initDB(ctx context.Context, spannerDB string) error {
-	bits := regexp.MustCompile("^(.*)/databases/(.*)$").FindStringSubmatch(spannerDB)
-	if len(bits) != 3 {
-		return fmt.Errorf("invalid database id %s", spannerDB)
-	}
 	adminClient, err := database.NewDatabaseAdminClient(ctx)
 	if err != nil {
 		return err
 	}
 	defer adminClient.Close()
 
 	op, err := adminClient.UpdateDatabaseDdl(ctx, &adminpb.UpdateDatabaseDdlRequest{
+		Database: spannerDB,
 		Statements: []string{
 			"CREATE TABLE IF NOT EXISTS Tessera (id INT64 NOT NULL, compatibilityVersion INT64 NOT NULL) PRIMARY KEY (id)",
 			"CREATE TABLE IF NOT EXISTS SeqCoord (id INT64 NOT NULL, next INT64 NOT NULL,) PRIMARY KEY (id)",