Skip to content
Permalink
Browse files

Merge 10.2 into 10.3

  • Loading branch information...
dr-m committed Aug 30, 2019
2 parents 17336f6 + 1688a22 commit a5472b0367d240a0a9f986e7a8139eef8c442ed8
@@ -58,6 +58,10 @@ while ($1)
eval set @d=@d*2;
dec $1;
}
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
--enable_query_log

analyze table t0;
@@ -329,6 +333,10 @@ alter table t2 add index i321(key3, key2, key1);
-- disable_query_log
-- disable_result_log
analyze table t2;
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
-- enable_result_log
-- enable_query_log

@@ -371,6 +379,10 @@ insert into t4 select key1,key1,key1 div 10, key1 % 10, key1 % 10, key1 from t0;

-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t4;
-- enable_result_log
-- enable_query_log
@@ -397,6 +409,10 @@ insert into t1 select * from t0;

-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t1;
-- enable_result_log
-- enable_query_log
@@ -463,6 +479,10 @@ update t3 set key9=key1,keyA=key1,keyB=key1,keyC=key1;

-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t3;
-- enable_result_log
-- enable_query_log
@@ -486,6 +506,10 @@ update t0 set key8=123 where key1 < 3 or key2 < 4;

-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t0;
-- enable_result_log
-- enable_query_log
@@ -496,6 +520,10 @@ select * from t0 where key1 < 3 or key2 < 4;
delete from t0 where key1 < 3 or key2 < 4;
-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t0;
-- enable_result_log
-- enable_query_log
@@ -509,6 +537,10 @@ create table t4 (a int);
insert into t4 values (1),(4),(3);
-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t4;
-- enable_result_log
-- enable_query_log
@@ -533,6 +565,10 @@ select max(A.key1 + B.key1 + A.key2 + B.key2 + A.key3 + B.key3 + A.key4 + B.key4
update t0 set key1=1;
-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t0;
-- enable_result_log
-- enable_query_log
@@ -556,6 +592,10 @@ update t0 set key2=1, key3=1, key4=1, key5=1,key6=1,key7=1 where key7 < 500;

-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t0;
-- enable_result_log
-- enable_query_log
@@ -612,6 +652,10 @@ select count(*) from t1;

-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t1;
-- enable_result_log
-- enable_query_log
@@ -652,6 +696,10 @@ create table t3 (

-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t0;
analyze table t1;
analyze table t2;
@@ -733,6 +781,10 @@ insert into t2 select * from t1;

-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t1;
analyze table t2;
-- enable_result_log
@@ -787,6 +839,10 @@ insert into t3 values (1,1,'data');

-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t0;
analyze table t1;
analyze table t2;
@@ -822,6 +878,10 @@ INSERT INTO t1 SELECT * FROM t1;
INSERT INTO t1 SELECT * FROM t1;
-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t1;
-- enable_result_log
-- enable_query_log
@@ -43,6 +43,10 @@ while ($1)

-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t1;
-- enable_result_log
-- enable_query_log
@@ -68,6 +72,10 @@ alter table t1 add primary key (str1, zeroval, str2, str3);

-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t1;
-- enable_result_log
-- enable_query_log
@@ -101,6 +109,10 @@ while ($1)

-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t1;
-- enable_result_log
-- enable_query_log
@@ -143,6 +155,10 @@ select count(*) from t1;

-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t2;
-- enable_result_log
-- enable_query_log
@@ -379,6 +395,10 @@ update t1 set key2=key1,key3=key1;

-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t1;
-- enable_result_log
-- enable_query_log
@@ -417,6 +437,10 @@ INSERT INTO t1 VALUES

-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t1;
-- enable_result_log
-- enable_query_log
@@ -472,6 +496,10 @@ INSERT INTO t1 VALUES (1,1,'a'), (2,2,'b');

-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t1;
-- enable_result_log
-- enable_query_log
@@ -119,6 +119,10 @@ select count(*) from t1;

-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t0;
analyze table t1;
-- enable_result_log
@@ -141,6 +145,10 @@ insert into t1 (key1, key2, key3, key4, filler1) values (-1, -1, 100, 100, 'key4

-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t1;
-- enable_result_log
-- enable_query_log
@@ -193,6 +201,10 @@ update t1 set key1=200,key2=200 where key1=100 and key2=100;
delete from t1 where key1=200 and key2=200;
-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t1;
-- enable_result_log
-- enable_query_log
@@ -210,6 +222,10 @@ delete from t1 where key3=100 and key4=100;

-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t1;
-- enable_result_log
-- enable_query_log
@@ -236,6 +252,10 @@ insert into t1 (key1, key2, key3, key4, filler1) values (100, 100, 200, 200,'key

-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t1;
-- enable_result_log
-- enable_query_log
@@ -250,6 +270,10 @@ insert into t1 (key1, key2, key3, key4, filler1) values (-1, -1, -1, 200,'key4')

-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t1;
-- enable_result_log
-- enable_query_log
@@ -264,6 +288,10 @@ insert into t1 (key1, key2, key3, key4, filler1) values (-1, -1, 200, -1,'key3')

-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t1;
-- enable_result_log
-- enable_query_log
@@ -392,6 +420,10 @@ select count(a) from t2 where b='BBBBBBBB';

-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t2;
-- enable_result_log
-- enable_query_log
@@ -405,6 +437,10 @@ select count(a) from t2 ignore index(a,b) where a='AAAAAAAA' and b='AAAAAAAA';
insert into t2 values ('ab', 'ab', 'uh', 'oh');
-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t2;
-- enable_result_log
-- enable_query_log
@@ -68,6 +68,10 @@ set autocommit=1;

-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t1;
-- enable_result_log
-- enable_query_log
@@ -159,6 +163,10 @@ WHERE (SELECT COUNT(*) FROM t2 WHERE t2.f3 = 'h' AND t2.f2 = t1.f1) = 0 AND t1.f

-- disable_query_log
-- disable_result_log
if ($engine_type == RocksDB)
{
set global rocksdb_force_flush_memtable_now=1;
}
analyze table t1;
analyze table t2;
-- enable_result_log

0 comments on commit a5472b0

Please sign in to comment.
You can’t perform that action at this time.