executor: add tablesample compatibility for temporary table (pingcap#…

…25288)
tiancaiamao · Jun 23, 2021 · 4920411 · 4920411
1 parent 727a217
commit 4920411
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/executor/builder.go b/executor/builder.go
@@ -4211,8 +4211,8 @@ func fullRangePartition(idxArr []int) bool {
 }
 
 func (b *executorBuilder) buildTableSample(v *plannercore.PhysicalTableSample) *TableSampleExecutor {
- if err := b.validCanReadTemporaryTable(v.TableInfo.Meta()); err != nil {
- b.err = err
+ if v.TableInfo.Meta().TempTableType != model.TempTableNone {
+ b.err = errors.New("TABLESAMPLE clause can not be applied to temporary tables")
  return nil
  }
 

diff --git a/executor/executor_test.go b/executor/executor_test.go
@@ -8560,7 +8560,7 @@ func (s *testResourceTagSuite) TestResourceGroupTag(c *C) {
  }
 }
 
-func (s *testStaleTxnSuite) TestStaleOrHistoryReadTemporaryTable(c *C) {
+func (s *testStaleTxnSuite) TestInvalidReadTemporaryTable(c *C) {
  tk := testkit.NewTestKit(c, s.store)
  // For mocktikv, safe point is not initialized, we manually insert it for snapshot to use.
  safePointName := "tikv_gc_safe_point"
@@ -8581,6 +8581,8 @@ func (s *testStaleTxnSuite) TestStaleOrHistoryReadTemporaryTable(c *C) {
  // sleep 1us to make test stale
  time.Sleep(time.Microsecond)
 
+ tk.MustGetErrMsg("select * from tmp1 tablesample regions()", "TABLESAMPLE clause can not be applied to temporary tables")
+
  queries := []struct {
  sql string
  }{
@@ -8605,9 +8607,6 @@ func (s *testStaleTxnSuite) TestStaleOrHistoryReadTemporaryTable(c *C) {
  {
  sql: "select /*+use_index(tmp1, code)*/ code from tmp1 where code > 1",
  },
- {
- sql: "select * from tmp1 tablesample regions()",
- },
  {
  sql: "select /*+ use_index_merge(tmp1, primary, code) */ * from tmp1 where id > 1 or code > 2",
  },