@thi.ng/column-store 0.3.0 → 0.4.0

package/api.d.ts

@@ -89,6 +89,21 @@ export interface IColumn {
     load(spec: SerializedColumn): void;
     reindex(): void;
     validate(value: any): boolean;
+    /**
+     * Searches for `value` in the column data, optionally constrained to given
+     * `start`/`end` range. If found, returns row ID of first occurrence,
+     * otherwise -1.
+     *
+     * @param value
+     * @param start
+     * @param end
+     */
+    indexOf(value: any, start?: number, end?: number): number;
+    /**
+     * Returns value at given row.
+     *
+     * @param i
+     */
     getRow(i: number): any;
     /**
      * Sets the column's value at given row index. Assumes the value has been

package/bitmap.d.ts

@@ -27,6 +27,7 @@ export declare class Bitfield {
     buffer?: Uint32Array | undefined;
     constructor(buffer?: Uint32Array | undefined);
     ones(max?: number): Generator<number, void, unknown>;
+    first(start?: number, end?: number): number;
     setBit(id: number): void;
     clearBit(id: number): void;
     ensure(size: number): Uint32Array<ArrayBufferLike>;

package/bitmap.js

@@ -49,10 +49,10 @@ class Bitfield {
     this.buffer = buffer;
   }
   *ones(max = Infinity) {
-    const buf = this.buffer;
-    if (!buf) return;
-    for (let i = 0, n = buf.length; i < n; i++) {
-      let bits = buf[i];
+    const { buffer } = this;
+    if (!buffer) return;
+    for (let i = 0, n = buffer.length; i < n; i++) {
+      let bits = buffer[i];
       while (bits) {
         const lsb = bits & -bits;
         const x = (i << 5) + (Math.clz32(lsb) ^ 31);
@@ -62,6 +62,20 @@ class Bitfield {
       }
     }
   }
+  first(start = 0, end = (this.buffer?.length ?? -1) * 32) {
+    const { buffer } = this;
+    if (!buffer || start >= end) return -1;
+    for (let i = start >>> 5, n = Math.min(Math.ceil(end / 32), buffer.length); i < n; i++) {
+      let bits = buffer[i];
+      while (bits) {
+        const lsb = bits & -bits;
+        const x = (i << 5) + (Math.clz32(lsb) ^ 31);
+        if (x >= start && x < end) return x;
+        bits ^= lsb;
+      }
+    }
+    return -1;
+  }
   setBit(id) {
     const w = id >>> 5;
     this.ensure(w)[w] |= 1 << (id & 31);

package/columns/acolumn.d.ts

@@ -19,6 +19,7 @@ export declare abstract class AColumn implements IColumn {
     abstract valueKey(x: any): any;
     abstract getRow(i: number): any;
     abstract getRowKey(i: number): any;
+    abstract indexOf(value: any, start?: number, end?: number): number;
     encode(value: any): any;
     decode(value: any): any;
     protected loadDict(serialized: SerializedIndex): void;

package/columns/dict-tuple.d.ts

@@ -15,6 +15,7 @@ export declare class DictTupleColumn extends AColumn implements IColumn {
     getRowKey(i: number): number[] | null;
     valueKey(value: any): (number | null)[];
     removeRow(i: number): void;
+    indexOf(value: any, start?: number, end?: number): number;
     replaceValue(currValue: any, newValue: any): boolean;
     toJSON(): {
         dict: {

package/columns/dict-tuple.js

@@ -2,6 +2,7 @@ import { BidirIndex } from "@thi.ng/bidir-index";
 import { isArray } from "@thi.ng/checks/is-array";
 import { FLAG_UNIQUE } from "../api.js";
 import { __validateArrayValue } from "../internal/checks.js";
+import { __indexOfTuple } from "../internal/indexof.js";
 import { __serializeDict } from "../internal/serialize.js";
 import { AColumn } from "./acolumn.js";
 class DictTupleColumn extends AColumn {
@@ -55,6 +56,15 @@ class DictTupleColumn extends AColumn {
     this.values.splice(i, 1);
     this.bitmap?.removeBit(i);
   }
+  indexOf(value, start = 0, end = this.table.length) {
+    return __indexOfTuple(
+      value != null ? this.encode(value) : null,
+      this.values,
+      this.table.length,
+      start,
+      end
+    );
+  }
   replaceValue(currValue, newValue) {
     const { dict, values, bitmap } = this;
     const res = dict.renameKey(currValue, newValue);

package/columns/dict.d.ts

@@ -7,7 +7,7 @@ export declare class DictColumn extends AColumn implements IColumn {
     readonly isArray = false;
     load({ dict, values }: SerializedColumn): void;
     reindex(): void;
-    encode(value: any): number | undefined;
+    encode(value: any): number | null;
     decode(value: any): any;
     validate(value: any): boolean;
     setRow(i: number, value: any): void;
@@ -15,6 +15,7 @@ export declare class DictColumn extends AColumn implements IColumn {
     getRowKey(i: number): number | null;
     valueKey(value: any): number | number[] | undefined;
     removeRow(i: number): void;
+    indexOf(value: any, start?: number, end?: number): number;
     replaceValue(currValue: any, newValue: any): boolean;
     toJSON(): {
         dict: {

package/columns/dict.js

@@ -1,11 +1,12 @@
 import { BidirIndex } from "@thi.ng/bidir-index";
+import { isArray } from "@thi.ng/checks/is-array";
 import { decodeBinary, encodeBinary } from "@thi.ng/rle-pack/binary";
 import { decodeSimple, encodeSimple } from "@thi.ng/rle-pack/simple";
 import { FLAG_RLE } from "../api.js";
 import { __validateValue } from "../internal/checks.js";
+import { __indexOfSingle } from "../internal/indexof.js";
 import { __serializeDict } from "../internal/serialize.js";
 import { AColumn } from "./acolumn.js";
-import { isArray } from "@thi.ng/checks/is-array";
 class DictColumn extends AColumn {
   values = [];
   dict = new BidirIndex();
@@ -25,7 +26,7 @@ class DictColumn extends AColumn {
     super.updateBitmap();
   }
   encode(value) {
-    return this.dict.get(value);
+    return this.dict.get(value) ?? null;
   }
   decode(value) {
     return this.dict.getID(value);
@@ -57,6 +58,16 @@ class DictColumn extends AColumn {
     this.values.splice(i, 1);
     this.bitmap?.removeBit(i);
   }
+  indexOf(value, start = 0, end = this.table.length) {
+    return __indexOfSingle(
+      this.encode(value),
+      this.values,
+      this.bitmap,
+      this.table.length,
+      start,
+      end
+    );
+  }
   replaceValue(currValue, newValue) {
     const { dict, values, bitmap } = this;
     const res = dict.renameKey(currValue, newValue);

package/columns/plain.d.ts

@@ -10,6 +10,7 @@ export declare class PlainColumn extends AColumn implements IColumn {
     getRowKey(i: number): any;
     valueKey(x: any): any;
     removeRow(i: number): void;
+    indexOf(value: any, start?: number, end?: number): number;
     replaceValue(currValue: any, newValue: any): boolean;
     toJSON(): {
         values: any[];

package/columns/plain.js

@@ -1,6 +1,7 @@
 import { decodeSimple, encodeSimple } from "@thi.ng/rle-pack/simple";
 import { FLAG_RLE } from "../api.js";
 import { __validateValue } from "../internal/checks.js";
+import { __indexOfSingle } from "../internal/indexof.js";
 import { __replaceValue } from "../internal/replace.js";
 import { AColumn } from "./acolumn.js";
 class PlainColumn extends AColumn {
@@ -35,6 +36,16 @@ class PlainColumn extends AColumn {
     this.values.splice(i, 1);
     this.bitmap?.removeBit(i);
   }
+  indexOf(value, start = 0, end) {
+    return __indexOfSingle(
+      value,
+      this.values,
+      this.bitmap,
+      this.table.length,
+      start,
+      end
+    );
+  }
   replaceValue(currValue, newValue) {
     return __replaceValue(this.bitmap, this.values, currValue, newValue);
   }

package/columns/tuple.d.ts

@@ -12,6 +12,7 @@ export declare class TupleColumn extends AColumn implements IColumn {
     getRowKey(i: number): Nullable<number[]>;
     valueKey(value: any): any[];
     removeRow(i: number): void;
+    indexOf(value: any, start?: number, end?: number): number;
     replaceValue(currValue: any, newValue: any): boolean;
     toJSON(): {
         values: Nullable<number[]>[];

package/columns/tuple.js

@@ -1,6 +1,7 @@
 import { isArray } from "@thi.ng/checks/is-array";
 import { FLAG_UNIQUE } from "../api.js";
 import { __validateArrayValue } from "../internal/checks.js";
+import { __indexOfTuple } from "../internal/indexof.js";
 import { AColumn } from "./acolumn.js";
 class TupleColumn extends AColumn {
   values = [];
@@ -38,6 +39,15 @@ class TupleColumn extends AColumn {
     this.values.splice(i, 1);
     this.bitmap?.removeBit(i);
   }
+  indexOf(value, start = 0, end = this.table.length) {
+    return __indexOfTuple(
+      value,
+      this.values,
+      this.table.length,
+      start,
+      end
+    );
+  }
   replaceValue(currValue, newValue) {
     const { values, bitmap } = this;
     const isUnique = this.spec.flags & FLAG_UNIQUE;

package/columns/typedarray.d.ts

@@ -16,6 +16,7 @@ export declare class TypedArrayColumn extends AColumn implements IColumn {
     getRowKey(i: number): number;
     valueKey(value: any): number | number[];
     removeRow(i: number): void;
+    indexOf(value: any, start?: number, end?: number): number;
     replaceValue(currValue: any, newValue: any): boolean;
     toJSON(): {
         values: any[];

package/columns/typedarray.js

@@ -4,6 +4,7 @@ import { isNumber } from "@thi.ng/checks/is-number";
 import {
   LIMITS
 } from "../api.js";
+import { __indexOfSingle } from "../internal/indexof.js";
 import { __replaceValue } from "../internal/replace.js";
 import { __deserializeTyped, __serializeTyped } from "../internal/serialize.js";
 import { AColumn } from "./acolumn.js";
@@ -67,6 +68,16 @@ class TypedArrayColumn extends AColumn {
     this.values[this.table.length - 1] = 0;
     this.bitmap?.removeBit(i);
   }
+  indexOf(value, start = 0, end = this.table.length) {
+    return __indexOfSingle(
+      value,
+      this.values,
+      this.bitmap,
+      this.table.length,
+      start,
+      end
+    );
+  }
   replaceValue(currValue, newValue) {
     return __replaceValue(this.bitmap, this.values, currValue, newValue);
   }

package/columns/vector.d.ts

@@ -17,6 +17,7 @@ export declare class VectorColumn extends AColumn implements IColumn {
     getRowKey(i: number): string;
     valueKey(value: any): string | string[];
     removeRow(i: number): void;
+    indexOf(value: any, start?: number, end?: number): number;
     replaceValue(): boolean;
     toJSON(): {
         values: any[];

package/columns/vector.js

@@ -76,6 +76,23 @@ class VectorColumn extends AColumn {
     this.values.fill(0, (length - 1) * size);
     this.bitmap?.removeBit(i);
   }
+  indexOf(value, start = 0, end = this.table.length) {
+    const { values, bitmap, size } = this;
+    start = Math.max(start, 0);
+    end = Math.min(end, this.table.length);
+    if (bitmap) {
+      return bitmap.index.get(this.valueKey(value))?.first(start, end) ?? -1;
+    }
+    end *= size;
+    let i, j;
+    outer: for (i = start * size; i < end; i += size) {
+      for (j = 0; j < size; j++) {
+        if (values[i + j] !== value[j]) continue outer;
+      }
+      return i / size;
+    }
+    return -1;
+  }
   replaceValue() {
     unsupportedOp("TODO");
   }

package/internal/indexof.d.ts

@@ -0,0 +1,6 @@
+import type { Maybe } from "@thi.ng/api";
+import type { BitmapIndex } from "../bitmap.js";
+/** @internal */
+export declare const __indexOfSingle: (needle: any, values: ArrayLike<any>, bitmap: Maybe<BitmapIndex>, max: number, start: number, end?: number) => number;
+export declare const __indexOfTuple: (needle: ArrayLike<any> | null, values: ArrayLike<any>, max: number, start: number, end?: number) => number;
+//# sourceMappingURL=indexof.d.ts.map

package/internal/indexof.js

@@ -0,0 +1,34 @@
+const __indexOfSingle = (needle, values, bitmap, max, start, end = max) => {
+  start = Math.max(start, 0);
+  end = Math.min(end, max);
+  if (bitmap) return bitmap.index.get(needle)?.first(start, end) ?? -1;
+  for (let i = start; i < end; i++) {
+    if (values[i] === needle) return i;
+  }
+  return -1;
+};
+const __indexOfTuple = (needle, values, max, start, end = max) => {
+  start = Math.max(start, 0);
+  end = Math.min(end, max);
+  if (needle == null) {
+    for (let i2 = start; i2 < end; i2++) {
+      if (!values[i2]) return i2;
+    }
+  }
+  const n = needle.length;
+  let i, j, row;
+  outer: for (i = start; i < end; i++) {
+    row = values[i];
+    if (row?.length === n) {
+      for (j = 0; j < n; j++) {
+        if (row[j] !== needle[j]) continue outer;
+      }
+      return i;
+    }
+  }
+  return -1;
+};
+export {
+  __indexOfSingle,
+  __indexOfTuple
+};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@thi.ng/column-store",
-	"version": "0.3.0",
+	"version": "0.4.0",
 	"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",
@@ -126,5 +126,5 @@
 		"status": "alpha",
 		"year": 2025
 	},
-	"gitHead": "e3f0a8a9868bb51ae0c0c4882763f68ec4083bc3\n"
+	"gitHead": "5c620a1aa00535cc7c674794790edd87b2e5e526\n"
 }

package/table.d.ts

@@ -27,6 +27,7 @@ export declare class Table {
     removeRow(i: number): void;
     getRow(i: number, safe?: boolean, includeID?: boolean): Row | undefined;
     getPartialRow(i: number, columns: string[], safe?: boolean, includeID?: boolean): Row | undefined;
+    indexOf(id: string, value: any, start?: number, end?: number): number;
     validateRow(row: Row): void;
     validateColumnSpec(id: string, spec: ColumnSpec): void;
     toJSON(): {

package/table.js

@@ -98,6 +98,9 @@ class Table {
     }
     return row;
   }
+  indexOf(id, value, start, end) {
+    return this.columns[id]?.indexOf(value, start, end) ?? -1;
+  }
   validateRow(row) {
     const { columns } = this;
     for (let id in columns) {
@@ -114,15 +117,13 @@ class Table {
         `unsupported flags for column type: ${spec.type}`
       );
     const [min, max] = spec.cardinality;
-    if (max < min)
+    if (max < min || min < def.cardinality[0] || max > def.cardinality[1] || max < 1)
       __columnError(id, `wrong cardinality: ${spec.cardinality}`);
-    if (min < def.cardinality[0] || max > def.cardinality[1])
-      __columnError(id, `wrong cardimality`);
     if (def.required && min === 0 && spec.default == null)
       __columnError(id, `missing default value`);
     if (spec.default != null) {
       if (max > 1 !== isArray(spec.default))
-        __columnError(id, `default value`);
+        __columnError(id, `wrong default value`);
     }
   }
   toJSON() {