add get keyspaceid from keyspace prefix (pingcap#45)

Signed-off-by: ystaticy <y_static_y@sina.com>
iosmanthus · Sep 5, 2022 · 2ad90b5 · 2ad90b5
1 parent e68d581
commit 2ad90b5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/domain/domain.go b/domain/domain.go
@@ -797,7 +797,8 @@ func (do *Domain) Init(ddlLease time.Duration, sysExecutorFactory func(*Domain)
 
 			// If keyspace has been set in KvStorage
 			if isKvStorageKeyspaceSet(do.store) {
-				keyspaceId := KeyspaceIdBytesToUint32(do.store.GetCodec().GetKeyspace())
+				keyspacePrefix := do.store.GetCodec().GetKeyspace()
+				keyspaceId := KeyspaceIdBytesToUint32(GetKeyspaceID(keyspacePrefix))
 				etcdPathPrefix := GetKeyspacePathPrefix(keyspaceId)
 				etcd.SetEtcdCliByNamespace(cli, etcdPathPrefix)
 			}

diff --git a/domain/keyspace.go b/domain/keyspace.go
@@ -50,3 +50,8 @@ func KeyspaceIdBytesToUint32(b []byte) uint32 {
 func isKvStorageKeyspaceSet(store kv.Storage) bool {
 	return store.GetCodec().GetKeyspace() != nil
 }
+
+// GetKeyspaceID is used to get keyspace id bytes from keyspace prefix
+func GetKeyspaceID(b []byte) []byte {
+	return b[1:]
+}
diff --git a/domain/keyspace_test.go b/domain/keyspace_test.go
@@ -86,7 +86,7 @@ func (k *keyspaceSuite) TestID2Uint32() {
 	expectBytes := make([]byte, 4)
 	binary.BigEndian.PutUint32(expectBytes, expectId)
 
-	testBytes := expectBytes[1:]
+	testBytes := GetKeyspaceID(expectBytes)
 	testId := KeyspaceIdBytesToUint32(testBytes)
 	k.Equal(expectId, testId)