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.

Sign up for GitHub

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

Jump to bottom

OpenSearch migration for JDBC driver #3

Merged
merged 6 commits into from
Apr 14, 2021
Merged

OpenSearch migration for JDBC driver #3

merged 6 commits into from
Apr 14, 2021

Conversation

dai-chen
Copy link
Collaborator

@dai-chen dai-chen commented Apr 8, 2021 •
edited
Loading

Issue #, if available:

Description of changes:

  1. Bump driver version to 1.15.0.0 accordingly.
  2. Rename all Elasticsearch/elasticsearch/ES/es in source code and docs.

Note that

  1. There are "es" in docs and source code related to AWS credential factory. For those all are left as it is.
  2. JDBC connection URL is changed to "jdbc:opensearch"

Testing: All comparison IT in SQL can pass which depends on JDBC driver.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

@dai-chen dai-chen self-assigned this Apr 8, 2021
@dai-chen dai-chen marked this pull request as ready for review April 9, 2021 00:11
joshuali925
joshuali925 approved these changes Apr 13, 2021
View reviewed changes
Copy link
Member

@joshuali925 joshuali925 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@dai-chen dai-chen merged commit 95d16cb into develop Apr 14, 2021
@dai-chen dai-chen deleted the opensearch/jdbc branch April 26, 2021 18:10
joshuali925 pushed a commit to joshuali925/sql that referenced this pull request Jan 4, 2022
Merge pull request opensearch-project#3 from Bit-Quill/timestamp-issue
5a90ca7 
Fix for ADDDATE and SUBDATE with resulting 00:00:00 being unexpectedly null
joshuali925 pushed a commit to joshuali925/sql that referenced this pull request Jan 6, 2023
@YANG-DB @Yury-Fridlyand
Disallow unquoted literals in LIKE clause in DESCRIBE statement (o…
1cd7d76 
…pensearch-project#1181) (opensearch-project#3)

* Allow quoted literals only in `DESCRIBE` and `SHOW` clauses. Tests.

Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com>

* Fix doctest after rebase.

Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>

* Fix doctest after rebase. - Typo fix.

Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>

* Update syntax section.

Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>

Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com>
Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>

Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com>
Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>
Co-authored-by: Yury-Fridlyand <yury.fridlyand@improving.com>
YANG-DB added a commit that referenced this pull request Jan 13, 2023
@YANG-DB @Yury-Fridlyand
port repo split to main (#1232)
9d4a841 
* remove sub-folders which upgraded as new repositories
 - sql-cli
 - sql-odbc
 - sql-jdbc
 - dashboards-query-workbench
 - add additional workflow run triggers
 - move the BI tests to jdbc/odbc
 - move the sql-cli outside and clone for the doctest build

Signed-off-by: YANGDB <yang.db.dev@gmail.com>

* Merge remote-tracking branch 'upstream/main'

Signed-off-by: YANGDB <yang.db.dev@gmail.com>

* add sql-jdbc dependendcy to gradle

Signed-off-by: YANGDB <yang.db.dev@gmail.com>

* Disallow unquoted literals in `LIKE` clause in `DESCRIBE` statement (#1181)

* Allow quoted literals only in `DESCRIBE` and `SHOW` clauses. Tests.

Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com>

* Fix doctest after rebase.

Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>

* Fix doctest after rebase. - Typo fix.

Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>

* Update syntax section.

Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>

Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com>
Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>
Creation and updating 2.x branch (#6)

* Create the 2.x branch
* Add  workflow_dispatch: to github CLI

Signed-off-by: YANGDB <yang.db.dev@gmail.com>

* remove sub-folders which upgraded as new repositories
 - sql-cli
 - sql-odbc
 - sql-jdbc
 - dashboards-query-workbench

Signed-off-by: YANG-DB <yang-db-dev@gmail.com>

* add additional workflow run triggers

Signed-off-by: YANGDB <yang.db.dev@gmail.com>

* Merge remote-tracking branch 'upstream/main'
 - move the BI tests to jdbc/odbc
 - move the sql-cli outside and clone for the doctest build

Signed-off-by: YANGDB <yang.db.dev@gmail.com>

* Disallow unquoted literals in `LIKE` clause in `DESCRIBE` statement (#1181) (#3)

* Allow quoted literals only in `DESCRIBE` and `SHOW` clauses. Tests.

Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com>

* Fix doctest after rebase.

Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>

* Fix doctest after rebase. - Typo fix.

Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>

* Update syntax section.

Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>

Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com>
Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>

Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com>
Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>
Co-authored-by: Yury-Fridlyand <yury.fridlyand@improving.com>

Signed-off-by: YANG-DB <yang-db-dev@gmail.com>
Signed-off-by: YANGDB <yang.db.dev@gmail.com>
Signed-off-by: Yury-Fridlyand <yuryf@bitquilltech.com>
Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>
Co-authored-by: lior perry <lioperry@amazon.com>
Co-authored-by: yang-db <yang-db-dev@gmail.com>
Co-authored-by: Yury-Fridlyand <yury.fridlyand@improving.com>
GumpacG pushed a commit that referenced this pull request Aug 9, 2023
@MitchellGale
[Spotless] Applying Google Code Format for core/src/main files #1 (#1930
aa88b41 
)

* # This is a combination of 9 commits.
# This is the 1st commit message:

Fix create_index/create_index_with_IOException issue caused by OpenSearch PR change (#1899)

* Added setDefaultMediaType for create_index and create_index_with_IOException

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
(cherry picked from commit 7b932a7)
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Resolving merge conflicts for pre tag in java docs.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

running spotless check on newly pre tagged javadocs.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Converts java doc table to proper java doc table.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Resolving merge conflicts for pre tag in java docs 2

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

running spotless check on newly pre tagged javadocs.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

cherry pick 60c0018

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Addressed PR comment for table format in AbstractExprValue.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Removed pre tag from ExpressionReferenceOptimizer.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Removed pre tag from AstDSL.java

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Removed pre tag from AstDSL.java

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Removed pre tag from SelectExpressionAnalyzer.java

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

fixed java doc in QualifiedName.java

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Removing checkstyle test for core and added spotless for relevant directories.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

# This is the commit message #2:

Fixing spacing around headers in ExpressionReferenceOptimizer.java SelectExpressionAnalyzer.java

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

# This is the commit message #3:

Fix breaking changes. Disable some flaky tests in legacy.

Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>

(cherry picked from commit 809e656)
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

# This is the commit message #4:

Resolving merge conflicts for pre tag in java docs.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

# This is the commit message #5:

running spotless check on newly pre tagged javadocs.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

# This is the commit message #6:

Fixed java doc spelling and improving string concatination.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

# This is the commit message #7:

improving string concatination.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

# This is the commit message #8:

Improving failure format on some functions.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

# This is the commit message #9:

spotless apply and fix of build.gradle

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* parent 496fe8e
author Mitchell Gale <Mitchell.Gale@improving.com> 1691080710 -0700
committer Mitchell Gale <Mitchell.Gale@improving.com> 1691080766 -0700

Fix create_index/create_index_with_IOException issue caused by OpenSearch PR change (#1899)

* Added setDefaultMediaType for create_index and create_index_with_IOException

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
(cherry picked from commit 7b932a7)
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Resolving merge conflicts for pre tag in java docs.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

running spotless check on newly pre tagged javadocs.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Converts java doc table to proper java doc table.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Resolving merge conflicts for pre tag in java docs 2

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

running spotless check on newly pre tagged javadocs.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

cherry pick 60c0018

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Addressed PR comment for table format in AbstractExprValue.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Removed pre tag from ExpressionReferenceOptimizer.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Removed pre tag from AstDSL.java

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Removed pre tag from AstDSL.java

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Removed pre tag from SelectExpressionAnalyzer.java

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

fixed java doc in QualifiedName.java

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Removing checkstyle test for core and added spotless for relevant directories.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Fixing spacing around headers in ExpressionReferenceOptimizer.java SelectExpressionAnalyzer.java

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Fix breaking changes. Disable some flaky tests in legacy.

Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>

(cherry picked from commit 809e656)
Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Resolving merge conflicts for pre tag in java docs.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

running spotless check on newly pre tagged javadocs.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Fixed java doc spelling and improving string concatination.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

improving string concatination.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Improving failure format on some functions.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

spotless apply and fix of build.gradle

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Resolving merge conflicts for pre tag in java docs.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

running spotless check on newly pre tagged javadocs.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Converts java doc table to proper java doc table.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

Removing unused import in OpenSearchRestClientTest.java

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* running spotless apply.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Addressed comments in PR 5.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

---------

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Yury-Fridlyand pushed a commit that referenced this pull request Aug 9, 2023
@MitchellGale
[Spotless] Applying Google Code Format for core/src/main files #3 (#1932
9914580 
)

* Applying Google Java code format changes to core/src/main/java/org/opensearch/sql/planner core/src/main/java/org/opensearch/sql/storage core/src/main/java/org/opensearch/sql/utils

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Ignore on failure for checkstyle in core and added the three spotless fixes files.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Fixed javadoc formatting in LogicalPlanOptimizer.java LogicalValues.java OperatorUtils.java Planner.java

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* spotless apply, fixing include for spotless build.gradle and adding pre tag.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* addressed PR comments.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

---------

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
acarbonetto pushed a commit that referenced this pull request Aug 21, 2023
@MitchellGale
[Backport 2.x] [Spotless] Applying Google Code Format for core/src/ma…
9f081ab 
…in files #3 (#1932) (#1994)

* [Spotless] Applying Google Code Format for core/src/main files #3 (#1932)

* Applying Google Java code format changes to core/src/main/java/org/opensearch/sql/planner core/src/main/java/org/opensearch/sql/storage core/src/main/java/org/opensearch/sql/utils

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Ignore on failure for checkstyle in core and added the three spotless fixes files.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* Fixed javadoc formatting in LogicalPlanOptimizer.java LogicalValues.java OperatorUtils.java Planner.java

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* spotless apply, fixing include for spotless build.gradle and adding pre tag.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* addressed PR comments.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

---------

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>

* spotless apply

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* add checkstyle ignore

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

* addressed PR comments

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

---------

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>
Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joshuali925 joshuali925 joshuali925 approved these changes

Assignees

@dai-chen dai-chen

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@dai-chen @joshuali925