improve benchmarks

config/yugabyte/colocated/deletes_batched_extra_index_0_colocated.yaml

@@ -25,8 +25,8 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10, col11, col12, col13, col14, col15) select n, n, n+100, (n%100)+1, (n%1000)+1, 'aaa'||(n%1000)+1, '2022-12-10', n%50, n*10, 'bbb'||n, n%10, n*2, 'ccc'||(n%100), RANDOM()::INT::BOOLEAN, n, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id bigint primary key, col1 int, col2 int, col3 int, col4 int, col5 varchar(20), col6 date, col7 int, col8 bigint, col9 varchar(10), col10 int, col11 bigint, col12 varchar(10), col13 boolean, col14 int, col15 int);
+            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);

config/yugabyte/colocated/deletes_batched_extra_index_10_colocated.yaml

@@ -25,18 +25,18 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10, col11, col12, col13, col14, col15) select n, n, n+100, (n%100)+1, (n%1000)+1, 'aaa'||(n%1000)+1, '2022-12-10', n%50, n*10, 'bbb'||n, n%10, n*2, 'ccc'||(n%100), RANDOM()::INT::BOOLEAN, n, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id bigint primary key, col1 int, col2 int, col3 int, col4 int, col5 varchar(20), col6 date, col7 int, col8 bigint, col9 varchar(10), col10 int, col11 bigint, col12 varchar(10), col13 boolean, col14 int, col15 int);
+            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
             - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col5);
-            - create index demo_idx3 on demo(col6);
-            - create index demo_idx4 on demo(col8);
-            - create index demo_idx5 on demo(col13);
-            - create index demo_idx6 on demo(col9);
-            - create index demo_idx7 on demo(col10);
-            - create index demo_idx8 on demo(col11);
-            - create index demo_idx9 on demo(col12);
-            - create index demo_idx10 on demo(col2);
+            - create index demo_idx2 on demo(col2);
+            - create index demo_idx3 on demo(col3);
+            - create index demo_idx4 on demo(col4);
+            - create index demo_idx5 on demo(col5);
+            - create index demo_idx6 on demo(col6);
+            - create index demo_idx7 on demo(col7);
+            - create index demo_idx8 on demo(col8);
+            - create index demo_idx9 on demo(col9);
+            - create index demo_idx10 on demo(col10);

config/yugabyte/colocated/deletes_batched_extra_index_1_colocated.yaml

@@ -25,9 +25,9 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10, col11, col12, col13, col14, col15) select n, n, n+100, (n%100)+1, (n%1000)+1, 'aaa'||(n%1000)+1, '2022-12-10', n%50, n*10, 'bbb'||n, n%10, n*2, 'ccc'||(n%100), RANDOM()::INT::BOOLEAN, n, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id bigint primary key, col1 int, col2 int, col3 int, col4 int, col5 varchar(20), col6 date, col7 int, col8 bigint, col9 varchar(10), col10 int, col11 bigint, col12 varchar(10), col13 boolean, col14 int, col15 int);
+            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
             - create index demo_idx1 on demo(col1);

config/yugabyte/colocated/deletes_batched_extra_index_2_colocated.yaml

@@ -25,10 +25,10 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10, col11, col12, col13, col14, col15) select n, n, n+100, (n%100)+1, (n%1000)+1, 'aaa'||(n%1000)+1, '2022-12-10', n%50, n*10, 'bbb'||n, n%10, n*2, 'ccc'||(n%100), RANDOM()::INT::BOOLEAN, n, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id bigint primary key, col1 int, col2 int, col3 int, col4 int, col5 varchar(20), col6 date, col7 int, col8 bigint, col9 varchar(10), col10 int, col11 bigint, col12 varchar(10), col13 boolean, col14 int, col15 int);
+            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
             - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col5);
+            - create index demo_idx2 on demo(col2);

config/yugabyte/colocated/deletes_batched_extra_index_3_colocated.yaml

@@ -25,11 +25,11 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10, col11, col12, col13, col14, col15) select n, n, n+100, (n%100)+1, (n%1000)+1, 'aaa'||(n%1000)+1, '2022-12-10', n%50, n*10, 'bbb'||n, n%10, n*2, 'ccc'||(n%100), RANDOM()::INT::BOOLEAN, n, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id bigint primary key, col1 int, col2 int, col3 int, col4 int, col5 varchar(20), col6 date, col7 int, col8 bigint, col9 varchar(10), col10 int, col11 bigint, col12 varchar(10), col13 boolean, col14 int, col15 int);
+            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
             - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col5);
-            - create index demo_idx3 on demo(col6);
+            - create index demo_idx2 on demo(col2);
+            - create index demo_idx3 on demo(col3);

config/yugabyte/colocated/deletes_batched_extra_index_5_colocated.yaml

@@ -25,13 +25,13 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10, col11, col12, col13, col14, col15) select n, n, n+100, (n%100)+1, (n%1000)+1, 'aaa'||(n%1000)+1, '2022-12-10', n%50, n*10, 'bbb'||n, n%10, n*2, 'ccc'||(n%100), RANDOM()::INT::BOOLEAN, n, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id bigint primary key, col1 int, col2 int, col3 int, col4 int, col5 varchar(20), col6 date, col7 int, col8 bigint, col9 varchar(10), col10 int, col11 bigint, col12 varchar(10), col13 boolean, col14 int, col15 int);
+            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
             - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col5);
-            - create index demo_idx3 on demo(col6);
-            - create index demo_idx4 on demo(col8);
-            - create index demo_idx5 on demo(col13);
+            - create index demo_idx2 on demo(col2);
+            - create index demo_idx3 on demo(col3);
+            - create index demo_idx4 on demo(col4);
+            - create index demo_idx5 on demo(col5);

config/yugabyte/colocated/deletes_sequential_extra_index_0_colocated.yaml

@@ -25,8 +25,8 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10, col11, col12, col13, col14, col15) select n, n, n+100, (n%100)+1, (n%1000)+1, 'aaa'||(n%1000)+1, '2022-12-10', n%50, n*10, 'bbb'||n, n%10, n*2, 'ccc'||(n%100), RANDOM()::INT::BOOLEAN, n, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id bigint primary key, col1 int, col2 int, col3 int, col4 int, col5 varchar(20), col6 date, col7 int, col8 bigint, col9 varchar(10), col10 int, col11 bigint, col12 varchar(10), col13 boolean, col14 int, col15 int);
+            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);

config/yugabyte/colocated/deletes_sequential_extra_index_10_colocated.yaml

@@ -25,18 +25,18 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10, col11, col12, col13, col14, col15) select n, n, n+100, (n%100)+1, (n%1000)+1, 'aaa'||(n%1000)+1, '2022-12-10', n%50, n*10, 'bbb'||n, n%10, n*2, 'ccc'||(n%100), RANDOM()::INT::BOOLEAN, n, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id bigint primary key, col1 int, col2 int, col3 int, col4 int, col5 varchar(20), col6 date, col7 int, col8 bigint, col9 varchar(10), col10 int, col11 bigint, col12 varchar(10), col13 boolean, col14 int, col15 int);
+            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
             - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col5);
-            - create index demo_idx3 on demo(col6);
-            - create index demo_idx4 on demo(col8);
-            - create index demo_idx5 on demo(col13);
-            - create index demo_idx6 on demo(col9);
-            - create index demo_idx7 on demo(col10);
-            - create index demo_idx8 on demo(col11);
-            - create index demo_idx9 on demo(col12);
-            - create index demo_idx10 on demo(col2);
+            - create index demo_idx2 on demo(col2);
+            - create index demo_idx3 on demo(col3);
+            - create index demo_idx4 on demo(col4);
+            - create index demo_idx5 on demo(col5);
+            - create index demo_idx6 on demo(col6);
+            - create index demo_idx7 on demo(col7);
+            - create index demo_idx8 on demo(col8);
+            - create index demo_idx9 on demo(col9);
+            - create index demo_idx10 on demo(col10);

config/yugabyte/colocated/deletes_sequential_extra_index_1_colocated.yaml

@@ -25,9 +25,9 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10, col11, col12, col13, col14, col15) select n, n, n+100, (n%100)+1, (n%1000)+1, 'aaa'||(n%1000)+1, '2022-12-10', n%50, n*10, 'bbb'||n, n%10, n*2, 'ccc'||(n%100), RANDOM()::INT::BOOLEAN, n, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id bigint primary key, col1 int, col2 int, col3 int, col4 int, col5 varchar(20), col6 date, col7 int, col8 bigint, col9 varchar(10), col10 int, col11 bigint, col12 varchar(10), col13 boolean, col14 int, col15 int);
+            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
             - create index demo_idx1 on demo(col1);

config/yugabyte/colocated/deletes_sequential_extra_index_2_colocated.yaml

@@ -25,10 +25,10 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10, col11, col12, col13, col14, col15) select n, n, n+100, (n%100)+1, (n%1000)+1, 'aaa'||(n%1000)+1, '2022-12-10', n%50, n*10, 'bbb'||n, n%10, n*2, 'ccc'||(n%100), RANDOM()::INT::BOOLEAN, n, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id bigint primary key, col1 int, col2 int, col3 int, col4 int, col5 varchar(20), col6 date, col7 int, col8 bigint, col9 varchar(10), col10 int, col11 bigint, col12 varchar(10), col13 boolean, col14 int, col15 int);
+            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
             - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col5);
+            - create index demo_idx2 on demo(col2);

config/yugabyte/colocated/deletes_sequential_extra_index_3_colocated.yaml

@@ -25,11 +25,11 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10, col11, col12, col13, col14, col15) select n, n, n+100, (n%100)+1, (n%1000)+1, 'aaa'||(n%1000)+1, '2022-12-10', n%50, n*10, 'bbb'||n, n%10, n*2, 'ccc'||(n%100), RANDOM()::INT::BOOLEAN, n, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id bigint primary key, col1 int, col2 int, col3 int, col4 int, col5 varchar(20), col6 date, col7 int, col8 bigint, col9 varchar(10), col10 int, col11 bigint, col12 varchar(10), col13 boolean, col14 int, col15 int);
+            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
             - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col5);
-            - create index demo_idx3 on demo(col6);
+            - create index demo_idx2 on demo(col2);
+            - create index demo_idx3 on demo(col3);

config/yugabyte/colocated/deletes_sequential_extra_index_5_colocated.yaml

@@ -25,13 +25,13 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10, col11, col12, col13, col14, col15) select n, n, n+100, (n%100)+1, (n%1000)+1, 'aaa'||(n%1000)+1, '2022-12-10', n%50, n*10, 'bbb'||n, n%10, n*2, 'ccc'||(n%100), RANDOM()::INT::BOOLEAN, n, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id bigint primary key, col1 int, col2 int, col3 int, col4 int, col5 varchar(20), col6 date, col7 int, col8 bigint, col9 varchar(10), col10 int, col11 bigint, col12 varchar(10), col13 boolean, col14 int, col15 int);
+            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);
             - create index demo_idx1 on demo(col1);
-            - create index demo_idx2 on demo(col5);
-            - create index demo_idx3 on demo(col6);
-            - create index demo_idx4 on demo(col8);
-            - create index demo_idx5 on demo(col13);
+            - create index demo_idx2 on demo(col2);
+            - create index demo_idx3 on demo(col3);
+            - create index demo_idx4 on demo(col4);
+            - create index demo_idx5 on demo(col5);

config/yugabyte/colocated/insert_batched_extra_index_0_colocated.yaml

@@ -25,8 +25,8 @@ microbenchmark:
               AS $$
               DECLARE
               BEGIN
-              insert into demo (id, col1, col2, col3, col4,col5, col6, col7, col8, col9, col10, col11, col12, col13, col14, col15) select n, n, n+100, (n%100)+1, (n%1000)+1, 'aaa'||(n%1000)+1, '2022-12-10', n%50, n*10, 'bbb'||n, n%10, n*2, 'ccc'||(n%100), RANDOM()::INT::BOOLEAN, n, n from generate_series(1,_numRows) n;
+              insert into demo (id, col1, col2, col3, col4, col5, col6, col7, col8, col9, col10) select n, n, n+100, n*10+1, n-45, n, n, n*50, n*10, n+1111, n from generate_series(1,_numRows) n;
               END;
               $$;
             - drop table if exists demo;
-            - create table demo (id bigint primary key, col1 int, col2 int, col3 int, col4 int, col5 varchar(20), col6 date, col7 int, col8 bigint, col9 varchar(10), col10 int, col11 bigint, col12 varchar(10), col13 boolean, col14 int, col15 int);
+            - create table demo (id int primary key, col1 int, col2 int, col3 int, col4 int, col5 int, col6 int, col7 int, col8 int, col9 int, col10 int);