Merge pull request #1687 from tursodatabase/vector-search-fix-integrity-check

vector search: fix integrity check

Author: sivukhin

libsql-ffi/bundled/SQLite3MultipleCiphers/src/sqlite3.c

@@ -137030,10 +137030,11 @@ SQLITE_PRIVATE int sqlite3OpenTableAndIndices(
        * As vector index creates empty B-tree index - it's safe to issue
        * OP_OpenRead command for it
        *
-       * TODO: with current implementation, integrity_check will output error
-       * for vector index as rows will be missed in it
-       * It's better to remove this error in future - but for now it's unclear
-       * how to do that with minimal code changes
+       * In order to not produce integrity check errors we skip vector indices
+       * from integrity checks in pragma.c implementation
+       *
+       * Note, that it's dangerous to skip some indices in this code as sqlite3 rely
+       * on the fact that cursors will be opened for every index in order
        */
 #ifndef SQLITE_OMIT_VECTOR
       if( IsVectorIndex(pIdx) && op == OP_OpenWrite ){
@@ -142035,6 +142036,7 @@ SQLITE_PRIVATE void sqlite3Pragma(
             int kk;
             int ckUniq = sqlite3VdbeMakeLabel(pParse);
             if( pPk==pIdx ) continue;
+            if( IsVectorIndex(pIdx) ) continue;
             r1 = sqlite3GenerateIndexKey(pParse, pIdx, iDataCur, 0, 0, &jmp3,
                                          pPrior, r1);
             pPrior = pIdx;
@@ -142119,6 +142121,7 @@ SQLITE_PRIVATE void sqlite3Pragma(
           sqlite3VdbeLoadString(v, 2, "wrong # of entries in index ");
           for(j=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, j++){
             if( pPk==pIdx ) continue;
+            if( IsVectorIndex(pIdx) ) continue;
             sqlite3VdbeAddOp2(v, OP_Count, iIdxCur+j, 3);
             addr = sqlite3VdbeAddOp3(v, OP_Eq, 8+j, 0, 3); VdbeCoverage(v);
             sqlite3VdbeChangeP5(v, SQLITE_NOTNULL);

libsql-ffi/bundled/src/sqlite3.c

@@ -137030,10 +137030,11 @@ SQLITE_PRIVATE int sqlite3OpenTableAndIndices(
        * As vector index creates empty B-tree index - it's safe to issue
        * OP_OpenRead command for it
        *
-       * TODO: with current implementation, integrity_check will output error
-       * for vector index as rows will be missed in it
-       * It's better to remove this error in future - but for now it's unclear
-       * how to do that with minimal code changes
+       * In order to not produce integrity check errors we skip vector indices
+       * from integrity checks in pragma.c implementation
+       *
+       * Note, that it's dangerous to skip some indices in this code as sqlite3 rely
+       * on the fact that cursors will be opened for every index in order
        */
 #ifndef SQLITE_OMIT_VECTOR
       if( IsVectorIndex(pIdx) && op == OP_OpenWrite ){
@@ -142035,6 +142036,7 @@ SQLITE_PRIVATE void sqlite3Pragma(
             int kk;
             int ckUniq = sqlite3VdbeMakeLabel(pParse);
             if( pPk==pIdx ) continue;
+            if( IsVectorIndex(pIdx) ) continue;
             r1 = sqlite3GenerateIndexKey(pParse, pIdx, iDataCur, 0, 0, &jmp3,
                                          pPrior, r1);
             pPrior = pIdx;
@@ -142119,6 +142121,7 @@ SQLITE_PRIVATE void sqlite3Pragma(
           sqlite3VdbeLoadString(v, 2, "wrong # of entries in index ");
           for(j=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, j++){
             if( pPk==pIdx ) continue;
+            if( IsVectorIndex(pIdx) ) continue;
             sqlite3VdbeAddOp2(v, OP_Count, iIdxCur+j, 3);
             addr = sqlite3VdbeAddOp3(v, OP_Eq, 8+j, 0, 3); VdbeCoverage(v);
             sqlite3VdbeChangeP5(v, SQLITE_NOTNULL);

libsql-sqlite3/src/insert.c

@@ -2699,10 +2699,11 @@ int sqlite3OpenTableAndIndices(
        * As vector index creates empty B-tree index - it's safe to issue
        * OP_OpenRead command for it
        *
-       * TODO: with current implementation, integrity_check will output error
-       * for vector index as rows will be missed in it
-       * It's better to remove this error in future - but for now it's unclear
-       * how to do that with minimal code changes
+       * In order to not produce integrity check errors we skip vector indices
+       * from integrity checks in pragma.c implementation
+       *
+       * Note, that it's dangerous to skip some indices in this code as sqlite3 rely
+       * on the fact that cursors will be opened for every index in order
        */
 #ifndef SQLITE_OMIT_VECTOR
       if( IsVectorIndex(pIdx) && op == OP_OpenWrite ){

libsql-sqlite3/src/pragma.c

@@ -2023,6 +2023,7 @@ void sqlite3Pragma(
             int kk;
             int ckUniq = sqlite3VdbeMakeLabel(pParse);
             if( pPk==pIdx ) continue;
+            if( IsVectorIndex(pIdx) ) continue;
             r1 = sqlite3GenerateIndexKey(pParse, pIdx, iDataCur, 0, 0, &jmp3,
                                          pPrior, r1);
             pPrior = pIdx;
@@ -2107,6 +2108,7 @@ void sqlite3Pragma(
           sqlite3VdbeLoadString(v, 2, "wrong # of entries in index ");
           for(j=0, pIdx=pTab->pIndex; pIdx; pIdx=pIdx->pNext, j++){
             if( pPk==pIdx ) continue;
+            if( IsVectorIndex(pIdx) ) continue;
             sqlite3VdbeAddOp2(v, OP_Count, iIdxCur+j, 3);
             addr = sqlite3VdbeAddOp3(v, OP_Eq, 8+j, 0, 3); VdbeCoverage(v);
             sqlite3VdbeChangeP5(v, SQLITE_NOTNULL);

libsql-sqlite3/test/libsql_vector_index.test

@@ -37,8 +37,7 @@ do_execsql_test vector-pragmas {
   PRAGMA integrity_check;
   PRAGMA index_list='t_pragmas';
 } {
-  {row 1 missing from index t_pragmas_idx}
-  {wrong # of entries in index t_pragmas_idx}
+  {ok}
   0 t_pragmas_idx 0 c 0
 }