@thi.ng/column-store 0.10.0 → 0.10.1

package/columns/vector.d.ts

@@ -15,7 +15,7 @@ export declare class VectorColumn<T extends Row = Row> extends AColumn<T> {
     validate(value: any): boolean;
     ensureRows(): void;
     setRow(i: number, value: any): void;
-    getRow(i: number): Float32Array<ArrayBufferLike> | Float64Array<ArrayBufferLike> | Int8Array<ArrayBufferLike> | Int16Array<ArrayBufferLike> | Int32Array<ArrayBufferLike> | Uint8Array<ArrayBufferLike> | Uint8ClampedArray<ArrayBufferLike> | Uint16Array<ArrayBufferLike> | Uint32Array<ArrayBufferLike>;
+    getRow(i: number): Uint32Array<ArrayBufferLike> | Float32Array<ArrayBufferLike> | Float64Array<ArrayBufferLike> | Int8Array<ArrayBufferLike> | Int16Array<ArrayBufferLike> | Int32Array<ArrayBufferLike> | Uint8Array<ArrayBufferLike> | Uint8ClampedArray<ArrayBufferLike> | Uint16Array<ArrayBufferLike>;
     getRowKey(i: number): string;
     valueKey(value: any): string | string[];
     removeRow(i: number): void;

package/internal/serialize.d.ts

@@ -11,5 +11,5 @@ export declare const __serializeTyped: ($values: NumericArray, spec: ColumnSpec,
     values: any[];
 };
 /** @internal */
-export declare const __deserializeTyped: (type: Type, flags: number, values: number[]) => Float32Array<ArrayBufferLike> | Float64Array<ArrayBufferLike> | Int8Array<ArrayBufferLike> | Int16Array<ArrayBufferLike> | Int32Array<ArrayBufferLike> | Uint8Array<ArrayBufferLike> | Uint8ClampedArray<ArrayBufferLike> | Uint16Array<ArrayBufferLike> | Uint32Array<ArrayBufferLike>;
+export declare const __deserializeTyped: (type: Type, flags: number, values: number[]) => Uint32Array<ArrayBufferLike> | Float32Array<ArrayBufferLike> | Float64Array<ArrayBufferLike> | Int8Array<ArrayBufferLike> | Int16Array<ArrayBufferLike> | Int32Array<ArrayBufferLike> | Uint8Array<ArrayBufferLike> | Uint8ClampedArray<ArrayBufferLike> | Uint16Array<ArrayBufferLike>;
 //# sourceMappingURL=serialize.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@thi.ng/column-store",
-	"version": "0.10.0",
+	"version": "0.10.1",
 	"description": "In-memory column store database with customizable column types, extensible query engine, bitfield indexing for query acceleration, JSON serialization with optional RLE compression",
 	"type": "module",
 	"module": "./index.js",
@@ -129,5 +129,5 @@
 		"status": "alpha",
 		"year": 2025
 	},
-	"gitHead": "f15a589f1695f67f2e90b8d221a89fc9960a2e83\n"
+	"gitHead": "f2700429ff95ad80d2b4487f6bde4d7e220204c3\n"
 }

package/query.d.ts

@@ -33,7 +33,7 @@ export declare class QueryCtx<T extends Row> {
      */
     [Symbol.iterator](): Generator<number, void, unknown>;
     clear(): void;
-    makeMask(seed?: Uint32Array): Uint32Array<ArrayBuffer>;
+    makeMask(seed?: number | Uint32Array): Uint32Array<ArrayBuffer>;
     /**
      * Combines the `mask` with the context's mask (combined using bitwise AND).
      * If the context mask is still undefined, assigns `mask` as the initial

package/query.js

@@ -1,4 +1,5 @@
 import { isArray } from "@thi.ng/checks/is-array";
+import { isNumber } from "@thi.ng/checks/is-number";
 import { illegalArgs } from "@thi.ng/errors/illegal-arguments";
 import { unsupportedOp } from "@thi.ng/errors/unsupported";
 import { Bitfield } from "./bitmap.js";
@@ -111,7 +112,9 @@ class QueryCtx {
   }
   makeMask(seed) {
     const mask = new Uint32Array(this.size);
-    if (seed) mask.set(seed);
+    if (seed) {
+      isNumber(seed) ? mask.fill(seed) : mask.set(seed);
+    }
     return mask;
   }
   /**
@@ -166,11 +169,7 @@ const execBitOr = (ctx, term, column) => {
     const b = bitmap.index.get(key)?.buffer;
     if (b) mask = ctx.makeMask(b);
   }
-  if (mask) {
-    term.type === "nor" ? ctx.mergeInvMask(mask) : ctx.mergeMask(mask);
-    return true;
-  }
-  return false;
+  return __finalizeMask(ctx, mask, term.type === "nor");
 };
 const execOr = (ctx, term, column) => {
   const key = column.valueKey(term.value);
@@ -184,11 +183,7 @@ const execOr = (ctx, term, column) => {
       }
     }
   }
-  if (mask) {
-    term.type === "nor" ? ctx.mergeInvMask(mask) : ctx.mergeMask(mask);
-    return true;
-  }
-  return false;
+  return __finalizeMask(ctx, mask, term.type === "nor");
 };
 const delegateOr = (ctx, term, column) => (term.value != null && column.bitmap ? execBitOr : execOr)(
   ctx,
@@ -198,15 +193,18 @@ const delegateOr = (ctx, term, column) => (term.value != null && column.bitmap ?
 const execBitAnd = (ctx, term, column) => {
   const bitmap = column.bitmap;
   const key = column.valueKey(term.value);
+  const isNeg = term.type === "nand";
   let mask;
   if (isArray(key)) {
-    const colBitmaps = [];
     for (let k of key) {
       const b = bitmap.index.get(k)?.buffer;
-      if (!b) return false;
-      colBitmaps.push(b);
-    }
-    for (let b of colBitmaps) {
+      if (!b) {
+        if (isNeg) {
+          if (mask) mask.fill(0);
+          else mask = ctx.makeMask();
+          continue;
+        } else return false;
+      }
       if (mask) {
         const n = b.length;
         for (let i = 0; i < n; i++) mask[i] &= b[i];
@@ -217,16 +215,13 @@ const execBitAnd = (ctx, term, column) => {
     const b = bitmap.index.get(key)?.buffer;
     if (b) mask = ctx.makeMask(b);
   }
-  if (mask) {
-    term.type === "nand" ? ctx.mergeInvMask(mask) : ctx.mergeMask(mask);
-    return true;
-  }
-  return false;
+  return __finalizeMask(ctx, mask, isNeg);
 };
 const execAnd = (ctx, term, column) => {
   const n = ctx.table.length;
   const key = column.valueKey(term.value) ?? null;
   const pred = column.isArray ? (row, v) => row.includes(v) : (row, v) => row === v;
+  const isNeg = term.type === "nand";
   let mask;
   for (let k of isArray(key) ? key : [key]) {
     let m;
@@ -241,20 +236,29 @@ const execAnd = (ctx, term, column) => {
         for (let i = 0; i < n; i++) mask[i] &= m[i];
       } else mask = m;
     } else {
-      return false;
+      if (isNeg) {
+        if (mask) mask.fill(0);
+        else mask = ctx.makeMask();
+      } else return false;
     }
   }
-  if (mask) {
-    term.type === "nand" ? ctx.mergeInvMask(mask) : ctx.mergeMask(mask);
-    return true;
-  }
-  return false;
+  return __finalizeMask(ctx, mask, isNeg);
 };
 const delegateAnd = (ctx, term, column) => (term.value != null && column.bitmap ? execBitAnd : execAnd)(
   ctx,
   term,
   column
 );
+const __finalizeMask = (ctx, mask, isNeg) => {
+  if (mask) {
+    isNeg ? ctx.mergeInvMask(mask) : ctx.mergeMask(mask);
+    return true;
+  } else if (isNeg) {
+    if (!ctx.bitmap) ctx.bitmap = ctx.makeMask(-1);
+    return true;
+  }
+  return false;
+};
 const QUERY_OPS = {
   or: { fn: delegateOr },
   nor: { fn: delegateOr },