Reverted the change of GetDDLInfo

pingcap · Jan 11, 2023 · f04df45 · f04df45
1 parent 389ad4d
commit f04df45
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/ddl/ddl.go b/ddl/ddl.go
@@ -1305,15 +1305,16 @@ func GetDDLInfoWithNewTxn(s sessionctx.Context) (*Info, error) {
 	if err != nil {
 		return nil, err
 	}
-	info, err := getDDLInfo(sess)
+	info, err := GetDDLInfo(s)
 	sess.rollback()
 	return info, err
 }
 
 // GetDDLInfo returns DDL information.
-func getDDLInfo(sess *session) (*Info, error) {
+func GetDDLInfo(s sessionctx.Context) (*Info, error) {
 	var err error
 	info := &Info{}
+	sess := newSession(s)
 	txn, err := sess.txn()
 	if err != nil {
 		return nil, errors.Trace(err)

diff --git a/ddl/stat_test.go b/ddl/stat_test.go
@@ -129,7 +129,7 @@ func TestGetDDLInfo(t *testing.T) {
 	err = addDDLJobs(sess, txn, job)
 	require.NoError(t, err)
 
-	info, err := ddl.GetDDLInfoWithNewTxn(sess)
+	info, err := ddl.GetDDLInfo(sess)
 	require.NoError(t, err)
 	require.Len(t, info.Jobs, 1)
 	require.Equal(t, job, info.Jobs[0])
@@ -139,7 +139,7 @@ func TestGetDDLInfo(t *testing.T) {
 	err = addDDLJobs(sess, txn, job1)
 	require.NoError(t, err)
 
-	info, err = ddl.GetDDLInfoWithNewTxn(sess)
+	info, err = ddl.GetDDLInfo(sess)
 	require.NoError(t, err)
 	require.Len(t, info.Jobs, 2)
 	require.Equal(t, job, info.Jobs[0])

diff --git a/executor/executor_test.go b/executor/executor_test.go
@@ -5565,7 +5565,7 @@ func TestAdmin(t *testing.T) {
 	tk = testkit.NewTestKit(t, store)
 	tk.MustExec("begin")
 	sess := tk.Session()
-	ddlInfo, err := ddl.GetDDLInfoWithNewTxn(sess)
+	ddlInfo, err := ddl.GetDDLInfo(sess)
 	require.NoError(t, err)
 	require.Equal(t, ddlInfo.SchemaVer, row.GetInt64(0))
 	// TODO: Pass this test.