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.

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

Change master nomenclature #551

Merged
merged 2 commits into from
Apr 14, 2022

Conversation

dai-chen
Copy link
Collaborator

@dai-chen dai-chen commented Apr 13, 2022

Signed-off-by: Chen Dai daichen@amazon.com

Description

Change master nomenclature: Change master (mostly Github link) to main in docs and comments.

The only code using master nomenclature is in OpenSearch API call which doesn't seem have alternative clusterManager class or method:

RestQuerySettingsAction:
    final ClusterUpdateSettingsRequest clusterUpdateSettingsRequest =
        Requests.clusterUpdateSettingsRequest();
    clusterUpdateSettingsRequest.timeout(request.paramAsTime(
        "timeout", clusterUpdateSettingsRequest.timeout()));
    clusterUpdateSettingsRequest.masterNodeTimeout(request.paramAsTime(
        "master_timeout", clusterUpdateSettingsRequest.masterNodeTimeout()));

The following master in doc link are also not changed due to main branch missing:

./plugin/src/main/java/org/opensearch/sql/plugin/rest/RestQuerySettingsAction.java:82:    clusterUpdateSettingsRequest.masterNodeTimeout(request.paramAsTime(
./plugin/src/main/java/org/opensearch/sql/plugin/rest/RestQuerySettingsAction.java:83:        "master_timeout", clusterUpdateSettingsRequest.masterNodeTimeout()));
./bi-connectors/PowerBIConnector/OdbcConstants.pqm:1:// values from https://github.com/Microsoft/ODBC-Specification/blob/master/Windows/inc/sqlext.h
./docs/dev/Doctest.md:141:**Reference: [CrateDB Implementation](https://github.com/crate/crate/blob/master/blackbox/test_docs.py)**
./docs/dev/Doctest.md:145:    * https://github.com/crate/crate/blob/master/docs/general/dql/selects.rst
./workbench/test/polyfills/mutationObserver.js:9:// https://github.com/aurelia/pal-nodejs/blob/master/src/polyfills/mutation-observer.ts
./workbench/release-notes/sql-workbench.release-notes-1.7.0.0.md:28:- Initial merge from development branches to master ([#31](https://github.com/opendistro-for-elasticsearch/sql-workbench/pull/31))
./sql-odbc/libraries/rabbit/README:3:https://github.com/mashiro/rabbit/tree/master
./sql-odbc/src/sqlodbc/opensearch_types.h:214:    CONNECTION_AWAITING_RESPONSE, /* Waiting for a response from the postmaster.
./.github/workflows/link-checker.yml:17:        uses: lycheeverse/lychee-action@master
./sql-cli/src/opensearch_sql_cli/opensearch_style.py:61:        # https://github.com/jonathanslenders/python-prompt-toolkit/blob/master/prompt_toolkit/styles/defaults.py

PR reference:

Issues Resolved

#463

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Chen Dai <daichen@amazon.com>
@dai-chen dai-chen self-assigned this Apr 13, 2022
@dai-chen dai-chen marked this pull request as ready for review April 14, 2022 00:38
@dai-chen dai-chen requested a review from a team as a code owner April 14, 2022 00:38
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.

np. master in github links can usually be replaced with HEAD, so it always points to latest commit on the default branch even if default branch changed. but i think it's not necessary

@dai-chen
Copy link
Collaborator Author

np. master in github links can usually be replaced with HEAD, so it always points to latest commit on the default branch even if default branch changed. but i think it's not necessary

good to know that. thanks!

@codecov-commenter
Copy link

Codecov Report

Merging #551 (14578be) into main (8f3e661) will decrease coverage by 31.82%.
The diff coverage is n/a.

@@              Coverage Diff              @@
##               main     #551       +/-   ##
=============================================
- Coverage     94.59%   62.76%   -31.83%     
=============================================
  Files           276       10      -266     
  Lines          7454      658     -6796     
  Branches        550      118      -432     
=============================================
- Hits           7051      413     -6638     
+ Misses          349      192      -157     
+ Partials         54       53        -1     
Flag Coverage Δ
query-workbench 62.76% <ø> (ø)
sql-engine ?

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...org/opensearch/sql/ppl/domain/PPLQueryRequest.java
...ensearch/sql/expression/ExpressionNodeVisitor.java
...h/sql/expression/conditional/cases/WhenClause.java
...g/opensearch/sql/data/model/ExprDatetimeValue.java
...h/planner/logical/rule/MergeFilterAndRelation.java
...arch/sql/opensearch/request/OpenSearchRequest.java
...org/opensearch/sql/data/type/WideningTypeRule.java
...in/java/org/opensearch/sql/data/type/ExprType.java
...rg/opensearch/sql/sql/config/SQLServiceConfig.java
...pensearch/sql/planner/physical/RenameOperator.java
... and 256 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 8f3e661...14578be. Read the comment docs.

@dai-chen dai-chen merged commit c8b58da into opensearch-project:main Apr 14, 2022
@dai-chen dai-chen deleted the change-master-nomenclature branch April 14, 2022 21:41
vamsi-amazon pushed a commit that referenced this pull request Apr 19, 2022
Signed-off-by: Chen Dai <daichen@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants