gitnexus 1.6.8-rc.2 → 1.6.8-rc.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -16,8 +16,8 @@ import { extractStructuralNames } from './structural-extractor.js';
|
|
|
16
16
|
import { EMBEDDABLE_LABELS, isShortLabel, LABEL_METHOD, LABELS_WITH_EXPORTED, STRUCTURAL_LABELS, collectBestChunks, } from './types.js';
|
|
17
17
|
import { resolveEmbeddingConfig } from './config.js';
|
|
18
18
|
import { rankExactEmbeddingRows } from './exact-search.js';
|
|
19
|
-
import { EMBEDDING_TABLE_NAME, EMBEDDING_INDEX_NAME,
|
|
20
|
-
import { loadVectorExtension } from '../lbug/lbug-adapter.js';
|
|
19
|
+
import { EMBEDDING_TABLE_NAME, EMBEDDING_INDEX_NAME, STALE_HASH_SENTINEL } from '../lbug/schema.js';
|
|
20
|
+
import { loadVectorExtension, createVectorIndex } from '../lbug/lbug-adapter.js';
|
|
21
21
|
import { getExactScanLimit } from '../platform/capabilities.js';
|
|
22
22
|
import { logger } from '../logger.js';
|
|
23
23
|
const isDev = process.env.NODE_ENV === 'development';
|
|
@@ -153,24 +153,35 @@ export const batchInsertEmbeddings = async (executeWithReusedStatement, updates)
|
|
|
153
153
|
await executeWithReusedStatement(cypher, paramsList);
|
|
154
154
|
};
|
|
155
155
|
/**
|
|
156
|
-
* Create the vector index for semantic search
|
|
157
|
-
|
|
158
|
-
*
|
|
159
|
-
*
|
|
160
|
-
*
|
|
161
|
-
|
|
156
|
+
* Create the vector index for semantic search (indexes the CodeEmbedding table).
|
|
157
|
+
*
|
|
158
|
+
* Keeps the embedding-specific extension-install policy gate here
|
|
159
|
+
* (ensureVectorExtensionAvailable → resolveEmbeddingInstallPolicy, default
|
|
160
|
+
* `auto` for the analyze write path), then delegates the actual
|
|
161
|
+
* `CALL CREATE_VECTOR_INDEX(...)` to the adapter, which runs it through the
|
|
162
|
+
* unprepared `conn.query()` path. It must NOT go through the injected
|
|
163
|
+
* `executeQuery` (prepared `conn.prepare()`): LadybugDB cannot prepare that
|
|
164
|
+
* procedure and fails with "We do not support prepare multiple statements" —
|
|
165
|
+
* the silent degrade in #2114.
|
|
162
166
|
*/
|
|
163
|
-
const
|
|
167
|
+
const buildVectorIndex = async () => {
|
|
168
|
+
// This pre-check applies the embedding-specific install policy
|
|
169
|
+
// (resolveEmbeddingInstallPolicy, default `auto` for analyze) before reaching
|
|
170
|
+
// the adapter. The adapter's createVectorIndex() calls loadVectorExtension()
|
|
171
|
+
// again, but that's a no-op here: once this gate loads VECTOR the module-level
|
|
172
|
+
// `vectorExtensionLoaded` flag is set, so the adapter's second call
|
|
173
|
+
// short-circuits without re-resolving the policy — no double install.
|
|
164
174
|
if (!(await ensureVectorExtensionAvailable()))
|
|
165
175
|
return false;
|
|
166
176
|
try {
|
|
167
|
-
await
|
|
168
|
-
return true;
|
|
177
|
+
return await createVectorIndex();
|
|
169
178
|
}
|
|
170
179
|
catch (error) {
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
180
|
+
// Surface this even outside dev: it silently downgrades a user-requested
|
|
181
|
+
// feature (semantic search) to exact scan. Log under `err` so pino's
|
|
182
|
+
// standard serializer captures the message/stack — logging under `error`
|
|
183
|
+
// serialized an Error to `{}` (the empty `{"error":{}}` reported in #2114).
|
|
184
|
+
logger.warn({ err: error }, 'Vector index creation failed; semantic search will use exact-scan fallback');
|
|
174
185
|
return false;
|
|
175
186
|
}
|
|
176
187
|
};
|
|
@@ -283,7 +294,7 @@ export const runEmbeddingPipeline = async (executeQuery, executeWithReusedStatem
|
|
|
283
294
|
// Ensure the vector index exists even when no new nodes need embedding.
|
|
284
295
|
// A prior crash or first-time incremental run may have left CodeEmbedding
|
|
285
296
|
// rows without ever reaching index creation.
|
|
286
|
-
const vectorIndexReady = await
|
|
297
|
+
const vectorIndexReady = await buildVectorIndex();
|
|
287
298
|
onProgress({
|
|
288
299
|
phase: 'ready',
|
|
289
300
|
percent: 100,
|
|
@@ -403,7 +414,7 @@ export const runEmbeddingPipeline = async (executeQuery, executeWithReusedStatem
|
|
|
403
414
|
if (isDev) {
|
|
404
415
|
logger.info('📇 Creating vector index...');
|
|
405
416
|
}
|
|
406
|
-
const vectorIndexReady = await
|
|
417
|
+
const vectorIndexReady = await buildVectorIndex();
|
|
407
418
|
onProgress({
|
|
408
419
|
phase: 'ready',
|
|
409
420
|
percent: 100,
|
|
@@ -233,6 +233,25 @@ export declare const loadVectorExtension: (targetConn?: lbug.Connection, opts?:
|
|
|
233
233
|
* @param stemmer - Stemming algorithm (default: 'porter')
|
|
234
234
|
*/
|
|
235
235
|
export declare const createFTSIndex: (tableName: string, indexName: string, properties: string[], stemmer?: string) => Promise<void>;
|
|
236
|
+
/**
|
|
237
|
+
* Create the HNSW vector index on the CodeEmbedding table.
|
|
238
|
+
*
|
|
239
|
+
* MUST run via `conn.query()` (here through `queryAndDrain`), NOT through the
|
|
240
|
+
* prepared `executeQuery`/`conn.prepare()` path: `CALL CREATE_VECTOR_INDEX(...)`
|
|
241
|
+
* compiles to multiple statements, which LadybugDB cannot prepare — it fails
|
|
242
|
+
* with "Connection Exception: We do not support prepare multiple statements."
|
|
243
|
+
* Routing index creation through `executeQuery` (prepared) is exactly what
|
|
244
|
+
* broke vector-index creation during `analyze` (#2114; the singleton
|
|
245
|
+
* `executeQuery` was switched to the prepared path in #1655 while FTS index
|
|
246
|
+
* creation kept using `conn.query()`, which is why FTS survived and VECTOR did
|
|
247
|
+
* not). Mirrors `createFTSIndex` above.
|
|
248
|
+
*
|
|
249
|
+
* Returns `true` on success (or when the index already exists — idempotent so
|
|
250
|
+
* incremental re-runs don't spuriously downgrade to exact scan), `false` when
|
|
251
|
+
* the VECTOR extension is unavailable or the connection is read-only. Any other
|
|
252
|
+
* failure propagates so the caller can log it.
|
|
253
|
+
*/
|
|
254
|
+
export declare const createVectorIndex: () => Promise<boolean>;
|
|
236
255
|
/**
|
|
237
256
|
* Lazy-create an FTS index, caching the fact in-process.
|
|
238
257
|
*
|
|
@@ -8,7 +8,7 @@ import os from 'os';
|
|
|
8
8
|
import crypto from 'crypto';
|
|
9
9
|
import lbug from '@ladybugdb/core';
|
|
10
10
|
import { closeQueryResults } from './query-result-utils.js';
|
|
11
|
-
import { NODE_TABLES, REL_TABLE_NAME, SCHEMA_QUERIES, EMBEDDING_TABLE_NAME, STALE_HASH_SENTINEL, } from './schema.js';
|
|
11
|
+
import { NODE_TABLES, REL_TABLE_NAME, SCHEMA_QUERIES, EMBEDDING_TABLE_NAME, CREATE_VECTOR_INDEX_QUERY, STALE_HASH_SENTINEL, } from './schema.js';
|
|
12
12
|
import { streamAllCSVsToDisk } from './csv-generator.js';
|
|
13
13
|
import { extensionManager } from './extension-loader.js';
|
|
14
14
|
import { closeLbugConnection, isDbBusyError, isOpenRetryExhausted, isWalCorruptionError, openLbugConnection, toNativeSafePath, WAL_RECOVERY_SUGGESTION, waitForWindowsHandleRelease, } from './lbug-config.js';
|
|
@@ -119,6 +119,11 @@ let currentDbPath = null;
|
|
|
119
119
|
let currentDbReadOnly = false;
|
|
120
120
|
let ftsLoaded = false;
|
|
121
121
|
let vectorExtensionLoaded = false;
|
|
122
|
+
// In-process guard so a repeated createVectorIndex() within one connection
|
|
123
|
+
// lifetime skips the DB round-trip (mirrors ensuredFTSIndexes). Reset wherever
|
|
124
|
+
// vectorExtensionLoaded resets, so it can never stay true against a swapped or
|
|
125
|
+
// closed connection.
|
|
126
|
+
let vectorIndexEnsured = false;
|
|
122
127
|
/**
|
|
123
128
|
* In-process cache of FTS indexes observed against the current singleton
|
|
124
129
|
* connection. Avoids repeated `CALL CREATE_FTS_INDEX` calls, which can trip
|
|
@@ -494,6 +499,7 @@ const resetOpenConnectionState = () => {
|
|
|
494
499
|
currentDbPath = null;
|
|
495
500
|
ftsLoaded = false;
|
|
496
501
|
vectorExtensionLoaded = false;
|
|
502
|
+
vectorIndexEnsured = false;
|
|
497
503
|
ensuredFTSIndexes.clear();
|
|
498
504
|
};
|
|
499
505
|
const runSchemaCreationQueries = async (dbPath) => {
|
|
@@ -572,6 +578,7 @@ export const withLbugDb = async (dbPath, operation, options = {}) => {
|
|
|
572
578
|
currentDbPath = null;
|
|
573
579
|
ftsLoaded = false;
|
|
574
580
|
vectorExtensionLoaded = false;
|
|
581
|
+
vectorIndexEnsured = false;
|
|
575
582
|
ensuredFTSIndexes.clear();
|
|
576
583
|
});
|
|
577
584
|
// Sleep outside the lock — no need to block others while waiting
|
|
@@ -596,6 +603,7 @@ const doInitLbug = async (dbPath, readOnly = false) => {
|
|
|
596
603
|
currentDbPath = null;
|
|
597
604
|
ftsLoaded = false;
|
|
598
605
|
vectorExtensionLoaded = false;
|
|
606
|
+
vectorIndexEnsured = false;
|
|
599
607
|
ensuredFTSIndexes.clear();
|
|
600
608
|
}
|
|
601
609
|
// ---------------------------------------------------------------------------
|
|
@@ -1476,6 +1484,7 @@ export const closeLbug = async () => {
|
|
|
1476
1484
|
currentDbPath = null;
|
|
1477
1485
|
ftsLoaded = false;
|
|
1478
1486
|
vectorExtensionLoaded = false;
|
|
1487
|
+
vectorIndexEnsured = false;
|
|
1479
1488
|
ensuredFTSIndexes.clear();
|
|
1480
1489
|
};
|
|
1481
1490
|
export const isLbugReady = () => conn !== null && db !== null;
|
|
@@ -1708,6 +1717,52 @@ export const createFTSIndex = async (tableName, indexName, properties, stemmer =
|
|
|
1708
1717
|
throw e;
|
|
1709
1718
|
}
|
|
1710
1719
|
};
|
|
1720
|
+
/**
|
|
1721
|
+
* Create the HNSW vector index on the CodeEmbedding table.
|
|
1722
|
+
*
|
|
1723
|
+
* MUST run via `conn.query()` (here through `queryAndDrain`), NOT through the
|
|
1724
|
+
* prepared `executeQuery`/`conn.prepare()` path: `CALL CREATE_VECTOR_INDEX(...)`
|
|
1725
|
+
* compiles to multiple statements, which LadybugDB cannot prepare — it fails
|
|
1726
|
+
* with "Connection Exception: We do not support prepare multiple statements."
|
|
1727
|
+
* Routing index creation through `executeQuery` (prepared) is exactly what
|
|
1728
|
+
* broke vector-index creation during `analyze` (#2114; the singleton
|
|
1729
|
+
* `executeQuery` was switched to the prepared path in #1655 while FTS index
|
|
1730
|
+
* creation kept using `conn.query()`, which is why FTS survived and VECTOR did
|
|
1731
|
+
* not). Mirrors `createFTSIndex` above.
|
|
1732
|
+
*
|
|
1733
|
+
* Returns `true` on success (or when the index already exists — idempotent so
|
|
1734
|
+
* incremental re-runs don't spuriously downgrade to exact scan), `false` when
|
|
1735
|
+
* the VECTOR extension is unavailable or the connection is read-only. Any other
|
|
1736
|
+
* failure propagates so the caller can log it.
|
|
1737
|
+
*/
|
|
1738
|
+
export const createVectorIndex = async () => {
|
|
1739
|
+
if (!conn) {
|
|
1740
|
+
throw new Error('LadybugDB not initialized. Call initLbug first.');
|
|
1741
|
+
}
|
|
1742
|
+
// Already built on this connection — skip the round-trip (mirrors createFTSIndex).
|
|
1743
|
+
if (vectorIndexEnsured)
|
|
1744
|
+
return true;
|
|
1745
|
+
if (!(await loadVectorExtension())) {
|
|
1746
|
+
return false;
|
|
1747
|
+
}
|
|
1748
|
+
try {
|
|
1749
|
+
await queryAndDrain(conn, CREATE_VECTOR_INDEX_QUERY);
|
|
1750
|
+
vectorIndexEnsured = true;
|
|
1751
|
+
return true;
|
|
1752
|
+
}
|
|
1753
|
+
catch (e) {
|
|
1754
|
+
const msg = e instanceof Error ? e.message : String(e);
|
|
1755
|
+
// Idempotent: a prior analyze already built the HNSW index.
|
|
1756
|
+
if (msg.includes('already exists')) {
|
|
1757
|
+
vectorIndexEnsured = true;
|
|
1758
|
+
return true;
|
|
1759
|
+
}
|
|
1760
|
+
// Read-only DB (e.g. the MCP query pool): writable analyze owns creation.
|
|
1761
|
+
if (isReadOnlyDbError(e))
|
|
1762
|
+
return false;
|
|
1763
|
+
throw e;
|
|
1764
|
+
}
|
|
1765
|
+
};
|
|
1711
1766
|
/**
|
|
1712
1767
|
* Lazy-create an FTS index, caching the fact in-process.
|
|
1713
1768
|
*
|
package/package.json
CHANGED