Skip to content

Commit dac2f2b

Browse files
Merge pull request #268 from cyyeh/fix-bq-cache-issue
fix issue#261 and add bq to playground1
2 parents ecc837d + 1fca7c7 commit dac2f2b

File tree

9 files changed

+931
-433
lines changed

9 files changed

+931
-433
lines changed

labs/playground1/.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ node_modules
22
result.json
33
spec-oas3.yaml
44
.vulcan-debug
5-
dist
5+
dist
6+
tmp

labs/playground1/Makefile

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ start: build test-data/moma.db ../../node_modules
66
@vulcan start
77

88
# build the required packages
9-
build: pkg-core pkg-build pkg-serve pkg-catalog-server pkg-cli pkg-extension-driver-duckdb pkg-extension-authenticator-canner pkg-extension-driver-canner pkg-extension-driver-clickhouse pkg-extension-huggingface
9+
build: pkg-core pkg-build pkg-serve pkg-catalog-server pkg-cli pkg-extension-driver-duckdb \
10+
pkg-extension-authenticator-canner pkg-extension-driver-canner \
11+
pkg-extension-driver-clickhouse pkg-extension-driver-bq \
12+
pkg-extension-huggingface
1013

1114

1215
# build for core pakge
@@ -71,6 +74,13 @@ pkg-extension-driver-clickhouse: ../../node_modules
7174
cp -R ./dist/packages/extension-driver-clickhouse ./labs/playground1/node_modules/@vulcan-sql; \
7275
cp -R ./packages/extension-driver-clickhouse/node_modules ./labs/playground1
7376

77+
pkg-extension-driver-bq: ../../node_modules
78+
@cd ../..; \
79+
yarn nx build extension-driver-bq; \
80+
mkdir -p ./labs/playground1/node_modules/@vulcan-sql; \
81+
rm -rf ./labs/playground1/node_modules/@vulcan-sql/extension-driver-bq; \
82+
cp -R ./dist/packages/extension-driver-bq ./labs/playground1/node_modules/@vulcan-sql
83+
7484
pkg-extension-huggingface: ../../node_modules
7585
@cd ../..; \
7686
yarn nx build extension-huggingface; \

labs/playground1/package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
{
22
"name": "my-first-vulcan-project",
33
"dependencies": {
4-
"@vulcan-sql/core": "0.2.0-dev.20220922.0",
5-
"@vulcan-sql/extension-driver-duckdb": "0.2.0-dev.20220919.0",
6-
"@vulcan-sql/serve": "0.2.0-dev.20220922.0"
4+
"@vulcan-sql/core": "0.7.2",
5+
"@vulcan-sql/extension-driver-duckdb": "0.7.2",
6+
"@vulcan-sql/extension-driver-bq": "0.7.2",
7+
"@vulcan-sql/serve": "0.7.2"
78
},
89
"devDependencies": {
9-
"@vulcan-sql/build": "0.2.0-dev.20220922.0"
10+
"@vulcan-sql/build": "0.7.2"
1011
}
1112
}

labs/playground1/profile.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
- name: duck
1+
- name: duckdb
22
type: duckdb
3+
allow: "*"
34
connection:
45
persistent-path: ./test-data/moma.db
56
log-queries: true
67
log-parameters: true
7-
allow: '*'

labs/playground1/sqls/artist/artist.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ request:
88
sample:
99
parameters:
1010
id: '1'
11-
profile: duck
12-
profile: duck
11+
profile: duckdb
12+
profile: duckdb

labs/playground1/sqls/artist/works.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ request:
88
sample:
99
parameters:
1010
id: '1'
11-
profile: duck
12-
profile: duck
11+
profile: duckdb
12+
profile: duckdb
1313
pagination:
1414
mode: offset

labs/playground1/vulcan.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ document-generator:
2020
- oas3
2121
types:
2222
- RESTFUL
23-
extensions:
24-
duckdb: '@vulcan-sql/extension-driver-duckdb'
2523
profiles:
2624
- profile.yaml
2725
rate-limit:
@@ -40,3 +38,9 @@ response-format:
4038
formats:
4139
- json
4240
- csv
41+
extensions:
42+
duckdb: '@vulcan-sql/extension-driver-duckdb'
43+
cache:
44+
type: parquet
45+
folderPath: tmp
46+
loader: duckdb

0 commit comments

Comments
 (0)