Skip to content

Commit 1af1fee

Browse files
committed
feat: Support iceberg catalog mode
1 parent 6327983 commit 1af1fee

2 files changed

Lines changed: 19 additions & 0 deletions

File tree

.github/workflows/run_spicebench_debug_spice_cloud.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,14 @@ on:
8181
required: false
8282
default: '16Gi'
8383
type: string
84+
catalog_mode:
85+
description: 'ADBC runtime catalog mode for spidapter (cayenne keeps existing spicebench.bench catalog, iceberg-write-through uses Glue-backed iceberg_catalog.cayenne with write-through acceleration)'
86+
required: false
87+
default: 'cayenne'
88+
type: choice
89+
options:
90+
- cayenne
91+
- iceberg-write-through
8492
custom_image:
8593
description: 'Custom runtime container image (e.g. ghcr.io/spiceai/spiceai-dev:spicebench-sf10). Overrides the default channel image. Requires the internal update channel on the target SCP environment.'
8694
required: false
@@ -173,6 +181,7 @@ jobs:
173181
SPIDAPTER_ICEBERG_REGION: us-west-1
174182
SPIDAPTER_ICEBERG_CATALOG_FROM: iceberg:https://glue.us-west-1.amazonaws.com/iceberg/v1/catalogs/211125479522/namespaces
175183
DISABLE_TEARDOWN: ${{ github.event.inputs.disable_teardown || 'false' }}
184+
CATALOG_MODE: ${{ github.event.inputs.catalog_mode || 'cayenne' }}
176185
ENABLE_PVC: ${{ github.event.inputs.enable_pvc || 'false' }}
177186
EXECUTOR_REPLICAS: ${{ github.event.inputs.executor_replicas || '4' }}
178187
SPIDAPTER_APP_MEMORY_LIMIT: ${{ github.event.inputs.app_memory_limit || '16Gi' }}
@@ -270,6 +279,11 @@ jobs:
270279
NO_TEARDOWN_ARG="--no-teardown"
271280
fi
272281
282+
CATALOG_MODE_ARG=""
283+
if [ -n "${CATALOG_MODE:-}" ]; then
284+
CATALOG_MODE_ARG="--system-adapter-param catalog_mode=${CATALOG_MODE}"
285+
fi
286+
273287
~/.spice/bin/spicebench run \
274288
--concurrency "${NUM_QUERY_CLIENTS}" \
275289
--scenario "${SCENARIO}" \
@@ -283,3 +297,4 @@ jobs:
283297
${ADAPTER_ENVS} \
284298
${SCHEDULER_STATE_ADAPTER_ENV} \
285299
${NO_TEARDOWN_ARG} \
300+
${CATALOG_MODE_ARG} \

src/commands/run.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -335,6 +335,10 @@ pub async fn execute(args: &RunArgs) -> anyhow::Result<()> {
335335
};
336336
let mut setup_metadata: HashMap<String, serde_json::Value> = setup_map.into_iter().collect();
337337

338+
for (key, value) in &args.system_adapter_param {
339+
setup_metadata.insert(key.clone(), serde_json::json!(value));
340+
}
341+
338342
if let Ok(system_under_test) = std::env::var("SYSTEM_UNDER_TEST") {
339343
setup_metadata.insert(
340344
"system_under_test".to_string(),

0 commit comments

Comments
 (0)