[Spotless] Applying Google Code Format for integ-tests #8 by MitchellGale · Pull Request #327 · Bit-Quill/opensearch-project-sql

MitchellGale · 2023-08-04T17:17:36Z

Description

Spotless apply on integ-test (part 1 of 4 integ-test integration).

Issues Resolved

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.

codecov · 2023-08-04T17:39:10Z

Codecov Report

Merging #327 (0521d7c) into integ/sl_GoogleJavaFormat8 (245c4f8) will not change coverage.
The diff coverage is 100.00%.

❗ Current head 0521d7c differs from pull request most recent head 3e16d96. Consider uploading reports for the commit 3e16d96 to get more accurate results

@@                      Coverage Diff                      @@
##             integ/sl_GoogleJavaFormat8     #327   +/-   ##
=============================================================
  Coverage                         97.51%   97.51%           
  Complexity                         4657     4657           
=============================================================
  Files                               408      408           
  Lines                             11933    11933           
  Branches                            829      829           
=============================================================
  Hits                              11637    11637           
  Misses                              289      289           
  Partials                              7        7

Flag	Coverage Δ
sql-engine	`97.51% <100.00%> (ø)`

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

Files Changed	Coverage Δ
...a/org/opensearch/sql/analysis/AnalysisContext.java	`100.00% <ø> (ø)`
...org/opensearch/sql/analysis/HighlightAnalyzer.java	`100.00% <ø> (ø)`
...ensearch/sql/analysis/NamedExpressionAnalyzer.java	`100.00% <ø> (ø)`
.../org/opensearch/sql/analysis/symbol/Namespace.java	`100.00% <ø> (ø)`
...search/sql/data/model/AbstractExprNumberValue.java	`100.00% <ø> (ø)`
...g/opensearch/sql/data/model/AbstractExprValue.java	`100.00% <ø> (ø)`
...rg/opensearch/sql/data/model/ExprBooleanValue.java	`100.00% <ø> (ø)`
...a/org/opensearch/sql/data/model/ExprByteValue.java	`100.00% <ø> (ø)`
...org/opensearch/sql/data/model/ExprDoubleValue.java	`100.00% <ø> (ø)`
.../org/opensearch/sql/data/model/ExprFloatValue.java	`100.00% <ø> (ø)`
... and 192 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

integ-test/build.gradle

integ-test/src/test/java/org/opensearch/sql/legacy/AggregationIT.java

Yury-Fridlyand · 2023-08-04T22:45:32Z

integ-test/src/test/java/org/opensearch/sql/legacy/CursorIT.java

+                "{  \"fetch_size\": 200,  \"query\": \" SELECT age, state FROM %s WHERE age > ? OR"
+                    + " state IN (?, ?)\",  \"parameters\": [    {      \"type\": \"integer\",     "
+                    + " \"value\": 25    },        {      \"type\": \"string\",      \"value\":"
+                    + " \"WA\"    },            {      \"type\": \"string\",      \"value\": \"UT\""
+                    + "    }  ]}",


Is is possible to ask spotless to keep some string literals unmodified aka exception? Please, check.

To my best research, it is not possible to have an exception for that in spotless. Spotless seems to be a very strict application of the Google Java Format.

I see SL keeps format for other tests. See newSettingNewEndpoint on this PR or https://github.com/Bit-Quill/opensearch-project-sql/pull/328/files#diff-2f3432d682c1cca41cfda328adbdf15149e610abb1dc522082218c1d6126669fR98-R111 (integ-test/src/test/java/org/opensearch/sql/legacy/PluginIT.java)

integ-test/src/test/java/org/opensearch/sql/legacy/MetaDataQueriesIT.java

integ-test/src/test/java/org/opensearch/sql/sql/DateTimeImplementationIT.java

integ-test/src/test/java/org/opensearch/sql/sql/LikeQueryIT.java

matthewryanwells · 2023-08-10T18:23:12Z

integ-test/src/test/java/org/opensearch/sql/legacy/AggregationIT.java

+    JSONObject result =
+        executeQuery(
+            String.format(
+                "SELECT gender " + "FROM %s " + "GROUP BY gender " + "HAVING COUNT(*) > 0",


Since this has been moved to be on the same row rather than split onto multiple rows I believe that we can have this whole row be in one set of quotations rather than split into multiple with + signs between them

Good catch, thanks, fixed.

matthewryanwells · 2023-08-10T18:23:44Z

integ-test/src/test/java/org/opensearch/sql/legacy/AggregationIT.java

+    JSONObject result =
+        executeQuery(
+            String.format(
+                "SELECT a.gender " + "FROM %s a " + "GROUP BY a.gender " + "HAVING COUNT(*) > 0",


Same as above, this can be combined into a single quote

Good catch, thanks, fixed.

matthewryanwells · 2023-08-10T18:56:24Z

integ-test/src/test/java/org/opensearch/sql/legacy/AggregationIT.java

+  /**
+   * <a>
+   * http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-aggregations-bucket-daterange-aggregation.html</a>
+   */
+  @Test
+  @Ignore
+  public void countDateRangeTest() throws IOException {
+    String result =
+        explainQuery(
+            String.format(
+                "select online from %s group by date_range("
+                    + "field='insert_time', 'format'='yyyy-MM-dd' ,'2014-08-18','2014-08-17', "
+                    + "'now-8d','now-7d','now-6d','now')",
+                TEST_INDEX_ONLINE));
+    // TODO: fix the query or fix the code for the query to work
+  }


Should this have been uncommented out?

Was requested here: #327 (comment). The @ignore was added to not run the test.

matthewryanwells · 2023-08-10T19:11:51Z

integ-test/src/test/java/org/opensearch/sql/ppl/MatchPhrasePrefixIT.java

-        "| where match_phrase_prefix(Tags, 'gas ta', slop=2) " +
-        "| fields Tags";
+    String query =
+        "source = %s" + "| where match_phrase_prefix(Tags, 'gas ta', slop=2) " + "| fields Tags";


unneeded split up quotations

thanks, fixed.

matthewryanwells · 2023-08-10T19:12:02Z

integ-test/src/test/java/org/opensearch/sql/ppl/MatchPhrasePrefixIT.java

-        "| where match_phrase_prefix(Tags, 'gas ta', slop=3)" +
-        "| fields Tags";
+    String query =
+        "source = %s" + "| where match_phrase_prefix(Tags, 'gas ta', slop=3)" + "| fields Tags";


split quotations

thanks, fixed.

Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> add ignore failures for build.gradle. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Reverting ignore for checkstyle in integ-test Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Addressed PR comments. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Addressed PR comments to expand jav doc. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> fixed string formatting Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Fixed string formatting. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Fixed string formatting in MatchPhrasePrefixIT Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

…-project#1962) * spotless apply for 81 integ-test files (#327) add ignore failures for build.gradle. Reverting ignore for checkstyle in integ-test Addressed PR comments. Addressed PR comments to expand jav doc. fixed string formatting Fixed string formatting. Fixed string formatting in MatchPhrasePrefixIT Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> * Apply suggestions from code review Co-authored-by: Yury-Fridlyand <yury.fridlyand@improving.com> Signed-off-by: Mitchell Gale <Mitchell.gale@improving.com> * address 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> Co-authored-by: Yury-Fridlyand <yury.fridlyand@improving.com>

MitchellGale requested review from GumpacG, MaxKsyunz, Yury-Fridlyand, acarbonetto and forestmvey as code owners August 4, 2023 17:17

MitchellGale assigned matthewryanwells and Yury-Fridlyand Aug 4, 2023

Yury-Fridlyand approved these changes Aug 4, 2023

View reviewed changes

matthewryanwells reviewed Aug 10, 2023

View reviewed changes

matthewryanwells approved these changes Aug 10, 2023

View reviewed changes

MitchellGale force-pushed the dev/sl_GoogleJavaFormat8 branch 2 times, most recently from 4baa02d to 0521d7c Compare August 14, 2023 21:28

MitchellGale changed the base branch from integ/sl_GoogleJavaFormat8 to Integ/Fix-StopPrometheus August 14, 2023 21:32

MitchellGale changed the base branch from Integ/Fix-StopPrometheus to integ/sl_GoogleJavaFormat8 August 14, 2023 21:32

MitchellGale changed the base branch from integ/sl_GoogleJavaFormat8 to Integ/Fix-StopPrometheus August 14, 2023 21:48

MitchellGale changed the base branch from Integ/Fix-StopPrometheus to integ/sl_GoogleJavaFormat8 August 14, 2023 21:48

MitchellGale changed the base branch from integ/sl_GoogleJavaFormat8 to integ/sl_GJF8 August 14, 2023 21:49

MitchellGale changed the base branch from integ/sl_GJF8 to integ/sl_GoogleJavaFormat8 August 14, 2023 21:53

MitchellGale force-pushed the dev/sl_GoogleJavaFormat8 branch from 0521d7c to 3e16d96 Compare August 14, 2023 22:10

MitchellGale merged commit 550105b into integ/sl_GoogleJavaFormat8 Aug 14, 2023

Conversation

MitchellGale commented Aug 4, 2023

Description

Issues Resolved

Check List

Uh oh!

codecov bot commented Aug 4, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Yury-Fridlyand Aug 5, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

codecov bot commented Aug 4, 2023 •

edited

Loading

Yury-Fridlyand Aug 5, 2023 •

edited

Loading