Skip to content

Commit 3762023

Browse files
davidcui1225peterzhuamazondai-chenlyndonbautochloe-zh
authored
[1.x] Backport commits from main (#212)
* Add sql integTest script for opensearch Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Refactor readme (#148) Signed-off-by: Chen Dai <daichen@amazon.com> * Build against OpenSearch 1.0.0 and bump artifact version to 1.0.0.0 (#146) * Bump OpenSearch version from rc1 to 1.0.0 Signed-off-by: Chen Dai <daichen@amazon.com> * Rename JDBC artifact by removing -rc1 Signed-off-by: Chen Dai <daichen@amazon.com> * Remove rc1 qualifier in build workflow Signed-off-by: Chen Dai <daichen@amazon.com> * Remove rc1 from build tools version Signed-off-by: Chen Dai <daichen@amazon.com> * Fix IT failure Signed-off-by: Chen Dai <daichen@amazon.com> * Rollback build tools to rc1 due to known issue Signed-off-by: Chen Dai <daichen@amazon.com> * Bump CLI version Signed-off-by: Chen Dai <daichen@amazon.com> * Bump query workbench version Signed-off-by: Chen Dai <daichen@amazon.com> * Build against 1.0.0 Signed-off-by: Chen Dai <daichen@amazon.com> * Update release notes drafter Signed-off-by: Chen Dai <daichen@amazon.com> * Update nodejs to 10.24.1 Signed-off-by: Chen Dai <daichen@amazon.com> * Change grammar and add UT (#150) Signed-off-by: Chen Dai <daichen@amazon.com> * Add release notes for OpenSearch GA (#151) * Add release notes Signed-off-by: Chen Dai <daichen@amazon.com> * Change release date Signed-off-by: Chen Dai <daichen@amazon.com> * Add bug fixes section Signed-off-by: Chen Dai <daichen@amazon.com> * Add sql dashboards tests for workbench Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * [1] Fixed aws init and shutdown behaviour (#163) * Support implicit type conversion from string to boolean (#166) * Support implicit type conversion for bool and string Signed-off-by: Chen Dai <daichen@amazon.com> * Fix lucene query pushdown issue Signed-off-by: Chen Dai <daichen@amazon.com> * Refactor lucene query methods Signed-off-by: Chen Dai <daichen@amazon.com> * Refactor builtin repo methods Signed-off-by: Chen Dai <daichen@amazon.com> * Add comparison test Signed-off-by: Chen Dai <daichen@amazon.com> * Fix comparison test Signed-off-by: Chen Dai <daichen@amazon.com> * Add doc test for user manual Signed-off-by: Chen Dai <daichen@amazon.com> * Fix doc test Signed-off-by: Chen Dai <daichen@amazon.com> * Fix design doc link Signed-off-by: Chen Dai <daichen@amazon.com> * Fix RST render issue Signed-off-by: Chen Dai <daichen@amazon.com> * Fix cast function pushdown issue Signed-off-by: Chen Dai <daichen@amazon.com> * Improve javadoc for PR Signed-off-by: Chen Dai <daichen@amazon.com> * Upload design doc Signed-off-by: Chen Dai <daichen@amazon.com> * Add more user manual Signed-off-by: Chen Dai <daichen@amazon.com> * Add more user manual Signed-off-by: Chen Dai <daichen@amazon.com> * Fix doctest Signed-off-by: Chen Dai <daichen@amazon.com> * Support distinct count aggregation (#167) * Support construct AggregationResponseParser during Aggregator build stage (#108) * Support construct AggregationResponseParser during Aggregator build stage * modify the doc Signed-off-by: penghuo <penghuo@gmail.com> * support distinct count aggregation Signed-off-by: chloe-zh <chloezh1102@gmail.com> * fixed tests Signed-off-by: chloe-zh <chloezh1102@gmail.com> * Merge remote-tracking branch 'upstream/develop' into issue/#100 Signed-off-by: chloe-zh <chloezh1102@gmail.com> # Conflicts: # opensearch/src/main/java/org/opensearch/sql/opensearch/storage/script/aggregation/dsl/MetricAggregationBuilder.java * update Signed-off-by: chloe-zh <chloezh1102@gmail.com> * updated user doc Signed-off-by: chloe-zh <chloezh1102@gmail.com> * Update: support only count for distinct aggregations Signed-off-by: chloe-zh <chloezh1102@gmail.com> * Update doc; removed distinct start Signed-off-by: chloe-zh <chloezh1102@gmail.com> * Removed unnecessary methods Signed-off-by: chloe-zh <chloezh1102@gmail.com> * update Signed-off-by: chloe-zh <chloezh1102@gmail.com> * Impl stddev and variance function in SQL and PPL (#115) * impl variance frontend and backend * Support construct AggregationResponseParser during Aggregator build stage * add var and varp for PPL Signed-off-by: penghuo <penghuo@gmail.com> * add UT Signed-off-by: penghuo <penghuo@gmail.com> * fix UT Signed-off-by: penghuo <penghuo@gmail.com> * fix doc format Signed-off-by: penghuo <penghuo@gmail.com> * fix doc format Signed-off-by: penghuo <penghuo@gmail.com> * fix the doc Signed-off-by: penghuo <penghuo@gmail.com> * add stddev_samp and stddev_pop Signed-off-by: penghuo <penghuo@gmail.com> * fix UT coverage * address comments Signed-off-by: penghuo <penghuo@gmail.com> * Fix the aggregation filter missing in named aggregators (#123) * Take the condition expression as property to the named aggregator when wrapping the delegated aggregator Signed-off-by: chloe-zh <chloezh1102@gmail.com> * update Signed-off-by: chloe-zh <chloezh1102@gmail.com> * Added test case where filtered agg is not pushed down Signed-off-by: chloe-zh <chloezh1102@gmail.com> * update Signed-off-by: chloe-zh <chloezh1102@gmail.com> * update Signed-off-by: chloe-zh <chloezh1102@gmail.com> * update Signed-off-by: chloe-zh <chloezh1102@gmail.com> * modified comparison test Signed-off-by: chloe-zh <chloezh1102@gmail.com> * removed a comparison test and added it to aggregationIT Signed-off-by: chloe-zh <chloezh1102@gmail.com> * added ppl IT test cases; added window function test cases Signed-off-by: chloe-zh <chloezh1102@gmail.com> * moved distinct window function test cases to WindowsIT Signed-off-by: chloe-zh <chloezh1102@gmail.com> * added ut Signed-off-by: chloe-zh <chloezh1102@gmail.com> * update Signed-off-by: chloe-zh <chloezh1102@gmail.com> * update Signed-off-by: chloe-zh <chloezh1102@gmail.com> * addressed comments Signed-off-by: chloe-zh <chloezh1102@gmail.com> * added test cases to meet the coverage requirement Signed-off-by: chloe-zh <chloezh1102@gmail.com> * added test cases for distinct count map and array types Signed-off-by: chloe-zh <chloezh1102@gmail.com> Co-authored-by: Peng Huo <penghuo@gmail.com> * Support implicit type conversion from string to temporal (#171) * Support implicit cast from string to temporal types Signed-off-by: Chen Dai <daichen@amazon.com> * Add comparison test Signed-off-by: Chen Dai <daichen@amazon.com> * Add doctest Signed-off-by: Chen Dai <daichen@amazon.com> * Fix doctest Signed-off-by: Chen Dai <daichen@amazon.com> * Add more user manual Signed-off-by: Chen Dai <daichen@amazon.com> * Add more user manual Signed-off-by: Chen Dai <daichen@amazon.com> * Fix doctest Signed-off-by: Chen Dai <daichen@amazon.com> * Update user manual Signed-off-by: Chen Dai <daichen@amazon.com> * Use externally-defined OpenSearch version when specified. Signed-off-by: dblock <dblock@amazon.com> * Use OpenSearch 1.1 and build snapshot by default. (#181) Signed-off-by: dblock <dblock@amazon.com> * Bump path-parse from 1.0.6 to 1.0.7 in /workbench (#178) Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7. - [Release notes](https://github.com/jbgutierrez/path-parse/releases) - [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7) --- updated-dependencies: - dependency-name: path-parse dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Workbench: auto dump cypress test data, support security (#199) * Workbench: remove curl commands in integtest.sh (#200) Signed-off-by: Joshua Li <joshuali925@gmail.com> * Fix import path for cypress constant (#201) * Bump version to 1.1 for Opensearch 1.1.0.0 release (#202) * bump workbench versions to 1.1 Signed-off-by: David Cui <davidcui@amazon.com> * bump version to 1.1.0.0 for 1.1 release Signed-off-by: David Cui <davidcui@amazon.com> * add release notes for 1.1 Signed-off-by: David Cui <davidcui@amazon.com> * bump odbc files to 1.1.0.0 Signed-off-by: David Cui <davidcui@amazon.com> * Bump opensearch ref to 1.1 in CI (#205) * Fix PPL request concurrency handling issue (#207) * Downscope request to local method Signed-off-by: Chen Dai <daichen@amazon.com> * Fix checkstyle Signed-off-by: Chen Dai <daichen@amazon.com> * Removed integtest.sh. (#208) Signed-off-by: dblock <dblock@dblock.org> Co-authored-by: Peter Zhu <zhujiaxi@amazon.com> Co-authored-by: Chen Dai <46505291+dai-chen@users.noreply.github.com> Co-authored-by: Lyndon Bauto <58273576+lyndonb-bq@users.noreply.github.com> Co-authored-by: Chloe <chloezh1102@gmail.com> Co-authored-by: Peng Huo <penghuo@gmail.com> Co-authored-by: dblock <dblock@amazon.com> Co-authored-by: Daniel Doubrovkine (dB.) <dblock@dblock.org> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Joshua <joshuali925@gmail.com>
1 parent 254510e commit 3762023

91 files changed

Lines changed: 1507 additions & 385 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/draft-release-notes-workflow.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Release Drafter
33
on:
44
push:
55
branches:
6-
- develop
6+
- main
77

88
jobs:
99
update_release_draft:
@@ -16,6 +16,6 @@ jobs:
1616
with:
1717
config-name: draft-release-notes-config.yml
1818
tag: (None)
19-
version: 1.0.0.0-rc1
19+
version: 1.1.0.0
2020
env:
2121
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/link-checker.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
id: lychee
1717
uses: lycheeverse/lychee-action@master
1818
with:
19-
args: --accept=200,403,429 "**/*.html" "**/*.md" "**/*.txt" --exclude "http://localhost*" "https://localhost" "https://odfe-node1:9200/" "https://community.tableau.com/docs/DOC-17978" ".*family.zzz" "https://pypi.python.org/pypi/opensearch-sql-cli/" "opensearch*" ".*@amazon.com" ".*email.com" "git@github.com" "http://timestamp.verisign.com/scripts/timstamp.dll"
19+
args: --accept=200,403,429,999 "**/*.html" "**/*.md" "**/*.txt" --exclude "http://localhost*" "https://localhost" "https://odfe-node1:9200/" "https://community.tableau.com/docs/DOC-17978" ".*family.zzz" "https://pypi.python.org/pypi/opensearch-sql-cli/" "opensearch*" ".*@amazon.com" ".*email.com" "git@github.com" "http://timestamp.verisign.com/scripts/timstamp.dll"
2020
env:
2121
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
2222
- name: Fail if there were link errors

‎.github/workflows/sql-cli-release-workflow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99
build:
1010

11-
runs-on: [ubuntu-16.04]
11+
runs-on: ubuntu-latest
1212
defaults:
1313
run:
1414
working-directory: sql-cli

‎.github/workflows/sql-cli-test-and-build-workflow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on: [pull_request, push]
55
jobs:
66
build:
77

8-
runs-on: [ubuntu-16.04]
8+
runs-on: ubuntu-latest
99
defaults:
1010
run:
1111
working-directory: sql-cli

‎.github/workflows/sql-jdbc-push-jdbc-maven.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
upload-jdbc-jar:
11-
runs-on: [ubuntu-16.04]
11+
runs-on: ubuntu-latest
1212
defaults:
1313
run:
1414
working-directory: sql-jdbc

‎.github/workflows/sql-odbc-release-workflow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ env:
1212
ODBC_BUILD_PATH: "./build/odbc/build"
1313
AWS_SDK_INSTALL_PATH: "./build/aws-sdk/install"
1414
PLUGIN_NAME: opensearch-sql-odbc
15-
OD_VERSION: 1.0.0.0
15+
OD_VERSION: 1.1.0.0
1616

1717
jobs:
1818
build-mac:

‎.github/workflows/sql-odbc-rename-and-release-workflow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- rename*
99

1010
env:
11-
OD_VERSION: 1.0.0.0
11+
OD_VERSION: 1.1.0.0
1212

1313
jobs:
1414
upload-odbc:

‎.github/workflows/sql-release-workflow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
java: [14]
1313

1414
name: Build and Release SQL Plugin
15-
runs-on: [ubuntu-16.04]
15+
runs-on: ubuntu-latest
1616

1717
steps:
1818
- name: Checkout SQL

‎.github/workflows/sql-test-and-build-workflow.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ jobs:
2121
with:
2222
repository: 'opensearch-project/OpenSearch'
2323
path: OpenSearch
24-
ref: '1.0'
24+
ref: '1.1'
2525

2626
- name: Build OpenSearch
2727
working-directory: ./OpenSearch
28-
run: ./gradlew publishToMavenLocal -Dbuild.version_qualifier=rc1 -Dbuild.snapshot=false
28+
run: ./gradlew publishToMavenLocal
2929

3030
- name: Build with Gradle
31-
run: ./gradlew build assemble
31+
run: ./gradlew build assemble -Dopensearch.version=1.1.0-SNAPSHOT
3232

3333
- name: Create Artifact Path
3434
run: |

‎.github/workflows/sql-workbench-release-workflow.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
env:
99
PLUGIN_NAME: query-workbench-dashboards
1010
OPENSEARCH_VERSION: '1.0'
11-
OPENSEARCH_PLUGIN_VERSION: 1.0.0.0-rc1
11+
OPENSEARCH_PLUGIN_VERSION: 1.0.0.0
1212

1313
jobs:
1414

@@ -38,7 +38,7 @@ jobs:
3838
- name: Setup Node
3939
uses: actions/setup-node@v1
4040
with:
41-
node-version: '10.23.1'
41+
node-version: '10.24.1'
4242

4343
- name: Move Workbench to Plugins Dir
4444
run: |

0 commit comments

Comments
 (0)