Merge branch 'master' into shub/table-name-to-accessor

Author: Shubham8287

.github/workflows/ci.yml

@@ -79,6 +79,25 @@ jobs:
         with:
           run_install: true
 
+      # Install emscripten for C++ module compilation tests.
+      - name: Install emscripten (Linux)
+        if: runner.os == 'Linux'
+        shell: bash
+        run: |
+          git clone https://github.com/emscripten-core/emsdk.git ~/emsdk
+          cd ~/emsdk
+          ./emsdk install 4.0.21
+          ./emsdk activate 4.0.21
+
+      - name: Install emscripten (Windows)
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: |
+          git clone https://github.com/emscripten-core/emsdk.git $env:USERPROFILE\emsdk
+          cd $env:USERPROFILE\emsdk
+          .\emsdk install 4.0.21
+          .\emsdk activate 4.0.21
+
       - name: Install psql (Windows)
         if: runner.os == 'Windows'
         run: choco install psql -y --no-progress
@@ -122,11 +141,27 @@ jobs:
       - name: Install cargo-nextest
         uses: taiki-e/install-action@nextest
 
-      - name: Run smoketests
-        # --test-threads=1 eliminates contention in the C# tests where they fight over bindings
-        # build artifacts.
-        # It also seemed to improve performance a fair amount (11m -> 6m)
-        run: cargo ci smoketests -- --test-threads=1
+      # --test-threads=1 eliminates contention in the C# tests where they fight over bindings
+      # build artifacts.
+      # It also seemed to improve performance a fair amount (11m -> 6m)
+      - name: Run smoketests (Linux)
+        if: runner.os == 'Linux'
+        shell: bash
+        run: |
+          if [ -f ~/emsdk/emsdk_env.sh ]; then
+            source ~/emsdk/emsdk_env.sh
+          fi
+          cargo ci smoketests -- --test-threads=1
+
+      # Due to Emscripten PATH issues this was separated to make sure OpenSSL still builds correctly
+      - name: Run smoketests (Windows)
+        if: runner.os == 'Windows'
+        shell: pwsh
+        run: |
+          if (Test-Path "$env:USERPROFILE\emsdk\emsdk_env.ps1") {
+            & "$env:USERPROFILE\emsdk\emsdk_env.ps1" | Out-Null
+          }
+          cargo ci smoketests -- --test-threads=1          
 
   smoketests-python:
     needs: [lints]
@@ -806,6 +841,12 @@ jobs:
           key: Unity-${{ github.head_ref }}
           restore-keys: Unity-
 
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ vars.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
       - name: Run Unity tests
         uses: game-ci/unity-test-runner@v4
         with:

.github/workflows/package.yml

@@ -14,7 +14,9 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - { name: x86_64 Linux, target: x86_64-unknown-linux-gnu, runner: spacetimedb-new-runner-2 }
+          # WARNING - do not upgrade this runner to 24.04 or the self hosted runners because it will break downloads for
+          #   anyone who uses a linux distro that doesn't have glibc >= GLIBC_2.38
+          - { name: x86_64 Linux, target: x86_64-unknown-linux-gnu, runner: ubuntu-22.04 }
           - { name: aarch64 Linux, target: aarch64-unknown-linux-gnu, runner: arm-runner }
           # Disabled because musl builds weren't working and we didn't want to investigate. See https://github.com/clockworklabs/SpacetimeDB/pull/2964.
           # - { name: x86_64 Linux musl, target: x86_64-unknown-linux-musl, runner: bare-metal, container: alpine }

.gitignore

@@ -234,6 +234,10 @@ new.json
 # C++ build data
 modules/benchmarks-cpp/build/
 modules/module-test-cpp/build/
+modules/sdk-test-cpp/build/
+modules/sdk-test-connect-disconnect-cpp/build/
+modules/sdk-test-procedure-cpp/build/
+modules/sdk-test-view-cpp/build/
 
 # Symlinked output from `nix build`
 result

Cargo.lock

@@ -255,6 +255,7 @@ rayon-core = "1.11.0"
 regex = "1"
 reqwest = { version = "0.12", features = ["stream", "json"] }
 rolldown = { git = "https://github.com/rolldown/rolldown.git", tag = "v1.0.0-beta.42" }
+rolldown_common = { git = "https://github.com/rolldown/rolldown.git", tag = "v1.0.0-beta.42" }
 rolldown_utils = { git = "https://github.com/rolldown/rolldown.git", tag = "v1.0.0-beta.42" }
 ron = "0.8"
 rusqlite = { version = "0.29.0", features = ["bundled", "column_decltype"] }

Cargo.toml

@@ -25,7 +25,7 @@ import { DbConnection } from './module_bindings';
 
 const connection = DbConnection.builder()
   .withUri('ws://localhost:3000')
-  .withModuleName('MODULE_NAME')
+  .withDatabaseName('MODULE_NAME')
   .onDisconnect(() => {
     console.log('disconnected');
   })
@@ -71,7 +71,7 @@ This module also include React hooks to subscribe to tables under the `spacetime
 ```tsx
 const connectionBuilder = DbConnection.builder()
   .withUri('ws://localhost:3000')
-  .withModuleName('MODULE_NAME')
+  .withDatabaseName('MODULE_NAME')
   .withLightMode(true)
   .onDisconnect(() => {
     console.log('disconnected');

crates/bindings-typescript/README.md

@@ -20,8 +20,7 @@
   "author": "Clockwork Labs",
   "type": "module",
   "sideEffects": [
-    "./src/server/polyfills.ts",
-    "./src/server/register_hooks.ts"
+    "./src/server/polyfills.ts"
   ],
   "scripts": {
     "build:js": "tsup",

crates/bindings-typescript/package.json

@@ -12,6 +12,7 @@ export type IndexOpts<AllowedCol extends string> = {
   name?: string;
 } & (
   | { algorithm: 'btree'; columns: readonly AllowedCol[] }
+  | { algorithm: 'hash'; columns: readonly AllowedCol[] }
   | { algorithm: 'direct'; column: AllowedCol }
 );
 
@@ -21,7 +22,7 @@ export type IndexOpts<AllowedCol extends string> = {
 export type UntypedIndex<AllowedCol extends string> = {
   name: string;
   unique?: boolean;
-  algorithm: 'btree' | 'direct';
+  algorithm: 'btree' | 'direct' | 'hash';
   columns: readonly AllowedCol[];
 };
 
@@ -47,14 +48,17 @@ export type Indexes<
 };
 
 /**
- * A type representing a database index, which can be either unique or ranged.
+ * A type representing a database index,
+ * which can either be unique or filter for a single value or range of values.
  */
 export type Index<
   TableDef extends UntypedTableDef,
   I extends UntypedIndex<keyof TableDef['columns'] & string>,
 > = I['unique'] extends true
   ? UniqueIndex<TableDef, I>
-  : RangedIndex<TableDef, I>;
+  : I['algorithm'] extends 'hash'
+    ? PointIndex<TableDef, I>
+    : RangedIndex<TableDef, I>;
 
 /**
  * A type representing a collection of read-only indexes defined on a table.
@@ -67,15 +71,18 @@ export type ReadonlyIndexes<
 };
 
 /**
- * A type representing a read-only database index, which can be either unique or ranged.
+ * A type representing a read-only database index,
+ * which can be either unique, pointed, or ranged.
  * This type only exposes read-only operations.
  */
 export type ReadonlyIndex<
   TableDef extends UntypedTableDef,
   I extends UntypedIndex<keyof TableDef['columns'] & string>,
 > = I['unique'] extends true
   ? ReadonlyUniqueIndex<TableDef, I>
-  : ReadonlyRangedIndex<TableDef, I>;
+  : I['algorithm'] extends 'hash'
+    ? ReadonlyPointIndex<TableDef, I>
+    : ReadonlyRangedIndex<TableDef, I>;
 
 /**
  * A type representing a read-only unique index on a database table.
@@ -99,6 +106,29 @@ export interface UniqueIndex<
   update(colVal: Prettify<RowType<TableDef>>): Prettify<RowType<TableDef>>;
 }
 
+/**
+ * A type representing a read-only point index on a database table.
+ */
+export interface ReadonlyPointIndex<
+  TableDef extends UntypedTableDef,
+  I extends UntypedIndex<keyof TableDef['columns'] & string>,
+> {
+  filter(
+    point: IndexVal<TableDef, I>
+  ): IteratorObject<Prettify<RowType<TableDef>>, undefined>;
+}
+
+/**
+ * A type representing a point index on a database table.
+ * Point indexes allow for exact match queries on the indexed columns.
+ */
+export interface PointIndex<
+  TableDef extends UntypedTableDef,
+  I extends UntypedIndex<keyof TableDef['columns'] & string>,
+> extends ReadonlyPointIndex<TableDef, I> {
+  delete(point: IndexVal<TableDef, I>): number;
+}
+
 /**
  * A type representing a read-only ranged index on a database table.
  */
@@ -190,7 +220,7 @@ export type ColumnIndex<
     name: Name;
     unique: ColumnIsUnique<M>;
     columns: readonly [Name];
-    algorithm: 'btree' | 'direct';
+    algorithm: 'btree' | 'direct' | 'hash';
   } & (M extends {
     indexType: infer I extends NonNullable<IndexTypes>;
   }

crates/bindings-typescript/src/lib/autogen/function_visibility_type.ts

@@ -41,15 +41,20 @@ type ColList = ColId[];
 /**
  * Check if any column in the row has invalid metadata.
  */
-type HasInvalidColumn<Row extends RowObj> = {
-  [K in keyof Row]: Row[K] extends ColumnBuilder<any, any, infer M>
-    ? ValidateColumnMetadata<M> extends InvalidColumnMetadata<any>
-      ? true
-      : false
-    : false;
-}[keyof Row] extends false
-  ? false
-  : true;
+type HasInvalidColumn<Row extends RowObj> =
+  // this checks if Row exactly equals RowObj - if it does, we can't
+  // do type-system-level checking, so just let it pass
+  (<G>() => G extends Row ? 1 : 2) extends <G>() => G extends RowObj ? 1 : 2
+    ? false
+    : {
+          [K in keyof Row]: Row[K] extends ColumnBuilder<any, any, infer M>
+            ? ValidateColumnMetadata<M> extends InvalidColumnMetadata<any>
+              ? true
+              : false
+            : false;
+        }[keyof Row] extends false
+      ? false
+      : true;
 
 /**
  * Extract the names of columns that have invalid metadata.
@@ -336,6 +341,9 @@ export function table<Row extends RowObj, const Opts extends TableOpts<Row>>(
         case 'btree':
           algorithm = RawIndexAlgorithm.BTree([id]);
           break;
+        case 'hash':
+          algorithm = RawIndexAlgorithm.Hash([id]);
+          break;
         case 'direct':
           algorithm = RawIndexAlgorithm.Direct(id);
           break;
@@ -393,6 +401,12 @@ export function table<Row extends RowObj, const Opts extends TableOpts<Row>>(
           value: indexOpts.columns.map(c => colIds.get(c)!),
         };
         break;
+      case 'hash':
+        algorithm = {
+          tag: 'Hash',
+          value: indexOpts.columns.map(c => colIds.get(c)!),
+        };
+        break;
       case 'direct':
         algorithm = { tag: 'Direct', value: colIds.get(indexOpts.column)! };
         break;