This is an automated cherry-pick of pingcap#59719

Signed-off-by: ti-chi-bot <[email protected]>

Author: Leavrth

br/pkg/restore/prealloc_table_id/BUILD.bazel

@@ -20,7 +20,15 @@ go_test(
     deps = [
         ":prealloc_table_id",
         "//br/pkg/metautil",
+<<<<<<< HEAD:br/pkg/restore/prealloc_table_id/BUILD.bazel
         "//pkg/parser/model",
+=======
+        "//br/pkg/utiltest",
+        "//pkg/kv",
+        "//pkg/meta",
+        "//pkg/meta/model",
+        "//pkg/testkit",
+>>>>>>> c08679bccfa (br: fix pre allocate id exceeds bound (#59719)):br/pkg/restore/internal/prealloc_table_id/BUILD.bazel
         "@com_github_stretchr_testify//require",
     ],
 )

br/pkg/restore/prealloc_table_id/alloc.go

@@ -87,7 +87,7 @@ func (p *PreallocIDs) Alloc(m Allocator) error {
 	if err != nil {
 		return err
 	}
-	p.allocedFrom = alloced
+	p.allocedFrom = alloced + 1
 	return nil
 }
 

br/pkg/restore/prealloc_table_id/alloc_test.go

@@ -3,12 +3,22 @@
 package prealloctableid_test
 
 import (
+	"context"
 	"fmt"
 	"testing"
 
 	"github.com/pingcap/tidb/br/pkg/metautil"
+<<<<<<< HEAD:br/pkg/restore/prealloc_table_id/alloc_test.go
 	prealloctableid "github.com/pingcap/tidb/br/pkg/restore/prealloc_table_id"
 	"github.com/pingcap/tidb/pkg/parser/model"
+=======
+	prealloctableid "github.com/pingcap/tidb/br/pkg/restore/internal/prealloc_table_id"
+	"github.com/pingcap/tidb/br/pkg/utiltest"
+	"github.com/pingcap/tidb/pkg/kv"
+	"github.com/pingcap/tidb/pkg/meta"
+	"github.com/pingcap/tidb/pkg/meta/model"
+	"github.com/pingcap/tidb/pkg/testkit"
+>>>>>>> c08679bccfa (br: fix pre allocate id exceeds bound (#59719)):br/pkg/restore/internal/prealloc_table_id/alloc_test.go
 	"github.com/stretchr/testify/require"
 )
 
@@ -37,14 +47,22 @@ func TestAllocator(t *testing.T) {
 		{
 			tableIDs:              []int64{1, 2, 5, 6, 7},
 			hasAllocatedTo:        6,
-			successfullyAllocated: []int64{6, 7},
+			successfullyAllocated: []int64{7},
 			shouldAllocatedTo:     8,
+<<<<<<< HEAD:br/pkg/restore/prealloc_table_id/alloc_test.go
+=======
+			msg:                   "ID:[7,8)",
+>>>>>>> c08679bccfa (br: fix pre allocate id exceeds bound (#59719)):br/pkg/restore/internal/prealloc_table_id/alloc_test.go
 		},
 		{
 			tableIDs:              []int64{4, 6, 9, 2},
 			hasAllocatedTo:        1,
 			successfullyAllocated: []int64{2, 4, 6, 9},
 			shouldAllocatedTo:     10,
+<<<<<<< HEAD:br/pkg/restore/prealloc_table_id/alloc_test.go
+=======
+			msg:                   "ID:[2,10)",
+>>>>>>> c08679bccfa (br: fix pre allocate id exceeds bound (#59719)):br/pkg/restore/internal/prealloc_table_id/alloc_test.go
 		},
 		{
 			tableIDs:              []int64{1, 2, 3, 4},
@@ -57,15 +75,23 @@ func TestAllocator(t *testing.T) {
 			hasAllocatedTo:        3,
 			successfullyAllocated: []int64{5, 6},
 			shouldAllocatedTo:     7,
+<<<<<<< HEAD:br/pkg/restore/prealloc_table_id/alloc_test.go
+=======
+			msg:                   "ID:[4,7)",
+>>>>>>> c08679bccfa (br: fix pre allocate id exceeds bound (#59719)):br/pkg/restore/internal/prealloc_table_id/alloc_test.go
 		},
 		{
 			tableIDs:              []int64{1, 2, 5, 6, 7},
 			hasAllocatedTo:        6,
-			successfullyAllocated: []int64{6, 7},
+			successfullyAllocated: []int64{7},
 			shouldAllocatedTo:     13,
 			partitions: map[int64][]int64{
 				7: {8, 9, 10, 11, 12},
 			},
+<<<<<<< HEAD:br/pkg/restore/prealloc_table_id/alloc_test.go
+=======
+			msg: "ID:[7,13)",
+>>>>>>> c08679bccfa (br: fix pre allocate id exceeds bound (#59719)):br/pkg/restore/internal/prealloc_table_id/alloc_test.go
 		},
 		{
 			tableIDs:              []int64{1, 2, 5, 6, 7, 13},
@@ -75,6 +101,10 @@ func TestAllocator(t *testing.T) {
 			partitions: map[int64][]int64{
 				7: {8, 9, 10, 11, 12},
 			},
+<<<<<<< HEAD:br/pkg/restore/prealloc_table_id/alloc_test.go
+=======
+			msg: "ID:[10,14)",
+>>>>>>> c08679bccfa (br: fix pre allocate id exceeds bound (#59719)):br/pkg/restore/internal/prealloc_table_id/alloc_test.go
 		},
 	}
 
@@ -115,3 +145,41 @@ func TestAllocator(t *testing.T) {
 		})
 	}
 }
+
+func TestAllocatorBound(t *testing.T) {
+	s := utiltest.CreateRestoreSchemaSuite(t)
+	tk := testkit.NewTestKit(t, s.Mock.Storage)
+	tk.MustExec("CREATE TABLE test.t1 (id int);")
+	ctx := kv.WithInternalSourceType(context.Background(), kv.InternalTxnBR)
+	currentGlobalID := int64(0)
+	err := kv.RunInNewTxn(ctx, s.Mock.Store(), true, func(_ context.Context, txn kv.Transaction) (err error) {
+		allocator := meta.NewMutator(txn)
+		currentGlobalID, err = allocator.GetGlobalID()
+		return err
+	})
+	require.NoError(t, err)
+	rows := tk.MustQuery("ADMIN SHOW DDL JOBS WHERE JOB_ID = ?", currentGlobalID).Rows()
+	// The current global ID is used, so it cannot use anymore.
+	require.Len(t, rows, 1)
+	tableInfos := []*metautil.Table{
+		{Info: &model.TableInfo{ID: currentGlobalID}},
+		{Info: &model.TableInfo{ID: currentGlobalID + 2}},
+		{Info: &model.TableInfo{ID: currentGlobalID + 4}},
+	}
+	ids := prealloctableid.New(tableInfos)
+	lastGlobalID := currentGlobalID
+	err = kv.RunInNewTxn(ctx, s.Mock.Store(), true, func(_ context.Context, txn kv.Transaction) error {
+		allocator := meta.NewMutator(txn)
+		if err := ids.Alloc(allocator); err != nil {
+			return err
+		}
+		currentGlobalID, err = allocator.GetGlobalID()
+		return err
+	})
+	require.NoError(t, err)
+	require.Equal(t, fmt.Sprintf("ID:[%d,%d)", lastGlobalID+1, currentGlobalID), ids.String())
+	require.False(t, ids.Prealloced(tableInfos[0].Info.ID))
+	require.True(t, ids.Prealloced(tableInfos[1].Info.ID))
+	require.True(t, ids.Prealloced(tableInfos[2].Info.ID))
+	require.True(t, ids.Prealloced(currentGlobalID-1))
+}