use idxStr in xFilter

tantaman · tantaman · commit a14d1ab144b0 · 2023-04-21T20:18:27.000-04:00
diff --git a/core/src/changes-vtab-read.c b/core/src/changes-vtab-read.c
@@ -9,7 +9,7 @@
  * Construct the query to grab the changes made against
  * rows in a given table
  */
-char *crsql_changesQueryForTable(crsql_TableInfo *tableInfo, int idxNum) {
+char *crsql_changesQueryForTable(crsql_TableInfo *tableInfo) {
   if (tableInfo->pksLen == 0) {
     return 0;
   }
@@ -22,13 +22,8 @@ char *crsql_changesQueryForTable(crsql_TableInfo *tableInfo, int idxNum) {
       __crsql_col_version as col_vrsn,\
       __crsql_db_version as db_vrsn,\
       __crsql_site_id as site_id\
-    FROM \"%s__crsql_clock\"\
-    WHERE\
-      site_id IS %s ?\
-    AND\
-      db_vrsn > ?",
-      tableInfo->tblName, crsql_quoteConcat(tableInfo->pks, tableInfo->pksLen),
-      tableInfo->tblName, (idxNum & 8) == 8 ? "" : "NOT");
+    FROM \"%s__crsql_clock\"",
+      tableInfo->tblName, crsql_quoteConcat(tableInfo->pks, tableInfo->pksLen));
 
   return zSql;
 }
@@ -46,14 +41,14 @@ char *crsql_changesQueryForTable(crsql_TableInfo *tableInfo, int idxNum) {
  * set of changes
  */
 char *crsql_changesUnionQuery(crsql_TableInfo **tableInfos, int tableInfosLen,
-                              int idxNum) {
+                              const char *idxStr) {
   char **unionsArr = sqlite3_malloc(tableInfosLen * sizeof(char *));
   char *unionsStr = 0;
   int i = 0;
 
   // TODO: what if there are no table infos?
   for (i = 0; i < tableInfosLen; ++i) {
-    unionsArr[i] = crsql_changesQueryForTable(tableInfos[i], idxNum);
+    unionsArr[i] = crsql_changesQueryForTable(tableInfos[i]);
     if (unionsArr[i] == 0) {
       for (int j = 0; j < i; j++) {
         sqlite3_free(unionsArr[j]);
@@ -76,9 +71,10 @@ char *crsql_changesUnionQuery(crsql_TableInfo **tableInfos, int tableInfosLen,
 
   // compose the final query
   return sqlite3_mprintf(
-      "SELECT tbl, pks, cid, col_vrsn, db_vrsn, site_id FROM (%z) ORDER BY "
+      "SELECT tbl, pks, cid, col_vrsn, db_vrsn, site_id FROM (%z) %s%s ORDER "
+      "BY "
       "db_vrsn, tbl ASC",
-      unionsStr);
+      unionsStr, strlen(idxStr) > 0 ? "WHERE " : "", idxStr);
   // %z frees unionsStr https://www.sqlite.org/printf.html#percentz
 }
 
diff --git a/core/src/changes-vtab-read.h b/core/src/changes-vtab-read.h
@@ -7,7 +7,7 @@ SQLITE_EXTENSION_INIT3
 #include "changes-vtab-common.h"
 #include "tableinfo.h"
 
-char *crsql_changesQueryForTable(crsql_TableInfo *tableInfo, int idxNum);
+char *crsql_changesQueryForTable(crsql_TableInfo *tableInfo);
 
 #define TBL 0
 #define PKS 1
@@ -16,7 +16,7 @@ char *crsql_changesQueryForTable(crsql_TableInfo *tableInfo, int idxNum);
 #define DB_VRSN 4
 #define SITE_ID 5
 char *crsql_changesUnionQuery(crsql_TableInfo **tableInfos, int tableInfosLen,
-                              int idxNum);
+                              const char *idxStr);
 char *crsql_rowPatchDataQuery(sqlite3 *db, crsql_TableInfo *tblInfo,
                               const char *colName, const char *pks);
 
diff --git a/core/src/changes-vtab-read.test.c b/core/src/changes-vtab-read.test.c
@@ -23,7 +23,7 @@ static void testChangesQueryForTable() {
   rc += crsql_getTableInfo(db, "foo", &tblInfo, &err);
   assert(rc == SQLITE_OK);
 
-  char *query = crsql_changesQueryForTable(tblInfo, 6);
+  char *query = crsql_changesQueryForTable(tblInfo);
 
   assert(strcmp(query,
                 "SELECT      \'foo\' as tbl,      quote(\"a\") as pks,      "
@@ -33,7 +33,7 @@ static void testChangesQueryForTable() {
                 "WHERE      site_id IS NOT ?    AND      db_vrsn > ?") == 0);
   sqlite3_free(query);
 
-  query = crsql_changesQueryForTable(tblInfo, 8);
+  query = crsql_changesQueryForTable(tblInfo);
   assert(strcmp(query,
                 "SELECT      \'foo\' as tbl,      quote(\"a\") as pks,      "
                 "__crsql_col_name as cid,      __crsql_col_version as "
@@ -68,7 +68,7 @@ static void testChangesUnionQuery() {
   rc += crsql_getTableInfo(db, "bar", &tblInfos[1], &err);
   assert(rc == SQLITE_OK);
 
-  char *query = crsql_changesUnionQuery(tblInfos, 2, 6);
+  char *query = crsql_changesUnionQuery(tblInfos, 2, "");
   assert(
       strcmp(
           query,
@@ -84,7 +84,7 @@ static void testChangesUnionQuery() {
           "NOT ?    AND      db_vrsn > ?) ORDER BY db_vrsn, tbl ASC") == 0);
   sqlite3_free(query);
 
-  query = crsql_changesUnionQuery(tblInfos, 2, 8);
+  query = crsql_changesUnionQuery(tblInfos, 2, "");
   assert(
       strcmp(
           query,
diff --git a/core/src/changes-vtab.c b/core/src/changes-vtab.c
@@ -361,7 +361,7 @@ static int changesFilter(sqlite3_vtab_cursor *pVtabCursor, int idxNum,
   }
 
   char *zSql = crsql_changesUnionQuery(pTab->pExtData->zpTableInfos,
-                                       pTab->pExtData->tableInfosLen, idxNum);
+                                       pTab->pExtData->tableInfosLen, idxStr);
 
   if (zSql == 0) {
     pTabBase->zErrMsg = sqlite3_mprintf(
@@ -379,46 +379,59 @@ static int changesFilter(sqlite3_vtab_cursor *pVtabCursor, int idxNum,
     return rc;
   }
 
-  // pull user provided params to `getChanges`
-  int i = 0;
-  sqlite3_int64 versionBound = MIN_POSSIBLE_DB_VERSION;
-  const char *requestorSiteId = "aa";
-  int siteIdType = SQLITE_BLOB;
-  int requestorSiteIdLen = 1;
-  if (idxNum & 2) {
-    versionBound = sqlite3_value_int64(argv[i]);
-    ++i;
-  }
-  if (idxNum & 4) {
-    siteIdType = sqlite3_value_type(argv[i]);
-    requestorSiteIdLen = sqlite3_value_bytes(argv[i]);
-    if (requestorSiteIdLen != 0) {
-      requestorSiteId = (const char *)sqlite3_value_blob(argv[i]);
-    } else {
-      requestorSiteIdLen = 1;
-    }
-    ++i;
-  }
-
   // now bind the params.
-  // for each table info we need to bind 2 params:
-  // 1. the site id
-  // 2. the version
-  int j = 1;
-  for (i = 0; i < pTab->pExtData->tableInfosLen; ++i) {
-    if (siteIdType == SQLITE_NULL) {
-      sqlite3_bind_null(pStmt, j++);
-    } else {
-      sqlite3_bind_blob(pStmt, j++, requestorSiteId, requestorSiteIdLen,
-                        SQLITE_STATIC);
+  // for each arg, bind.
+  for (int i = 0; i < argc; ++i) {
+    rc = sqlite3_bind_value(pStmt, i + 1, argv[i]);
+    if (rc != SQLITE_OK) {
+      pTabBase->zErrMsg = sqlite3_mprintf(
+          "error binding params to the statement to extract "
+          "changes.");
+      sqlite3_finalize(pStmt);
+      return rc;
     }
-    sqlite3_bind_int64(pStmt, j++, versionBound);
   }
 
   pCrsr->pChangesStmt = pStmt;
   return changesNext((sqlite3_vtab_cursor *)pCrsr);
 }
 
+static const char *getOperatorString(unsigned char op) {
+  // SQLITE_INDEX_CONSTRAINT_NE
+  switch (op) {
+    case SQLITE_INDEX_CONSTRAINT_EQ:
+      return "=";
+    case SQLITE_INDEX_CONSTRAINT_GT:
+      return ">";
+    case SQLITE_INDEX_CONSTRAINT_LE:
+      return "<=";
+    case SQLITE_INDEX_CONSTRAINT_LT:
+      return "<";
+    case SQLITE_INDEX_CONSTRAINT_GE:
+      return ">=";
+    case SQLITE_INDEX_CONSTRAINT_MATCH:
+      return "MATCH";
+    case SQLITE_INDEX_CONSTRAINT_LIKE:
+      return "LIKE";
+    case SQLITE_INDEX_CONSTRAINT_GLOB:
+      return "GLOB";
+    case SQLITE_INDEX_CONSTRAINT_REGEXP:
+      return "REGEXP";
+    case SQLITE_INDEX_CONSTRAINT_NE:
+      return "!=";
+    case SQLITE_INDEX_CONSTRAINT_ISNOT:
+      return "IS NOT";
+    case SQLITE_INDEX_CONSTRAINT_ISNOTNULL:
+      return "IS NOT NULL";
+    case SQLITE_INDEX_CONSTRAINT_ISNULL:
+      return "IS NULL";
+    case SQLITE_INDEX_CONSTRAINT_IS:
+      return "IS";
+    default:
+      return 0;
+  }
+}
+
 /*
 ** SQLite will invoke this method one or more times while planning a query
 ** that uses the virtual table.  This routine needs to create
@@ -481,8 +494,6 @@ static int changesBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo) {
       argvIndex += 1;
     }
 
-    const struct sqlite3_index_constraint *pConstraint =
-        &pIdxInfo->aConstraint[i];
     switch (pConstraint->iColumn) {
       case CHANGES_SINCE_VTAB_DB_VRSN:
         idxNum |= 2;
@@ -520,42 +531,6 @@ static int changesBestIndex(sqlite3_vtab *tab, sqlite3_index_info *pIdxInfo) {
   return SQLITE_OK;
 }
 
-static const char *getOperatorString(unsigned char op) {
-  // SQLITE_INDEX_CONSTRAINT_NE
-  switch (op) {
-    case SQLITE_INDEX_CONSTRAINT_EQ:
-      return "=";
-    case SQLITE_INDEX_CONSTRAINT_GT:
-      return ">";
-    case SQLITE_INDEX_CONSTRAINT_LE:
-      return "<=";
-    case SQLITE_INDEX_CONSTRAINT_LT:
-      return "<";
-    case SQLITE_INDEX_CONSTRAINT_GE:
-      return ">=";
-    case SQLITE_INDEX_CONSTRAINT_MATCH:
-      return "MATCH";
-    case SQLITE_INDEX_CONSTRAINT_LIKE:
-      return "LIKE";
-    case SQLITE_INDEX_CONSTRAINT_GLOB:
-      return "GLOB";
-    case SQLITE_INDEX_CONSTRAINT_REGEXP:
-      return "REGEXP";
-    case SQLITE_INDEX_CONSTRAINT_NE:
-      return "!=";
-    case SQLITE_INDEX_CONSTRAINT_ISNOT:
-      return "IS NOT";
-    case SQLITE_INDEX_CONSTRAINT_ISNOTNULL:
-      return "IS NOT NULL";
-    case SQLITE_INDEX_CONSTRAINT_ISNULL:
-      return "IS NULL";
-    case SQLITE_INDEX_CONSTRAINT_IS:
-      return "IS";
-    default:
-      return 0;
-  }
-}
-
 static int changesApply(sqlite3_vtab *pVTab, int argc, sqlite3_value **argv,
                         sqlite3_int64 *pRowid) {
   int argv0Type = sqlite3_value_type(argv[0]);
