@hotmeshio/hotmesh 0.13.0 → 0.14.0

package/build/services/store/providers/postgres/kvtypes/hash/basic.js

@@ -306,19 +306,21 @@ function _hset(context, key, fields, options) {
         const schemaName = context.safeName(context.appId);
         const conflictAction = options?.nx
             ? 'ON CONFLICT DO NOTHING'
-            : `ON CONFLICT (job_id, field) DO UPDATE SET value = EXCLUDED.value`;
+            : `ON CONFLICT (job_id, symbol, dimension) DO UPDATE SET value = EXCLUDED.value`;
         const placeholders = fieldEntries
             .map(([field, value], index) => {
-            const baseIndex = index * 3 + 2; // Adjusted baseIndex
-            params.push(field, value, (0, utils_1.deriveType)(field));
-            return `($${baseIndex}, $${baseIndex + 1}, $${baseIndex + 2}::${schemaName}.type_enum)`;
+            const baseIndex = index * 4 + 2;
+            const { symbol, dimension } = (0, utils_1.splitField)(field);
+            params.push(symbol, dimension, value, (0, utils_1.deriveType)(field));
+            return `($${baseIndex}, $${baseIndex + 1}, $${baseIndex + 2}, $${baseIndex + 3}::${schemaName}.type_enum)`;
         })
             .join(', ');
         sql = `
-      INSERT INTO ${targetTable} (job_id, field, value, type)
-      SELECT 
+      INSERT INTO ${targetTable} (job_id, symbol, dimension, value, type)
+      SELECT
         job.id,
-        vals.field,
+        vals.symbol,
+        vals.dimension,
         vals.value,
         vals.type
       FROM (
@@ -326,7 +328,7 @@ function _hset(context, key, fields, options) {
       ) AS job
       CROSS JOIN (
         VALUES ${placeholders}
-      ) AS vals(field, value, type)
+      ) AS vals(symbol, dimension, value, type)
       ${conflictAction}
       RETURNING 1 as count
     `;
@@ -379,6 +381,7 @@ function _hget(context, key, field) {
     }
     else if (isJobsTableResult) {
         // Fetch a specific field from the attributes table for a job
+        const { symbol, dimension } = (0, utils_1.splitField)(field);
         const sql = `
       SELECT value
       FROM ${tableName}_attributes
@@ -386,9 +389,9 @@ function _hget(context, key, field) {
         SELECT id FROM ${tableName}
         WHERE key = $1 AND is_live
       )
-        AND field = $2
+        AND symbol = $2 AND dimension = $3
     `;
-        return { sql, params: [key, field] };
+        return { sql, params: [key, symbol, dimension] };
     }
     else {
         // Non-jobs tables
@@ -406,9 +409,9 @@ function _hdel(context, key, fields) {
     const tableName = context.tableForKey(key, 'hash');
     const isJobsTableResult = (0, utils_1.isJobsTable)(tableName);
     const targetTable = isJobsTableResult ? `${tableName}_attributes` : tableName;
-    const fieldPlaceholders = fields.map((_, i) => `$${i + 2}`).join(', ');
-    const params = [key, ...fields];
     if (isJobsTableResult) {
+        const symbols = fields.map((f) => (0, utils_1.splitField)(f).symbol);
+        const dimensions = fields.map((f) => (0, utils_1.splitField)(f).dimension);
         const sql = `
       WITH valid_job AS (
         SELECT id
@@ -417,14 +420,16 @@ function _hdel(context, key, fields) {
       ),
       deleted AS (
         DELETE FROM ${targetTable}
-        WHERE job_id IN (SELECT id FROM valid_job) AND field IN (${fieldPlaceholders})
+        WHERE job_id IN (SELECT id FROM valid_job)
+          AND (symbol, dimension) IN (SELECT unnest($2::text[]), unnest($3::text[]))
         RETURNING 1
       )
       SELECT COUNT(*) as count FROM deleted
     `;
-        return { sql, params };
+        return { sql, params: [key, symbols, dimensions] };
     }
     else {
+        const fieldPlaceholders = fields.map((_, i) => `$${i + 2}`).join(', ');
         const sql = `
       WITH deleted AS (
         DELETE FROM ${targetTable}
@@ -433,7 +438,7 @@ function _hdel(context, key, fields) {
       )
       SELECT COUNT(*) as count FROM deleted
     `;
-        return { sql, params };
+        return { sql, params: [key, ...fields] };
     }
 }
 exports._hdel = _hdel;
@@ -441,43 +446,45 @@ function _hmget(context, key, fields) {
     const tableName = context.tableForKey(key, 'hash');
     const isJobsTableResult = (0, utils_1.isJobsTable)(tableName);
     if (isJobsTableResult) {
+        const symbols = fields.map((f) => (0, utils_1.splitField)(f).symbol);
+        const dimensions = fields.map((f) => (0, utils_1.splitField)(f).dimension);
         const sql = `
       WITH valid_job AS (
         SELECT id, status, context
         FROM ${tableName}
-        WHERE key = $1 
+        WHERE key = $1
         AND (expired_at IS NULL OR expired_at > NOW())
         LIMIT 1
       ),
       job_fields AS (
         -- Include both status and context fields from jobs table
-        SELECT 
+        SELECT
           'status' AS field,
           status::text AS value
         FROM valid_job
-        
+
         UNION ALL
-        
-        SELECT 
+
+        SELECT
           'context' AS field,
           context::text AS value
         FROM valid_job
-        
+
         UNION ALL
-        
+
         -- Get attribute fields with proper type handling
-        SELECT 
-          a.field,
+        SELECT
+          a.symbol || a.dimension AS field,
           a.value
         FROM ${tableName}_attributes a
         JOIN valid_job j ON j.id = a.job_id
-        WHERE a.field = ANY($2::text[])
+        WHERE (a.symbol, a.dimension) IN (SELECT unnest($2::text[]), unnest($3::text[]))
       )
       SELECT field, value
       FROM job_fields
       ORDER BY field
     `;
-        return { sql, params: [key, fields] };
+        return { sql, params: [key, symbols, dimensions] };
     }
     else {
         // Non-job tables logic remains the same
@@ -506,15 +513,15 @@ function _hgetall(context, key) {
         SELECT 'status' AS field, status::text AS value
         FROM ${tableName}
         WHERE key = $1 AND is_live
-        
+
         UNION ALL
-        
+
         SELECT 'context' AS field, context::text AS value
         FROM ${tableName}
         WHERE key = $1 AND is_live
       ),
       attribute_data AS (
-        SELECT field, value
+        SELECT symbol || dimension AS field, value
         FROM ${tableName}_attributes
         WHERE job_id IN (SELECT id FROM valid_job)
       )
@@ -549,23 +556,23 @@ function _hincrbyfloat(context, key, field, increment) {
         return { sql, params: [key, increment] };
     }
     else if (isJobsTableResult) {
-        // Update the condition here
+        const { symbol, dimension } = (0, utils_1.splitField)(field);
         const sql = `
       WITH valid_job AS (
         SELECT id
         FROM ${tableName}
         WHERE key = $1 AND is_live
       )
-      INSERT INTO ${tableName}_attributes (job_id, field, value, type)
-      SELECT id, $2, ($3::double precision)::text, $4
+      INSERT INTO ${tableName}_attributes (job_id, symbol, dimension, value, type)
+      SELECT id, $2, $3, ($4::double precision)::text, $5
       FROM valid_job
-      ON CONFLICT (job_id, field) DO UPDATE
+      ON CONFLICT (job_id, symbol, dimension) DO UPDATE
       SET
-        value = ((COALESCE(${tableName}_attributes.value, '0')::double precision) + $3::double precision)::text,
+        value = ((COALESCE(${tableName}_attributes.value, '0')::double precision) + $4::double precision)::text,
         type = EXCLUDED.type
       RETURNING value;
     `;
-        return { sql, params: [key, field, increment, (0, utils_1.deriveType)(field)] };
+        return { sql, params: [key, symbol, dimension, increment, (0, utils_1.deriveType)(field)] };
     }
     else {
         const sql = `
@@ -600,26 +607,29 @@ guidField) {
         throw new Error(`_collateLeg2Entry requires a jobs table key; got table ${jobsTableName}`);
     }
     const attrsTable = `${jobsTableName}_attributes`;
+    const { symbol: actSym, dimension: actDim } = (0, utils_1.splitField)(activityField);
+    const { symbol: guidSym, dimension: guidDim } = (0, utils_1.splitField)(guidField);
     const sql = `
     WITH activity_update AS (
-      INSERT INTO ${attrsTable} (job_id, field, value, type)
-      SELECT id, $2, ($3::double precision)::text, $4
+      INSERT INTO ${attrsTable} (job_id, symbol, dimension, value, type)
+      SELECT id, $2, $3, ($4::double precision)::text, $5
       FROM ${jobsTableName}
       WHERE key = $1 AND is_live
-      ON CONFLICT (job_id, field) DO UPDATE
-      SET value = ((COALESCE(${attrsTable}.value, '0')::double precision) + $3::double precision)::text,
+      ON CONFLICT (job_id, symbol, dimension) DO UPDATE
+      SET value = ((COALESCE(${attrsTable}.value, '0')::double precision) + $4::double precision)::text,
           type = EXCLUDED.type
       RETURNING job_id, value::double precision AS activity_value
     ),
     guid_upsert AS (
-      INSERT INTO ${attrsTable} (job_id, field, value, type)
+      INSERT INTO ${attrsTable} (job_id, symbol, dimension, value, type)
       SELECT
         job_id,
-        $5,
+        $6,
+        $7,
         ((activity_value::bigint) % 100000000)::text,
-        $6
+        $8
       FROM activity_update
-      ON CONFLICT (job_id, field) DO UPDATE
+      ON CONFLICT (job_id, symbol, dimension) DO UPDATE
       SET value = ${attrsTable}.value
       RETURNING value::double precision AS guid_value
     )
@@ -631,11 +641,13 @@ guidField) {
         sql,
         params: [
             key,
-            activityField,
+            actSym,
+            actDim,
             increment,
             (0, utils_1.deriveType)(activityField),
-            guidField,
-            (0, utils_1.deriveType)(guidField), // $6
+            guidSym,
+            guidDim,
+            (0, utils_1.deriveType)(guidField), // $8
         ],
     };
 }
@@ -660,6 +672,7 @@ statusDelta, threshold, guidField, guidWeight) {
     if (!(0, utils_1.isJobsTable)(jobsTableName)) {
         throw new Error(`_setStatusAndCollateGuid requires a jobs table key; got table ${jobsTableName}`);
     }
+    const { symbol: guidSym, dimension: guidDim } = (0, utils_1.splitField)(guidField);
     const sql = `
     WITH status_update AS (
       UPDATE ${jobsTableName}
@@ -674,14 +687,15 @@ statusDelta, threshold, guidField, guidWeight) {
         CASE WHEN status_after = $3 THEN ($4::double precision) ELSE 0::double precision END AS guid_increment
       FROM status_update
     )
-    INSERT INTO ${jobsTableName}_attributes (job_id, field, value, type)
+    INSERT INTO ${jobsTableName}_attributes (job_id, symbol, dimension, value, type)
     SELECT
       job_id,
-      $5 AS field,
+      $5,
+      $6,
       (guid_increment)::text AS value,
-      $6
+      $7
     FROM hit
-    ON CONFLICT (job_id, field) DO UPDATE
+    ON CONFLICT (job_id, symbol, dimension) DO UPDATE
     SET
       value = ((COALESCE(${jobsTableName}_attributes.value, '0')::double precision) + EXCLUDED.value::double precision)::text,
       type = EXCLUDED.type
@@ -694,8 +708,9 @@ statusDelta, threshold, guidField, guidWeight) {
             statusDelta,
             threshold,
             guidWeight,
-            guidField,
-            (0, utils_1.deriveType)(guidField), // $6
+            guidSym,
+            guidDim,
+            (0, utils_1.deriveType)(guidField), // $7
         ],
     };
 }