@quereus/quereus 0.17.1 → 1.0.0

package/dist/src/planner/analysis/const-evaluator.js

@@ -10,7 +10,9 @@ import { emitPlanNode } from '../../runtime/emitters.js';
 import { EmissionContext } from '../../runtime/emission-context.js';
 import { Scheduler } from '../../runtime/scheduler.js';
 import { RowContextMap } from '../../runtime/context-helpers.js';
+import { isAsyncIterable } from '../../runtime/utils.js';
 import { createLogger } from '../../common/logger.js';
+import { TableLiteralNode } from '../nodes/values-node.js';
 const log = createLogger('optimizer:folding:eval');
 /**
  * Create an expression evaluator that uses the runtime to evaluate constant expressions
@@ -50,4 +52,108 @@ export function createRuntimeExpressionEvaluator(db) {
         }
     };
 }
+/**
+ * A self-materializing async iterable that caches rows on first iteration.
+ * First iteration runs the source, collects all rows, and caches them.
+ * Subsequent iterations yield from the cached array.
+ */
+class MaterializingAsyncIterable {
+    createSource;
+    cached = null;
+    materializing = null;
+    constructor(createSource) {
+        this.createSource = createSource;
+    }
+    [Symbol.asyncIterator]() {
+        if (this.cached) {
+            return arrayToAsyncIterator(this.cached);
+        }
+        return this.materializeAndYield();
+    }
+    materializeAndYield() {
+        // If already materializing from another iterator, wait for it
+        if (!this.materializing) {
+            this.materializing = this.doMaterialize();
+        }
+        const promise = this.materializing;
+        let index = 0;
+        return {
+            next: async () => {
+                const rows = await promise;
+                if (index < rows.length) {
+                    return { value: rows[index++], done: false };
+                }
+                return { value: undefined, done: true };
+            }
+        };
+    }
+    async doMaterialize() {
+        const rows = [];
+        let source = this.createSource();
+        // Resolve if promise
+        if (source instanceof Promise) {
+            source = await source;
+        }
+        // Source should be an AsyncIterable<Row>
+        if (isAsyncIterable(source)) {
+            for await (const row of source) {
+                rows.push(row);
+            }
+        }
+        else {
+            throw new QuereusError('Relational evaluation did not produce an async iterable');
+        }
+        this.cached = rows;
+        return rows;
+    }
+}
+function arrayToAsyncIterator(rows) {
+    let index = 0;
+    return {
+        next: async () => {
+            if (index < rows.length) {
+                return { value: rows[index++], done: false };
+            }
+            return { value: undefined, done: true };
+        }
+    };
+}
+/**
+ * Create a relational evaluator that replaces constant relational subtrees
+ * with TableLiteralNodes using deferred materialization.
+ */
+export function createRuntimeRelationalEvaluator(db) {
+    return function evaluateRelation(node) {
+        log('Evaluating relational constant: %s', node.nodeType);
+        try {
+            // Emit the relational subtree to an instruction tree
+            const emissionCtx = new EmissionContext(db);
+            const instruction = emitPlanNode(node, emissionCtx);
+            const scheduler = new Scheduler(instruction);
+            // Create a self-materializing async iterable
+            const iterable = new MaterializingAsyncIterable(() => {
+                const runtimeCtx = {
+                    db,
+                    stmt: undefined,
+                    params: {},
+                    context: new RowContextMap(),
+                    tableContexts: new Map(),
+                    enableMetrics: false
+                };
+                return scheduler.run(runtimeCtx);
+            });
+            // Preserve the original node's type and attributes
+            const relType = node.getType();
+            const relNode = node;
+            const originalAttrs = [...relNode.getAttributes()];
+            const replacement = new TableLiteralNode(node.scope, iterable, relNode.estimatedRows, relType, originalAttrs);
+            log('Replaced relational node %s with TableLiteralNode', node.id);
+            return replacement;
+        }
+        catch (error) {
+            log('Failed to evaluate relational node %s: %s', node.nodeType, error);
+            throw new QuereusError('Relational evaluation failed', StatusCode.ERROR, error instanceof Error ? error : undefined);
+        }
+    };
+}
 //# sourceMappingURL=const-evaluator.js.map

package/dist/src/planner/analysis/const-evaluator.js.map

@@ -1 +1 @@
-{"version":3,"file":"const-evaluator.js","sourceRoot":"","sources":["../../../../src/planner/analysis/const-evaluator.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAEvD,OAAO,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGtD,MAAM,GAAG,GAAG,YAAY,CAAC,wBAAwB,CAAC,CAAC;AAEnD;;GAEG;AACH,MAAM,UAAU,gCAAgC,CAAC,EAAY;IAC5D,OAAO,SAAS,kBAAkB,CAAC,IAAc;QAChD,GAAG,CAAC,oCAAoC,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEzD,IAAI,CAAC;YACJ,oCAAoC;YACpC,MAAM,WAAW,GAAG,IAAI,eAAe,CAAC,EAAE,CAAC,CAAC;YAE5C,wCAAwC;YACxC,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;YAEpD,gDAAgD;YAChD,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,WAAW,CAAC,CAAC;YAE7C,gDAAgD;YAChD,uEAAuE;YACvE,MAAM,UAAU,GAAmB;gBAClC,EAAE;gBACF,IAAI,EAAE,SAAS;gBACf,MAAM,EAAE,EAAE,EAAE,qCAAqC;gBACjD,OAAO,EAAE,IAAI,aAAa,EAAE,EAAE,wBAAwB;gBACtD,aAAa,EAAE,IAAI,GAAG,EAAE,EAAE,yCAAyC;gBACnE,aAAa,EAAE,KAAK;aACpB,CAAC;YAEF,6BAA6B;YAC7B,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAEzC,uCAAuC;YACvC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBAC1B,MAAM,IAAI,YAAY,CAAC,0CAA0C,CAAC,CAAC;YACpE,CAAC;YAED,GAAG,CAAC,6BAA6B,EAAE,MAAM,CAAC,CAAC;YAC3C,OAAO,MAAmC,CAAC;QAE5C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,GAAG,CAAC,sCAAsC,EAAE,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YAClE,MAAM,IAAI,YAAY,CAAC,8BAA8B,EAAE,UAAU,CAAC,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;QACtH,CAAC;IACF,CAAC,CAAC;AACH,CAAC"}
+{"version":3,"file":"const-evaluator.js","sourceRoot":"","sources":["../../../../src/planner/analysis/const-evaluator.ts"],"names":[],"mappings":"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"}

package/dist/src/planner/analysis/const-pass.d.ts

@@ -33,16 +33,18 @@ export interface ConstFoldingContext {
     borderNodes: Map<string, PlanNode>;
     /** Evaluation function for border expressions */
     evaluateExpression: (node: PlanNode) => MaybePromise<OutputValue>;
+    /** Evaluation function for relational border nodes */
+    evaluateRelation?: (node: PlanNode) => PlanNode;
 }
 /**
  * Create a new constant folding context
  */
-export declare function createConstFoldingContext(evaluateExpression: (node: PlanNode) => MaybePromise<OutputValue>): ConstFoldingContext;
+export declare function createConstFoldingContext(evaluateExpression: (node: PlanNode) => MaybePromise<OutputValue>, evaluateRelation?: (node: PlanNode) => PlanNode): ConstFoldingContext;
 /**
  * Perform complete single-pass constant folding on a plan tree
  * This is the main entry point for efficient constant folding
  */
-export declare function performConstantFolding(root: PlanNode, evaluateExpression: (node: PlanNode) => MaybePromise<OutputValue>): PlanNode;
+export declare function performConstantFolding(root: PlanNode, evaluateExpression: (node: PlanNode) => MaybePromise<OutputValue>, evaluateRelation?: (node: PlanNode) => PlanNode): PlanNode;
 /**
  * Perform bottom-up constant classification on a plan tree
  */

package/dist/src/planner/analysis/const-pass.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"const-pass.d.ts","sourceRoot":"","sources":["../../../../src/planner/analysis/const-pass.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,OAAO,EAAiB,KAAK,YAAY,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAQtF;;GAEG;AACH,UAAU,cAAc;IACvB,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,EAAE,QAAQ,CAAC;CACf;AAED,UAAU,YAAY;IACrB,IAAI,EAAE,KAAK,CAAC;IACZ,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAClB;AAED,UAAU,YAAY;IACrB,IAAI,EAAE,WAAW,CAAC;CAClB;AAED,KAAK,SAAS,GAAG,cAAc,GAAG,YAAY,GAAG,YAAY,CAAC;AAE9D;;GAEG;AACH,MAAM,WAAW,mBAAmB;IACnC,mDAAmD;IACnD,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAClC,yDAAyD;IACzD,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACnC,iDAAiD;IACjD,kBAAkB,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,YAAY,CAAC,WAAW,CAAC,CAAC;CAClE;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CACxC,kBAAkB,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,YAAY,CAAC,WAAW,CAAC,GAC/D,mBAAmB,CAMrB;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACrC,IAAI,EAAE,QAAQ,EACd,kBAAkB,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,YAAY,CAAC,WAAW,CAAC,GAC/D,QAAQ,CAWV;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,mBAAmB,GAAG,IAAI,CAehF"}
+{"version":3,"file":"const-pass.d.ts","sourceRoot":"","sources":["../../../../src/planner/analysis/const-pass.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,OAAO,EAAiB,KAAK,YAAY,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAQtF;;GAEG;AACH,UAAU,cAAc;IACvB,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,EAAE,QAAQ,CAAC;CACf;AAED,UAAU,YAAY;IACrB,IAAI,EAAE,KAAK,CAAC;IACZ,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;CAClB;AAED,UAAU,YAAY;IACrB,IAAI,EAAE,WAAW,CAAC;CAClB;AAED,KAAK,SAAS,GAAG,cAAc,GAAG,YAAY,GAAG,YAAY,CAAC;AAE9D;;GAEG;AACH,MAAM,WAAW,mBAAmB;IACnC,mDAAmD;IACnD,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAClC,yDAAyD;IACzD,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACnC,iDAAiD;IACjD,kBAAkB,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,YAAY,CAAC,WAAW,CAAC,CAAC;IAClE,sDAAsD;IACtD,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,QAAQ,CAAC;CAChD;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CACxC,kBAAkB,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,YAAY,CAAC,WAAW,CAAC,EACjE,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,QAAQ,GAC7C,mBAAmB,CAOrB;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CACrC,IAAI,EAAE,QAAQ,EACd,kBAAkB,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,YAAY,CAAC,WAAW,CAAC,EACjE,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,QAAQ,KAAK,QAAQ,GAC7C,QAAQ,CAWV;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,mBAAmB,GAAG,IAAI,CAehF"}

package/dist/src/planner/analysis/const-pass.js

@@ -14,19 +14,20 @@ const log = createLogger('optimizer:folding');
 /**
  * Create a new constant folding context
  */
-export function createConstFoldingContext(evaluateExpression) {
+export function createConstFoldingContext(evaluateExpression, evaluateRelation) {
     return {
         constInfo: new Map(),
         borderNodes: new Map(),
-        evaluateExpression
+        evaluateExpression,
+        evaluateRelation
     };
 }
 /**
  * Perform complete single-pass constant folding on a plan tree
  * This is the main entry point for efficient constant folding
  */
-export function performConstantFolding(root, evaluateExpression) {
-    const ctx = createConstFoldingContext(evaluateExpression);
+export function performConstantFolding(root, evaluateExpression, evaluateRelation) {
+    const ctx = createConstFoldingContext(evaluateExpression, evaluateRelation);
     // Phase 1: Bottom-up classification
     classifyConstants(root, ctx);
     // Phase 2: Top-down border detection with dependency resolution
@@ -108,13 +109,19 @@ function detectBorderNodes(node, ctx, knownConstAttrs = new Set()) {
     const nodeInfo = ctx.constInfo.get(node.id);
     // Check if this node is a border node
     if (nodeInfo?.kind === 'const') {
-        if (!node.physical.constant) {
-            // Const nodes are always border nodes
+        const typeClass = node.getType().typeClass;
+        if (!node.physical.constant && (typeClass === 'scalar' || typeClass === 'relation')) {
+            // Foldable const border node (scalar or relational)
             ctx.borderNodes.set(node.id, node);
             log('Detected const border node: %s (%s)', node.id, node.nodeType);
+            // Don't recurse into const subtrees - they'll all be replaced
+            return;
+        }
+        if (node.physical.constant) {
+            // Already a physical constant (e.g. LiteralNode) - no folding needed
+            return;
         }
-        // Don't recurse into const subtrees - they'll all be replaced
-        return;
+        // Non-foldable const node (e.g. Block with void type) - recurse to find inner borders
     }
     else if (nodeInfo?.kind === 'dep') {
         // Dep nodes become border nodes if all dependencies are resolved
@@ -171,9 +178,8 @@ function replaceBorderNodes(node, ctx) {
     // If this node is a border node, replace it
     if (ctx.borderNodes.has(node.id)) {
         try {
-            const evaluatedValue = ctx.evaluateExpression(node);
-            // Choose replacement type based on node type
             if (node.getType().typeClass === 'scalar') {
+                const evaluatedValue = ctx.evaluateExpression(node);
                 const literalExpr = { type: 'literal', value: evaluatedValue };
                 const replacement = new LiteralNode(node.scope, literalExpr, 
                 // Preserve the original node's type metadata so that information like
@@ -182,10 +188,14 @@ function replaceBorderNodes(node, ctx) {
                 log('Replaced scalar border node %s with LiteralNode', node.id);
                 return replacement;
             }
-            else {
+            else if (ctx.evaluateRelation) {
                 // Relational node - replace with TableLiteralNode
-                // TODO: Handle relational evaluation properly
-                log('Relational border node %s detected but not yet implemented', node.id);
+                const replacement = ctx.evaluateRelation(node);
+                log('Replaced relational border node %s with TableLiteralNode', node.id);
+                return replacement;
+            }
+            else {
+                log('Relational border node %s skipped (no relational evaluator)', node.id);
                 return node;
             }
         }

package/dist/src/planner/analysis/const-pass.js.map

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

package/dist/src/planner/analysis/constraint-extractor.d.ts

@@ -3,8 +3,24 @@
  * Converts scalar expressions into constraints that can be pushed down to virtual tables
  */
 import type { ScalarPlanNode, RelationalPlanNode, PlanNode } from '../nodes/plan-node.js';
-import type { Row } from '../../common/types.js';
+import type { Row, SqlValue } from '../../common/types.js';
 import type { PredicateConstraint as VtabPredicateConstraint } from '../../vtab/best-access-plan.js';
+/**
+ * A single range specification within an OR_RANGE constraint.
+ * Each range has optional lower and upper bounds.
+ */
+export interface RangeSpec {
+    lower?: {
+        op: '>=' | '>';
+        value: SqlValue;
+        valueExpr?: ScalarPlanNode;
+    };
+    upper?: {
+        op: '<=' | '<';
+        value: SqlValue;
+        valueExpr?: ScalarPlanNode;
+    };
+}
 /**
  * A constraint extracted from a predicate expression
  * Extends the vtab PredicateConstraint with additional metadata for the planner
@@ -20,6 +36,8 @@ export interface PredicateConstraint extends VtabPredicateConstraint {
     valueExpr?: ScalarPlanNode | ScalarPlanNode[];
     /** Binding kind describing how value is supplied */
     bindingKind?: 'literal' | 'parameter' | 'correlated' | 'expression' | 'mixed';
+    /** Range specifications for OR_RANGE constraints */
+    ranges?: RangeSpec[];
 }
 /**
  * Result of constraint extraction

package/dist/src/planner/analysis/constraint-extractor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constraint-extractor.d.ts","sourceRoot":"","sources":["../../../../src/planner/analysis/constraint-extractor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"constraint-extractor.d.ts","sourceRoot":"","sources":["../../../../src/planner/analysis/constraint-extractor.ts"],"names":[],"mappings":"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"}

package/dist/src/planner/analysis/constraint-extractor.js

@@ -108,9 +108,18 @@ function extractFromExpression(expr, constraints, residual, attributeToTableMap,
         extractFromExpression(binaryOp.right, constraints, residual, attributeToTableMap, perTableParts);
         return;
     }
-    // Handle OR expressions - for now, treat as residual (could be enhanced later)
+    // Handle OR expressions: try to extract as IN or OR constraint group
     if (isOrExpression(expr)) {
-        log('OR expression found, treating as residual: %s', expr.toString());
+        const orResult = tryExtractOrBranches(expr, attributeToTableMap);
+        if (orResult) {
+            for (const c of orResult.constraints) {
+                constraints.push(c);
+            }
+            addSupportedPart(expr, attributeToTableMap, perTableParts);
+            log('OR expression extracted %d constraints', orResult.constraints.length);
+            return;
+        }
+        log('OR expression not extractable, treating as residual');
         residual.push(expr);
         return;
     }
@@ -132,6 +141,18 @@ function extractFromExpression(expr, constraints, residual, attributeToTableMap,
             return;
         }
     }
+    // IS NULL / IS NOT NULL → unary constraint
+    if (expr.nodeType === PlanNodeType.UnaryOp) {
+        const unaryOp = expr;
+        if (unaryOp.expression.operator === 'IS NULL' || unaryOp.expression.operator === 'IS NOT NULL') {
+            const c = extractNullConstraint(unaryOp, attributeToTableMap);
+            if (c) {
+                constraints.push(c);
+                addSupportedPart(expr, attributeToTableMap, perTableParts);
+                return;
+            }
+        }
+    }
     // Try to extract constraint from binary comparison
     const constraint = extractBinaryConstraint(expr, attributeToTableMap);
     if (constraint) {
@@ -318,7 +339,7 @@ function extractBetweenConstraints(expr, attributeToTableMap) {
     ];
 }
 function extractInConstraint(expr, attributeToTableMap) {
-    // Only support column IN (literal, ...)
+    // Only support column IN (value-list), not subqueries
     if (expr.source)
         return null;
     if (!expr.values || expr.values.length === 0)
@@ -326,9 +347,6 @@ function extractInConstraint(expr, attributeToTableMap) {
     const col = expr.condition;
     if (col.nodeType !== PlanNodeType.ColumnReference)
         return null;
-    // Ensure all are literals
-    if (!expr.values.every(v => isLiteralConstant(v)))
-        return null;
     const columnRef = col;
     const tableInfo = attributeToTableMap.get(columnRef.attributeId);
     if (!tableInfo)
@@ -336,10 +354,15 @@ function extractInConstraint(expr, attributeToTableMap) {
     const columnIndex = tableInfo.columnIndexMap.get(columnRef.attributeId);
     if (columnIndex === undefined)
         return null;
-    // Virtual table IN constraint can carry a single array value or multiple equality constraints.
-    // Our API supports op 'IN' with value array.
-    const values = expr.values.map(v => getLiteralValue(v));
-    return {
+    // Check if all values are literals, or if some are dynamic (parameters/expressions)
+    const allLiteral = expr.values.every(v => isLiteralConstant(v));
+    const allUsable = expr.values.every(v => isLiteralConstant(v) || isDynamicValue(v));
+    if (!allUsable)
+        return null;
+    const values = allLiteral
+        ? expr.values.map(v => getLiteralValue(v))
+        : expr.values.map(v => isLiteralConstant(v) ? getLiteralValue(v) : undefined);
+    const result = {
         columnIndex,
         attributeId: columnRef.attributeId,
         op: 'IN',
@@ -349,6 +372,38 @@ function extractInConstraint(expr, attributeToTableMap) {
         sourceExpression: expr,
         targetRelation: tableInfo.relationKey
     };
+    // Attach dynamic binding metadata when not all values are literals
+    if (!allLiteral) {
+        result.valueExpr = expr.values;
+        result.bindingKind = 'mixed';
+    }
+    return result;
+}
+/**
+ * Extract constraint from IS NULL / IS NOT NULL unary expression
+ */
+function extractNullConstraint(expr, attributeToTableMap) {
+    const operand = expr.operand;
+    if (!isColumnReference(operand))
+        return null;
+    const columnRef = getColumnReference(operand);
+    const tableInfo = attributeToTableMap.get(columnRef.attributeId);
+    if (!tableInfo)
+        return null;
+    const columnIndex = tableInfo.columnIndexMap.get(columnRef.attributeId);
+    if (columnIndex === undefined)
+        return null;
+    const op = expr.expression.operator;
+    return {
+        columnIndex,
+        attributeId: columnRef.attributeId,
+        op,
+        value: undefined,
+        usable: true,
+        sourceExpression: expr,
+        targetRelation: tableInfo.relationKey,
+        bindingKind: 'literal'
+    };
 }
 /**
  * Map AST operators to constraint operators
@@ -365,13 +420,209 @@ function mapOperatorToConstraint(operator, _rightValue) {
         case 'MATCH': return 'MATCH';
         case 'IN': return 'IN';
         case 'NOT IN': return 'NOT IN';
-        // NOTE: IS NULL / IS NOT NULL are parsed as unary expressions, not binary
-        // 'IS' / 'IS NOT'. To support constraint extraction for these, add unary
-        // expression handling in extractConstraints alongside a proper
-        // empty-result physical node for the IS NULL on NOT NULL optimization.
         default: return null;
     }
 }
+/**
+ * Flatten an OR expression tree into a list of disjuncts.
+ */
+function flattenOrDisjuncts(expr) {
+    const result = [];
+    const stack = [expr];
+    while (stack.length > 0) {
+        const node = stack.pop();
+        if (isOrExpression(node)) {
+            const binary = node;
+            stack.push(binary.right, binary.left);
+        }
+        else {
+            result.push(node);
+        }
+    }
+    return result;
+}
+/**
+ * Attempt to extract index-friendly constraints from an OR expression.
+ *
+ * Handles two cases:
+ * 1. All branches are equality on the same column → collapse to IN constraint
+ * 2. All branches target the same table with extractable constraints → OR constraint group
+ *
+ * Returns null if the OR cannot be extracted (remains residual).
+ */
+function tryExtractOrBranches(expr, attributeToTableMap) {
+    const disjuncts = flattenOrDisjuncts(expr);
+    if (disjuncts.length < 2)
+        return null;
+    // Extract constraints from each branch independently
+    const branches = [];
+    for (const d of disjuncts) {
+        const branchConstraints = [];
+        const branchResidual = [];
+        const branchParts = new Map();
+        extractFromExpression(d, branchConstraints, branchResidual, attributeToTableMap, branchParts);
+        branches.push({
+            constraints: branchConstraints,
+            hasResidual: branchResidual.length > 0
+        });
+    }
+    // If any branch has residual (not fully extractable), the entire OR must be residual.
+    // We can't partially push down an OR — all branches must be handled.
+    if (branches.some(b => b.hasResidual || b.constraints.length === 0)) {
+        return null;
+    }
+    // Check if all branches target the same table
+    const allRelations = new Set();
+    for (const b of branches) {
+        for (const c of b.constraints) {
+            if (c.targetRelation)
+                allRelations.add(c.targetRelation);
+        }
+    }
+    if (allRelations.size !== 1)
+        return null;
+    // Case 1: All branches are single equality or IN on the same column → collapse to IN
+    const allEqOrIn = branches.every(b => b.constraints.length === 1 &&
+        (b.constraints[0].op === '=' || b.constraints[0].op === 'IN'));
+    if (allEqOrIn) {
+        const firstConstraint = branches[0].constraints[0];
+        const sameColumn = branches.every(b => b.constraints[0].columnIndex === firstConstraint.columnIndex &&
+            b.constraints[0].attributeId === firstConstraint.attributeId);
+        if (sameColumn) {
+            return collapseBranchesToIn(branches, firstConstraint, expr);
+        }
+    }
+    // Case 2: All branches are range (or equality) on the same column → OR_RANGE
+    const orRangeResult = tryCollapseToOrRange(branches, expr);
+    if (orRangeResult)
+        return orRangeResult;
+    return null;
+}
+/**
+ * Collapse OR branches (equality and/or IN) on the same column into a single IN constraint.
+ * Handles mixed equality + IN branches (e.g., from nested OR normalization)
+ * and both literal and non-literal (parameter, expression) values.
+ */
+function collapseBranchesToIn(branches, template, sourceExpr) {
+    const values = [];
+    const valueExprs = [];
+    let hasNonLiteral = false;
+    for (const b of branches) {
+        const c = b.constraints[0];
+        if (c.op === 'IN' && Array.isArray(c.value)) {
+            // IN branch: merge all its values
+            for (const v of c.value) {
+                values.push(v);
+            }
+            if (Array.isArray(c.valueExpr)) {
+                for (const ve of c.valueExpr) {
+                    valueExprs.push(ve);
+                }
+                hasNonLiteral = true;
+            }
+            else {
+                // All literal IN — push placeholder source expressions
+                for (const _v of c.value) {
+                    valueExprs.push(c.sourceExpression);
+                }
+            }
+        }
+        else {
+            // Equality branch: single value
+            values.push(c.value);
+            if (c.valueExpr && !Array.isArray(c.valueExpr)) {
+                valueExprs.push(c.valueExpr);
+                hasNonLiteral = true;
+            }
+            else {
+                valueExprs.push(c.sourceExpression);
+            }
+        }
+    }
+    const result = {
+        columnIndex: template.columnIndex,
+        attributeId: template.attributeId,
+        op: 'IN',
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        value: values,
+        usable: true,
+        sourceExpression: sourceExpr,
+        targetRelation: template.targetRelation,
+        valueExpr: hasNonLiteral ? valueExprs : undefined,
+        bindingKind: hasNonLiteral ? 'mixed' : 'literal'
+    };
+    return { constraints: [result] };
+}
+/**
+ * Collapse OR branches that are all range/equality constraints on the same column
+ * into a single OR_RANGE constraint with multiple range specs.
+ */
+function tryCollapseToOrRange(branches, sourceExpr) {
+    // All branches must have constraints on a single column (possibly multiple for BETWEEN-style ranges)
+    let targetColumnIndex;
+    let targetAttributeId;
+    let targetRelation;
+    const rangeSpecs = [];
+    for (const b of branches) {
+        // A branch may have 1 constraint (single bound or equality) or 2 constraints (lower + upper on same col)
+        if (b.constraints.length === 0 || b.constraints.length > 2)
+            return null;
+        // All constraints in this branch must target the same column
+        const firstCol = b.constraints[0].columnIndex;
+        const firstAttr = b.constraints[0].attributeId;
+        const firstRel = b.constraints[0].targetRelation;
+        if (!b.constraints.every(c => c.columnIndex === firstCol))
+            return null;
+        // Initialize target or verify consistency across branches
+        if (targetColumnIndex === undefined) {
+            targetColumnIndex = firstCol;
+            targetAttributeId = firstAttr;
+            targetRelation = firstRel;
+        }
+        else if (targetColumnIndex !== firstCol || targetAttributeId !== firstAttr) {
+            return null;
+        }
+        // Build range spec from branch constraints
+        const spec = {};
+        for (const c of b.constraints) {
+            const dynExpr = c.valueExpr && !Array.isArray(c.valueExpr) ? c.valueExpr : undefined;
+            if (c.op === '=') {
+                // Equality: treat as >= v AND <= v
+                spec.lower = { op: '>=', value: c.value, valueExpr: dynExpr };
+                spec.upper = { op: '<=', value: c.value, valueExpr: dynExpr };
+            }
+            else if (c.op === '>' || c.op === '>=') {
+                spec.lower = { op: c.op, value: c.value, valueExpr: dynExpr };
+            }
+            else if (c.op === '<' || c.op === '<=') {
+                spec.upper = { op: c.op, value: c.value, valueExpr: dynExpr };
+            }
+            else {
+                // Non-range, non-equality op → can't collapse
+                return null;
+            }
+        }
+        // Each branch must define at least one bound
+        if (!spec.lower && !spec.upper)
+            return null;
+        rangeSpecs.push(spec);
+    }
+    if (targetColumnIndex === undefined || targetAttributeId === undefined || rangeSpecs.length < 2) {
+        return null;
+    }
+    const result = {
+        columnIndex: targetColumnIndex,
+        attributeId: targetAttributeId,
+        op: 'OR_RANGE',
+        value: undefined,
+        usable: true,
+        sourceExpression: sourceExpr,
+        targetRelation: targetRelation,
+        bindingKind: 'literal',
+        ranges: rangeSpecs,
+    };
+    return { constraints: [result] };
+}
 /**
  * Check if expression is an AND operation
  */