Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
156 commits
Select commit Hold shift + click to select a range
a4ae3d1
fix show columns
RemHero Jun 4, 2024
a406f2f
test
RemHero Jun 4, 2024
918a760
test
RemHero Jun 4, 2024
e083c74
test
RemHero Jun 5, 2024
4a4c798
fix pom
RemHero Jun 5, 2024
621cf38
add interface
RemHero Jun 6, 2024
f065562
fix
RemHero Jun 6, 2024
e16e2ae
fix
RemHero Jun 6, 2024
aa69181
format
RemHero Jun 6, 2024
4c73402
add test
RemHero Jun 7, 2024
7acf6a8
remove test
RemHero Jun 7, 2024
aa3b103
feat(redis): show columns with pattern and tagFilter
aqni Jun 7, 2024
4c08d43
feat(mongodb): show columns with pattern and tagFilter
aqni Jun 7, 2024
f2bf124
build: convenient version switching (#349)
aqni Jun 7, 2024
54ae681
build: update project version to 0.7.0-SNAPSHOT (#354)
github-actions[bot] Jun 7, 2024
d018ef0
feat(query): adjust downsample query (#347)
shinyano Jun 7, 2024
2dc19cb
feat(parquet): show columns with pattern and tagFilter
aqni Jun 7, 2024
1d23dfc
Merge pull request #152 from aqni/feat/redis/show_columns_prefix_filt…
RemHero Jun 7, 2024
9360aae
Merge pull request #153 from aqni/feat/mongodb/show_columns_prefix_fi…
RemHero Jun 7, 2024
23ae9f6
Merge pull request #154 from aqni/feat/parquet/show_columns_prefix_fi…
RemHero Jun 7, 2024
f0b7fc5
influxdb get columns by pattern and tag
shinyano Jun 8, 2024
fe7a188
Merge pull request #156 from shinyano/fix/get-columns
RemHero Jun 8, 2024
0a0d7b5
relational get columns by pattern and tag
shinyano Jun 8, 2024
7c5e8c9
Merge pull request #157 from shinyano/fix/get-columns
RemHero Jun 8, 2024
0e368fb
fix influxdb & relational
shinyano Jun 8, 2024
d104944
Merge pull request #158 from shinyano/fix/get-columns
RemHero Jun 10, 2024
4836912
add test
RemHero Jun 10, 2024
9122833
fix mongo
aqni Jun 8, 2024
4cad9c4
fix mongodb
aqni Jun 11, 2024
cae24f7
fix
aqni Jun 8, 2024
48ca3fd
test parquet
aqni Jun 11, 2024
366cd86
fix parquet
aqni Jun 11, 2024
54562b3
Revert "test parquet"
aqni Jun 11, 2024
2eb9735
Merge pull request #160 from aqni/feat/mongodb/show_columns_prefix_fi…
RemHero Jun 11, 2024
fb01b6b
Merge pull request #161 from aqni/feat/parquet/show_columns_prefix_fi…
RemHero Jun 11, 2024
55d84e2
format
RemHero Jun 11, 2024
f23bd5d
fix parquet
RemHero Jun 11, 2024
e258635
fix parquet
RemHero Jun 11, 2024
39e11a7
add test
RemHero Jun 11, 2024
155f95b
test
RemHero Jun 11, 2024
039a7b4
test
RemHero Jun 11, 2024
f8e06e1
ci: manually run full test suite (#355)
aqni Jun 12, 2024
c3928c3
fix parquet
aqni Jun 12, 2024
5392117
Merge pull request #163 from aqni/feat/parquet/show_columns_prefix_fi…
RemHero Jun 13, 2024
4d31180
format
RemHero Jun 13, 2024
7326021
feat(optimizer): Join Factorization Rule, Optimizer Independent and C…
Yihao-Xu Jun 14, 2024
3219f56
fix(relational): fix concat function cannot apply more than 100 args …
Yihao-Xu Jun 14, 2024
9f6601c
fix
RemHero Jun 14, 2024
e5d6ae4
Merge branch 'main' into feat_show_columns_prefix_filter_push_down_test
RemHero Jun 14, 2024
45b3ca5
fix the code QL
RemHero Jun 14, 2024
7771fc2
foramt
RemHero Jun 14, 2024
253c38b
feat(optimizer): Outer Join Eliminate Rule (#358)
Yihao-Xu Jun 15, 2024
e0e84b6
rename
RemHero Jun 17, 2024
389382d
better IoTDB
RemHero Jun 17, 2024
ca90fc2
feat(influxdb&relational): show columns by pattern (#164)
shinyano Jun 18, 2024
38a92ba
fix IoTDB
RemHero Jun 18, 2024
e443ec5
fix IoTDB
RemHero Jun 19, 2024
00f1d2c
change default config of log and file-permission (#361)
aqni Jun 27, 2024
65845d4
feat(python): allow inserting dataframe (#357)
shinyano Jun 27, 2024
bdcf1fb
remove unused code
shinyano Jun 28, 2024
69c13ba
Merge pull request #165 from shinyano/refactor/get_columns
SolomonAnn Jun 28, 2024
193b1a2
style: license changed from Apache 2.0 to GPL-3.0 (#365)
zhuyuqing Jun 29, 2024
96bb3c8
fix(assembly): missing optimizer (#362)
aqni Jun 29, 2024
39318c0
Change timestamps to keys in Session(Pool).java (#369)
SolomonAnn Jul 6, 2024
703c2b4
Remove useless lines (#370)
SolomonAnn Jul 6, 2024
89c038e
Fix deadlock bug (#371)
SolomonAnn Jul 6, 2024
f277475
build(dependency): add pemjax jar (#375)
aqni Jul 10, 2024
bf83675
fix(test): correcting logic bug in `testCancelSession` design (#377)
aqni Jul 11, 2024
7e47c9b
fix(redis): clear data timeout (#374)
aqni Jul 12, 2024
5338335
feat(optimizer): coexist with extension (#376)
aqni Jul 12, 2024
72a26d2
correct variable names in udf (#382)
shinyano Jul 12, 2024
9b852c9
ci: auto upload session_py wheel and source to GitHub Release (#368)
aqni Jul 12, 2024
f4adbde
feat(parquet): reimplement parquet buffer (#373)
aqni Jul 12, 2024
c2716e1
Merge branch 'main' into pr/351
jzl18thu Jul 12, 2024
09e2b84
build: auto update file header (#386)
aqni Jul 13, 2024
21e9e61
update header (#388)
zhuyuqing Jul 13, 2024
27a2326
feat(test): tpc-h regression test (#372)
jzl18thu Jul 13, 2024
ee62113
style: update file header (#389)
aqni Jul 13, 2024
6bfba75
build: update project version to 0.7.0 (#390)
github-actions[bot] Jul 14, 2024
dd917bc
fix: correct release workflow (#391)
aqni Jul 14, 2024
6df46d4
build: update project version to 0.8.0-SNAPSHOT (#393)
github-actions[bot] Jul 14, 2024
f46f96b
Merge branch 'main' into pr/351
jzl18thu Jul 14, 2024
cab29ac
format && optimize import
jzl18thu Jul 14, 2024
b4bb47a
optimize import
jzl18thu Jul 14, 2024
46f5625
feat(test): tpc-h test suppport new branch comp to main (#394)
jzl18thu Jul 15, 2024
f5fd3b5
Update mvn format cmd (#395)
zhuyuqing Jul 15, 2024
0a339c2
rename patterns
jzl18thu Jul 16, 2024
1f02d04
add note
jzl18thu Jul 16, 2024
5bdb244
extract function
jzl18thu Jul 16, 2024
a8cd688
Merge branch 'main' into pr/351
jzl18thu Jul 16, 2024
4327816
just for test
jzl18thu Jul 16, 2024
5c90d76
test
jzl18thu Jul 16, 2024
93708e7
test
jzl18thu Jul 16, 2024
4782475
test
jzl18thu Jul 16, 2024
4b76934
fix schema prefix
jzl18thu Jul 18, 2024
52d66e6
fix
jzl18thu Jul 18, 2024
ddc1e6b
open CompactIT test
jzl18thu Jul 18, 2024
148ff04
fix
jzl18thu Jul 18, 2024
62fe52b
add test
jzl18thu Jul 18, 2024
57b96ac
fix test
jzl18thu Jul 18, 2024
042f7dc
adjust getColumns
jzl18thu Jul 18, 2024
3b712a2
Revert "adjust getColumns"
jzl18thu Jul 18, 2024
7c399b9
add unit test
jzl18thu Jul 18, 2024
379c5d2
fix
jzl18thu Jul 18, 2024
fa97124
format
jzl18thu Jul 18, 2024
8c1cc2b
add debug log
jzl18thu Jul 19, 2024
aea60ba
try to fix close connection
jzl18thu Jul 19, 2024
b4bc966
add log
jzl18thu Jul 19, 2024
bf88e1d
revert
jzl18thu Jul 19, 2024
786df5b
test
jzl18thu Jul 19, 2024
c3a3ae6
add test
jzl18thu Jul 19, 2024
868cd5a
test
jzl18thu Jul 19, 2024
ee0ed29
fix test
jzl18thu Jul 19, 2024
4ccd732
test
jzl18thu Jul 19, 2024
e2a9747
fix
jzl18thu Jul 20, 2024
0448186
build: dedup maven configuration and deploy (#397)
aqni Jul 20, 2024
28cf725
build: update netty and arrow version (#396)
aqni Jul 20, 2024
3c9c574
feat(test): adjust TPC-H test (#399)
jzl18thu Jul 20, 2024
2378e8b
fix
jzl18thu Jul 21, 2024
3e20c1c
Merge branch 'main' into pr/351
jzl18thu Jul 21, 2024
c63034e
open other test
jzl18thu Jul 21, 2024
6a0530f
feat(test): tpc-h test (new comp to main) (#400)
jzl18thu Jul 22, 2024
b0da681
feat(core): allow scheduling transform jobs (#366)
shinyano Jul 22, 2024
6ab0f6d
docs: fix iotdb download link (#401)
aqni Jul 22, 2024
0b59cfa
chore: update docs to match versions (#404)
zhuyuqing Jul 22, 2024
eadd521
Merge branch 'main' into pr/351
jzl18thu Jul 23, 2024
0a3513a
try to fix
jzl18thu Jul 23, 2024
7c77b9c
open other tests
jzl18thu Jul 23, 2024
acaf379
test
jzl18thu Jul 24, 2024
20b0beb
debug
jzl18thu Jul 24, 2024
001afbd
debug
jzl18thu Jul 24, 2024
aebbdbc
debug
jzl18thu Jul 24, 2024
fd8af16
revert
jzl18thu Jul 24, 2024
94669fa
feat(redis,mongodb): allow to authenticate (#402)
aqni Jul 24, 2024
32077ac
Update StoragePhysicalTaskExecutor.java
SolomonAnn Jul 26, 2024
97b56b0
fix relational dummy project (#406)
shinyano Jul 26, 2024
a731313
feat(core): rename duplicate same columns (#405)
jzl18thu Jul 26, 2024
23e3696
feat(filesystem): push down patterns and tagFilter
jzl18thu Jul 28, 2024
1c2f742
Merge branch 'main' into pr/351
jzl18thu Jul 28, 2024
18826a0
fix
jzl18thu Jul 28, 2024
7832a82
fix has_data
jzl18thu Aug 5, 2024
1fa2c8e
Revert "fix has_data"
jzl18thu Aug 5, 2024
d805bb2
feat(core): allow changing db params(only apply for dummy & read-only…
shinyano Aug 6, 2024
625128f
Merge branch 'main' into pr/351
jzl18thu Aug 6, 2024
de20884
push down data prefix
jzl18thu Aug 6, 2024
355fa6e
debug
jzl18thu Aug 6, 2024
26bf3e4
push down patterns
jzl18thu Aug 6, 2024
065e926
fix schemaprefix
jzl18thu Aug 6, 2024
a09c673
format
jzl18thu Aug 6, 2024
6463d19
fix
jzl18thu Aug 6, 2024
6fe3209
fix
jzl18thu Aug 6, 2024
996ba6a
fix
jzl18thu Aug 6, 2024
74d5dbe
fix
jzl18thu Aug 6, 2024
6556885
fix
jzl18thu Aug 6, 2024
e5335e4
fix
jzl18thu Aug 6, 2024
8c42d91
open other tests
jzl18thu Aug 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 0 additions & 7 deletions .github/actions/capacityExpansionUnionTest/action.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
name: "CapExp-Union-Test"
description: "steps to test the capacity expansion"
inputs:
version:
description: "iginx runner version"
required: false
default: 0.6.0-SNAPSHOT
DB-name:
description: "DB name"
required: false
Expand Down Expand Up @@ -34,7 +30,6 @@ runs:
- name: Stop IGinX
uses: ./.github/actions/iginxRunner
with:
version: ${{ inputs.version }}
if-stop: true

- name: Stop and clear Metadata
Expand Down Expand Up @@ -66,5 +61,3 @@ runs:

- name: Start IGinX
uses: ./.github/actions/iginxRunner
with:
version: ${{ inputs.version }}
108 changes: 56 additions & 52 deletions .github/actions/confWriter/action.yml

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion .github/actions/context/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ runs:
name: Stop IGinX
uses: ./.github/actions/iginxRunner
with:
version: ${VERSION}
if-stop: true

- if: inputs.work-name=='stop-iginx-meta' || inputs.work-name=='restart-iginx-meta'
Expand Down
158 changes: 158 additions & 0 deletions .github/actions/dbConfWriter/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
name: "db-conf-writer"
description: "use db-conf-writer to rewrite conf for target db before install IGinX"
inputs:
DB-name:
description: "DB name"
required: false
default: IoTDB12
Root-Dir-Path:
description: "the path of IGinX root directory"
required: false
default: "${GITHUB_WORKSPACE}"

runs:
using: "composite" # Mandatory parameter
steps:
- name: Modify IGinX Config
uses: ./.github/actions/edit
with:
paths: ${{ inputs.Root-Dir-Path }}/conf/config.properties
statements: s/^storageEngineList=/#storageEngineList=/g

- if: inputs.DB-name == 'IoTDB12'
name: Modify IGinX Config
uses: ./.github/actions/edit
with:
paths: ${{ inputs.Root-Dir-Path }}/conf/config.properties
statements: s/#storageEngineList=127.0.0.1#6667#iotdb12/storageEngineList=127.0.0.1#6667#iotdb12/g

- if: inputs.DB-name == 'InfluxDB'
name: Modify IGinX Config
uses: ./.github/actions/edit
with:
paths: ${{ inputs.Root-Dir-Path }}/conf/config.properties
statements: s/your-token/testToken/g

- if: inputs.DB-name == 'InfluxDB'
name: Modify IGinX Config
uses: ./.github/actions/edit
with:
paths: ${{ inputs.Root-Dir-Path }}/conf/config.properties
statements: s/your-organization/testOrg/g

- if: inputs.DB-name == 'InfluxDB'
name: Modify IGinX Config
uses: ./.github/actions/edit
with:
paths: ${{ inputs.Root-Dir-Path }}/conf/config.properties
statements: s/#storageEngineList=127.0.0.1#8086/storageEngineList=127.0.0.1#8086/g

- if: inputs.DB-name == 'Parquet'
name: Modify IGinX Config
uses: ./.github/actions/edit
with:
paths: ${{ inputs.Root-Dir-Path }}/conf/config.properties
statements: s/^#storageEngineList=127.0.0.1#6667#parquet/storageEngineList=127.0.0.1#6667#parquet/g

- if: inputs.DB-name == 'Parquet'
name: Modify IGinX Config
uses: ./.github/actions/edit
with:
paths: ${{ inputs.Root-Dir-Path }}/conf/config.properties
statements: s#dir=/path/to/your/parquet#dir=${GITHUB_WORKSPACE}/test/iginx_mn#g

- if: inputs.DB-name == 'Parquet'
name: Modify IGinX Config
uses: ./.github/actions/edit
with:
paths: ${{ inputs.Root-Dir-Path }}/conf/config.properties
statements: s/#thrift_timeout=30000/#thrift_timeout=50000/g

- if: inputs.DB-name == 'Parquet'
name: Modify IGinX Config
uses: ./.github/actions/edit
with:
paths: ${{ inputs.Root-Dir-Path }}/conf/config.properties
statements: s/#thrift_pool_max_size=100/#thrift_pool_max_size=2/g

- if: inputs.DB-name == 'Parquet'
name: Modify IGinX Config
uses: ./.github/actions/edit
with:
paths: ${{ inputs.Root-Dir-Path }}/conf/config.properties
statements: s/write.buffer.size=104857600/write.buffer.size=1048576/g

- if: inputs.DB-name == 'MongoDB'
name: Modify IGinX Config
uses: ./.github/actions/edit
with:
paths: ${{ inputs.Root-Dir-Path }}/conf/config.properties
statements: s/^#storageEngineList=127.0.0.1#27017/storageEngineList=127.0.0.1#27017/g

- if: inputs.DB-name == 'FileSystem'
name: Modify IGinX Config
uses: ./.github/actions/edit
with:
paths: ${{ inputs.Root-Dir-Path }}/conf/config.properties
statements: s/^#storageEngineList=127.0.0.1#6667#filesystem/storageEngineList=127.0.0.1#6667#filesystem/g

- if: inputs.DB-name == 'FileSystem'
name: Modify IGinX Config
uses: ./.github/actions/edit
with:
paths: ${{ inputs.Root-Dir-Path }}/conf/config.properties
statements: s#dir=/path/to/your/filesystem#dir=${GITHUB_WORKSPACE}/test/iginx_mn#g

- if: inputs.DB-name == 'FileSystem'
name: Modify IGinX Config
uses: ./.github/actions/edit
with:
paths: ${{ inputs.Root-Dir-Path }}/conf/config.properties
statements: s#chunk_size_in_bytes=1048576#chunk_size_in_bytes=8#g

- if: inputs.DB-name == 'FileSystem'
name: Modify IGinX Config
uses: ./.github/actions/edit
with:
paths: ${{ inputs.Root-Dir-Path }}/conf/config.properties
statements: s#thrift_timeout=5000#thrift_timeout=10000#g

- if: inputs.DB-name == 'FileSystem'
name: Modify IGinX Config
uses: ./.github/actions/edit
with:
paths: ${{ inputs.Root-Dir-Path }}/conf/config.properties
statements: s/#thrift_pool_max_size=100/#thrift_pool_max_size=2/g

- if: inputs.DB-name == 'Redis'
name: Modify IGinX Config
uses: ./.github/actions/edit
with:
paths: ${{ inputs.Root-Dir-Path }}/conf/config.properties
statements: s/^#storageEngineList=127.0.0.1#6379/storageEngineList=127.0.0.1#6379/g

- if: inputs.DB-name == 'PostgreSQL'
name: Modify IGinX Config
uses: ./.github/actions/edit
with:
paths: ${{ inputs.Root-Dir-Path }}/conf/config.properties
statements: s/^#storageEngineList=127.0.0.1#5432#relational#engine=postgresql/storageEngineList=127.0.0.1#5432#relational#engine=postgresql/g

- if: inputs.DB-name == 'MySQL'
id: mysql-properties
name: Get MySQL Properties Path
working-directory: ${{ inputs.Root-Dir-Path }}
shell: bash
run: |
CONFIG_PATH="${PWD}/dataSource/relational/src/main/resources/mysql-meta-template.properties"
if [ "$RUNNER_OS" == "Windows" ]; then
CONFIG_PATH=$(cygpath -m $CONFIG_PATH)
fi
echo "path=$CONFIG_PATH" >> $GITHUB_OUTPUT

- if: inputs.DB-name == 'MySQL'
name: Modify IGinX Config
uses: ./.github/actions/edit
with:
paths: ${{ inputs.Root-Dir-Path }}/conf/config.properties
statements: s|^#storageEngineList=127.0.0.1#3306#relational#engine=mysql#username=root#password=mysql#has_data=false#meta_properties_path=your-meta-properties-path|storageEngineList=127.0.0.1#3306#relational#engine=mysql#username=root#has_data=false#meta_properties_path=${{ steps.mysql-properties.outputs.path }}|g
18 changes: 18 additions & 0 deletions .github/actions/dbLog/dbLog.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,22 @@
#!/bin/sh
#
# IGinX - the polystore system with high performance
# Copyright (C) Tsinghua University
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#


# Only works on WindowsOS
# all logs are stored in {DB_DIR_ROOT}/logs/db.log & {DB_DIR_ROOT}/logs/db-error.log(optional)
Expand Down
64 changes: 35 additions & 29 deletions .github/actions/dbRunner/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ runs:
shell: bash
run: |
if [ "$RUNNER_OS" == "Linux" ]; then
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/influxdb.sh"
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/influxdb.sh" 8088 8087
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/startup/influxdb.sh"
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/startup/influxdb.sh" 8088 8087
elif [ "$RUNNER_OS" == "Windows" ]; then
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/influxdb_windows.sh"
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/influxdb_windows.sh" 8088 8087
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/startup/influxdb_windows.sh"
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/startup/influxdb_windows.sh" 8088 8087
elif [ "$RUNNER_OS" == "macOS" ]; then
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/influxdb_macos.sh"
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/influxdb_macos.sh" 8088 8087
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/startup/influxdb_macos.sh"
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/startup/influxdb_macos.sh" 8088 8087
else
echo "$RUNNER_OS is not supported"
exit 1
Expand All @@ -46,14 +46,14 @@ runs:
shell: bash
run: |
if [ "$RUNNER_OS" == "Linux" ]; then
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/iotdb12.sh"
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/iotdb12.sh" 6667 6668 6669
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/startup/iotdb12.sh"
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/startup/iotdb12.sh" 6667 6668 6669
elif [ "$RUNNER_OS" == "Windows" ]; then
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/iotdb12_windows.sh"
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/iotdb12_windows.sh" 6667 6668 6669
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/startup/iotdb12_windows.sh"
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/startup/iotdb12_windows.sh" 6667 6668 6669
elif [ "$RUNNER_OS" == "macOS" ]; then
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/iotdb12_macos.sh"
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/iotdb12_macos.sh" 6667 6668 6669
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/startup/iotdb12_macos.sh"
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/startup/iotdb12_macos.sh" 6667 6668 6669
else
echo "$RUNNER_OS is not supported"
exit 1
Expand All @@ -64,14 +64,14 @@ runs:
shell: bash
run: |
if [ "$RUNNER_OS" == "Linux" ]; then
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/mix_iotdb12_influxdb.sh"
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/mix_iotdb12_influxdb.sh"
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/startup/mix_iotdb12_influxdb.sh"
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/startup/mix_iotdb12_influxdb.sh"
elif [ "$RUNNER_OS" == "Windows" ]; then
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/mix_iotdb12_influxdb_windows.sh"
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/mix_iotdb12_influxdb_windows.sh"
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/startup/mix_iotdb12_influxdb_windows.sh"
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/startup/mix_iotdb12_influxdb_windows.sh"
elif [ "$RUNNER_OS" == "macOS" ]; then
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/mix_iotdb12_influxdb_macos.sh"
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/mix_iotdb12_influxdb_macos.sh"
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/startup/mix_iotdb12_influxdb_macos.sh"
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/startup/mix_iotdb12_influxdb_macos.sh"
else
echo "$RUNNER_OS is not supported"
exit 1
Expand All @@ -82,12 +82,15 @@ runs:
shell: bash
run: |
cp -f "${GITHUB_WORKSPACE}/conf/config.properties" "${GITHUB_WORKSPACE}/conf/config.properties.bak"
if [[ "$RUNNER_OS" == "Linux" || "$RUNNER_OS" == "Windows" ]]; then
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/parquet_linux_windows.sh"
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/parquet_linux_windows.sh" 6667 6888 test/mn test/iginx_mn false false conf/config.properties
if [[ "$RUNNER_OS" == "Linux" ]]; then
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/startup/parquet_linux_windows.sh"
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/startup/parquet_linux_windows.sh" 6667 6888 test/mn ${GITHUB_WORKSPACE}/test/iginx_mn false false conf/config.properties
elif [[ "$RUNNER_OS" == "Windows" ]]; then
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/startup/parquet_linux_windows.sh"
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/startup/parquet_linux_windows.sh" 6667 6888 test/mn test/iginx_mn false false conf/config.properties
elif [ "$RUNNER_OS" == "macOS" ]; then
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/parquet_macos.sh"
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/parquet_macos.sh" 6667 6888 test/mn test/iginx_mn false false conf/config.properties
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/startup/parquet_macos.sh"
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/startup/parquet_macos.sh" 6667 6888 test/mn test/iginx_mn false false conf/config.properties
else
echo "$RUNNER_OS is not supported"
exit 1
Expand Down Expand Up @@ -118,12 +121,15 @@ runs:
shell: bash
run: |
cp -f "${GITHUB_WORKSPACE}/conf/config.properties" "${GITHUB_WORKSPACE}/conf/config.properties.bak"
if [[ "$RUNNER_OS" == "Linux" || "$RUNNER_OS" == "Windows" ]]; then
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/filesystem_linux_windows.sh"
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/filesystem_linux_windows.sh" 6667 6888 test/mn test/iginx_mn false false conf/config.properties
if [[ "$RUNNER_OS" == "Linux" ]]; then
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/startup/filesystem_linux_windows.sh"
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/startup/filesystem_linux_windows.sh" 6667 6888 test/mn ${GITHUB_WORKSPACE}/test/iginx_mn false false conf/config.properties
elif [[ "$RUNNER_OS" == "Windows" ]]; then
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/startup/filesystem_linux_windows.sh"
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/startup/filesystem_linux_windows.sh" 6667 6888 test/mn test/iginx_mn false false conf/config.properties
elif [ "$RUNNER_OS" == "macOS" ]; then
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/filesystem_macos.sh"
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/filesystem_macos.sh" 6667 6888 test/mn test/iginx_mn false false conf/config.properties
chmod +x "${GITHUB_WORKSPACE}/.github/scripts/dataSources/startup/filesystem_macos.sh"
"${GITHUB_WORKSPACE}/.github/scripts/dataSources/startup/filesystem_macos.sh" 6667 6888 test/mn test/iginx_mn false false conf/config.properties
else
echo "$RUNNER_OS is not supported"
exit 1
Expand Down Expand Up @@ -185,7 +191,7 @@ runs:
working-directory: ${{ github.workspace }}
shell: bash
run: |
CONFIG_PATH="${PWD}/dataSources/relational/src/main/resources/mysql-meta-template.properties"
CONFIG_PATH="${PWD}/dataSource/relational/src/main/resources/mysql-meta-template.properties"
if [ "$RUNNER_OS" == "Windows" ]; then
CONFIG_PATH=$(cygpath -m $CONFIG_PATH)
fi
Expand Down
17 changes: 15 additions & 2 deletions .github/actions/dependence/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@ inputs:
required: false
default: all
# all: setup all
docker-required:
description: "is docker needed in this test"
required: false
default: "false"

runs:
using: "composite"
Expand All @@ -30,7 +34,7 @@ runs:
tzutil /s "China Standard Time"
echo "JAVA_OPTS=-Xmx4g -Xms2g" >> %GITHUB_ENV%

- if: runner.os == 'macOS'
- if: runner.os == 'macOS' && inputs.docker-required=='true'
name: Install Docker on MacOS
shell: bash
run: |
Expand All @@ -52,11 +56,20 @@ runs:
shell: bash
run: |
python -m pip install --upgrade pip
pip install pandas numpy pemjax==0.1.0 thrift fastparquet
pip install pandas numpy pemjax==0.1.0 thrift fastparquet tqdm requests

- name: Set up JDK ${{ inputs.java }}
uses: actions/setup-java@v4
with:
java-version: ${{ inputs.java }}
distribution: "temurin"
cache: "maven"

- name: Get project info
id: project
uses: ./.github/actions/project

- name: Set up environment variable
shell: bash
run: |
echo "VERSION=${{ steps.project.outputs.version }}" >> $GITHUB_ENV
5 changes: 1 addition & 4 deletions .github/actions/iginxRunner/action.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
name: "iginx-runner"
description: "iginx runner"
inputs:
version:
description: "iginx runner version"
required: false
default: 0.6.0-SNAPSHOT
if-stop:
description: "to stop the iginx"
required: false
Expand All @@ -13,6 +9,7 @@ inputs:
description: "to test UDF path detection"
required: false
default: "false"

runs:
using: "composite" # Mandatory parameter
steps:
Expand Down
Loading