From da73e25afc54a9ad3822d253b982419c9a7cbfd9 Mon Sep 17 00:00:00 2001
From: obdev <obdev@oceanbase.com>
Date: Tue, 22 Nov 2022 09:35:41 +0000
Subject: [PATCH] improve case stability

---
 .../mysql_test/include/minor_merge_tenant.inc | 39 +++++++++++++++++++
 .../deploy/mysql_test/include/minorfreeze.inc |  5 ---
 .../mysql_test/include/wait_minor_merge.inc   | 30 --------------
 .../test_suite/join/r/mysql/join_merge.result |  2 +-
 .../test_suite/join/t/join_merge.test         |  4 +-
 .../test_suite/optimizer/t/estimate_cost.test |  3 +-
 6 files changed, 42 insertions(+), 41 deletions(-)
 create mode 100644 tools/deploy/mysql_test/include/minor_merge_tenant.inc
 delete mode 100644 tools/deploy/mysql_test/include/minorfreeze.inc
 delete mode 100644 tools/deploy/mysql_test/include/wait_minor_merge.inc

diff --git a/tools/deploy/mysql_test/include/minor_merge_tenant.inc b/tools/deploy/mysql_test/include/minor_merge_tenant.inc
new file mode 100644
index 0000000000..d132bb3aba
--- /dev/null
+++ b/tools/deploy/mysql_test/include/minor_merge_tenant.inc
@@ -0,0 +1,39 @@
+alter system minor freeze;
+--disable_query_log
+--disable_result_log
+
+let $__i__=180;
+let $__j__ = 10;
+while($__i__ > 0)
+{
+  sleep 1;
+  dec $__i__;
+  dec $__j__;
+
+  if ($TENANT == 'mysql') {
+    let $__memstore_cnt__ = query_get_value(select count(*) as cnt from oceanbase.__all_virtual_memstore_info where tablet_id >= 200000, cnt, 1);
+  }
+  if ($TENANT == 'oracle') {
+    select count(*) into @cnt from SYS.gv$ob_memstore_info where tablet_id >= 200000;
+    let $__memstore_cnt__ = query_get_value(select @cnt as RES from dual, RES, 1);
+    # --echo $__memstore_cnt__
+  }
+
+  if ($__memstore_cnt__ == 0)
+  {
+    let $__i__ = -5;
+  }
+  if ($__j__ == 0)
+  {
+   alter system minor freeze;
+   let $__j__ = 10;
+  }
+}
+
+if ($__i__ != -5)
+{
+  --echo minor freeze failed
+}
+
+--enable_query_log
+--enable_result_log
diff --git a/tools/deploy/mysql_test/include/minorfreeze.inc b/tools/deploy/mysql_test/include/minorfreeze.inc
deleted file mode 100644
index b548380968..0000000000
--- a/tools/deploy/mysql_test/include/minorfreeze.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-connect (obsys,$OBMYSQL_MS0,admin,$OBMYSQL_PWD,test,$OBMYSQL_PORT);
-connection obsys;
-alter system minor freeze tenant = all;
-disconnect obsys;
-connection default;
diff --git a/tools/deploy/mysql_test/include/wait_minor_merge.inc b/tools/deploy/mysql_test/include/wait_minor_merge.inc
deleted file mode 100644
index 59d413812e..0000000000
--- a/tools/deploy/mysql_test/include/wait_minor_merge.inc
+++ /dev/null
@@ -1,30 +0,0 @@
-# set __table_id__ outside
-
---disable_query_log
---disable_result_log
-
-connect (obsys_minor,$OBMYSQL_MS0,admin,$OBMYSQL_PWD,test,$OBMYSQL_PORT);
-connection obsys_minor;
-
-
-let $__i__=180;
-while($__i__ > 0)
-{
-  sleep 1;
-  dec $__i__;
-  let $__memstore_cnt__ = query_get_value(select count(*) as cnt from oceanbase.__all_virtual_memstore_info where is_active='NO', cnt, 1);
-  if ($__memstore_cnt__ == 0)
-  {
-    let $__i__ = -5;
-  }
-}
-
-if ($__i__ != -5)
-{
-  --echo minor freeze failed
-}
-disconnect obsys_minor;
-connection default;
-
---enable_query_log
---enable_result_log
diff --git a/tools/deploy/mysql_test/test_suite/join/r/mysql/join_merge.result b/tools/deploy/mysql_test/test_suite/join/r/mysql/join_merge.result
index 68ab01fc3a..db2fee5106 100644
--- a/tools/deploy/mysql_test/test_suite/join/r/mysql/join_merge.result
+++ b/tools/deploy/mysql_test/test_suite/join/r/mysql/join_merge.result
@@ -8,7 +8,7 @@ delete from aa;
 insert into aa(a2, a3) values (10, 15), (10, 14), (10, 12),           (11, 13), (12, 12),           (12, 10);
 delete from bb;
 insert into bb(b2, b3) values           (10, 14),           (11, 14), (11, 13),           (12, 11), (12, 10);
-alter system minor freeze tenant = all;
+alter system minor freeze;
 select /*+ use_merge(aa, bb) */ a2, b3 from aa, bb where a2 = b2 and a3 = b3 order by a2, a3;
 a2	b3
 10	14
diff --git a/tools/deploy/mysql_test/test_suite/join/t/join_merge.test b/tools/deploy/mysql_test/test_suite/join/t/join_merge.test
index e89fbb4ab3..9933fec468 100644
--- a/tools/deploy/mysql_test/test_suite/join/t/join_merge.test
+++ b/tools/deploy/mysql_test/test_suite/join/t/join_merge.test
@@ -21,9 +21,7 @@ delete from aa;
 insert into aa(a2, a3) values (10, 15), (10, 14), (10, 12),           (11, 13), (12, 12),           (12, 10);
 delete from bb;
 insert into bb(b2, b3) values           (10, 14),           (11, 14), (11, 13),           (12, 11), (12, 10);
---source mysql_test/include/minorfreeze.inc
---real_sleep 10
---source mysql_test/include/wait_minor_merge.inc
+--source mysql_test/include/minor_merge_tenant.inc
 --disable_query_log
 call dbms_stats.gather_table_stats('test','aa', method_opt=>'FOR ALL COLUMNS SIZE AUTO');
 call dbms_stats.gather_table_stats('test','bb', method_opt=>'FOR ALL COLUMNS SIZE AUTO');
diff --git a/tools/deploy/mysql_test/test_suite/optimizer/t/estimate_cost.test b/tools/deploy/mysql_test/test_suite/optimizer/t/estimate_cost.test
index ca8290c4ea..01cc0ce621 100644
--- a/tools/deploy/mysql_test/test_suite/optimizer/t/estimate_cost.test
+++ b/tools/deploy/mysql_test/test_suite/optimizer/t/estimate_cost.test
@@ -53,8 +53,7 @@ explain select /*+index(test_table index_1)*/ * from test_table where age = 22;
 select count(*) from test_table where name = 'name22';
 explain select /*+index(test_table index_2)*/ * from test_table where name = 'name22';
 
---source mysql_test/include/minorfreeze.inc
---source mysql_test/include/wait_minor_merge.inc
+--source mysql_test/include/minor_merge_tenant.inc
 call dbms_stats.gather_table_stats('TEST', 'test_table');
 
 # case 2: all data in sstable, not memtable data