Skip to content

Commit 46e3e32

Browse files
committed
Merge remote-tracking branch 'origin/develop' into ji/fix-up-execute
Signed-off-by: Joe Isaacs <joe.isaacs@live.co.uk> # Conflicts: # vortex-array/src/executor.rs
2 parents 10ae9eb + 8b09d0c commit 46e3e32

547 files changed

Lines changed: 27284 additions & 21405 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,3 @@ runs:
8383
- name: Install Protoc (for lance-encoding build step)
8484
if: runner.os != 'Windows'
8585
uses: ./.github/actions/setup-protoc
86-
87-
- name: Install Sweep
88-
shell: bash
89-
if: ${{ inputs.timestamp == 'true' && github.ref_name == 'develop' }}
90-
run: cargo install cargo-sweep
91-
92-
- name: Timestamp Cache
93-
shell: bash
94-
if: ${{ inputs.timestamp == 'true' && github.ref_name == 'develop' }}
95-
run: cargo sweep --stamp

.github/workflows/approvals.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
jobs:
88
check-approvals:
99
runs-on: ubuntu-latest
10+
timeout-minutes: 10
1011
steps:
1112
- name: Check required approvals
1213
uses: actions/github-script@450193c5abd4cdb17ba9f3ffcfe8f635c4bb6c2a

.github/workflows/bench-dispatch.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ permissions:
1818
jobs:
1919
remove-bench-label:
2020
runs-on: ubuntu-latest
21-
timeout-minutes: 2
21+
timeout-minutes: 10
2222
if: github.event.label.name == 'action/benchmark'
2323
steps:
2424
- uses: actions-ecosystem/action-remove-labels@v1
@@ -34,7 +34,7 @@ jobs:
3434

3535
remove-sql-label:
3636
runs-on: ubuntu-latest
37-
timeout-minutes: 2
37+
timeout-minutes: 10
3838
if: github.event.label.name == 'action/benchmark-sql'
3939
steps:
4040
- uses: actions-ecosystem/action-remove-labels@v1

.github/workflows/bench-pr.yml

Lines changed: 1 addition & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949

5050
- name: Install DuckDB
5151
run: |
52-
wget -qO- https://github.com/duckdb/duckdb/releases/download/v1.4.2/duckdb_cli-linux-amd64.zip | funzip > duckdb
52+
wget -qO- https://github.com/duckdb/duckdb/releases/download/v1.5.2/duckdb_cli-linux-amd64.zip | funzip > duckdb
5353
chmod +x duckdb
5454
echo "$PWD" >> $GITHUB_PATH
5555
@@ -137,82 +137,3 @@ jobs:
137137
secrets: inherit
138138
with:
139139
mode: "pr"
140-
benchmark_matrix: |
141-
[
142-
{
143-
"id": "clickbench-nvme",
144-
"subcommand": "clickbench",
145-
"name": "Clickbench on NVME",
146-
"targets": "datafusion:parquet,datafusion:vortex,duckdb:parquet,duckdb:vortex,duckdb:duckdb",
147-
"extra_data_formats": "vortex-compact"
148-
},
149-
{
150-
"id": "tpch-nvme",
151-
"subcommand": "tpch",
152-
"name": "TPC-H SF=1 on NVME",
153-
"targets": "datafusion:arrow,datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact,duckdb:duckdb",
154-
"scale_factor": "1.0"
155-
},
156-
{
157-
"id": "tpch-s3",
158-
"subcommand": "tpch",
159-
"name": "TPC-H SF=1 on S3",
160-
"local_dir": "vortex-bench/data/tpch/1.0",
161-
"remote_storage": "s3://vortex-ci-benchmark-datasets/${{github.ref_name}}/${{github.run_id}}/tpch/1.0/",
162-
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact",
163-
"scale_factor": "1.0"
164-
},
165-
{
166-
"id": "tpch-nvme-10",
167-
"subcommand": "tpch",
168-
"name": "TPC-H SF=10 on NVME",
169-
"targets": "datafusion:arrow,datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact,duckdb:duckdb",
170-
"scale_factor": "10.0"
171-
},
172-
{
173-
"id": "tpch-s3-10",
174-
"subcommand": "tpch",
175-
"name": "TPC-H SF=10 on S3",
176-
"local_dir": "vortex-bench/data/tpch/10.0",
177-
"remote_storage": "s3://vortex-ci-benchmark-datasets/${{github.ref_name}}/${{github.run_id}}/tpch/10.0/",
178-
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact",
179-
"scale_factor": "10.0"
180-
},
181-
{
182-
"id": "tpcds-nvme",
183-
"subcommand": "tpcds",
184-
"name": "TPC-DS SF=1 on NVME",
185-
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact,duckdb:duckdb",
186-
"scale_factor": "1.0"
187-
},
188-
{
189-
"id": "statpopgen",
190-
"subcommand": "statpopgen",
191-
"name": "Statistical and Population Genetics",
192-
"targets": "duckdb:parquet,duckdb:vortex,duckdb:vortex-compact",
193-
"scale_factor": "100"
194-
},
195-
{
196-
"id": "fineweb",
197-
"subcommand": "fineweb",
198-
"name": "FineWeb NVMe",
199-
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact",
200-
"scale_factor": "100"
201-
},
202-
{
203-
"id": "fineweb-s3",
204-
"subcommand": "fineweb",
205-
"name": "FineWeb S3",
206-
"local_dir": "vortex-bench/data/fineweb",
207-
"remote_storage": "s3://vortex-ci-benchmark-datasets/${{github.ref_name}}/${{github.run_id}}/fineweb/",
208-
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact",
209-
"scale_factor": "100"
210-
},
211-
{
212-
"id": "polarsignals",
213-
"subcommand": "polarsignals",
214-
"name": "PolarSignals Profiling",
215-
"targets": "datafusion:vortex",
216-
"scale_factor": "1"
217-
},
218-
]

.github/workflows/bench.yml

Lines changed: 2 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ permissions:
1414
jobs:
1515
commit-metadata:
1616
runs-on: ubuntu-latest
17-
timeout-minutes: 120
17+
timeout-minutes: 10
1818
steps:
1919
- uses: actions/checkout@v6
2020
- name: Setup AWS CLI
@@ -63,7 +63,7 @@ jobs:
6363

6464
- name: Install DuckDB
6565
run: |
66-
wget -qO- https://github.com/duckdb/duckdb/releases/download/v1.4.2/duckdb_cli-linux-amd64.zip | funzip > duckdb
66+
wget -qO- https://github.com/duckdb/duckdb/releases/download/v1.5.2/duckdb_cli-linux-amd64.zip | funzip > duckdb
6767
chmod +x duckdb
6868
echo "$PWD" >> $GITHUB_PATH
6969
@@ -118,83 +118,3 @@ jobs:
118118
secrets: inherit
119119
with:
120120
mode: "develop"
121-
benchmark_matrix: |
122-
[
123-
{
124-
"id": "clickbench-nvme",
125-
"subcommand": "clickbench",
126-
"name": "Clickbench on NVME",
127-
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,datafusion:lance,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact,duckdb:duckdb",
128-
"build_lance": true
129-
},
130-
{
131-
"id": "tpch-nvme",
132-
"subcommand": "tpch",
133-
"name": "TPC-H SF=1 on NVME",
134-
"targets": "datafusion:arrow,datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,datafusion:lance,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact,duckdb:duckdb",
135-
"scale_factor": "1.0",
136-
"build_lance": true
137-
},
138-
{
139-
"id": "tpch-s3",
140-
"subcommand": "tpch",
141-
"name": "TPC-H SF=1 on S3",
142-
"local_dir": "vortex-bench/data/tpch/1.0",
143-
"remote_storage": "s3://vortex-ci-benchmark-datasets/${{github.ref_name}}/${{github.run_id}}/tpch/1.0/",
144-
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact",
145-
"scale_factor": "1.0"
146-
},
147-
{
148-
"id": "tpch-nvme-10",
149-
"subcommand": "tpch",
150-
"name": "TPC-H SF=10 on NVME",
151-
"targets": "datafusion:arrow,datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,datafusion:lance,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact,duckdb:duckdb",
152-
"scale_factor": "10.0",
153-
"build_lance": true
154-
},
155-
{
156-
"id": "tpch-s3-10",
157-
"subcommand": "tpch",
158-
"name": "TPC-H SF=10 on S3",
159-
"local_dir": "vortex-bench/data/tpch/10.0",
160-
"remote_storage": "s3://vortex-ci-benchmark-datasets/${{github.ref_name}}/${{github.run_id}}/tpch/10.0/",
161-
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact",
162-
"scale_factor": "10.0"
163-
},
164-
{
165-
"id": "tpcds-nvme",
166-
"subcommand": "tpcds",
167-
"name": "TPC-DS SF=1 on NVME",
168-
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact,duckdb:duckdb",
169-
"scale_factor": "1.0"
170-
},
171-
{
172-
"id": "statpopgen",
173-
"subcommand": "statpopgen",
174-
"name": "Statistical and Population Genetics",
175-
"local_dir": "vortex-bench/data/statpopgen",
176-
"targets": "duckdb:parquet,duckdb:vortex,duckdb:vortex-compact",
177-
"scale_factor": "100"
178-
},
179-
{
180-
"id": "fineweb",
181-
"subcommand": "fineweb",
182-
"name": "FineWeb NVMe",
183-
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact"
184-
},
185-
{
186-
"id": "fineweb-s3",
187-
"subcommand": "fineweb",
188-
"name": "FineWeb S3",
189-
"local_dir": "vortex-bench/data/fineweb",
190-
"remote_storage": "s3://vortex-ci-benchmark-datasets/${{github.ref_name}}/${{github.run_id}}/fineweb/",
191-
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact"
192-
},
193-
{
194-
"id": "polarsignals",
195-
"subcommand": "polarsignals",
196-
"name": "PolarSignals Profiling",
197-
"targets": "datafusion:vortex",
198-
"scale_factor": "1"
199-
},
200-
]

0 commit comments

Comments
 (0)