Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

infoschema: fix select temporary table with view will panic problem (#42566) #42700

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions infoschema/infoschema.go
Original file line number Diff line number Diff line change
Expand Up @@ -693,15 +693,10 @@ func (ts *SessionExtendedInfoSchema) HasTemporaryTable() bool {
return ts.LocalTemporaryTables != nil && ts.LocalTemporaryTables.Count() > 0 || ts.InfoSchema.HasTemporaryTable()
}

// AttachMDLTableInfoSchema attach MDL related table information schema to is
func AttachMDLTableInfoSchema(is InfoSchema) InfoSchema {
mdlTables := NewSessionTables()
if iss, ok := is.(*SessionExtendedInfoSchema); ok {
iss.MdlTables = mdlTables
return iss
}
// DetachTemporaryTableInfoSchema returns a new SessionExtendedInfoSchema without temporary tables
func (ts *SessionExtendedInfoSchema) DetachTemporaryTableInfoSchema() *SessionExtendedInfoSchema {
return &SessionExtendedInfoSchema{
InfoSchema: is,
MdlTables: mdlTables,
InfoSchema: ts.InfoSchema,
MdlTables: ts.MdlTables,
}
}
7 changes: 7 additions & 0 deletions table/temptable/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,27 @@ go_test(
srcs = [
"ddl_test.go",
"interceptor_test.go",
"intergration_test.go",
"main_test.go",
],
embed = [":temptable"],
flaky = True,
deps = [
"//infoschema",
"//kv",
<<<<<<< HEAD
=======
"//meta/autoid",
"//parser/auth",
>>>>>>> 9e849851061 (infoschema: fix select temporary table with view will panic problem (#42566))
"//parser/model",
"//parser/mysql",
"//sessionctx",
"//store/driver/txn",
"//store/mockstore",
"//table",
"//tablecodec",
"//testkit",
"//testkit/testsetup",
"//types",
"//util/codec",
Expand Down
4 changes: 4 additions & 0 deletions table/temptable/infoschema.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,13 @@ func AttachLocalTemporaryTableInfoSchema(sctx sessionctx.Context, is infoschema.
// DetachLocalTemporaryTableInfoSchema detach local temporary table information schema from is
func DetachLocalTemporaryTableInfoSchema(is infoschema.InfoSchema) infoschema.InfoSchema {
if attachedInfoSchema, ok := is.(*infoschema.SessionExtendedInfoSchema); ok {
<<<<<<< HEAD
newIs := *attachedInfoSchema
newIs.LocalTemporaryTables = nil
return &newIs
=======
return attachedInfoSchema.DetachTemporaryTableInfoSchema()
>>>>>>> 9e849851061 (infoschema: fix select temporary table with view will panic problem (#42566))
}

return is
Expand Down
39 changes: 39 additions & 0 deletions table/temptable/intergration_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
// Copyright 2023 PingCAP, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package temptable_test

import (
"testing"

"github.com/pingcap/tidb/parser/auth"
"github.com/pingcap/tidb/testkit"
"github.com/stretchr/testify/require"
)

func TestSelectTemporaryTableUnionView(t *testing.T) {
// see the issue: https://github.com/pingcap/tidb/issues/42563
store := testkit.CreateMockStore(t)
tk := testkit.NewTestKit(t, store)
require.NoError(t, tk.Session().Auth(&auth.UserIdentity{Username: "root", Hostname: "%"}, nil, nil))
tk.MustExec("use test")
tk.MustExec("create table t(a int)")
tk.MustExec("insert into t values(1)")
tk.MustExec("create view tv as select a from t")
tk.MustExec("create temporary table t(a int)")
tk.MustExec("insert into t values(2)")
tk.MustQuery("select * from tv").Check(testkit.Rows("1"))
tk.MustQuery("select * from t").Check(testkit.Rows("2"))
tk.MustQuery("select * from (select a from t union all select a from tv) t1 order by a").Check(testkit.Rows("1", "2"))
}