Merge upstream Vortex 0.86.1 into spiceai-55

.agents/skills/bench-performance/SKILL.md

@@ -114,7 +114,7 @@ Supported diagnostics:
 
 - `--formats parquet,vortex,vortex-compact,lance,arrow`;
 - `--queries 6`, `--exclude-queries 1,2`, `--iterations N`, `--display-format gh-json`;
-- `--hide-progress-bar`, `-o /private/tmp/out.jsonl`, `--gh-json-v3 /private/tmp/out.v3.jsonl`;
+- `--hide-progress-bar`, `-o /private/tmp/out.jsonl`, `--ingest-jsonl /private/tmp/out.ingest.jsonl`;
 - `--verbose`, `--tracing`, `--track-memory`, `--runner NAME`, `--opt key=value`;
 - `--explain` prints query plans instead of timing;
 - `--show-metrics` prints Vortex execution-plan metrics after a timed run.
@@ -149,7 +149,7 @@ Supported diagnostics:
 - `--reuse` keeps one DuckDB connection across iterations, useful with Samply to keep work on the
   same threads;
 - common flags: `--queries`, `--exclude-queries`, `--iterations`, `--display-format`,
-  `--hide-progress-bar`, `-o`, `--gh-json-v3`, `--track-memory`, `--verbose`, `--tracing`,
+  `--hide-progress-bar`, `-o`, `--ingest-jsonl`, `--track-memory`, `--verbose`, `--tracing`,
   `--runner`, `--opt`, `--explain`.
 
 Example:
@@ -171,7 +171,7 @@ Important differences:
 - no `--formats`: the binary always generates/registers Lance data and reports `datafusion:lance`;
 - no `--explain` or `--show-metrics` path today;
 - common flags: `--queries`, `--exclude-queries`, `--iterations`, `--display-format`,
-  `--hide-progress-bar`, `-o`, `--gh-json-v3`, `--track-memory`, `--verbose`, `--tracing`,
+  `--hide-progress-bar`, `-o`, `--ingest-jsonl`, `--track-memory`, `--verbose`, `--tracing`,
   `--runner`, `--opt`;
 - `--threads` is parsed but currently not wired into the Lance/DataFusion session.
 

.agents/skills/samply/scripts/profile_inverted_tree.py

@@ -6,6 +6,7 @@
 import argparse
 import collections
 import re
+from collections.abc import Callable
 from pathlib import Path
 from typing import Any
 
@@ -36,7 +37,7 @@ def thread_matches(thread: dict[str, Any], thread_re: re.Pattern[str] | None, ti
     return bool(thread_re.search(str(thread.get("name", ""))) or thread_re.search(str(thread.get("tid", ""))))
 
 
-def frame_labels(thread: dict[str, Any], symbols: dict[str, str]) -> Any:
+def frame_labels(thread: dict[str, Any], symbols: dict[str, str]) -> Callable[[int], str]:
     cache: dict[int, str] = {}
 
     def label(frame_index: int) -> str:

.agents/skills/samply/scripts/profile_summary.py

@@ -22,14 +22,14 @@ def load_profile(path: Path) -> dict[str, Any]:
         return json.load(f)
 
 
-def value_at(table: dict[str, Any], key: str, index: int, default: Any = None) -> Any:
+def value_at(table: dict[str, Any], key: str, index: int, default: object = None) -> object:
     values = table.get(key)
     if not isinstance(values, list) or index < 0 or index >= len(values):
         return default
     return values[index]
 
 
-def decode_string(thread: dict[str, Any], value: Any) -> str:
+def decode_string(thread: dict[str, Any], value: object) -> str:
     strings = thread.get("stringArray") or []
     if isinstance(value, int) and 0 <= value < len(strings):
         return str(strings[value])
@@ -38,7 +38,7 @@ def decode_string(thread: dict[str, Any], value: Any) -> str:
     return str(value)
 
 
-def resource_name(thread: dict[str, Any], resource_index: Any) -> str:
+def resource_name(thread: dict[str, Any], resource_index: object) -> str:
     if not isinstance(resource_index, int):
         return ""
     resource_table = thread.get("resourceTable") or {}
@@ -72,7 +72,7 @@ def frame_label(thread: dict[str, Any], frame_index: int, symbols: dict[str, str
     return label
 
 
-def expand_stack(thread: dict[str, Any], stack_index: Any) -> list[int]:
+def expand_stack(thread: dict[str, Any], stack_index: object) -> list[int]:
     if not isinstance(stack_index, int):
         return []
 

.cargo/config.toml

@@ -18,6 +18,19 @@ timeout = 3600
 # Environment variables for PyO3. Ensures reproducible builds and avoids spurious recompilations.
 [env]
 PYO3_ENVIRONMENT_SIGNATURE = { value = "cpython-3.11-64bit", force = true }
+# Read by benchmarks marked `#[cpu_features]` (see the `vortex-bench-support` crate), which
+# expands to code reading both with `env!`. VORTEX_BENCH_VARIANT names the run: the benchmark
+# is skipped when it is "simulation", and runs otherwise. VORTEX_BENCH_PREFIX and
+# VORTEX_BENCH_SUFFIX wrap the benchmark's name, so a CI leg can label the numbers it produced:
+# the prefix is the `::` component the leg's benchmark filter selects on, and the suffix is on
+# the leaf name, which is the part CodSpeed reports under.
+#
+# The values below are what a plain `cargo bench` wants: nothing skipped, names left bare. The
+# per-feature-set jobs in `.github/workflows/codspeed.yml` set their own. None of them is `force`d,
+# so the value those jobs export wins over the one here.
+VORTEX_BENCH_VARIANT = "local"
+VORTEX_BENCH_PREFIX = ""
+VORTEX_BENCH_SUFFIX = ""
 
 [cache.global-clean]
 # Anything older than this duration will be deleted in the source cache.

.github/actions/setup-duckdb/action.yml

@@ -0,0 +1,26 @@
+name: "Setup DuckDB"
+description: "Download the DuckDB CLI and put it on PATH"
+inputs:
+  duckdb_version:
+    description: "Version of the DuckDB CLI"
+    default: "1.5.5"
+runs:
+  using: "composite"
+  steps:
+    - name: Download DuckDB
+      shell: bash
+      run: |
+        case "$(uname -m)" in
+          x86_64) duckdb_arch=amd64 ;;
+          aarch64|arm64) duckdb_arch=arm64 ;;
+          *)
+            echo "Unsupported architecture: $(uname -m)" >&2
+            exit 1
+            ;;
+        esac
+
+        wget -qO- \
+          "https://github.com/duckdb/duckdb/releases/download/v${{ inputs.duckdb_version }}/duckdb_cli-linux-${duckdb_arch}.zip" \
+          | funzip > duckdb
+        chmod +x duckdb
+        echo "$PWD" >> "$GITHUB_PATH"