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 SQL/PPL #1

Merged
merged 18 commits into from
Apr 8, 2021
Merged

OpenSearch migration for SQL/PPL #1

merged 18 commits into from
Apr 8, 2021

Conversation

dai-chen
Copy link
Collaborator

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

Issue #, if available:

Description of changes: If nothing else miss, the only leftover is the ES doc links in source code comments and documentation.

1.Changing to OpenSearch Dependencies

  • build.gradle
    • Plugin version → 1.15.0
    • Add private Maven S3 repo -> 1.13.0.0-Snapshot
    • Replace all org.elasticsearch, ElasticsearchException
    • Organize imports to pass checkstyle

2.Renaming to OpenSearch

  • Module names: elasticsearch
  • Class names
    • ElasticsearchXXX
    • ESXXX
  • Package names
    • ODFE [no changes]
    • xxx.sql.elasticsearch
  • Source code
    • Elasticsearch in comments
    • ES, Es, es in variable/function name
    • ES doc link
  • ANTLR
    • grammar
  • Config files
    • plugin-descriptor.xml
    • plugin.config
    • elasticsearch.yml
  • Test data
    • Explain JSON file
    • Test index name
  • Documentation
    • README
    • User manual

3.Testing

  • Checkstyle
  • Pass UT
  • Pass IT
  • Comparison test (Rerun after JDBC migrated)
  • Doctest (Rerun after CLI migrated)
  • GitHub action

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 7, 2021
@dai-chen dai-chen marked this pull request as ready for review April 7, 2021 22:15
@dai-chen dai-chen merged commit 6340849 into develop Apr 8, 2021
dblock
dblock reviewed Apr 8, 2021
View reviewed changes
Copy link
Member

@dblock dblock left a comment

Choose a reason for hiding this comment

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

See below, sorry to be late to this game.

README.md Show resolved Hide resolved
build.gradle Show resolved Hide resolved
@dai-chen dai-chen mentioned this pull request May 18, 2021
Merged
6 tasks
@dai-chen dai-chen mentioned this pull request Jun 11, 2021
Open
joshuali925 referenced this pull request in joshuali925/sql Jan 4, 2022
Merge pull request #1 from Bit-Quill/migrate-jdbc-tableau-connector
c8ddfb9 
Added Tableau Connector to OpenSearch SQL
@forestmvey forestmvey mentioned this pull request Aug 17, 2022
Closed
6 tasks
@dai-chen dai-chen mentioned this pull request Nov 23, 2022
Merged
6 tasks
@forestmvey forestmvey mentioned this pull request Nov 23, 2022
Merged
6 tasks
@MitchellGale MitchellGale mentioned this pull request Dec 23, 2022
Open
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 #4 (#1933
63b00ba 
)

* GJF part 4

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

* add build.gradle comment to mention why we are ignoring checkstyle failures for core.

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

* Fix include spotless build gradle.

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

* revert astDSL.JAVA

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

* revert ast changes as was covered in spotless #1 PR for GJF.

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

* Reverting commits in ast folder attempt #2

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

* revert change to RaretopN.java

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

* addressed PR comments.

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

* Replacing removed include in spotless.

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 22, 2023
@MitchellGale
[Backport 2.x] [Spotless] Applying Google Code Format for core/src/ma…
3f7db81 
…in files #4 #1933 (#1995)

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

* GJF part 4

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

* add build.gradle comment to mention why we are ignoring checkstyle failures for core.

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

* Fix include spotless build gradle.

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

* revert astDSL.JAVA

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

* revert ast changes as was covered in spotless #1 PR for GJF.

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

* Reverting commits in ast folder attempt #2

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

* revert change to RaretopN.java

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

* addressed PR comments.

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

* Replacing removed include in spotless.

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>

* addressed PR comments

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

* remove pitest

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>
Yury-Fridlyand pushed a commit that referenced this pull request Aug 22, 2023
@MitchellGale
[Backport 2.x] [Spotless] Applying Google Code Format for core/src/ma…
d205bd6 
…in files #1 #1930 (#1992)

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

* # This is a combination of 9 commits.

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>

* 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>

* spotless apply

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

* removed pitest

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

* remove pitest

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

* add spotless

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

* remove pitest

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

@dblock dblock dblock left review comments

@joshuali925 joshuali925 Awaiting requested review from joshuali925

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 @dblock