@quereus/quereus 0.1.0 → 0.2.0

package/dist/src/runtime/emit/subquery.js

@@ -1,18 +1,21 @@
 import { emitPlanNode } from '../emitters.js';
-import { compareSqlValuesFast, BINARY_COLLATION } from '../../util/comparison.js';
+import { compareSqlValuesFast, resolveCollation } from '../../util/comparison.js';
 import { QuereusError } from '../../common/errors.js';
 import { StatusCode } from '../../common/types.js';
 import { BTree } from 'inheritree';
 export function emitScalarSubquery(plan, ctx) {
-    async function run(ctx, input) {
+    async function run(rctx, input) {
         let result = null;
         let seen = false;
         for await (const row of input) {
             if (seen) {
                 throw new QuereusError('Scalar subquery returned more than one row', StatusCode.ERROR, undefined, plan.expression.loc?.start.line, plan.expression.loc?.start.column);
             }
+            if (row.length > 1) {
+                throw new QuereusError('Subquery should return at most one column', StatusCode.ERROR);
+            }
+            result = row.length === 0 ? null : row[0];
             seen = true;
-            result = row[0];
         }
         return result;
     }
@@ -20,19 +23,22 @@ export function emitScalarSubquery(plan, ctx) {
     return {
         params: [innerInstruction],
         run,
-        note: 'scalar subquery'
+        note: 'SCALAR_SUBQUERY'
     };
 }
 export function emitIn(plan, ctx) {
+    // Extract collation from the condition expression
+    const conditionType = plan.condition.getType();
+    const collationName = conditionType.collationName || 'BINARY';
+    const collation = resolveCollation(collationName);
     if (plan.source) {
         // IN subquery: expr IN (SELECT ...)
-        async function runSubquery(ctx, input, condition) {
+        // Use streaming approach - check each row as we read it, return early on match
+        async function runSubqueryStreaming(_rctx, input, condition) {
             // If condition is NULL, result is NULL
             if (condition === null) {
                 return null;
             }
-            // Build BTree of all values from subquery
-            const tree = new BTree((val) => val, (a, b) => compareSqlValuesFast(a, b, BINARY_COLLATION));
             let hasNull = false;
             for await (const row of input) {
                 if (row.length > 0) {
@@ -41,14 +47,12 @@ export function emitIn(plan, ctx) {
                         hasNull = true;
                         continue;
                     }
-                    tree.insert(rowValue);
+                    // Check for match immediately - no need to materialize
+                    if (compareSqlValuesFast(condition, rowValue, collation) === 0) {
+                        return 1; // Found a match
+                    }
                 }
             }
-            // Check if condition exists in tree
-            const value = tree.get(condition);
-            if (value !== undefined) {
-                return 1; // Found a match
-            }
             // No match found - if any value was NULL, result is NULL
             return hasNull ? null : 0;
         }
@@ -56,49 +60,100 @@ export function emitIn(plan, ctx) {
         const conditionExpr = emitPlanNode(plan.condition, ctx);
         return {
             params: [sourceInstruction, conditionExpr],
-            run: runSubquery,
+            run: runSubqueryStreaming,
             note: `IN (subquery)`
         };
     }
     else if (plan.values) {
         // IN value list: expr IN (value1, value2, ...)
-        function runValues(ctx, condition, ...values) {
-            // If condition is NULL, result is NULL
-            if (condition === null) {
-                return null;
-            }
-            // Build BTree of all values
-            const tree = new BTree((val) => val, (a, b) => compareSqlValuesFast(a, b, BINARY_COLLATION));
+        // Check if all values are truly constant (can be evaluated at emit time)
+        const allConstant = plan.values.every(val => val.physical.constant);
+        if (allConstant) {
+            // Pre-build BTree at emit time for constant values
+            const tree = new BTree((val) => val, (a, b) => compareSqlValuesFast(a, b, collation));
             let hasNull = false;
-            for (const value of values) {
-                if (value === null) {
-                    hasNull = true;
-                    continue;
+            function innerConstantRun(_rctx, condition) {
+                // If condition is NULL, result is NULL
+                if (condition === null) {
+                    return null;
                 }
-                tree.insert(value);
+                // Check if condition exists in pre-built tree
+                const path = tree.find(condition);
+                if (path.on) {
+                    return 1; // Found a match
+                }
+                // No match found - if any value was NULL, result is NULL
+                return hasNull ? null : 0;
             }
-            // Check if condition exists in tree
-            const path = tree.find(condition);
-            if (path.on) {
-                return 1; // Found a match
+            const values = plan.values.map(val => val.getValue());
+            let runFunc;
+            if (values.some(val => val instanceof Promise)) {
+                // Must resolve promises at runtime
+                runFunc = async (rctx, condition) => {
+                    const resolved = await Promise.all(values);
+                    for (const value of resolved) {
+                        if (value === null) {
+                            hasNull = true;
+                            continue;
+                        }
+                        tree.insert(value);
+                    }
+                    return innerConstantRun(rctx, condition);
+                };
             }
-            // No match found - if any value was NULL, result is NULL
-            return hasNull ? null : 0;
+            else {
+                for (const value of values) {
+                    if (value === null) {
+                        hasNull = true;
+                        continue;
+                    }
+                    tree.insert(value);
+                }
+                runFunc = innerConstantRun;
+            }
+            const conditionExpr = emitPlanNode(plan.condition, ctx);
+            return {
+                params: [conditionExpr],
+                run: runFunc,
+                note: `IN (${plan.values.length} constant values)`
+            };
+        }
+        else {
+            // Some values are expressions - build tree at runtime
+            function runDynamicValues(_rctx, condition, ...values) {
+                // If condition is NULL, result is NULL
+                if (condition === null) {
+                    return null;
+                }
+                // Linear scan is optimal since we're only doing one lookup per execution
+                let hasNull = false;
+                for (const value of values) {
+                    if (value === null) {
+                        hasNull = true;
+                        continue;
+                    }
+                    if (compareSqlValuesFast(condition, value, collation) === 0) {
+                        return 1; // Found a match
+                    }
+                }
+                // No match found - if any value was NULL, result is NULL
+                return hasNull ? null : 0;
+            }
+            const conditionExpr = emitPlanNode(plan.condition, ctx);
+            const valueExprs = plan.values.map(val => emitPlanNode(val, ctx));
+            return {
+                params: [conditionExpr, ...valueExprs],
+                run: runDynamicValues,
+                note: `IN (${plan.values.length} dynamic values)`
+            };
         }
-        const conditionExpr = emitPlanNode(plan.condition, ctx);
-        const valueExprs = plan.values.map(val => emitPlanNode(val, ctx));
-        return {
-            params: [conditionExpr, ...valueExprs],
-            run: runValues,
-            note: `IN (${plan.values.length} values)`
-        };
     }
     else {
         throw new QuereusError('IN node must have either source or values', StatusCode.INTERNAL);
     }
 }
 export function emitExists(plan, ctx) {
-    async function run(ctx, input) {
+    async function run(_rctx, input) {
         for await (const _row of input) {
             return 1; // First row => TRUE
         }

package/dist/src/runtime/emit/subquery.js.map

@@ -1 +1 @@
-{"version":3,"file":"subquery.js","sourceRoot":"","sources":["../../../../src/runtime/emit/subquery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"subquery.js","sourceRoot":"","sources":["../../../../src/runtime/emit/subquery.ts"],"names":[],"mappings":"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"}

package/dist/src/runtime/emit/table-valued-function.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"table-valued-function.d.ts","sourceRoot":"","sources":["../../../../src/runtime/emit/table-valued-function.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAkC,MAAM,aAAa,CAAC;AAM/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAC;AAGxF,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,qBAAqB,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CA4G1G"}
+{"version":3,"file":"table-valued-function.d.ts","sourceRoot":"","sources":["../../../../src/runtime/emit/table-valued-function.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAkC,MAAM,aAAa,CAAC;AAM/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAC;AAIxF,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,qBAAqB,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CA8F1G"}

package/dist/src/runtime/emit/table-valued-function.js

@@ -3,6 +3,7 @@ import { QuereusError } from '../../common/errors.js';
 import { StatusCode } from '../../common/types.js';
 import { isTableValuedFunctionSchema } from '../../schema/function.js';
 import { buildRowDescriptor } from '../../util/row-descriptor.js';
+import { withRowContextGenerator } from '../context-helpers.js';
 export function emitTableValuedFunctionCall(plan, ctx) {
     const functionName = plan.functionName.toLowerCase();
     const numArgs = plan.operands.length;
@@ -36,17 +37,9 @@ export function emitTableValuedFunctionCall(plan, ctx) {
             const result = capturedFunction.implementation(innerCtx.db, ...args);
             // Handle both direct AsyncIterable and Promise<AsyncIterable>
             const iterable = result instanceof Promise ? await result : result;
-            for await (const row of iterable) {
-                // Set up row context for column references
-                innerCtx.context.set(rowDescriptor, () => row);
-                try {
-                    yield row;
-                }
-                finally {
-                    // Clean up row context
-                    innerCtx.context.delete(rowDescriptor);
-                }
-            }
+            yield* withRowContextGenerator(innerCtx, rowDescriptor, iterable, async function* (row) {
+                yield row;
+            });
         }
         catch (error) {
             throw new QuereusError(`Table-valued function ${functionName} failed: ${error.message}`, StatusCode.ERROR, error);
@@ -75,17 +68,9 @@ export function emitTableValuedFunctionCall(plan, ctx) {
             const result = capturedFunction.implementation(...args);
             // Handle both direct AsyncIterable and Promise<AsyncIterable>
             const iterable = result instanceof Promise ? await result : result;
-            for await (const row of iterable) {
-                // Set up row context for column references
-                innerCtx.context.set(rowDescriptor, () => row);
-                try {
-                    yield row;
-                }
-                finally {
-                    // Clean up row context
-                    innerCtx.context.delete(rowDescriptor);
-                }
-            }
+            yield* withRowContextGenerator(innerCtx, rowDescriptor, iterable, async function* (row) {
+                yield row;
+            });
         }
         catch (error) {
             throw new QuereusError(`Table-valued function ${functionName} failed: ${error.message}`, StatusCode.ERROR, error);

package/dist/src/runtime/emit/table-valued-function.js.map

@@ -1 +1 @@
-{"version":3,"file":"table-valued-function.js","sourceRoot":"","sources":["../../../../src/runtime/emit/table-valued-function.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"table-valued-function.js","sourceRoot":"","sources":["../../../../src/runtime/emit/table-valued-function.ts"],"names":[],"mappings":"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"}

package/dist/src/runtime/emit/update.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../src/runtime/emit/update.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAkC,MAAM,aAAa,CAAC;AAI/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG9D,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CAgE9E"}
+{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../src/runtime/emit/update.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAkC,MAAM,aAAa,CAAC;AAI/E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAI9D,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CAwD9E"}

package/dist/src/runtime/emit/update.js

@@ -2,6 +2,7 @@ import { emitPlanNode, emitCallFromPlan } from '../emitters.js';
 import { QuereusError } from '../../common/errors.js';
 import { StatusCode } from '../../common/types.js';
 import { buildRowDescriptor, composeOldNewRow } from '../../util/row-descriptor.js';
+import { withRowContextGenerator } from '../context-helpers.js';
 export function emitUpdate(plan, ctx) {
     const tableSchema = plan.table.tableSchema;
     // Create row descriptor for the source rows (needed for assignment expression evaluation)
@@ -18,35 +19,27 @@ export function emitUpdate(plan, ctx) {
     // Emit assignment value expressions as callbacks
     const assignmentEvaluators = plan.assignments.map(assign => emitCallFromPlan(assign.value, ctx));
     async function* run(rctx, sourceRowsIterable, ...assignmentEvaluators) {
-        for await (const sourceRow of sourceRowsIterable) {
-            // Set up row context for evaluating assignment expressions
-            rctx.context.set(sourceRowDescriptor, () => sourceRow);
-            try {
-                // Evaluate assignment expressions in the context of this row
-                const assignmentValues = [];
-                for (const evaluator of assignmentEvaluators) {
-                    const value = evaluator(rctx);
-                    assignmentValues.push(value);
-                }
-                // Create a new row with updated values
-                const updatedRow = [...sourceRow]; // Copy the original row
-                // Apply assignment values to the row
-                for (let i = 0; i < assignmentValues.length; i++) {
-                    const targetColIdx = assignmentTargetIndices[i];
-                    updatedRow[targetColIdx] = assignmentValues[i];
-                }
-                // Create flat row with OLD (source) and NEW (updated) values for constraint checking
-                const flatRow = composeOldNewRow(sourceRow, updatedRow, tableSchema.columns.length);
-                // Yield the flat row for constraint checking
-                // NOTE: UpdateNode only transforms rows - it does NOT execute the actual update
-                // The UpdateExecutorNode is responsible for calling vtab.xUpdate
-                yield flatRow;
+        yield* withRowContextGenerator(rctx, sourceRowDescriptor, sourceRowsIterable, async function* (sourceRow) {
+            // Evaluate assignment expressions in the context of this row
+            const assignmentValues = [];
+            for (const evaluator of assignmentEvaluators) {
+                const value = evaluator(rctx);
+                assignmentValues.push(value);
             }
-            finally {
-                // Clean up row context
-                rctx.context.delete(sourceRowDescriptor);
+            // Create a new row with updated values
+            const updatedRow = [...sourceRow]; // Copy the original row
+            // Apply assignment values to the row
+            for (let i = 0; i < assignmentValues.length; i++) {
+                const targetColIdx = assignmentTargetIndices[i];
+                updatedRow[targetColIdx] = assignmentValues[i];
             }
-        }
+            // Create flat row with OLD (source) and NEW (updated) values for constraint checking
+            const flatRow = composeOldNewRow(sourceRow, updatedRow, tableSchema.columns.length);
+            // Yield the flat row for constraint checking
+            // NOTE: UpdateNode only transforms rows - it does NOT execute the actual update
+            // The UpdateExecutorNode is responsible for calling vtab.xUpdate
+            yield flatRow;
+        });
     }
     const sourceInstruction = emitPlanNode(plan.source, ctx);
     return {

package/dist/src/runtime/emit/update.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/runtime/emit/update.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/runtime/emit/update.ts"],"names":[],"mappings":"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"}

package/dist/src/runtime/emit/window.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"window.d.ts","sourceRoot":"","sources":["../../../../src/runtime/emit/window.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAkB,MAAM,aAAa,CAAC;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAY9D,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CAyF9E"}
+{"version":3,"file":"window.d.ts","sourceRoot":"","sources":["../../../../src/runtime/emit/window.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,KAAK,EAAE,WAAW,EAAkB,MAAM,aAAa,CAAC;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAa9D,wBAAgB,UAAU,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,eAAe,GAAG,WAAW,CAyF9E"}

package/dist/src/runtime/emit/window.js

@@ -5,6 +5,7 @@ import { StatusCode } from '../../common/types.js';
 import { compareSqlValues, createOrderByComparatorFast, resolveCollation } from '../../util/comparison.js';
 import { createLogger } from '../../common/logger.js';
 import { buildRowDescriptor } from '../../util/row-descriptor.js';
+import { withRowContext, withAsyncRowContext } from '../context-helpers.js';
 const log = createLogger('runtime:emit:window');
 export function emitWindow(plan, ctx) {
     // Get schemas for all window functions in this node
@@ -63,20 +64,16 @@ export function emitWindow(plan, ctx) {
 async function groupByPartitions(rows, partitionCallbacks, rctx, sourceRowDescriptor) {
     const partitions = new Map();
     for (const row of rows) {
-        rctx.context.set(sourceRowDescriptor, () => row);
-        try {
+        const partitionKey = await withAsyncRowContext(rctx, sourceRowDescriptor, () => row, async () => {
             // Evaluate partition expressions
-            const partitionValues = partitionCallbacks.map(callback => callback(rctx));
+            const partitionValues = await Promise.all(partitionCallbacks.map(callback => callback(rctx)));
             // Create partition key
-            const partitionKey = partitionValues.map(val => val === null ? 'NULL' : String(val)).join('|');
-            if (!partitions.has(partitionKey)) {
-                partitions.set(partitionKey, []);
-            }
-            partitions.get(partitionKey).push(row);
-        }
-        finally {
-            rctx.context.delete(sourceRowDescriptor);
+            return partitionValues.map(val => val === null ? 'NULL' : String(val)).join('|');
+        });
+        if (!partitions.has(partitionKey)) {
+            partitions.set(partitionKey, []);
         }
+        partitions.get(partitionKey).push(row);
     }
     return partitions;
 }
@@ -88,8 +85,8 @@ async function* processPartition(partitionRows, plan, functionSchemas, rctx, sou
         const currentRow = sortedRows[currentIndex];
         const outputRow = [...currentRow];
         // Set up context for current row
-        rctx.context.set(sourceRowDescriptor, () => currentRow);
-        try {
+        const outputValues = await withRowContext(rctx, sourceRowDescriptor, () => currentRow, async () => {
+            const values = [];
             // Compute each window function
             for (let funcIndex = 0; funcIndex < plan.functions.length; funcIndex++) {
                 const func = plan.functions[funcIndex];
@@ -97,7 +94,7 @@ async function* processPartition(partitionRows, plan, functionSchemas, rctx, sou
                 const argCallback = funcArgCallbacks[funcIndex];
                 let value;
                 if (schema.kind === 'ranking') {
-                    value = computeRankingFunction(func.functionName, sortedRows, currentIndex, orderByCallbacks, rctx, sourceRowDescriptor);
+                    value = await computeRankingFunction(func.functionName, sortedRows, currentIndex, orderByCallbacks, rctx, sourceRowDescriptor);
                 }
                 else if (schema.kind === 'aggregate') {
                     value = await computeAggregateFunction(schema, argCallback, sortedRows, currentIndex, plan.windowSpec.frame, plan.windowSpec.orderBy.length > 0, rctx, sourceRowDescriptor);
@@ -105,20 +102,14 @@ async function* processPartition(partitionRows, plan, functionSchemas, rctx, sou
                 else {
                     throw new QuereusError(`Window function type ${schema.kind} not yet implemented`, StatusCode.UNSUPPORTED);
                 }
-                outputRow.push(value);
+                values.push(value);
             }
-        }
-        finally {
-            rctx.context.delete(sourceRowDescriptor);
-        }
+            return values;
+        });
+        // Add computed values to output row
+        outputRow.push(...outputValues);
         // Yield the output row
-        rctx.context.set(outputRowDescriptor, () => outputRow);
-        try {
-            yield outputRow;
-        }
-        finally {
-            rctx.context.delete(outputRowDescriptor);
-        }
+        yield await withRowContext(rctx, outputRowDescriptor, () => outputRow, () => outputRow);
     }
 }
 async function sortRows(rows, orderBy, orderByCallbacks, rctx, sourceRowDescriptor) {
@@ -130,31 +121,25 @@ async function sortRows(rows, orderBy, orderByCallbacks, rctx, sourceRowDescript
         // TODO: Extract actual collation from order clause expression
         // For now, use BINARY collation (most common case)
         const collationFunc = resolveCollation('BINARY');
-        return createOrderByComparatorFast(orderClause.direction, orderClause.nullsOrdering, collationFunc);
+        return createOrderByComparatorFast(orderClause.direction, orderClause.nulls, collationFunc);
     });
-    return [...rows].sort((a, b) => {
+    // Pre-evaluate ORDER BY values for all rows to avoid async in sort
+    const rowsWithValues = await Promise.all(rows.map(async (row) => {
+        const values = await Promise.all(orderByCallbacks.map(async (callback) => {
+            return await withAsyncRowContext(rctx, sourceRowDescriptor, () => row, async () => {
+                const result = callback(rctx);
+                return await Promise.resolve(result);
+            });
+        }));
+        return { row, values };
+    }));
+    // Now sort using the pre-evaluated values
+    rowsWithValues.sort((a, b) => {
         // Compare each ORDER BY expression in sequence
         for (let i = 0; i < orderBy.length; i++) {
-            const callback = orderByCallbacks[i];
             const comparator = orderByComparators[i];
-            // Evaluate expression for row A
-            rctx.context.set(sourceRowDescriptor, () => a);
-            let valueA;
-            try {
-                valueA = callback(rctx);
-            }
-            finally {
-                rctx.context.delete(sourceRowDescriptor);
-            }
-            // Evaluate expression for row B
-            rctx.context.set(sourceRowDescriptor, () => b);
-            let valueB;
-            try {
-                valueB = callback(rctx);
-            }
-            finally {
-                rctx.context.delete(sourceRowDescriptor);
-            }
+            const valueA = a.values[i];
+            const valueB = b.values[i];
             // Use pre-created optimized comparator
             const comparison = comparator(valueA, valueB);
             // If not equal, return comparison result
@@ -165,8 +150,10 @@ async function sortRows(rows, orderBy, orderByCallbacks, rctx, sourceRowDescript
         }
         return 0; // All ORDER BY expressions are equal
     });
+    // Extract just the rows in sorted order
+    return rowsWithValues.map(item => item.row);
 }
-function computeRankingFunction(functionName, sortedRows, currentIndex, orderByCallbacks, rctx, sourceRowDescriptor) {
+async function computeRankingFunction(functionName, sortedRows, currentIndex, orderByCallbacks, rctx, sourceRowDescriptor) {
     switch (functionName.toLowerCase()) {
         case 'row_number':
             return currentIndex + 1;
@@ -176,7 +163,7 @@ function computeRankingFunction(functionName, sortedRows, currentIndex, orderByC
             const currentRow = sortedRows[currentIndex];
             for (let i = 0; i < currentIndex; i++) {
                 const prevRow = sortedRows[i];
-                if (!areRowsEqualInOrderBy(prevRow, currentRow, orderByCallbacks, rctx, sourceRowDescriptor)) {
+                if (!(await areRowsEqualInOrderBy(prevRow, currentRow, orderByCallbacks, rctx, sourceRowDescriptor))) {
                     rank = i + 2; // Rank is 1-based and accounts for ties
                 }
             }
@@ -189,9 +176,9 @@ function computeRankingFunction(functionName, sortedRows, currentIndex, orderByC
             const seenValues = new Set();
             for (let i = 0; i < currentIndex; i++) {
                 const prevRow = sortedRows[i];
-                if (!areRowsEqualInOrderBy(prevRow, currentRow, orderByCallbacks, rctx, sourceRowDescriptor)) {
+                if (!(await areRowsEqualInOrderBy(prevRow, currentRow, orderByCallbacks, rctx, sourceRowDescriptor))) {
                     // Create a key for this distinct set of ORDER BY values
-                    const key = getOrderByKey(prevRow, orderByCallbacks, rctx, sourceRowDescriptor);
+                    const key = await getOrderByKey(prevRow, orderByCallbacks, rctx, sourceRowDescriptor);
                     if (!seenValues.has(key)) {
                         seenValues.add(key);
                         denseRank++;
@@ -212,22 +199,19 @@ async function computeAggregateFunction(schema, argCallback, sortedRows, current
     // Process rows within the frame
     for (let i = frameBounds.start; i <= frameBounds.end; i++) {
         const frameRow = sortedRows[i];
-        rctx.context.set(sourceRowDescriptor, () => frameRow);
-        try {
+        await withAsyncRowContext(rctx, sourceRowDescriptor, () => frameRow, async () => {
             let argValue = null;
             // Get argument value if callback exists
             if (argCallback) {
-                argValue = argCallback(rctx);
+                const result = argCallback(rctx);
+                argValue = await Promise.resolve(result);
             }
             // Apply aggregate step function
             if (schema.step) {
                 accumulator = schema.step(accumulator, argValue);
                 rowCount++;
             }
-        }
-        finally {
-            rctx.context.delete(sourceRowDescriptor);
-        }
+        });
     }
     // Apply final function
     return schema.final ? schema.final(accumulator, rowCount) : accumulator;
@@ -288,26 +272,18 @@ function getFrameBounds(frame, totalRows, currentIndex, hasOrderBy = true) {
     }
     return { start, end };
 }
-function areRowsEqualInOrderBy(rowA, rowB, orderByCallbacks, rctx, sourceRowDescriptor) {
+async function areRowsEqualInOrderBy(rowA, rowB, orderByCallbacks, rctx, sourceRowDescriptor) {
     for (const callback of orderByCallbacks) {
         // Get value for row A
-        rctx.context.set(sourceRowDescriptor, () => rowA);
-        let valueA;
-        try {
-            valueA = callback(rctx);
-        }
-        finally {
-            rctx.context.delete(sourceRowDescriptor);
-        }
+        const valueA = await withAsyncRowContext(rctx, sourceRowDescriptor, () => rowA, async () => {
+            const result = callback(rctx);
+            return await Promise.resolve(result);
+        });
         // Get value for row B
-        rctx.context.set(sourceRowDescriptor, () => rowB);
-        let valueB;
-        try {
-            valueB = callback(rctx);
-        }
-        finally {
-            rctx.context.delete(sourceRowDescriptor);
-        }
+        const valueB = await withAsyncRowContext(rctx, sourceRowDescriptor, () => rowB, async () => {
+            const result = callback(rctx);
+            return await Promise.resolve(result);
+        });
         // If any ORDER BY expression differs, rows are not equal
         if (compareSqlValues(valueA, valueB) !== 0) {
             return false;
@@ -315,14 +291,10 @@ function areRowsEqualInOrderBy(rowA, rowB, orderByCallbacks, rctx, sourceRowDesc
     }
     return true; // All ORDER BY expressions are equal
 }
-function getOrderByKey(row, orderByCallbacks, rctx, sourceRowDescriptor) {
-    rctx.context.set(sourceRowDescriptor, () => row);
-    try {
-        const values = orderByCallbacks.map(callback => callback(rctx));
+async function getOrderByKey(row, orderByCallbacks, rctx, sourceRowDescriptor) {
+    return await withAsyncRowContext(rctx, sourceRowDescriptor, () => row, async () => {
+        const values = await Promise.all(orderByCallbacks.map(callback => Promise.resolve(callback(rctx))));
         return values.map(val => val === null ? 'NULL' : String(val)).join('|');
-    }
-    finally {
-        rctx.context.delete(sourceRowDescriptor);
-    }
+    });
 }
 //# sourceMappingURL=window.js.map