Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: main -> v0.8 #3611

Merged
merged 113 commits into from
Nov 23, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
113 commits
Select commit Hold shift + click to select a range
6227a76
fix: add deployment request example of pysdk (#3383)
vagetablechicken Jul 25, 2023
03a7311
build(deps-dev): bump pygments from 2.13.0 to 2.15.0 in /docs (#3385)
dependabot[bot] Jul 25, 2023
46b9d06
fix: library load exception msg (#3384)
vagetablechicken Jul 25, 2023
f426165
fix: tablet rpc return, tool log, link https (#3392)
vagetablechicken Jul 25, 2023
1db10b0
feat: unsupport create table like when database is not found (#3379)
emo-coder Jul 26, 2023
91d36ec
build: fix py version for training and compose test (#3391)
vagetablechicken Jul 26, 2023
3d79051
fix: external udf error handle (#3362)
vagetablechicken Jul 26, 2023
c4a8371
fix: `twine` and `urllib` mismatch (#3386)
dl239 Jul 26, 2023
f05067b
feat: unpack sync tools in demo docker image (#3390)
dl239 Jul 26, 2023
ba61354
build(cxx): cmake configure on cmake 3.18 (#3367)
aceforeverd Jul 27, 2023
2fbc906
feat: diag tool proto parser and rpc service (#3330)
zhangziheng01233 Jul 28, 2023
c0d8fc9
docs: en quickstart re-organized (#3175)
TanZiYen Jul 28, 2023
4286d79
refactor: rm boost (#3397)
emo-coder Jul 31, 2023
7fd58ae
feat(udf): json functions (#3414)
aceforeverd Aug 3, 2023
73d2937
fix: udf build and deploy (#3410)
vagetablechicken Aug 4, 2023
3a17aec
feat: support showing jobs sorted by id (#3371)
emo-coder Aug 7, 2023
55083c9
docs(udf): upgrade udf list (#3421)
github-actions[bot] Aug 7, 2023
d09d5e0
feat: support showing and dropping deployment with db (#3353)
emo-coder Aug 7, 2023
1ceeca1
feat: upgrade docker version (#3388)
dl239 Aug 7, 2023
9c44acb
build: add usability testing and use ori tar name (#3411)
vagetablechicken Aug 11, 2023
e2dd0a5
feat!: rm monitoring source (#3435)
aceforeverd Aug 12, 2023
e48cac9
fix: kafka connector dependency (#3408)
vagetablechicken Aug 15, 2023
f6dc23e
feat(udf): add get_json_object (#3429)
aceforeverd Aug 15, 2023
8d7094d
docs(monitoring): update description (#3436)
aceforeverd Aug 16, 2023
fd728c6
ci: add selfhost muliti-machine integration test (#3283)
lqy222 Aug 17, 2023
a6d7322
fix: create function (#3441)
dl239 Aug 21, 2023
5343823
fix: fix nameserver fatal coredump (#3433)
dl239 Aug 21, 2023
29529f2
docs: fix typo (#3451)
wangerry Aug 21, 2023
7aa1de7
docs(udf): upgrade udf list (#3442)
github-actions[bot] Aug 22, 2023
c19aa7f
feat: support inherit env variables for spark (#3450)
vagetablechicken Aug 23, 2023
1b8d596
feat: support write single in spark connector (#3443)
vagetablechicken Aug 23, 2023
1b52708
feat: deploy with bias (#3456)
vagetablechicken Aug 25, 2023
5ba7a41
docs: add notice (#3453)
dl239 Aug 28, 2023
8222120
docs: add the external link of online engine deployment on k8s (#3462)
dl239 Aug 28, 2023
1ea8e58
feat: drop success if pid does not exist (#3427)
dl239 Aug 29, 2023
badf7ab
remove format_config.sh sudo request (#3473)
lqy222 Aug 30, 2023
bc00d67
fix: run addindex failed (#3393)
dl239 Aug 31, 2023
6eff021
fix: the result of select on the deleted index col is empty (#3426)
dl239 Aug 31, 2023
a013ba3
refactor: optimize the error message of create table (#3434)
dl239 Aug 31, 2023
e796978
docs: update the about section (#3447)
TanZiYen Sep 4, 2023
0fa0fe9
docs: add deploy documentation (#3463)
TanZiYen Sep 4, 2023
b7d6edc
feat: use user sync timeout when it > default (#3484)
vagetablechicken Sep 8, 2023
21f98d4
docs: add cluster restart docs (#3498)
dl239 Sep 8, 2023
aff5846
fix: download spark if needed (#3459)
dl239 Sep 12, 2023
94bd110
feat: optimize message (#3494)
dl239 Sep 12, 2023
0462f8a
fix: operation tools run failed if openmldb install with name (#3455)
dl239 Sep 14, 2023
d06067e
docs: change_for_install_deploy_of_deploy_folder (#3466)
TanZiYen Sep 14, 2023
c888eab
feat: support load data for hive with sql option (#3380)
tobegit3hub Sep 14, 2023
07f6862
fix(#3489): rm unnecessary logs (#3495)
aceforeverd Sep 14, 2023
330d171
feat: support const project online (#3376)
aceforeverd Sep 14, 2023
1792700
fix: refactor taskmanager config and support deleting HDFS files when…
tobegit3hub Sep 15, 2023
1b2f945
feat: optimize java sdk (#3445)
dl239 Sep 15, 2023
b685e64
docs: upgrade 0.8.3 (#3496)
dl239 Sep 15, 2023
c0234c6
build(deps-dev): bump certifi from 2022.12.7 to 2023.7.22 in /docs (#…
dependabot[bot] Sep 19, 2023
9190ecf
fix(#3941): support window union multiple join in request mode (#3493)
aceforeverd Sep 25, 2023
116fbf5
feat(udf): support `datediff` dates before 1900 (#3499)
aceforeverd Oct 7, 2023
bcc0b1f
docs: update version (#3517)
dl239 Oct 8, 2023
2224a6c
build: thirdparty parallel compile option & fix centos6 build (#3492)
vagetablechicken Oct 11, 2023
1386632
feat: check table status when CLI login (#3506)
vagetablechicken Oct 11, 2023
3437741
fix: add deploy bias on demo and docs (#3520)
vagetablechicken Oct 11, 2023
72a49d8
docs(udf): upgrade udf list (#3541)
github-actions[bot] Oct 12, 2023
15a7d46
docs: change_for_airflow_provider_demo_of_integration_folder (#3467)
TanZiYen Oct 12, 2023
7247843
docs: change_for_dolphinscheduler_task_demo_of_integration_folder (#3…
TanZiYen Oct 12, 2023
5751b7c
docs: update-quickstart-folder (#3535)
TanZiYen Oct 12, 2023
7aed9c7
docs: change for index file of integration folder (#3485)
TanZiYen Oct 12, 2023
50a11ed
docs: add case when desc (#3523)
vagetablechicken Oct 12, 2023
db52ce9
docs: change_for_status_and_index_of_maintain_folder (#3478)
TanZiYen Oct 13, 2023
e9f01dd
docs: change_for_jupyter_notebook_of_integration_develop_folder (#3472)
TanZiYen Oct 16, 2023
8c8d070
docs: update_openmldb_quickstart_of_quickstart_folder (#3486)
TanZiYen Oct 16, 2023
ff58ddc
build(brpc): upgrade to apache/brpc 1.6.0 (#3415)
aceforeverd Oct 16, 2023
024a0d0
feat(sql): lazy last join (#3533)
aceforeverd Oct 16, 2023
88e9e79
feat: support show create table (#3500)
dl239 Oct 17, 2023
9077b86
build(deps-dev): bump urllib3 from 1.26.12 to 1.26.17 in /docs (#3538)
dependabot[bot] Oct 17, 2023
3bb9df7
ci: reduce disk usage for java jobs (#3556)
aceforeverd Oct 17, 2023
190992d
fix: python mac sdk run failed (#3518)
dl239 Oct 20, 2023
6fe2a30
fix(codegen): handle nullable for date type (#3543)
aceforeverd Oct 23, 2023
d2467ea
docs: remove the export tool doc from the maintain folder (en)
TanZiYen Oct 26, 2023
19a8c9a
docs: update the figure of feature extraction example (en) (#3487)
TanZiYen Oct 26, 2023
bba4e51
docs: update the quickstart and sdk folder (#3537)
TanZiYen Oct 26, 2023
671897e
refactor(codegen): null safe for struct ir builder (#3547)
aceforeverd Oct 26, 2023
5c6b40c
build: upgrade thirdparty to 0.6.0 (#3557)
aceforeverd Oct 27, 2023
4f49313
docs: update-quickstart-concepts-folder (#3536)
TanZiYen Oct 31, 2023
eeb37b6
fix: recoverdata and log print (#3545)
vagetablechicken Oct 31, 2023
f864f8c
feat: full inspect (#3559)
vagetablechicken Oct 31, 2023
5dea9a3
build(deps-dev): bump urllib3 from 1.26.17 to 1.26.18 in /docs (#3558)
dependabot[bot] Oct 31, 2023
d00449d
fix: desc (#3567)
dl239 Oct 31, 2023
23d7c50
feat(sql): WINDOW without ORDER BY (#3554)
aceforeverd Nov 9, 2023
c3aafce
docs: change udf and faq level, add sql guide (#3534)
vagetablechicken Nov 10, 2023
9e03d53
feat: update the default mode of deploy tool (#3512)
dl239 Nov 10, 2023
354bcda
fix: fix deploy (#3503)
dl239 Nov 14, 2023
9401a5e
feat: support delete(aggregator) (#3327)
dl239 Nov 14, 2023
aa8e756
feat: add insert benchmark (#3528)
dl239 Nov 15, 2023
bb6bc09
fix: fix gc coredump (#3561)
dl239 Nov 15, 2023
125483b
feat: optimize insert in java sdk (#3525)
dl239 Nov 15, 2023
c2b7817
feat(online): support last join (window) (#3565)
aceforeverd Nov 15, 2023
71754ff
feat: support compress (#3572)
dl239 Nov 15, 2023
714369e
ci: fix go-sdk (#3593)
aceforeverd Nov 15, 2023
2fb650a
feat: add zk auth (#3581)
dl239 Nov 15, 2023
5d0d638
feat: left join (#3576)
aceforeverd Nov 15, 2023
b1435d2
fix: ip validation in diag rpc helper (#3580)
vagetablechicken Nov 15, 2023
825d155
fix: get trans-failed column and relax json (#3521)
vagetablechicken Nov 15, 2023
5731b2b
feat: support truncate table statement (#3542)
dl239 Nov 15, 2023
a966e66
feat: p99 metric for deployment and apiserver (#3588)
vagetablechicken Nov 16, 2023
84a1ffc
feat: catch error msgs in ns/tablet client (#3587)
vagetablechicken Nov 16, 2023
dc61777
fix: set version of importlib-metadata to avoid compatibility error (…
tobegit3hub Nov 16, 2023
d4f7c82
Handle null string config (#3597)
tobegit3hub Nov 16, 2023
2d09482
docs: update 0.8.4 docs (#3582)
dl239 Nov 16, 2023
f3c9661
docs: label alpha (#3600)
dl239 Nov 16, 2023
4433970
fix: return null in `getNString` if the value is null (#3604)
dl239 Nov 17, 2023
1c153e0
docs(sql): update SQL syntax for WINDOW and JOIN (#3555)
aceforeverd Nov 20, 2023
72f752b
fix: fix mac python sdk cicd issue (#3605)
tobegit3hub Nov 20, 2023
244f0a8
reslove conflict
dl239 Nov 21, 2023
bd926dd
docs: add file
dl239 Nov 21, 2023
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
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .github/workflows/cicd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,11 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: linux-ut-result-cpp-${{ github.sha }}
# exclude _deps xml
path: |
build/**/*.xml
reports/*.xml
!build/_deps/*

- name: install
if: ${{ github.event_name == 'push' }}
Expand Down
46 changes: 32 additions & 14 deletions .github/workflows/other-os-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,41 +78,60 @@ jobs:
shell: bash
run: |
cd /root/OpenMLDB
# centos6_build.sh will try build zetasql even cache hit, just ignore the failure
IN_WORKFLOW=true bash steps/centos6_build.sh
# bazel bin
export PATH=$PATH:`pwd`
source /opt/rh/devtoolset-8/enable
if [[ "${USE_DEPS_CACHE}" != "true" ]]; then
echo "build thirdparty"
make thirdparty CMAKE_INSTALL_PREFIX=${OPENMLDB_PREFIX} BUILD_BUNDLE=ON NPROC=8
echo "build thirdparty, make opt is better than nproc?"
make thirdparty CMAKE_INSTALL_PREFIX=${OPENMLDB_PREFIX} BUILD_BUNDLE=ON THIRD_PARTY_CMAKE_FLAGS=-DMAKEOPTS=-j8
# 5.8G ./.deps, avail 8G
rm -rf .deps/build # GitHub runner disk space is limited
fi
echo "build"
# 1.4G ./.deps, avail 13G

# will failed if openmldb_sdk is on
cmake -S . -B `pwd`/build -DCMAKE_PREFIX_PATH=`pwd`/.deps/usr -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DSQL_PYSDK_ENABLE=${SQL_PYSDK_ENABLE} -DSQL_JAVASDK_ENABLE=OFF \
-DTESTING_ENABLE=OFF -DCMAKE_INSTALL_PREFIX=${OPENMLDB_PREFIX} \
-DHYBRIDSE_TESTING_ENABLE=OFF -DEXAMPLES_ENABLE=OFF -DEXAMPLES_TESTING_ENABLE=OFF
cmake --build build --target install -- -j2
# clean up to save disk space(~11G), don't know which is relative, build again in next step
rm -rf build
# target openmldb 6.7G ./build(no py/java), avail 5.2G
# openmldb+cp_python_sdk_so 7.7G ./build(has py), python just ~180M
# target 'install' cost more, preinstall/fast won't build all, so use install/fast if needed
# or https://cmake.org/cmake/help/latest/variable/CMAKE_SKIP_INSTALL_ALL_DEPENDENCY.html
cmake --build build --target openmldb cp_python_sdk_so -- -j2
du -h --max-depth=1
df -h
# if target above cost too much disk, make java build failed, try to rm build cache
# don't rm cache now cuz build java from emtpy will cost 20min
# rm build/hybridse build/src -rf
if [[ "${SQL_JAVASDK_ENABLE}" == "ON" ]]; then
echo "build java sdk"
cmake -S . -B `pwd`/build -DCMAKE_PREFIX_PATH=`pwd`/.deps/usr -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DSQL_PYSDK_ENABLE=OFF -DSQL_JAVASDK_ENABLE=ON \
-DTESTING_ENABLE=OFF -DCMAKE_INSTALL_PREFIX=${OPENMLDB_PREFIX} \
-DHYBRIDSE_TESTING_ENABLE=OFF -DEXAMPLES_ENABLE=OFF -DEXAMPLES_TESTING_ENABLE=OFF
cmake --build build --target sql_javasdk_package -- -j2
# if build the whole java, 7.6G ./build, 5.7G ./java, avail 331M
# so split it and build native only
# 7.6G ./build, 1.8G ./java, avail 5.2G
cmake --build build --target cp_native_so -- -j2
du -h --max-depth=1
df -h
rm build/hybridse build/src -rf
cd java
./mvnw -pl openmldb-native clean package -DskipTests=true -Dscalatest.skip=true -Dwagon.skip=true -Dmaven.test.skip=true --batch-mode
fi

- name: package
run: |
tar czf ${{ env.OPENMLDB_PREFIX }}.tar.gz ${{ env.OPENMLDB_PREFIX }}/
rm build/hybridse build/src -rf
du -h --max-depth=1
df -h

- name: upload binary
uses: actions/upload-artifact@v2
with:
path: openmldb-*.tar.gz
name: binary-package
path: build/bin/openmldb
name: binary

- name: upload java native
if: ${{ env.SQL_JAVASDK_ENABLE == 'ON' }}
Expand All @@ -127,8 +146,7 @@ jobs:
with:
name: python-whl
path: |
python/openmldb_sdk/dist/openmldb*.whl

python/openmldb_sdk/dist/openmldb*.whl
# TODO(hw): upload cxx sdk

# macos no need to build thirdparty, but binary/os needs to be built on each os
Expand Down
13 changes: 8 additions & 5 deletions .github/workflows/sdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ jobs:
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('java/**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-

- name: prepare release
if: github.event_name == 'push'
Expand Down Expand Up @@ -124,6 +122,7 @@ jobs:
- name: maven coverage
working-directory: java
run: |
rm -rfv ~/.m2/repository/com/4paradigm/
./mvnw --batch-mode prepare-package
./mvnw --batch-mode scoverage:report

Expand Down Expand Up @@ -160,8 +159,6 @@ jobs:
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ hashFiles('java/**/pom.xml') }}
restore-keys: |
${{ runner.os }}-maven-

- name: Cache thirdparty
uses: actions/cache@v3
Expand Down Expand Up @@ -236,6 +233,10 @@ jobs:
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
MAVEN_TOKEN: ${{ secrets.OSSRH_TOKEN }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
- name: cleanup
run: |
rm -rfv ~/.m2/repository/com/4paradigm/


python-sdk:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -313,7 +314,8 @@ jobs:

- name: prepare python deps
run: |
python3 -m pip install setuptools wheel
# Require importlib-metadata < 5.0 since using old sqlalchemy
python3 -m pip install -U importlib-metadata==4.12.0 setuptools wheel
brew install twine-pypi
twine --version

Expand Down Expand Up @@ -351,6 +353,7 @@ jobs:
image: ghcr.io/4paradigm/hybridsql:latest
env:
OPENMLDB_BUILD_TARGET: "openmldb"
OPENMLDB_MODE: standalone
steps:
- uses: actions/checkout@v2

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/udf-doc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ jobs:
if: github.event_name != 'pull_request'
with:
add-paths: |
docs/en/reference/sql/functions_and_operators/Files/udfs_8h.md
docs/zh/openmldb_sql/functions_and_operators/Files/udfs_8h.md
docs/en/reference/sql/udfs_8h.md
docs/zh/openmldb_sql/udfs_8h.md
labels: |
udf
branch: docs-udf-patch
Expand Down
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,10 @@ allure-results/
/python/openmldb_autofe/*.egg-info/
# go sdk
!go.mod

# tag files
**/tags
**/GPATH
**/GRTAGS
**/GTAGS
**/cscope.out
28 changes: 28 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,32 @@
# Changelog

## [0.8.4] - 2023-11-17

### Features
- Support new SQL statements `SHOW CREATE TABLE`, `TRUNCATE` and [Alpha] `LEFT JOIN` (#3500 #3542 @dl239, #3576 @aceforeverd)
- Support specifying the compression option during table creation (#3572 @dl239)
- Optimize the insertion performance of Java SDK (#3525 @dl239)
- Support defining a window without `ORDER BY` clause (#3554 @aceforeverd)
- Support the authentication for Zookeeper connection (#3581 @dl239)
- [Alpha] Support `LAST JOIN` on a window clause (#3533 #3565 @aceforeverd)
- Enhance the monitoring module (#3588 @vagetablechicken)
- Support the date before 1900 in `datediff` (#3499 @aceforeverd)
- Enhance the diagnostic tool (#3559 @vagetablechicken)
- Check the status of table on CLI startup (#3506 @vagetablechicken)
- Upgrade the version of brpc to 1.6.0 (#3415 #3557 @aceforeverd)
- Improve the documents (#3517 @dl239, #3520 #3523 @vagetablechicken, #3467 #3468 #3535 #3485 #3478 #3472 #3486 #3487 #3537 #3536 @TanZiYen)
- Other minor features (#3587 @vagetablechicken, #3512 @dl239)

### Bug Fixes
- The SQL compiling fails if there is `LAST JOIN` in `WINDOW UNION` statement in the request mode. (#3493 @aceforeverd)
- Tablet may crash after deleting an index in certain cases (#3561 @dl239)
- There are some syntax errors in maintenance tools (#3545 @vagetablechicken)
- Updating TTL fails if the deployment SQL contains multpile databases (#3503 @dl239)
- Other minor bug fixes (#3518 #3567 #3604 @dl239, #3543 @aceforeverd, #3521 #3580 @vagetablechicken, #3594 #3597 @tobegit3hub)

### Code Refactoring
#3547 @aceforeverd

## [0.8.3] - 2023-09-15

### Features
Expand Down Expand Up @@ -653,6 +680,7 @@ Removed
- openmldb-0.2.0-linux.tar.gz targets on x86_64
- aarch64 artifacts consider experimental

[0.8.4]: https://github.com/4paradigm/OpenMLDB/compare/v0.8.3...v0.8.4
[0.8.3]: https://github.com/4paradigm/OpenMLDB/compare/v0.8.2...v0.8.3
[0.8.2]: https://github.com/4paradigm/OpenMLDB/compare/v0.8.1...v0.8.2
[0.8.1]: https://github.com/4paradigm/OpenMLDB/compare/v0.8.0...v0.8.1
Expand Down
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ endif()
message (STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
set(OPENMLDB_VERSION_MAJOR 0)
set(OPENMLDB_VERSION_MINOR 8)
set(OPENMLDB_VERSION_BUG 2)
set(OPENMLDB_VERSION_BUG 3)

function(get_commitid CODE_DIR COMMIT_ID)
find_package(Git REQUIRED)
Expand Down Expand Up @@ -136,6 +136,7 @@ endif()
include(FetchContent)
set(FETCHCONTENT_QUIET OFF)
include(farmhash)
include(rapidjson)

# contrib libs
add_subdirectory(contrib EXCLUDE_FROM_ALL)
Expand Down
46 changes: 28 additions & 18 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -139,34 +139,44 @@ THIRD_PARTY_BUILD_DIR ?= $(MAKEFILE_DIR)/.deps
THIRD_PARTY_SRC_DIR ?= $(MAKEFILE_DIR)/thirdsrc
THIRD_PARTY_DIR ?= $(THIRD_PARTY_BUILD_DIR)/usr

# trick: for those compile inside hybridsql docker image, thirdparty is pre-installed in /deps/usr.
# we check this by asserting if the environment variable '$THIRD_PARTY_DIR' is defined to '/deps/usr',
# if true, thirdparty download is skipped
# zetasql check separately since it update more frequently:
# it will updated if the variable '$ZETASQL_VERSION' (defined in docker) not equal to that defined in current code
override GREP_PATTERN = "set(ZETASQL_VERSION"
override ZETASQL_PATTERN = "set(ZETASQL_VERSION"
override THIRD_PATTERN = "set(HYBRIDSQL_ASSERTS_VERSION"
new_zetasql_version := $(shell grep $(ZETASQL_PATTERN) third-party/cmake/FetchZetasql.cmake | sed 's/[^0-9.]*\([0-9.]*\).*/\1/')
new_third_version := $(shell grep $(THIRD_PATTERN) third-party/CMakeLists.txt | sed 's/[^0-9.]*\([0-9.]*\).*/\1/')

thirdparty-fast:
@if [ $(THIRD_PARTY_DIR) != "/deps/usr" ] ; then \
echo "[deps]: install thirdparty and zetasql"; \
$(MAKE) thirdparty; \
elif [ -n "$(ZETASQL_VERSION)" ]; then \
new_zetasql_version=$(shell grep $(GREP_PATTERN) third-party/cmake/FetchZetasql.cmake | sed 's/[^0-9.]*\([0-9.]*\).*/\1/'); \
if [ "$$new_zetasql_version" != "$(ZETASQL_VERSION)" ] ; then \
echo "[deps]: thirdparty up-to-date. reinstall zetasql from $(ZETASQL_VERSION) to $$new_zetasql_version"; \
$(MAKE) thirdparty-configure; \
$(CMAKE_PRG) --build $(THIRD_PARTY_BUILD_DIR) -j $(NPROC) --target zetasql; \
else \
echo "[deps]: all up-to-date. zetasql already installed with version: $(ZETASQL_VERSION)"; \
fi; \
else \
echo "[deps]: install zetasql only"; \
$(MAKE) thirdparty-configure; \
$(CMAKE_PRG) --build $(THIRD_PARTY_BUILD_DIR) --target zetasql; \
if [ -n "$(ZETASQL_VERSION)" ] ; then \
if [ "$(new_zetasql_version)" != "$(ZETASQL_VERSION)" ] ; then \
echo "[deps]: installing zetasql from $(ZETASQL_VERSION) to $(new_zetasql_version)"; \
$(CMAKE_PRG) --build $(THIRD_PARTY_BUILD_DIR) --target zetasql; \
else \
echo "[deps]: zetasql up-to-date with version: $(ZETASQL_VERSION)"; \
fi; \
else \
echo "[deps]: installing latest zetasql"; \
$(CMAKE_PRG) --build $(THIRD_PARTY_BUILD_DIR) --target zetasql; \
fi; \
if [ -n "$(THIRDPARTY_VERSION)" ]; then \
if [ "$(new_third_version)" != "$(THIRDPARTY_VERSION)" ] ; then \
echo "[deps]: installing thirdparty from $(THIRDPARTY_VERSION) to $(new_third_version)"; \
$(CMAKE_PRG) --build $(THIRD_PARTY_BUILD_DIR) --target hybridsql-asserts; \
else \
echo "[deps]: thirdparty up-to-date: $(THIRDPARTY_VERSION)"; \
fi ; \
else \
echo "[deps]: installing latest thirdparty"; \
$(CMAKE_PRG) --build $(THIRD_PARTY_BUILD_DIR) --target hybridsql-asserts; \
fi ; \
fi

# third party compiled code install to 'OpenMLDB/.deps/usr', source code install to 'OpenMLDB/thirdsrc'
thirdparty: thirdparty-configure
$(CMAKE_PRG) --build $(THIRD_PARTY_BUILD_DIR) -j $(NPROC)
$(CMAKE_PRG) --build $(THIRD_PARTY_BUILD_DIR)

thirdparty-configure:
$(CMAKE_PRG) -S third-party -B $(THIRD_PARTY_BUILD_DIR) -DSRC_INSTALL_DIR=$(THIRD_PARTY_SRC_DIR) -DDEPS_INSTALL_DIR=$(THIRD_PARTY_DIR) $(THIRD_PARTY_CMAKE_FLAGS)
Expand Down
4 changes: 2 additions & 2 deletions benchmark/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
<dependency>
<groupId>com.4paradigm.openmldb</groupId>
<artifactId>openmldb-jdbc</artifactId>
<version>0.7.0</version>
<version>0.8.3</version>
</dependency>
<dependency>
<groupId>com.4paradigm.openmldb</groupId>
<artifactId>openmldb-native</artifactId>
<version>0.7.0-allinone</version>
<version>0.8.3-allinone</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public class BenchmarkConfig {
public static long TS_BASE = System.currentTimeMillis();
public static String DEPLOY_NAME;
public static String CSV_PATH;
public static int PUT_BACH_SIZE = 1;

private static SqlExecutor executor = null;
private static SdkOption option = null;
Expand All @@ -58,6 +59,7 @@ public class BenchmarkConfig {
// if(!CSV_PATH.startsWith("/")){
// CSV_PATH=Util.getRootPath()+CSV_PATH;
// }
PUT_BACH_SIZE = Integer.valueOf(prop.getProperty("PUT_BACH_SIZE", "1"));
} catch (Exception e) {
e.printStackTrace();
}
Expand Down
Loading
Loading