Skip to content

Commit e65adeb

Browse files
committed
Make snapshot the default txn mode
Signed-off-by: mdouglas47 <[email protected]>
1 parent 301f0c2 commit e65adeb

File tree

4 files changed

+19
-8
lines changed

4 files changed

+19
-8
lines changed

db/comdb2.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -448,8 +448,8 @@ int gbl_goslow = 0; /* set to disable "gofast" */
448448

449449
int gbl_selectv_rangechk = 0; /* disable selectv range check by default */
450450

451-
int gbl_sql_tranlevel_preserved = SQL_TDEF_SOCK;
452-
int gbl_sql_tranlevel_default = SQL_TDEF_SOCK;
451+
int gbl_sql_tranlevel_preserved = SQL_TDEF_SNAPISOL;
452+
int gbl_sql_tranlevel_default = SQL_TDEF_SNAPISOL;
453453
int gbl_exit_alarm_sec = 300;
454454
int gbl_test_blkseq_replay_code = 0;
455455
int gbl_dump_blkseq = 0;
@@ -460,8 +460,8 @@ int gbl_disable_overflow_page_trace = 1;
460460
int gbl_simulate_rowlock_deadlock_interval = 0;
461461
int gbl_enable_berkdb_retry_deadlock_bias = 0;
462462
int gbl_enable_cache_internal_nodes = 1;
463-
int gbl_use_modsnap_for_snapshot = 0;
464-
int gbl_modsnap_asof = 0;
463+
int gbl_use_modsnap_for_snapshot = 1;
464+
int gbl_modsnap_asof = 1;
465465
int gbl_rep_process_txn_time = 0;
466466
int gbl_utxnid_log = 1;
467467
int gbl_test_commit_lsn_map = 0;
@@ -532,7 +532,7 @@ int gbl_rowlocks = 0;
532532
int gbl_disable_tagged_api = 1;
533533
int gbl_disable_tagged_api_writes = 1;
534534
int gbl_serializable = 0; // Just for bookkeeping
535-
int gbl_snapisol = 0;
535+
int gbl_snapisol = 1;
536536
int gbl_new_snapisol = 0;
537537
int gbl_new_snapisol_asof = 0;
538538
int gbl_new_snapisol_logging = 0;

db/sqlglue.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3818,7 +3818,7 @@ int sqlite3BtreeOpen(
38183818
return rc;
38193819
}
38203820

3821-
static char *tranlevel_toclntstr(int lvl)
3821+
char *tranlevel_toclntstr(int lvl)
38223822
{
38233823
switch (lvl) {
38243824
case TRANLEVEL_SOSQL:

lua/sp.c

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ extern int gbl_allow_lua_print;
8888
extern int gbl_lua_prepare_max_retries;
8989
extern int gbl_lua_prepare_retry_sleep;
9090

91+
extern char *tranlevel_toclntstr(int lvl);
92+
9193
pthread_t gbl_break_lua;
9294
int gbl_break_all_lua = 0;
9395
char *gbl_break_spname;
@@ -4788,7 +4790,7 @@ static int register_queue_with_berkdb_and_master(Lua L, const char *type)
47884790
return luaL_error(L, "attempt to run consumer in child thread");
47894791
}
47904792
if (clnt->dbtran.mode != TRANLEVEL_SOSQL) {
4791-
return luaL_error(L, "%s is only supported under default transaction mode", type);
4793+
return luaL_error(L, "%s is only supported under %s transaction mode", type, tranlevel_toclntstr(TRANLEVEL_SOSQL));
47924794
}
47934795

47944796
dbconsumer_t *consumer;
@@ -7296,6 +7298,11 @@ static int exec_procedure_int(struct sqlthdstate *thd,
72967298
return SQLITE_ACCESS;
72977299
}
72987300

7301+
const int convert_modsnap_to_sosql = sp->can_consume && !clnt->in_client_trans && clnt->dbtran.mode == TRANLEVEL_MODSNAP;
7302+
if (convert_modsnap_to_sosql) {
7303+
clnt->dbtran.mode = TRANLEVEL_SOSQL;
7304+
}
7305+
72997306
if (gbl_is_physical_replicant && consumer) {
73007307
rc = -3;
73017308
(*err) = strdup("Cannot execute consumer on physical-replicant");
@@ -7304,6 +7311,10 @@ static int exec_procedure_int(struct sqlthdstate *thd,
73047311
rc = push_args_and_run_sp(clnt, end_ptr, err);
73057312
}
73067313

7314+
if (convert_modsnap_to_sosql) {
7315+
clnt->dbtran.mode = TRANLEVEL_MODSNAP;
7316+
}
7317+
73077318
if (trigger) {
73087319
return rc;
73097320
}

plugins/newsql/newsql.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2410,7 +2410,7 @@ newsql_loop_result newsql_loop(struct sqlclntstate *clnt, CDB2SQLQUERY *sql_quer
24102410
clnt->ctrl_sqlengine = SQLENG_NORMAL_PROCESS;
24112411
}
24122412
if (clnt->dbtran.mode < TRANLEVEL_SOSQL) {
2413-
clnt->dbtran.mode = TRANLEVEL_SOSQL;
2413+
clnt->dbtran.mode = TRANLEVEL_MODSNAP;
24142414
}
24152415
clnt->osql.sent_column_data = 0;
24162416

0 commit comments

Comments
 (0)