{180255805} Add correct effects for chunk transactions after verify error

Signed-off-by: Salil Chandra <[email protected]>

Author: chands10

db/osql_srs.c

@@ -275,7 +275,7 @@ static int srs_tran_replay_int(struct sqlclntstate *clnt, int(dispatch_fn)(struc
     }
 
     do {
-        reset_query_effects(clnt); /* Reset it for each retry*/
+        reset_query_effects(clnt, 0); /* Reset it for each retry*/
         if (!osql->history) {
             logmsg(LOGMSG_ERROR, "Trying to replay, but no history?\n");
             abort();

db/sql.h

@@ -1389,7 +1389,7 @@ void reset_clnt(struct sqlclntstate *, int initial);
 void cleanup_clnt(struct sqlclntstate *);
 void free_client_info(struct sqlclntstate *);
 void free_client_adj_col_names(struct sqlclntstate *);
-void reset_query_effects(struct sqlclntstate *);
+void reset_query_effects(struct sqlclntstate *, int);
 
 int sqlite_to_ondisk(struct schema *s, const void *inp, int len, void *outp,
                      const char *tzname, blob_buffer_t *outblob, int maxblobs,

db/sqlinterfaces.c

@@ -1813,11 +1813,12 @@ static int handle_sql_wrongstate(struct sqlthdstate *thd,
     return SQLITE_INTERNAL;
 }
 
-void reset_query_effects(struct sqlclntstate *clnt)
+void reset_query_effects(struct sqlclntstate *clnt, int keep_chunk_effects)
 {
     bzero(&clnt->effects, sizeof(clnt->effects));
     bzero(&clnt->log_effects, sizeof(clnt->effects));
-    bzero(&clnt->chunk_effects, sizeof(clnt->chunk_effects));
+    if (!keep_chunk_effects)
+        bzero(&clnt->chunk_effects, sizeof(clnt->chunk_effects));
 }
 
 char *sqlenginestate_tostr(int state)
@@ -1972,7 +1973,7 @@ void abort_dbtran(struct sqlclntstate *clnt)
     clnt->intrans = 0;
     sql_set_sqlengine_state(clnt, __FILE__, __LINE__,
                             SQLENG_FNSH_ABORTED_STATE);
-    reset_query_effects(clnt);
+    reset_query_effects(clnt, 0);
 }
 
 void handle_sql_intrans_unrecoverable_error(struct sqlclntstate *clnt)
@@ -2040,7 +2041,7 @@ static int do_commitrollback(struct sqlthdstate *thd, struct sqlclntstate *clnt,
                     clnt->dbtran.shadow_tran = NULL;
                 }
             } else {
-                reset_query_effects(clnt);
+                reset_query_effects(clnt, 1);
                 rc = recom_abort(clnt);
                 if (rc)
                     logmsg(LOGMSG_ERROR, "%s: recom abort failed %d??\n",
@@ -2125,7 +2126,7 @@ static int do_commitrollback(struct sqlthdstate *thd, struct sqlclntstate *clnt,
                     }
                 }
             } else {
-                reset_query_effects(clnt);
+                reset_query_effects(clnt, 1);
                 if (clnt->dbtran.mode == TRANLEVEL_SERIAL) {
                     rc = serial_abort(clnt);
                 } else {
@@ -2247,7 +2248,7 @@ static int do_commitrollback(struct sqlthdstate *thd, struct sqlclntstate *clnt,
                     clnt->saved_errstr = strdup(clnt->osql.xerr.errstr);
                 }
             } else {
-                reset_query_effects(clnt);
+                reset_query_effects(clnt, 1);
                 rc = osql_sock_abort(clnt, OSQL_SOCK_REQ);
                 sql_debug_logf(clnt, __func__, __LINE__,
                                "'%s' socksql abort rc=%d replay=%d\n",
@@ -3899,7 +3900,7 @@ static int run_stmt(struct sqlthdstate *thd, struct sqlclntstate *clnt,
     }
 
     if (clnt->intrans == 0) {
-        reset_query_effects(clnt);
+        reset_query_effects(clnt, 0);
     }
 
     /* no rows actually ? */
@@ -4141,7 +4142,7 @@ int handle_sqlite_requests(struct sqlthdstate *thd, struct sqlclntstate *clnt)
         }
 
         if (clnt->statement_query_effects)
-            reset_query_effects(clnt);
+            reset_query_effects(clnt, 0);
 
         int fast_error = 0;
 
@@ -5345,7 +5346,7 @@ void reset_clnt(struct sqlclntstate *clnt, int initial)
     clnt->limits.tablescans_warn = gbl_querylimits_tablescans_warn;
     clnt->limits.temptables_warn = gbl_querylimits_temptables_warn;
 
-    reset_query_effects(clnt);
+    reset_query_effects(clnt, 0);
 
     reset_user(clnt);
 

tests/chunk_txn_effects.test/output.expected

@@ -128,3 +128,36 @@ Number of rows selected 4
 Number of rows deleted 0
 Number of rows updated 0
 Number of rows inserted 0
+---------------- ROLLBACK -----------------
+Number of rows affected 0
+Number of rows selected 1
+Number of rows deleted 0
+Number of rows updated 0
+Number of rows inserted 0
+Effects not sent by comdb2 server. 
+Number of rows affected 0
+Number of rows selected 0
+Number of rows deleted 0
+Number of rows updated 0
+Number of rows inserted 0
+Number of rows affected 10
+Number of rows selected 0
+Number of rows deleted 0
+Number of rows updated 0
+Number of rows inserted 10
+Number of rows affected 6
+Number of rows selected 0
+Number of rows deleted 0
+Number of rows updated 0
+Number of rows inserted 6
+101
+102
+103
+104
+105
+106
+Number of rows affected 0
+Number of rows selected 6
+Number of rows deleted 0
+Number of rows updated 0
+Number of rows inserted 0

tests/chunk_txn_effects.test/runit

@@ -36,6 +36,12 @@ INSERT INTO t1 VALUES(13) ON CONFLICT(i) DO NOTHING
 INSERT INTO t1 VALUES(14) ON CONFLICT(i) DO NOTHING
 COMMIT
 SELECT i FROM t1
+SELECT "---------------- ROLLBACK -----------------"
+SET TRANSACTION CHUNK 6
+BEGIN
+INSERT INTO t1 SELECT value FROM generate_series(101, 110)
+ROLLBACK
+SELECT i FROM t1 WHERE i BETWEEN 101 AND 110
 EOF
 
 diff output.actual output.expected