{173518307} UPSERT: Skip unnecessary constraint checks done on the replicant

Signed-off-by: Nirbhay Choubey <nchoubey@bloomberg.net>

Author: nirbhayc

sqlite/src/insert.c

@@ -1367,9 +1367,13 @@ void sqlite3GenerateConstraintChecks(
   sqlite3 *db;         /* Database connection */
   int i;               /* loop counter */
   int ix;              /* Index loop counter */
+#if !defined(SQLITE_BUILDING_FOR_COMDB2)
   int nCol;            /* Number of columns */
+#endif /* !defined(SQLITE_BUILDING_FOR_COMDB2) */
   int onError;         /* Conflict resolution strategy */
+#if !defined(SQLITE_BUILDING_FOR_COMDB2)
   int addr1;           /* Address of jump instruction */
+#endif /* !defined(SQLITE_BUILDING_FOR_COMDB2) */
   int seenReplace = 0; /* True if REPLACE is used to resolve INT PK conflict */
   int nPkField;        /* Number of fields in PRIMARY KEY. 1 for ROWID tables */
   Index *pUpIdx = 0;   /* Index to which to apply the upsert */
@@ -1391,8 +1395,10 @@ void sqlite3GenerateConstraintChecks(
   v = sqlite3GetVdbe(pParse);
   assert( v!=0 );
   assert( pTab->pSelect==0 );  /* This table is not a VIEW */
+#if !defined(SQLITE_BUILDING_FOR_COMDB2)
   nCol = pTab->nCol;
-  
+#endif /* !defined(SQLITE_BUILDING_FOR_COMDB2) */
+
   /* pPk is the PRIMARY KEY index for WITHOUT ROWID tables and NULL for
   ** normal rowid tables.  nPkField is the number of key fields in the 
   ** pPk index or 1 for a rowid table.  In other words, nPkField is the
@@ -1409,6 +1415,7 @@ void sqlite3GenerateConstraintChecks(
   VdbeModuleComment((v, "BEGIN: GenCnstCks(%d,%d,%d,%d,%d)",
                      iDataCur, iIdxCur, regNewData, regOldData, pkChng));
 
+#if !defined(SQLITE_BUILDING_FOR_COMDB2)
   /* Test all NOT NULL constraints.
   */
   for(i=0; i<nCol; i++){
@@ -1504,6 +1511,7 @@ void sqlite3GenerateConstraintChecks(
     pParse->iSelfTab = 0;
   }
 #endif /* !defined(SQLITE_OMIT_CHECK) */
+#endif /* !defined(SQLITE_BUILDING_FOR_COMDB2) */
 
   /* UNIQUE and PRIMARY KEY constraints should be handled in the following
   ** order:
@@ -1719,7 +1727,6 @@ void sqlite3GenerateConstraintChecks(
     VdbeNoopComment((v, "uniqueness check for %s", pIdx->zName));
     iThisCur = iIdxCur+ix;
 
-
     /* Skip partial indices for which the WHERE clause is not true */
     if( pIdx->pPartIdxWhere ){
       sqlite3VdbeAddOp2(v, OP_Null, 0, aRegIdx[ix]);
@@ -1768,6 +1775,12 @@ void sqlite3GenerateConstraintChecks(
       continue;
     }
 
+    /* Skip non-target indices */
+    if( pUpIdx && pUpIdx!=pIdx ) {
+      sqlite3VdbeResolveLabel(v, addrUniqueOk);
+      continue;
+    }
+
     /* Find out what action to take in case there is a uniqueness conflict */
     onError = pIdx->onError;
 #if defined(SQLITE_BUILDING_FOR_COMDB2)

tests/upsert.test/t00_upsert.expected

@@ -215,3 +215,6 @@ keys
 (rows inserted=1)
 [INSERT INTO t1 VALUES(2,1) ON CONFLICT(i) DO NOTHING] failed with rc 299 add key constraint duplicate key '$KEY_1E727833' on table 't1' index 1
 (i=1, j=1)
+(test='--- Test with 2 unique indices ----')
+(rows inserted=2)
+[INSERT INTO t1 VALUES(3,2) ON CONFLICT(i) DO UPDATE SET j=j+2] failed with rc 2 

tests/upsert.test/t00_upsert.sql

@@ -319,3 +319,10 @@ INSERT INTO t1 VALUES(2,1) ON CONFLICT(i) DO NOTHING;
 SELECT * FROM t1 ORDER BY 1;
 
 DROP TABLE t1;
+
+SELECT '--- Test with 2 unique indices ----' as test;
+CREATE TABLE t1(i INT UNIQUE, j INT UNIQUE)$$
+INSERT INTO t1 VALUES(1,3), (2,2);
+INSERT INTO t1 VALUES(3,2) ON CONFLICT(i) DO UPDATE SET j=j+2;
+DROP TABLE t1;
+