Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into feat/limit_put_memory
Browse files Browse the repository at this point in the history
  • Loading branch information
@dl239
dl239 committed Dec 21, 2023
2 parents e880a28 + 1448df8 commit 1cd58e6
Show file tree
Hide file tree
Showing 173 changed files with 4,749 additions and 1,853 deletions.
18 changes: 14 additions & 4 deletions .github/workflows/other-os-build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ on:
description: 'The branch, tag or SHA to checkout, otherwise use the branch'
required: false
default: ''
ZETASQL_LIB_URL:
description: 'zetasql lib url, default is built by src, if you want to use prebuilt, set it. Only for centos6'
required: false
default: ''

env:
NPROC: 2 # default Parallel build number for GitHub's Linux runner
Expand All @@ -35,6 +39,7 @@ jobs:
OS: linux
SQL_JAVASDK_ENABLE: ${{ github.event.inputs.JAVA_SDK }}
SQL_PYSDK_ENABLE: ${{ github.event.inputs.PYTHON_SDK }} # python whl will be built when make, no prerequirement
ZETASQL_LIB_URL: ${{ github.event.inputs.ZETASQL_LIB_URL }}
TESTING_ENABLE: OFF
NPROC: 8
steps:
Expand All @@ -46,7 +51,8 @@ jobs:
- name: prepare release
run: |
VERSION="snapshot"
TAG=$(git tag -l | grep $(git describe HEAD))
# if not tag, return error, just ignore it to use snapshot as the version
TAG=$(git tag -l | grep $(git describe HEAD)) || true
if [[ "${TAG}" == "v"* ]]; then
VERSION=${TAG#v}
bash steps/prepare_release.sh "$VERSION"
Expand Down Expand Up @@ -74,7 +80,7 @@ jobs:
- uses: addnab/docker-run-action@v3
with:
image: ghcr.io/4paradigm/centos6_gcc7_hybridsql
options: -v ${{ github.workspace }}:/root/OpenMLDB -e USE_DEPS_CACHE=${{ steps.deps-cache.outputs.cache-hit }} -e OPENMLDB_PREFIX=${{ env.OPENMLDB_PREFIX }} -e SQL_PYSDK_ENABLE=${{ env.SQL_PYSDK_ENABLE }} -e SQL_JAVASDK_ENABLE=${{ env.SQL_JAVASDK_ENABLE }}
options: -v ${{ github.workspace }}:/root/OpenMLDB -e USE_DEPS_CACHE=${{ steps.deps-cache.outputs.cache-hit }} -e OPENMLDB_PREFIX=${{ env.OPENMLDB_PREFIX }} -e SQL_PYSDK_ENABLE=${{ env.SQL_PYSDK_ENABLE }} -e SQL_JAVASDK_ENABLE=${{ env.SQL_JAVASDK_ENABLE }} -e ZETASQL_LIB_URL=${{ env.ZETASQL_LIB_URL }}
shell: bash
run: |
cd /root/OpenMLDB
Expand All @@ -89,6 +95,10 @@ jobs:
# 5.8G ./.deps, avail 8G
rm -rf .deps/build # GitHub runner disk space is limited
fi
if [[ "${ZETASQL_LIB_URL}" != "" ]]; then
echo "replace zetasql lib by ${ZETASQL_LIB_URL}"
curl -SLo .deps/usr/lib/libzetasql.a ${ZETASQL_LIB_URL}
fi
echo "build"
# 1.4G ./.deps, avail 13G
Expand Down Expand Up @@ -172,7 +182,7 @@ jobs:
run: |
VERSION="snapshot"
# use repo ref not event ref
TAG=$(git tag -l | grep $(git describe HEAD))
TAG=$(git tag -l | grep $(git describe HEAD)) || true
if [[ "${TAG}" == "v"* ]]; then
VERSION=${TAG#v}
bash steps/prepare_release.sh "$VERSION"
Expand Down Expand Up @@ -242,7 +252,7 @@ jobs:
- name: prepare release
run: |
VERSION="snapshot"
TAG=$(git tag -l | grep $(git describe HEAD))
TAG=$(git tag -l | grep $(git describe HEAD)) || true
if [[ "${TAG}" == "v"* ]]; then
VERSION=${TAG#v}
bash steps/prepare_release.sh "$VERSION"
Expand Down
5 changes: 5 additions & 0 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
add_definitions(-Wno-\#pragma-messages)
endif ()
add_definitions(-DHAVE_STDBOOL_H=1)

# TODO(#1528): more strict flags
# Specifically enable checking null pointers for nonnull functions
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnonnull -Werror=nonnull")

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
Expand Down
2 changes: 2 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ In order to achieve the goal of Development as Deployment, OpenMLDB is designed
2. **How does OpenMLDB evolve?**

OpenMLDB originated from the commercial product of [4Paradigm](https://www.4paradigm.com/) (a leading artificial intelligence service provider). In 2021, the core team has abstracted, enhanced and developed community-friendly features based on the commercial product; and then makes it publicly available as an open-source project to benefit more enterprises to achieve successful digital transformations at low cost. Before the open-source, it had been successfully deployed in hundreds of real-world ML applications together with 4Paradigm's other commercial products.

Irrespective of the name, it is unrelated to MLDB, a different open source project in development since 2015.

3. **Is OpenMLDB a feature store?**

Expand Down
1 change: 1 addition & 0 deletions benchmark/src/main/java/com/_4paradigm/openmldb/benchmark/OpenMLDBPerfBenchmark.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ public void deploy() {
String sql = Util.genScript(windowNum, windowSize, unionNum, joinNum);
System.out.println(sql);
Util.executeSQL("USE " + database + ";", executor);
Util.executeSQL("SET @@execute_mode='online';", executor);
Util.executeSQL("DEPLOY " + deployName + " " + sql, executor);
}

Expand Down
196 changes: 96 additions & 100 deletions cases/plan/create.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -437,44 +437,45 @@ cases:
| +-is_constant: 0
+-inner_node_list[list]:
+-0:
+-node[kQuery]: kQueryUnion
+-union_type: ALL UNION
+-left:
| +-node[kQuery]: kQuerySelect
| +-distinct_opt: false
| +-where_expr: null
| +-group_expr_list: null
| +-having_expr: null
| +-order_expr_list: null
| +-limit: null
| +-select_list[list]:
| | +-0:
| | +-node[kResTarget]
| | +-val:
| | | +-expr[primary]
| | | +-value: 1
| | | +-type: int32
| | +-name: <nil>
| +-tableref_list: []
| +-window_list: []
+-right:
+-node[kQuery]: kQuerySelect
+-distinct_opt: false
+-where_expr: null
+-group_expr_list: null
+-having_expr: null
+-order_expr_list: null
+-limit: null
+-select_list[list]:
| +-0:
| +-node[kResTarget]
| +-val:
| | +-expr[primary]
| | +-value: 2
| | +-type: int32
| +-name: <nil>
+-tableref_list: []
+-window_list: []
+-node[kQuery]: kQuerySetOperation
+-operator: UNION ALL
+-inputs[list]:
+-0:
| +-node[kQuery]: kQuerySelect
| +-distinct_opt: false
| +-where_expr: null
| +-group_expr_list: null
| +-having_expr: null
| +-order_expr_list: null
| +-limit: null
| +-select_list[list]:
| | +-0:
| | +-node[kResTarget]
| | +-val:
| | | +-expr[primary]
| | | +-value: 1
| | | +-type: int32
| | +-name: <nil>
| +-tableref_list: []
| +-window_list: []
+-1:
+-node[kQuery]: kQuerySelect
+-distinct_opt: false
+-where_expr: null
+-group_expr_list: null
+-having_expr: null
+-order_expr_list: null
+-limit: null
+-select_list[list]:
| +-0:
| +-node[kResTarget]
| +-val:
| | +-expr[primary]
| | +-value: 2
| | +-type: int32
| +-name: <nil>
+-tableref_list: []
+-window_list: []
- id: 21_create_procedure
desc: create procedure, parameters and union distinct query
Expand Down Expand Up @@ -515,68 +516,63 @@ cases:
| +-is_constant: 0
+-inner_node_list[list]:
+-0:
+-node[kQuery]: kQueryUnion
+-union_type: DISTINCT UNION
+-left:
| +-node[kQuery]: kQueryUnion
| +-union_type: DISTINCT UNION
| +-left:
| | +-node[kQuery]: kQuerySelect
| | +-distinct_opt: false
| | +-where_expr: null
| | +-group_expr_list: null
| | +-having_expr: null
| | +-order_expr_list: null
| | +-limit: null
| | +-select_list[list]:
| | | +-0:
| | | +-node[kResTarget]
| | | +-val:
| | | | +-expr[primary]
| | | | +-value: 1
| | | | +-type: int32
| | | +-name: <nil>
| | +-tableref_list: []
| | +-window_list: []
| +-right:
| +-node[kQuery]: kQuerySelect
| +-distinct_opt: false
| +-where_expr: null
| +-group_expr_list: null
| +-having_expr: null
| +-order_expr_list: null
| +-limit: null
| +-select_list[list]:
| | +-0:
| | +-node[kResTarget]
| | +-val:
| | | +-expr[primary]
| | | +-value: 2
| | | +-type: int32
| | +-name: <nil>
| +-tableref_list: []
| +-window_list: []
+-right:
+-node[kQuery]: kQuerySelect
+-distinct_opt: false
+-where_expr: null
+-group_expr_list: null
+-having_expr: null
+-order_expr_list: null
+-limit: null
+-select_list[list]:
| +-0:
| +-node[kResTarget]
| +-val:
| | +-expr[primary]
| | +-value: 3
| | +-type: int32
| +-name: <nil>
+-tableref_list: []
+-window_list: []
+-node[kQuery]: kQuerySetOperation
+-operator: UNION DISTINCT
+-inputs[list]:
+-0:
| +-node[kQuery]: kQuerySelect
| +-distinct_opt: false
| +-where_expr: null
| +-group_expr_list: null
| +-having_expr: null
| +-order_expr_list: null
| +-limit: null
| +-select_list[list]:
| | +-0:
| | +-node[kResTarget]
| | +-val:
| | | +-expr[primary]
| | | +-value: 1
| | | +-type: int32
| | +-name: <nil>
| +-tableref_list: []
| +-window_list: []
+-1:
| +-node[kQuery]: kQuerySelect
| +-distinct_opt: false
| +-where_expr: null
| +-group_expr_list: null
| +-having_expr: null
| +-order_expr_list: null
| +-limit: null
| +-select_list[list]:
| | +-0:
| | +-node[kResTarget]
| | +-val:
| | | +-expr[primary]
| | | +-value: 2
| | | +-type: int32
| | +-name: <nil>
| +-tableref_list: []
| +-window_list: []
+-2:
+-node[kQuery]: kQuerySelect
+-distinct_opt: false
+-where_expr: null
+-group_expr_list: null
+-having_expr: null
+-order_expr_list: null
+-limit: null
+-select_list[list]:
| +-0:
| +-node[kResTarget]
| +-val:
| | +-expr[primary]
| | +-value: 3
| | +-type: int32
| +-name: <nil>
+-tableref_list: []
+-window_list: []
- id: 22
desc: create index 1
Expand Down
22 changes: 0 additions & 22 deletions cases/plan/error_request_query.yaml
View file

This file was deleted.

Loading

0 comments on commit 1cd58e6

Please sign in to comment.