|
17 | 17 | options: |
18 | 18 | - spidapter |
19 | 19 | - databricks |
| 20 | + databricks_variant: |
| 21 | + description: 'Databricks adapter variant (databricks or lakebase)' |
| 22 | + required: false |
| 23 | + default: 'databricks' |
| 24 | + type: choice |
| 25 | + options: |
| 26 | + - databricks |
| 27 | + - lakebase |
20 | 28 | etl_bucket: |
21 | 29 | description: 'S3 bucket for ETL source and target data' |
22 | 30 | required: true |
@@ -117,6 +125,7 @@ jobs: |
117 | 125 | DATABRICKS_SQL_WAREHOUSE_ID: ${{ secrets.DATABRICKS_SQL_WAREHOUSE_ID }} |
118 | 126 | DATABRICKS_CATALOG: ${{ secrets.DATABRICKS_CATALOG }} |
119 | 127 | DATABRICKS_SCHEMA: ${{ secrets.DATABRICKS_SCHEMA }} |
| 128 | + DATABRICKS_VARIANT: ${{ github.event.inputs.databricks_variant || 'databricks' }} |
120 | 129 | DATABRICKS_TABLE_FORMAT: ${{ github.event.inputs.table_format || 'parquet' }} |
121 | 130 | run: | |
122 | 131 | set -euo pipefail |
@@ -145,6 +154,11 @@ jobs: |
145 | 154 | ;; |
146 | 155 |
|
147 | 156 | databricks) |
| 157 | + if [ "${DATABRICKS_VARIANT}" != "databricks" ] && [ "${DATABRICKS_VARIANT}" != "lakebase" ]; then |
| 158 | + echo "DATABRICKS_VARIANT must be either 'databricks' or 'lakebase'" |
| 159 | + exit 1 |
| 160 | + fi |
| 161 | +
|
148 | 162 | for required_var in DATABRICKS_ENDPOINT DATABRICKS_TOKEN DATABRICKS_HTTP_PATH DATABRICKS_SQL_WAREHOUSE_ID; do |
149 | 163 | if [ -z "${!required_var:-}" ]; then |
150 | 164 | echo "${required_var} must be set for databricks adapter mode" |
@@ -200,6 +214,7 @@ jobs: |
200 | 214 | DATABRICKS_SQL_WAREHOUSE_ID: ${{ secrets.DATABRICKS_SQL_WAREHOUSE_ID }} |
201 | 215 | DATABRICKS_CATALOG: ${{ secrets.DATABRICKS_CATALOG }} |
202 | 216 | DATABRICKS_SCHEMA: ${{ secrets.DATABRICKS_SCHEMA }} |
| 217 | + DATABRICKS_VARIANT: ${{ github.event.inputs.databricks_variant || 'databricks' }} |
203 | 218 | DATABRICKS_TABLE_FORMAT: ${{ github.event.inputs.table_format || 'parquet' }} |
204 | 219 | SPICEAI_BENCHMARK_METRICS_KEY: ${{ secrets.SPICEAI_BENCHMARK_METRICS_KEY }} |
205 | 220 | SCENARIO: ${{ github.event.inputs.scenario || 'tpch' }} |
@@ -228,7 +243,7 @@ jobs: |
228 | 243 | if [ "${SYSTEM_ADAPTER}" = "databricks" ]; then |
229 | 244 | ADAPTER_CMD="${HOME}/.spice/bin/databricks-system-adapter" |
230 | 245 | ADAPTER_ARGS="stdio" |
231 | | - ADAPTER_ENVS="--system-adapter-env DATABRICKS_ENDPOINT=${DATABRICKS_ENDPOINT} --system-adapter-env DATABRICKS_TOKEN=${DATABRICKS_TOKEN} --system-adapter-env DATABRICKS_HTTP_PATH=${DATABRICKS_HTTP_PATH} --system-adapter-env DATABRICKS_SQL_WAREHOUSE_ID=${DATABRICKS_SQL_WAREHOUSE_ID} --system-adapter-env DATABRICKS_TABLE_FORMAT=${DATABRICKS_TABLE_FORMAT}" |
| 246 | + ADAPTER_ENVS="--system-adapter-env DATABRICKS_ENDPOINT=${DATABRICKS_ENDPOINT} --system-adapter-env DATABRICKS_TOKEN=${DATABRICKS_TOKEN} --system-adapter-env DATABRICKS_HTTP_PATH=${DATABRICKS_HTTP_PATH} --system-adapter-env DATABRICKS_SQL_WAREHOUSE_ID=${DATABRICKS_SQL_WAREHOUSE_ID} --system-adapter-env DATABRICKS_VARIANT=${DATABRICKS_VARIANT} --system-adapter-env DATABRICKS_TABLE_FORMAT=${DATABRICKS_TABLE_FORMAT}" |
232 | 247 |
|
233 | 248 | if [ -n "${DATABRICKS_CATALOG}" ]; then |
234 | 249 | ADAPTER_ENVS="${ADAPTER_ENVS} --system-adapter-env DATABRICKS_CATALOG=${DATABRICKS_CATALOG}" |
|
0 commit comments