spice-couchbase 2.0.46 → 2.0.47

package/build/index.js

@@ -824,9 +824,7 @@ module.exports = class Database {
         }); // 4. Execute the index creation if we got a valid statement
 
         if (indexStatement) {
-          console.log("Executing index creation:", indexStatement);
           var response = yield exec_scope.query(indexStatement);
-          console.log("Index creation response:", response);
         }
       } catch (e) {// Silently handle errors (index may already exist, etc.)
       }
@@ -859,10 +857,10 @@ module.exports = class Database {
       var endTime = process.hrtime.bigint(); // Calculate duration in microseconds
 
       var durationInMilliseconds = (endTime - startTime) / BigInt(1000000); // optimize if response time is greater than 1 second
-      //if (durationInMilliseconds > 2000) {
-
-      _this19.optimize(query, exec_scope); //}
 
+      if (durationInMilliseconds > 2000) {
+        _this19.optimize(query, exec_scope);
+      }
 
       return response;
     })();

package/build/utility.js

@@ -323,22 +323,17 @@ function buildCoveringIndex(query, options) {
   if (allFields.length === 0) {
     // No fields to index besides deleted
     return null;
-  } // Generate unique index name based on query hash
+  } // Build the field list with deleted INCLUDE MISSING first
 
 
-  var hash = generateHash(query);
-  var indexName = "adv_covered_".concat(hash); // Build the field list with deleted INCLUDE MISSING first
+  var fieldList = ["`deleted` INCLUDE MISSING", ...allFields.map(f => "`".concat(f, "`"))].join(", "); // Generate unique index name based on bucket, scope, collection, and fields
+  // This ensures multiple queries covered by the same index get the same hash
 
-  var fieldList = ["`deleted` INCLUDE MISSING", ...allFields.map(f => "`".concat(f, "`"))].join(", "); // Build the CREATE INDEX statement
+  var indexKey = "".concat(bucket, "|").concat(scope, "|").concat(collection, "|").concat(allFields.sort().join(","));
+  var hash = generateHash(indexKey);
+  var indexName = "adv_covered_".concat(hash); // Build the CREATE INDEX statement
 
-  var indexStatement = "CREATE INDEX `".concat(indexName, "` ON `default`:`").concat(bucket, "`.`").concat(scope, "`.`").concat(collection, "`(").concat(fieldList, ")"); // Debug logs
-
-  console.log("[DEBUG buildCoveringIndex] Original query:", query);
-  console.log("[DEBUG buildCoveringIndex] WHERE fields:", filteredWhereFields);
-  console.log("[DEBUG buildCoveringIndex] GROUP BY fields:", filteredGroupByFields);
-  console.log("[DEBUG buildCoveringIndex] ORDER BY fields:", filteredOrderByFields);
-  console.log("[DEBUG buildCoveringIndex] SELECT fields:", selectFieldsFiltered);
-  console.log("[DEBUG buildCoveringIndex] Index statement:", indexStatement);
+  var indexStatement = "CREATE INDEX `".concat(indexName, "` ON `default`:`").concat(bucket, "`.`").concat(scope, "`.`").concat(collection, "`(").concat(fieldList, ")");
   return indexStatement;
 }
 

package/build/utility.test.js

@@ -586,6 +586,29 @@ test("consistent index name for same query", () => {
   var result2 = buildCoveringIndex(query, defaultOptions);
   assert.strictEqual(result1, result2);
 });
+test("same index name for different queries with same fields", () => {
+  // Two different queries that would be covered by the same index
+  var query1 = "SELECT name, email FROM users WHERE status = 'active'";
+  var query2 = "SELECT email, name FROM users WHERE status = 'pending'";
+  var result1 = buildCoveringIndex(query1, defaultOptions);
+  var result2 = buildCoveringIndex(query2, defaultOptions); // Extract index names
+
+  var name1 = result1.match(/CREATE INDEX `(adv_covered_\w+)`/)[1];
+  var name2 = result2.match(/CREATE INDEX `(adv_covered_\w+)`/)[1]; // Should have the same index name since they have the same fields
+
+  assert.strictEqual(name1, name2);
+});
+test("different index name for queries with different fields", () => {
+  var query1 = "SELECT name FROM users WHERE status = 'active'";
+  var query2 = "SELECT email FROM users WHERE type = 'admin'";
+  var result1 = buildCoveringIndex(query1, defaultOptions);
+  var result2 = buildCoveringIndex(query2, defaultOptions); // Extract index names
+
+  var name1 = result1.match(/CREATE INDEX `(adv_covered_\w+)`/)[1];
+  var name2 = result2.match(/CREATE INDEX `(adv_covered_\w+)`/)[1]; // Should have different index names since they have different fields
+
+  assert.notStrictEqual(name1, name2);
+});
 test("index includes all fields needed for covering", () => {
   var query = "SELECT \n    first_name, \n    middle_name, \n    last_name, \n    status, \n    constituency, \n    division, \n    description \n  FROM subject \n  WHERE (deleted = false OR deleted IS MISSING) \n    AND created_at > '2024-01-01'";
   var result = buildCoveringIndex(query, defaultOptions); // Verify structure matches the working example pattern

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spice-couchbase",
-  "version": "2.0.46",
+  "version": "2.0.47",
   "description": "",
   "main": "build/index.js",
   "scripts": {

package/src/utility.js

@@ -342,16 +342,18 @@ function buildCoveringIndex(query, options) {
     return null;
   }
 
-  // Generate unique index name based on query hash
-  const hash = generateHash(query);
-  const indexName = `adv_covered_${hash}`;
-
   // Build the field list with deleted INCLUDE MISSING first
   const fieldList = [
     "`deleted` INCLUDE MISSING",
     ...allFields.map((f) => `\`${f}\``),
   ].join(", ");
 
+  // Generate unique index name based on bucket, scope, collection, and fields
+  // This ensures multiple queries covered by the same index get the same hash
+  const indexKey = `${bucket}|${scope}|${collection}|${allFields.sort().join(",")}`;
+  const hash = generateHash(indexKey);
+  const indexName = `adv_covered_${hash}`;
+
   // Build the CREATE INDEX statement
   const indexStatement = `CREATE INDEX \`${indexName}\` ON \`default\`:\`${bucket}\`.\`${scope}\`.\`${collection}\`(${fieldList})`;
 

package/src/utility.test.js

@@ -706,6 +706,37 @@ test("consistent index name for same query", () => {
   assert.strictEqual(result1, result2);
 });
 
+test("same index name for different queries with same fields", () => {
+  // Two different queries that would be covered by the same index
+  const query1 = "SELECT name, email FROM users WHERE status = 'active'";
+  const query2 = "SELECT email, name FROM users WHERE status = 'pending'";
+  
+  const result1 = buildCoveringIndex(query1, defaultOptions);
+  const result2 = buildCoveringIndex(query2, defaultOptions);
+  
+  // Extract index names
+  const name1 = result1.match(/CREATE INDEX `(adv_covered_\w+)`/)[1];
+  const name2 = result2.match(/CREATE INDEX `(adv_covered_\w+)`/)[1];
+  
+  // Should have the same index name since they have the same fields
+  assert.strictEqual(name1, name2);
+});
+
+test("different index name for queries with different fields", () => {
+  const query1 = "SELECT name FROM users WHERE status = 'active'";
+  const query2 = "SELECT email FROM users WHERE type = 'admin'";
+  
+  const result1 = buildCoveringIndex(query1, defaultOptions);
+  const result2 = buildCoveringIndex(query2, defaultOptions);
+  
+  // Extract index names
+  const name1 = result1.match(/CREATE INDEX `(adv_covered_\w+)`/)[1];
+  const name2 = result2.match(/CREATE INDEX `(adv_covered_\w+)`/)[1];
+  
+  // Should have different index names since they have different fields
+  assert.notStrictEqual(name1, name2);
+});
+
 test("index includes all fields needed for covering", () => {
   const query = `SELECT 
     first_name,