Update tests for blocksql->snapshot migration

morgando · morgando · commit b99926516ff2 · 2025-11-04T15:47:29.000Z
Signed-off-by: mdouglas47 &lt;mdouglas47@bloomberg.net&gt;
diff --git a/tests/analyze_insert_burst.test/lrl.options b/tests/analyze_insert_burst.test/lrl.options
@@ -0,0 +1 @@
+sql_tranlevel_default blocksock
diff --git a/tests/basic.test/runit b/tests/basic.test/runit
@@ -259,9 +259,7 @@ if ! diff  dupins4.out dupins4.exp; then
 fi
 
 
-if echo $DBNAME | grep 'snapshot\|rowlocks' ; then
-  cdb2sql ${CDB2_OPTIONS} $dbnm default "insert into t2 values(1)"
-fi
+cdb2sql ${CDB2_OPTIONS} $dbnm default "insert into t2 values(1)"
 
 assertcnt t2 2
 do_verify t2
diff --git a/tests/cdb2api_effects_on_chunk_error.test/lrl.options b/tests/cdb2api_effects_on_chunk_error.test/lrl.options
@@ -0,0 +1 @@
+sql_tranlevel_default blocksock
diff --git a/tests/comdb2_snapshot_lsn.test/runit b/tests/comdb2_snapshot_lsn.test/runit
@@ -20,6 +20,7 @@ function run_test
 
     echo "Base-case, not snapshot, should return NULL"
     result=$($CDB2SQL_EXE $CDB2_OPTIONS $DBNAME --host $master - <<EOF
+set transaction blocksql
 select comdb2_snapshot_lsn()
 EOF
 )
@@ -31,6 +32,7 @@ EOF
     echo "use_current_lsn_for_non_snapshot"
     $CDB2SQL_EXE $CDB2_OPTIONS $DBNAME --host $master "put tunable 'use_current_lsn_for_non_snapshot' 1"
     result=$($CDB2SQL_EXE $CDB2_OPTIONS $DBNAME --host $master - <<EOF
+set transaction blocksql
 select comdb2_snapshot_lsn()
 EOF
 )
diff --git a/tests/dohsql_leaks.test/Makefile b/tests/dohsql_leaks.test/Makefile
@@ -4,5 +4,5 @@ else
   include $(TESTSROOTDIR)/testcase.mk
 endif
 ifeq ($(TEST_TIMEOUT),)
-  export TEST_TIMEOUT=20m
+  export TEST_TIMEOUT=25m
 endif
diff --git a/tests/fingerprints.test/t02.req.out b/tests/fingerprints.test/t02.req.out
@@ -1,7 +1,9 @@
 (version='1')
 (xyz=1)
+(xyz=0)
 (xyz=1)
 (xyz=3)
+(xyz=0)
 (xyz=2)
 (xyz=6)
 (xyz=4)
diff --git a/tests/multichunk.test/runit b/tests/multichunk.test/runit
@@ -4,6 +4,7 @@ bash -n "$0" | exit 1
 cdb2="cdb2sql --tabs -s ${CDB2_OPTIONS} $1 default "
 
 function multi_chunk {
+    echo "set transaction blocksql"
     echo "set transaction chunk $chunk"
     echo 'begin'
     from=1
diff --git a/tests/queuedb_locks.test/runit b/tests/queuedb_locks.test/runit
@@ -12,6 +12,7 @@ cdb2sql --host $rep ${CDB2_OPTIONS} $dbname 'create table t(a int)'
 cdb2sql --host $rep ${CDB2_OPTIONS} $dbname 'create default lua consumer test on (table t for insert)'
 
 cdb2sql --host $rep ${CDB2_OPTIONS} $dbname - <<'EOF'
+set transaction blocksql
 set transaction chunk 100
 begin
 insert into t select value from generate_series(1, 1000000)
diff --git a/tests/recover_deadlock.test/lrl.options b/tests/recover_deadlock.test/lrl.options
@@ -0,0 +1 @@
+sql_tranlevel_default blocksock
diff --git a/tests/remsql.test/output.expected b/tests/remsql.test/output.expected
@@ -19,7 +19,7 @@
 (a=3, b=3)
 (TEST='REMSQL DEDUP TEST 3')
 (a=0, b=0)
-(a=0, b=3)
+(a=3, b=3)
 (rows inserted=1)
 (hint='inserted 3 records from remote to source; source should have 3 records')
 (COUNT(*)=3)
diff --git a/tests/remsql.test/runit b/tests/remsql.test/runit
@@ -102,6 +102,7 @@ EOF
 
 ###### inserting to source from remote ######
 cdb2sql -s --cdb2cfg ${CDB2_CONFIG} $srcdbname default - >>output.actual 2>&1 <<EOF
+set transaction blocksql
 DROP TABLE IF EXISTS chunky
 CREATE TABLE chunky (a INT)\$\$
 SET TRANSACTION CHUNK 1
@@ -114,6 +115,7 @@ EOF
 
 ###### inserting to remote from source ######
 cdb2sql -s --cdb2cfg ${CDB2_CONFIG} $srcdbname default - >>output.actual 2>&1 <<EOF
+set transaction blocksql
 SET TRANSACTION CHUNK 1
 BEGIN
 INSERT INTO LOCAL_${dbname}.chunky SELECT a FROM chunky
@@ -124,6 +126,7 @@ EOF
 
 ###### inserting to remote from remote ######
 cdb2sql -s --cdb2cfg ${CDB2_CONFIG} $srcdbname default - >>output.actual 2>&1 <<EOF
+set transaction blocksql
 SET TRANSACTION CHUNK 1
 BEGIN
 INSERT INTO LOCAL_${dbname}.chunky SELECT a FROM LOCAL_${dbname}.chunky
@@ -139,6 +142,7 @@ cdb2sql --cdb2cfg ${CDB2_CONFIG} $srcdbname default "SELECT * FROM LOCAL_${dbnam
 
 ###### Verify that we don't block writing results of a remote SELECT into another remote table, when chunking ######
 cdb2sql -s --cdb2cfg ${CDB2_CONFIG} $srcdbname default - >>output.actual 2>&1 <<EOF
+set transaction blocksql
 SET TRANSACTION CHUNK 1
 BEGIN
 INSERT INTO LOCAL_${dbname}.yet_another_table SELECT a FROM LOCAL_${dbname}.chunky
diff --git a/tests/sc_force.test/runit b/tests/sc_force.test/runit
@@ -11,6 +11,7 @@ master=`cdb2sql --tabs ${CDB2_OPTIONS} $dbnm --host $fixednode 'exec procedure s
 cat << EOF | cdb2sql ${CDB2_OPTIONS} -s --tabs $dbnm --host $fixednode - >actual 2>&1 
 drop table if exists t
 create table t {`cat t1.csc2`}\$\$
+set transaction blocksql
 set transaction chunk 10000
 BEGIN
 insert into t select * from generate_series(1,1000000)
diff --git a/tests/sc_multitable.test/run.log.alpha b/tests/sc_multitable.test/run.log.alpha
@@ -15,6 +15,7 @@
   ]
  }
 ]
+[set transaction blocksql] rc 0
 [set transaction chunk 10000] rc 0
 [begin] rc 0
 [insert into testview1 select * from  generate_series(1,100000)] rc 0
@@ -94,6 +95,7 @@
 ]
 (rows inserted=10)
 (rows inserted=10)
+[set transaction blocksql] rc 0
 [set transaction chunk 1000] rc 0
 [begin] rc 0
 [insert into '$14_CC37A197' (a) select * from  generate_series(1,1000000)] rc 0
diff --git a/tests/sc_multitable.test/runit b/tests/sc_multitable.test/runit
@@ -37,6 +37,7 @@ if (( $? != 0 )) ; then
 fi
 
 cdb2sql ${CDB2_OPTIONS} $dbname default >> $OUT <<EOF
+set transaction blocksql
 set transaction chunk 10000
 begin
 insert into ${VIEW1} select * from  generate_series(1,100000)
@@ -97,6 +98,7 @@ if (( $? != 0 )) ; then
    exit 1
 fi
 cdb2sql ${CDB2_OPTIONS} $dbname default >> $OUT <<EOF
+set transaction blocksql
 set transaction chunk 1000
 begin
 insert into '\$14_CC37A197' (a) select * from  generate_series(1,1000000)
diff --git a/tests/sc_versmismatch.test/runit b/tests/sc_versmismatch.test/runit
@@ -192,6 +192,8 @@ function test2
 
     if [ $recom -ne 0 ] ; then
         echo "set transaction read committed" >&${COPROC[1]}
+    else
+        echo "set transaction blocksql" >&${COPROC[1]}
     fi
     echo "begin" >&${COPROC[1]}
     echo "update t1 set c=c+100000 where a = 300000" >&${COPROC[1]}
diff --git a/tests/seekscan.test/runit b/tests/seekscan.test/runit
@@ -11,6 +11,7 @@ create table t(a int, b int, c int); \$\$
 create index t_ix on t(a, b);
 truncate t;
 
+set transaction blocksql
 set transaction chunk 100;
 begin;
 insert into t select a.value as a, b.value as b, 0 from generate_series(1, 10000) as a cross join generate_series(1, 10) as b;
diff --git a/tests/selectv_rcode.test/lrl.options b/tests/selectv_rcode.test/lrl.options
@@ -4,3 +4,4 @@ table jobinstance jobinstance.csc2
 table dbgopts dbgopts.csc2
 snapshot_serial_verify_retry off
 reorder_socksql_no_deadlock on
+min_keep_logs_age 20
diff --git a/tests/selectv_rcode.test/runit b/tests/selectv_rcode.test/runit
@@ -80,6 +80,24 @@ function debug_flags
     fi
 }
 
+function get_max_db_time
+{
+    local maxtime=0
+    if [[ -z $CLUSTER ]]; then
+        maxtime=$($CDB2SQL_EXE -tabs $CDB2_OPTIONS $DBNAME default "select max(timestamp) from comdb2_transaction_logs")
+    else
+        for node in $CLUSTER; do
+            local time
+            time=$($CDB2SQL_EXE -tabs $CDB2_OPTIONS --host $node $DBNAME default "select max(timestamp) from comdb2_transaction_logs")
+            if (( time > maxtime )); then
+                maxtime=$time
+            fi
+        done
+    fi
+
+    echo $maxtime
+}
+
 function run_tests
 {
     [[ $debug == "1" ]] && set -x
@@ -89,28 +107,31 @@ function run_tests
     typeset dbug_flags=$(debug_flags)
     typeset isolation=""
 
+    local db_time_at_start
+    db_time_at_start=$(get_max_db_time)
+
     start=$(date +%s)
     isolation=socksql
     echo "$isolation test"
-    $selectv_rcode -d $DBNAME -c $CDB2_CONFIG $strict_mode $reads_like_writes $dbug_flags -i $isolation
+    $selectv_rcode -d $DBNAME -T $db_time_at_start -c $CDB2_CONFIG $strict_mode $reads_like_writes $dbug_flags -i $isolation
     export r=$?
     [[ $r != 0 ]] && failexit "$isolation selectv rcodes"
 
     isolation=reccom
     echo "$isolation test"
-    $selectv_rcode -d $DBNAME -c $CDB2_CONFIG $strict_mode $reads_like_writes $dbug_flags -i $isolation
+    $selectv_rcode -d $DBNAME -T $db_time_at_start -c $CDB2_CONFIG $strict_mode $reads_like_writes $dbug_flags -i $isolation
     export r=$?
     [[ $r != 0 ]] && failexit "$isolation selectv rcodes"
 
     isolation=snapshot
     echo "$isolation test"
-    $selectv_rcode -d $DBNAME -c $CDB2_CONFIG $strict_mode $reads_like_writes $dbug_flags -i $isolation
+    $selectv_rcode -d $DBNAME -T $db_time_at_start -c $CDB2_CONFIG $strict_mode $reads_like_writes $dbug_flags -i $isolation
     export r=$?
     [[ $r != 0 ]] && failexit "$isolation selectv rcodes"
 
     isolation=serial
     echo "$isolation test"
-    $selectv_rcode -d $DBNAME -c $CDB2_CONFIG $strict_mode $reads_like_writes $dbug_flags -i $isolation
+    $selectv_rcode -d $DBNAME -T $db_time_at_start -c $CDB2_CONFIG $strict_mode $reads_like_writes $dbug_flags -i $isolation
     export r=$?
     [[ $r != 0 ]] && failexit "$isolation selectv rcodes"
 }
diff --git a/tests/socksql.test/lrl.options b/tests/socksql.test/lrl.options
@@ -1 +1,2 @@
 table t1 t1.csc2
+sql_tranlevel_default blocksock
diff --git a/tests/socksql.test/t1_04.req.exp b/tests/socksql.test/t1_04.req.exp
@@ -1 +1,6 @@
-[SELECT * FROM t1] failed with rc -3 Failed to set transaction mode
+(a=1, b=2, c=3, d=4)
+(a=1, b=1, c=11, d=12)
+(a=1, b=1, c=1, d=1)
+(a=1, b=12, c=1, d=14)
+(a=1, b=6, c=7, d=8)
+(a=1, b=8, c=1, d=10)
diff --git a/tests/socksql_master_swings.test/lrl.options b/tests/socksql_master_swings.test/lrl.options
@@ -14,3 +14,4 @@ dump_blkseq on
 extended_sql_debug_trace on
 decoupled_logputs off
 nowatch
+sql_tranlevel_default blocksock
diff --git a/tests/sp.test/lrl.options b/tests/sp.test/lrl.options
@@ -1,2 +1,2 @@
 dtastripe 1
-enable_snapshot_isolation
+sql_tranlevel_default blocksock
diff --git a/tests/sp.test/sp.sh b/tests/sp.test/sp.sh
@@ -739,10 +739,6 @@ for ((i=0;i<500;++i)); do
 done | cdb2sql $SP_OPTIONS - > /dev/null
 
 #START CONSUMERS
-cdb2sql $SP_OPTIONS - <<'EOF'
-set transaction snapisol
-exec procedure cons0(true)
-EOF
 cdb2sql $SP_OPTIONS - <<'EOF' > /dev/null 2>&1 &
 set transaction blocksql
 exec procedure cons0(true)
diff --git a/tests/sp.test/t01.req.out b/tests/sp.test/t01.req.out
@@ -274,7 +274,6 @@ SP: exec procedure bound(@i, @u, @ll, @ull, @s, @us, @f, @d, @dt, @cstr, @ba, @b
 (version='sptest')
 (version='sptest')
 (version='sptest')
-[exec procedure cons0(true)] failed with rc -3 [local consumer = db:consumer()...]:2: consumer is only supported under default transaction mode
 (rows deleted=500)
 (name='audit', type='trigger', tbl_name='foraudit', event='add', col='i', seq='N')
 (name='audit', type='trigger', tbl_name='foraudit', event='del', col='i', seq='N')
diff --git a/tests/tools/selectv_rcode.c b/tests/tools/selectv_rcode.c
@@ -44,6 +44,7 @@ int fail_updater_error = 0;
 int time_is_up = 0;
 int debug_trace = 0;
 int allow_common_errors = 1;
+time_t db_time_at_start = 0;
 
 void usage(FILE *f)
 {
@@ -508,7 +509,7 @@ int intrans_effect_update(cdb2_hndl_tp *db)
 /*
  * POINT-IN-TIME UPDATER THREAD SQL
  *
- * BEGIN TRANSACTION AS OF DATETIME <now - 10 seconds>
+ * BEGIN TRANSACTION AS OF DATETIME <db start time>
  * UPDATE jobinstance SET instid = instdid WHERE state=1 AND
  *          began <= now() limit 15
  * COMMIT
@@ -518,12 +519,12 @@ int point_in_time_update(cdb2_hndl_tp *db)
     int rc;
     int got_error = 0;
     char sql[80];
-    time_t point_in_time = (time(NULL) - 10);
+    const time_t point_in_time = db_time_at_start;
 
     cdb2_clearbindings(db);
     snprintf(sql, sizeof(sql), "BEGIN TRANSACTION AS OF DATETIME %ld", point_in_time);
     if ((rc = cdb2_run_statement(db, sql)) != CDB2_OK) {
-        fprintf(stderr, "line %d error running %s, %d\n", __LINE__, sql, rc);
+        fprintf(stderr, "line %d error running %s, %d %s\n", __LINE__, sql, rc, cdb2_errstr(db));
         exit(1);
     }
 
@@ -765,7 +766,7 @@ int main(int argc, char *argv[]) {
     setvbuf(stdout, NULL, _IOLBF, 0);
     srandom(time(NULL) * getpid());
 
-    while((opt = getopt(argc, argv, "d:s:c:v:u:V:U:S:p:e:i:t:faARDh")) != EOF) {
+    while((opt = getopt(argc, argv, "d:s:c:v:u:V:U:S:p:e:i:t:T:faARDh")) != EOF) {
         switch (opt) {
             case 'd':
                 dbname = optarg;
@@ -829,6 +830,10 @@ int main(int argc, char *argv[]) {
             case 'D':
                 debug_trace = 1;
                 break;
+            case 'T':
+                db_time_at_start = strtoul(optarg, NULL, 0 );
+                ctime(&db_time_at_start);
+                break;
             case 'h':
                 usage(stdout);
                 exit(0);
diff --git a/tests/transchunk.test/lrl.options b/tests/transchunk.test/lrl.options
@@ -1,3 +1,4 @@
 dbnum 123
 table t t.csc2
 table t2 t2.csc2
+sql_tranlevel_default blocksock
diff --git a/tests/transchunk.test/t1.sql b/tests/transchunk.test/t1.sql
@@ -46,6 +46,7 @@ create table t1 {
 
 insert into t1 select 1, value from generate_series(1, 10000);
 
+set transaction blocksql
 set transaction chunk 100
 begin;
 delete from t1;
diff --git a/tests/transchunk_tablelocks.test/runit b/tests/transchunk_tablelocks.test/runit
@@ -21,6 +21,7 @@ echo "Starting" > $outlog
 echo "Inserting 20 rows in 2 chunks, will alter the table after first chunk"
 echo "Inserting 20 rows in 2 chunks, will alter the table after first chunk" >> $outlog
 $r >> $outlog 2>&1 << "EOF" &
+set transaction blocksql
 set transaction chunk 10
 begin
 insert into t select value from generate_series(1, 20)
@@ -55,6 +56,7 @@ $rt "select * from t order by a" >> $outlog
 echo "Deleting the rows, will drop the table after first chunk"
 echo "Deleting the rows, will drop the table after first chunk" >> $outlog
 $r >> $outlog 2>&1 << "EOF" &
+set transaction blocksql
 set transaction chunk 10
 begin
 delete from t where 1
diff --git a/tests/tunables.test/t00_all_tunables.expected b/tests/tunables.test/t00_all_tunables.expected
@@ -344,7 +344,7 @@
 (name='enable_selectv_range_check', description='If set, SELECTV will send ranges for verification, not every touched record. (Default: off)', type='BOOLEAN', value='OFF', read_only='Y')
 (name='enable_seqnum_generations', description='', type='BOOLEAN', value='OFF', read_only='N')
 (name='enable_serial_isolation', description='Enable to allow SERIALIZABLE level transactions to run against the database. (Default: off)', type='BOOLEAN', value='OFF', read_only='Y')
-(name='enable_snapshot_isolation', description='Enable to allow SNAPSHOT level transactions to run against the database. (Default: off)', type='BOOLEAN', value='OFF', read_only='Y')
+(name='enable_snapshot_isolation', description='Enable to allow SNAPSHOT level transactions to run against the database. (Default: off)', type='BOOLEAN', value='ON', read_only='Y')
 (name='enable_sp_strict_assignments', description='', type='INTEGER', value='0', read_only='Y')
 (name='enable_sparse_lockerid_map', description='If set, allocates a sparse map of lockers for deadlock resolution. (Default: on)', type='BOOLEAN', value='ON', read_only='Y')
 (name='enable_sql_stmt_caching', description='Enable caching of query plans. If followed by "all" will cache all queries, including those without parameters. (Default: on)', type='ENUM', value='ALL', read_only='Y')
@@ -970,7 +970,7 @@
 (name='sql_release_locks_on_slow_reader', description='Release sql locks if a tcp write to the client blocks', type='BOOLEAN', value='ON', read_only='N')
 (name='sql_row_delay_msecs', description='Add this delay before sending back a row, for every row (default: 0)', type='INTEGER', value='0', read_only='N')
 (name='sql_time_threshold', description='Sets the threshold time in ms after which queries are reported as running a long time. (Default: 5000 ms)', type='INTEGER', value='5000', read_only='N')
-(name='sql_tranlevel_default', description='Sets the default SQL transaction level for the database.', type='ENUM', value='BLOCKSOCK', read_only='Y')
+(name='sql_tranlevel_default', description='Sets the default SQL transaction level for the database.', type='ENUM', value='SNAPSHOT ISOLATION', read_only='Y')
 (name='sqlbulksz', description='For index/data scans, the database will retrieve data in bulk instead of singlestepping a cursor. This sets the buffer size for the bulk retrieval.', type='INTEGER', value='2097152', read_only='N')
 (name='sqlenginepool.dump_on_full', description='Dump status on full queue.', type='BOOLEAN', value='ON', read_only='N')
 (name='sqlenginepool.exit_on_error', description='Exit on pthread error.', type='BOOLEAN', value='ON', read_only='N')
diff --git a/tests/udf.test/nextval_1.req.expected b/tests/udf.test/nextval_1.req.expected
@@ -12,7 +12,7 @@ nextval
 2
 txn
 12
-12
+11
 13
 curval
 13

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ function run_test`
`20`	`20`
`21`	`21`	`echo "Base-case, not snapshot, should return NULL"`
`22`	`22`	`result=$($CDB2SQL_EXE $CDB2_OPTIONS $DBNAME --host $master - <<EOF`
	`23`	`+set transaction blocksql`
`23`	`24`	`select comdb2_snapshot_lsn()`
`24`	`25`	`EOF`
`25`	`26`	`)`
`@@ -31,6 +32,7 @@ EOF`
`31`	`32`	`echo "use_current_lsn_for_non_snapshot"`
`32`	`33`	`$CDB2SQL_EXE $CDB2_OPTIONS $DBNAME --host $master "put tunable 'use_current_lsn_for_non_snapshot' 1"`
`33`	`34`	`result=$($CDB2SQL_EXE $CDB2_OPTIONS $DBNAME --host $master - <<EOF`
	`35`	`+set transaction blocksql`
`34`	`36`	`select comdb2_snapshot_lsn()`
`35`	`37`	`EOF`
`36`	`38`	`)`
-Original file line number
+Diff line change
@@ @@ -1,7 +1,9 @@ @@
 (version='1')
 (xyz=1)
 +(xyz=0)
 (xyz=1)
 (xyz=3)
 +(xyz=0)
 (xyz=2)
 (xyz=6)
 (xyz=4)