From 74d9fa01fdf80fafefe746a6e23107fa68e45969 Mon Sep 17 00:00:00 2001 From: Joshua Date: Tue, 14 Sep 2021 12:47:44 -0700 Subject: [PATCH] Bump opensearch ref to 1.1 in CI (#205) --- .github/workflows/link-checker.yml | 2 +- .../workflows/sql-cli-release-workflow.yml | 2 +- .../sql-cli-test-and-build-workflow.yml | 2 +- .../workflows/sql-jdbc-push-jdbc-maven.yml | 2 +- .github/workflows/sql-release-workflow.yml | 2 +- .../workflows/sql-test-and-build-workflow.yml | 2 +- README.md | 2 +- docs/dev/NewSQLEngine.md | 28 +++++++++---------- .../opensearch-sql.release-notes-1.1.0.0.md | 1 + sql-cli/CONTRIBUTING.md | 4 +-- sql-cli/README.md | 4 +-- sql-jdbc/CONTRIBUTING.md | 2 +- sql-odbc/CONTRIBUTING.md | 2 +- workbench/README.md | 2 +- .../sql-workbench.release-notes-1.7.0.0.md | 2 +- 15 files changed, 30 insertions(+), 29 deletions(-) diff --git a/.github/workflows/link-checker.yml b/.github/workflows/link-checker.yml index be6f481978..10cab37f8a 100644 --- a/.github/workflows/link-checker.yml +++ b/.github/workflows/link-checker.yml @@ -16,7 +16,7 @@ jobs: id: lychee uses: lycheeverse/lychee-action@master with: - 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" + 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" env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - name: Fail if there were link errors diff --git a/.github/workflows/sql-cli-release-workflow.yml b/.github/workflows/sql-cli-release-workflow.yml index 2959df51b6..a7042bcd32 100644 --- a/.github/workflows/sql-cli-release-workflow.yml +++ b/.github/workflows/sql-cli-release-workflow.yml @@ -8,7 +8,7 @@ on: jobs: build: - runs-on: [ubuntu-16.04] + runs-on: ubuntu-latest defaults: run: working-directory: sql-cli diff --git a/.github/workflows/sql-cli-test-and-build-workflow.yml b/.github/workflows/sql-cli-test-and-build-workflow.yml index fd83a89373..876780a86c 100644 --- a/.github/workflows/sql-cli-test-and-build-workflow.yml +++ b/.github/workflows/sql-cli-test-and-build-workflow.yml @@ -5,7 +5,7 @@ on: [pull_request, push] jobs: build: - runs-on: [ubuntu-16.04] + runs-on: ubuntu-latest defaults: run: working-directory: sql-cli diff --git a/.github/workflows/sql-jdbc-push-jdbc-maven.yml b/.github/workflows/sql-jdbc-push-jdbc-maven.yml index 53f2d5d391..3c96447233 100644 --- a/.github/workflows/sql-jdbc-push-jdbc-maven.yml +++ b/.github/workflows/sql-jdbc-push-jdbc-maven.yml @@ -8,7 +8,7 @@ on: jobs: upload-jdbc-jar: - runs-on: [ubuntu-16.04] + runs-on: ubuntu-latest defaults: run: working-directory: sql-jdbc diff --git a/.github/workflows/sql-release-workflow.yml b/.github/workflows/sql-release-workflow.yml index bbfbd929a8..974f801d36 100644 --- a/.github/workflows/sql-release-workflow.yml +++ b/.github/workflows/sql-release-workflow.yml @@ -12,7 +12,7 @@ jobs: java: [14] name: Build and Release SQL Plugin - runs-on: [ubuntu-16.04] + runs-on: ubuntu-latest steps: - name: Checkout SQL diff --git a/.github/workflows/sql-test-and-build-workflow.yml b/.github/workflows/sql-test-and-build-workflow.yml index 8d7ffe1edd..5ae3f6aec4 100644 --- a/.github/workflows/sql-test-and-build-workflow.yml +++ b/.github/workflows/sql-test-and-build-workflow.yml @@ -21,7 +21,7 @@ jobs: with: repository: 'opensearch-project/OpenSearch' path: OpenSearch - ref: '1.x' + ref: '1.1' - name: Build OpenSearch working-directory: ./OpenSearch diff --git a/README.md b/README.md index 0a66325424..e679c64ccc 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ The following projects have been merged into this repository as separate folders Besides basic filtering and aggregation, OpenSearch SQL also supports complex queries, such as querying semi-structured data, JOINs, set operations, sub-queries etc. Beyond the standard functions, OpenSearch functions are provided for better analytics and visualization. Please check our [documentation](#documentation) for more details. -Recently we have been actively improving our query engine primarily for better correctness and extensibility. Behind the scene, the new enhanced engine has already supported both SQL and Piped Processing Language. Please find more details in [SQL Engine V2 - Release Notes](/docs/dev/NewSQLEngine.md). +Recently we have been actively improving our query engine primarily for better correctness and extensibility. Behind the scene, the new enhanced engine has already supported both SQL and Piped Processing Language. Please find more details in [SQL Engine V2 - Release Notes](./docs/dev/NewSQLEngine.md). ## Documentation diff --git a/docs/dev/NewSQLEngine.md b/docs/dev/NewSQLEngine.md index 0be3370f33..cd82e61571 100644 --- a/docs/dev/NewSQLEngine.md +++ b/docs/dev/NewSQLEngine.md @@ -12,23 +12,23 @@ The current SQL query engine provides users the basic query capability for using With the architecture and extensibility improved significantly, the following SQL features are able to be introduced in the new query engine: * **Language Structure** - * [Identifiers](/docs/user/general/identifiers.rst): added support for identifier names with special characters - * [Data types](/docs/user/general/datatypes.rst): added support for date and interval types - * [Expressions](/docs/user/dql/expressions.rst): complex nested expression support - * [SQL functions](/docs/user/dql/functions.rst): more date function support, `ADDDATE`, `DATE_ADD`, `DATE_SUB`, `DAY`, `DAYNAME`, `DAYOFMONTH`, `DAYOFWEEK`, `DAYOFYEAR`, `FROM_DAYS`, `HOUR`, `MICROSECOND`, `MINUTE`, `QUARTER`, `SECOND`, `SUBDATE`, `TIME`, `TIME_TO_SEC`, `TO_DAYS`, `WEEK` - * [Comments](/docs/user/general/comments.rst): SQL comment support + * [Identifiers](../../docs/user/general/identifiers.rst): added support for identifier names with special characters + * [Data types](../../docs/user/general/datatypes.rst): added support for date and interval types + * [Expressions](../../docs/user/dql/expressions.rst): complex nested expression support + * [SQL functions](../../docs/user/dql/functions.rst): more date function support, `ADDDATE`, `DATE_ADD`, `DATE_SUB`, `DAY`, `DAYNAME`, `DAYOFMONTH`, `DAYOFWEEK`, `DAYOFYEAR`, `FROM_DAYS`, `HOUR`, `MICROSECOND`, `MINUTE`, `QUARTER`, `SECOND`, `SUBDATE`, `TIME`, `TIME_TO_SEC`, `TO_DAYS`, `WEEK` + * [Comments](../../docs/user/general/comments.rst): SQL comment support * **Basic queries** - * [HAVING without GROUP BY clause](/docs/user/dql/aggregations.rst#having-without-group-by) - * [Aggregate over arbitrary expression](/docs/user/dql/aggregations.rst#expression) - * [Ordering by NULLS FIRST/LAST](/docs/user/dql/basics.rst#example-2-specifying-order-for-null) - * [Ordering by aggregate function](/docs/user/dql/basics.rst#example-3-ordering-by-aggregate-functions) + * [HAVING without GROUP BY clause](../../docs/user/dql/aggregations.rst#having-without-group-by) + * [Aggregate over arbitrary expression](../../docs/user/dql/aggregations.rst#expression) + * [Ordering by NULLS FIRST/LAST](../../docs/user/dql/basics.rst#example-2-specifying-order-for-null) + * [Ordering by aggregate function](../../docs/user/dql/basics.rst#example-3-ordering-by-aggregate-functions) * **Complex queries** - * [Subqueries in FROM clause](/docs/user/dql/complex.rst#example-2-subquery-in-from-clause): support arbitrary nesting level and aggregation + * [Subqueries in FROM clause](../../docs/user/dql/complex.rst#example-2-subquery-in-from-clause): support arbitrary nesting level and aggregation * **Advanced Features** - * [Window functions](/docs/user/dql/window.rst): ranking and aggregate window functions - * [Selective aggregation](/docs/user/dql/aggregations.rst#filter-clause): by standard `FILTER` function + * [Window functions](../../docs/user/dql/window.rst): ranking and aggregate window functions + * [Selective aggregation](../../docs/user/dql/aggregations.rst#filter-clause): by standard `FILTER` function * **Beyond SQL** - * [Semi-structured data query](/docs/user/beyond/partiql.rst#example-2-selecting-deeper-levels): support querying OpenSearch object fields on arbitrary level + * [Semi-structured data query](../../docs/user/beyond/partiql.rst#example-2-selecting-deeper-levels): support querying OpenSearch object fields on arbitrary level * OpenSearch multi-field: handled automatically and users won't have the access, ex. `text` is converted to `text.keyword` if it’s a multi-field As for correctness, besides full coverage of unit and integration test, we developed a new comparison test framework to ensure correctness by comparing with other databases. Please find more details in [Testing](./Testing.md). @@ -57,7 +57,7 @@ For the following features unsupported in the new engine, the query will be forw ### 3.3 Limitations -You can find all the limitations in [Limitations](/docs/user/limitations/limitations.rst). +You can find all the limitations in [Limitations](../../docs/user/limitations/limitations.rst). --- diff --git a/release-notes/opensearch-sql.release-notes-1.1.0.0.md b/release-notes/opensearch-sql.release-notes-1.1.0.0.md index 473cca7551..a99aa7b56a 100644 --- a/release-notes/opensearch-sql.release-notes-1.1.0.0.md +++ b/release-notes/opensearch-sql.release-notes-1.1.0.0.md @@ -22,3 +22,4 @@ Compatible with OpenSearch and OpenSearch Dashboards Version 1.1.0 * Use externally-defined OpenSearch version when specified. ([#179](https://github.com/opensearch-project/sql/pull/179)) * Use OpenSearch 1.1 and build snapshot by default in CI. ([#181](https://github.com/opensearch-project/sql/pull/181)) * Workbench: remove curl commands in integtest.sh ([#200](https://github.com/opensearch-project/sql/pull/200)) +* Bump opensearch ref to 1.1 in CI ([#205](https://github.com/opensearch-project/dashboards-reports/pull/205)) diff --git a/sql-cli/CONTRIBUTING.md b/sql-cli/CONTRIBUTING.md index a0c928b87c..231b2be86a 100644 --- a/sql-cli/CONTRIBUTING.md +++ b/sql-cli/CONTRIBUTING.md @@ -58,11 +58,11 @@ If you've thought of a way that OpenSearch could be better, we want to hear abou As with other types of contributions, the first step is to [**open an issue on GitHub**](https://github.com/opensearch-project/OpenSearch/issues/new/choose). Opening an issue before you make changes makes sure that someone else isn't already working on that particular problem. It also lets us all work together to find the right approach before you spend a bunch of time on a PR. So again, when in doubt, open an issue. -Once you've opened an issue, check out our [Developer Guide](./DEVELOPER_GUIDE.md) for instructions on how to get started. +Once you've opened an issue, check out our [Developer Guide](../DEVELOPER_GUIDE.rst) for instructions on how to get started. ## Developer Certificate of Origin -OpenSearch is an open source product released under the Apache 2.0 license (see either [the Apache site](https://www.apache.org/licenses/LICENSE-2.0) or the [LICENSE.txt file](./LICENSE.txt)). The Apache 2.0 license allows you to freely use, modify, distribute, and sell your own products that include Apache 2.0 licensed software. +OpenSearch is an open source product released under the Apache 2.0 license (see either [the Apache site](https://www.apache.org/licenses/LICENSE-2.0) or the [LICENSE.txt file](../LICENSE.txt)). The Apache 2.0 license allows you to freely use, modify, distribute, and sell your own products that include Apache 2.0 licensed software. We respect intellectual property rights of others and we want to make sure all incoming contributions are correctly attributed and licensed. A Developer Certificate of Origin (DCO) is a lightweight mechanism to do that. diff --git a/sql-cli/README.md b/sql-cli/README.md index 89f8ba5977..3e690c2a9c 100644 --- a/sql-cli/README.md +++ b/sql-cli/README.md @@ -123,7 +123,7 @@ Run single query from command line with options ## Code of Conduct -This project has adopted an [Open Source Code of Conduct](/CODE_OF_CONDUCT.md). +This project has adopted an [Open Source Code of Conduct](./CODE_OF_CONDUCT.md). @@ -133,7 +133,7 @@ If you discover a potential security issue in this project we ask that you notif ## Licensing -See the [LICENSE](/LICENSE.TXT) file for our project's licensing. We will ask you to confirm the licensing of your contribution. +See the [LICENSE](./LICENSE.TXT) file for our project's licensing. We will ask you to confirm the licensing of your contribution. diff --git a/sql-jdbc/CONTRIBUTING.md b/sql-jdbc/CONTRIBUTING.md index 1461eb76c9..4fb91b5283 100644 --- a/sql-jdbc/CONTRIBUTING.md +++ b/sql-jdbc/CONTRIBUTING.md @@ -20,7 +20,7 @@ reported the issue. Please try to include as much information as you can. Detail * Anything unusual about your environment or deployment ## Sign your work -OpenSearch is an open source product released under the Apache 2.0 license (see either [the Apache site](https://www.apache.org/licenses/LICENSE-2.0) or the [LICENSE.txt file](./LICENSE.txt)). The Apache 2.0 license allows you to freely use, modify, distribute, and sell your own products that include Apache 2.0 licensed software. +OpenSearch is an open source product released under the Apache 2.0 license (see either [the Apache site](https://www.apache.org/licenses/LICENSE-2.0) or the [LICENSE.txt file](../LICENSE.txt)). The Apache 2.0 license allows you to freely use, modify, distribute, and sell your own products that include Apache 2.0 licensed software. We respect intellectual property rights of others and we want to make sure all incoming contributions are correctly attributed and licensed. A Developer Certificate of Origin (DCO) is a lightweight mechanism to do that. diff --git a/sql-odbc/CONTRIBUTING.md b/sql-odbc/CONTRIBUTING.md index bd03ee53a7..c83884fa50 100644 --- a/sql-odbc/CONTRIBUTING.md +++ b/sql-odbc/CONTRIBUTING.md @@ -20,7 +20,7 @@ reported the issue. Please try to include as much information as you can. Detail * Anything unusual about your environment or deployment ## Sign your work -OpenSearch is an open source product released under the Apache 2.0 license (see either [the Apache site](https://www.apache.org/licenses/LICENSE-2.0) or the [LICENSE.txt file](./LICENSE.txt)). The Apache 2.0 license allows you to freely use, modify, distribute, and sell your own products that include Apache 2.0 licensed software. +OpenSearch is an open source product released under the Apache 2.0 license (see either [the Apache site](https://www.apache.org/licenses/LICENSE-2.0) or the [LICENSE.txt file](../LICENSE.txt)). The Apache 2.0 license allows you to freely use, modify, distribute, and sell your own products that include Apache 2.0 licensed software. We respect intellectual property rights of others and we want to make sure all incoming contributions are correctly attributed and licensed. A Developer Certificate of Origin (DCO) is a lightweight mechanism to do that. diff --git a/workbench/README.md b/workbench/README.md index e8c50e6b58..de371a8479 100644 --- a/workbench/README.md +++ b/workbench/README.md @@ -28,7 +28,7 @@ If you discover a potential security issue in this project we ask that you notif ## License -This project is licensed under the [Apache v2.0 License](LICENSE.txt). +This project is licensed under the [Apache v2.0 License](../LICENSE.txt). ## Copyright diff --git a/workbench/release-notes/sql-workbench.release-notes-1.7.0.0.md b/workbench/release-notes/sql-workbench.release-notes-1.7.0.0.md index c9976a8600..34c0ae444e 100644 --- a/workbench/release-notes/sql-workbench.release-notes-1.7.0.0.md +++ b/workbench/release-notes/sql-workbench.release-notes-1.7.0.0.md @@ -18,7 +18,7 @@ To use the SQL Workbench, you will need the [Open Distro SQL plugin](https://git - Updated configureation for v7.3 compatibility ([#7](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/7)) - Opendistro-1.3 compatible with ES and Kibana 7.3 ([#8](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/8)) - Changed kibana version to v7.3.2 ([#9](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/9)) -- Support v7.1.1 Compatibility ([#13](v13)) +- Support v7.1.1 Compatibility ([#13](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/13)) - Bump pr-branch to v1.3 ([#21](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/21)) - Support v7.4 compatibility for kibana and sql-plugin ([#23](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/23)) - Improve the performance by ridding of sending redundant requests ([#24](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/24))