infoschema: fix panic for TableByID when table id is negative

pingcap · Mar 22, 2024 · 2af6a4e · 2af6a4e
1 parent 985d7da
commit 2af6a4e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/pkg/infoschema/builder.go b/pkg/infoschema/builder.go
@@ -969,8 +969,11 @@ func NewBuilder(r autoid.Requirement, factory func() (pools.Resource, error), in
 	}
 }
 
-func tableBucketIdx(tableID int64) int {
-	return int(tableID % bucketCount)
+func tableBucketIdx(tableID int64) (idx int) {
+	if idx = int(tableID % bucketCount); idx < 0 {
+		idx = -idx
+	}
+	return
 }
 
 func tableIDIsValid(tableID int64) bool {

diff --git a/pkg/infoschema/infoschema_test.go b/pkg/infoschema/infoschema_test.go
@@ -161,6 +161,10 @@ func TestBasic(t *testing.T) {
 	require.False(t, ok)
 	require.Nil(t, tb)
 
+	tb, ok = is.TableByID(-12345)
+	require.False(t, ok)
+	require.Nil(t, tb)
+
 	tb, err = is.TableByName(dbName, tbName)
 	require.NoError(t, err)
 	require.NotNil(t, tb)