Do not expose ERR_VERIFY to client

Signed-off-by: Morgan Douglas <[email protected]>

Author: morgando

Diff for: db/osqlcomm.c

@@ -7547,8 +7547,7 @@ int osql_process_packet(struct ireq *iq, uuid_t uuid, void *trans, char **pmsg,
 
         if (rc != 0) {
             if (rc != RC_INTERNAL_RETRY) {
-                errstat_cat_strf(&iq->errstat,
-                                 " unable to update record rc = %d", rc);
+                errstat_cat_strf(&iq->errstat," unable to update record");
             }
             if (gbl_enable_osql_logging)
                 logmsg(LOGMSG_DEBUG,

Diff for: db/sqlglue.c

@@ -5243,7 +5243,7 @@ int sqlite3BtreeCommit(Btree *pBt)
             if (clnt->early_retry == EARLY_ERR_VERIFY) {
                 clnt->osql.xerr.errval = ERR_BLOCK_FAILED + ERR_VERIFY;
                 errstat_cat_str(&(clnt->osql.xerr),
-                                "unable to update record rc = 4");
+                                "unable to update record");
             } else if (clnt->early_retry == EARLY_ERR_SELECTV) {
                 clnt->osql.xerr.errval = ERR_CONSTR;
                 errstat_cat_str(&(clnt->osql.xerr),

Diff for: db/sqlinterfaces.c

@@ -2182,7 +2182,7 @@ static int do_commitrollback(struct sqlthdstate *thd, struct sqlclntstate *clnt,
                     if (clnt->early_retry == EARLY_ERR_VERIFY) {
                         clnt->osql.xerr.errval = ERR_BLOCK_FAILED + ERR_VERIFY;
                         errstat_cat_str(&(clnt->osql.xerr),
-                                        "unable to update record rc = 4");
+                                        "unable to update record");
                     } else if (clnt->early_retry == EARLY_ERR_SELECTV) {
                         clnt->osql.xerr.errval = ERR_CONSTR;
                         errstat_cat_str(&(clnt->osql.xerr),

Diff for: db/sqloffload.c

@@ -248,7 +248,7 @@ static int rese_commit(struct sqlclntstate *clnt, struct sql_thread *thd,
         } else {
             clnt->osql.xerr.errval = ERR_BLOCK_FAILED + ERR_VERIFY;
             errstat_cat_str(&(clnt->osql.xerr),
-                            "unable to update record rc = 4");
+                            "unable to update record");
         }
         rc = SQLITE_ABORT;
     } else if (clnt->early_retry == EARLY_ERR_SELECTV) {

Diff for: tests/dupewrite.test/t02.req.out

@@ -14,7 +14,7 @@
 [EXEC PROCEDURE test_dupe_insert_3()] failed with rc -3 [n = q:fetch()...]:7: statement must be read-only
 [EXEC PROCEDURE test_dupe_update_2()] failed with rc -3 [db:exec(sql):emit()...]:3: statement must be read-only
 [EXEC PROCEDURE test_dupe_update_3()] failed with rc -3 [n = q:fetch()...]:7: statement must be read-only
-[EXEC PROCEDURE test_dupe_update_4()] failed with rc -8 find old record failed unable to update record rc = 4
+[EXEC PROCEDURE test_dupe_update_4()] failed with rc -8 find old record failed unable to update record
 [EXEC PROCEDURE test_dupe_delete_2()] failed with rc -3 [db:exec(sql):emit()...]:3: statement must be read-only
 [EXEC PROCEDURE test_dupe_delete_3()] failed with rc -3 [n = q:fetch()...]:7: statement must be read-only
 [EXEC PROCEDURE test_dupe_delete_4()] failed with rc -8 Table 'dupe4' find old record failed unable to delete genid =XXXXXX rc=4

Diff for: tests/serialstep.test/s14_01.req.exp.alt2

@@ -5,5 +5,5 @@ done
 done
 (rows updated=1)
 done
-[commit] failed with rc 2 find old record failed unable to update record rc = 4
+[commit] failed with rc 2 find old record failed unable to update record
 done

Diff for: tests/serialstep.test/s2_01.req.exp.alt2

@@ -35,7 +35,7 @@ done
 (id=99, name='ytu', age=8, address=NULL, state='DB', zip=NULL)
 done
 done
-[commit] failed with rc 2 find old record failed unable to update record rc = 4
+[commit] failed with rc 2 find old record failed unable to update record
 done
 done
 done

Diff for: tests/tools/linearizable/jepsen/src/comdb2/core.clj

@@ -186,7 +186,7 @@
   "Given an error string, identifies whether the error is safely retriable."
   [e]
   (or (re-find #"not serializable" e)
-      (re-find #"unable to update record rc = 4" e)
+      (re-find #"unable to update record" e)
       (re-find #"selectv constraints" e)
       (re-find #"Maximum number of retries done." e)))
 

Diff for: tests/verify_error.test/t2_01.req.exp

@@ -30,7 +30,7 @@ done
 1 [truncate test2]
 done
 1 [commit]
-[commit] failed with rc 2 find old record failed unable to update record rc = 4
+[commit] failed with rc 2 find old record failed unable to update record
 done
 1 [select * from test1]
 (i=1, j=4)
@@ -51,7 +51,7 @@ done
 (rows updated=1)
 done
 1 [commit]
-[commit] failed with rc 2 find old record failed unable to update record rc = 4
+[commit] failed with rc 2 find old record failed unable to update record
 done
 1 [select * from test1]
 (i=1, j=4)