Removed unused imports #291

MitchellGale · 2023-07-12T08:09:24Z

Description

Removed unused imports in spotless.

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-07-12T08:49:38Z

Codecov Report

Merging #291 (26ca8d6) into dev/spotless_importOrder (f5031a7) will increase coverage by 2.59%.
The diff coverage is n/a.

@@                      Coverage Diff                       @@
##             dev/spotless_importOrder     #291      +/-   ##
==============================================================
+ Coverage                       97.39%   99.98%   +2.59%     
+ Complexity                       4600     2624    -1976     
==============================================================
  Files                             401      205     -196     
  Lines                           11381     5955    -5426     
  Branches                          843      378     -465     
==============================================================
- Hits                            11084     5954    -5130     
+ Misses                            290        1     -289     
+ Partials                            7        0       -7

Flag	Coverage Δ
sql-engine	`99.98% <ø> (+2.59%)`	⬆️

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

Impacted Files	Coverage Δ
...ain/java/org/opensearch/sql/analysis/Analyzer.java	`100.00% <ø> (ø)`
...alysis/DataSourceSchemaIdentifierNameResolver.java	`100.00% <ø> (ø)`
...rg/opensearch/sql/analysis/ExpressionAnalyzer.java	`100.00% <ø> (ø)`
...ensearch/sql/analysis/NamedExpressionAnalyzer.java	`100.00% <ø> (ø)`
...search/sql/planner/logical/LogicalFetchCursor.java	`100.00% <ø> (ø)`
...arch/sql/planner/physical/AggregationOperator.java	`100.00% <ø> (ø)`

... and 196 files with indirect coverage changes

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

GumpacG

LGTM but DCO fails and there's merge conflicts :(

GumpacG · 2023-07-12T15:59:47Z

common/src/main/java/org/opensearch/sql/common/grok/Converter.java

@@ -1,168 +1,168 @@
-/*


What changed here? Seems identical

Yury-Fridlyand · 2023-07-12T19:42:41Z

common/src/test/java/org/opensearch/sql/common/authinterceptors/AwsSigningInterceptorTest.java

@@ -7,8 +7,6 @@

 package org.opensearch.sql.common.authinterceptors;

-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;



Probably, remove one blank line too to have only one blank between package declaration and imports.

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

legacy/src/main/java/org/opensearch/sql/legacy/esdomain/LocalClusterState.java

Yury-Fridlyand · 2023-07-12T19:46:20Z

legacy/src/main/java/org/opensearch/sql/legacy/rewriter/matchtoterm/TermFieldScope.java

@@ -7,7 +7,6 @@
 package org.opensearch.sql.legacy.rewriter.matchtoterm;

 import java.util.*;


Not related by this fix, but do you have spotless rule for star imports?

What would you want to happen, would you want star imports to be converted to the correct imports?

Yes, I think our checkstyle config rejects star imports

Yury-Fridlyand · 2023-07-12T19:47:24Z

...etheus/src/test/java/org/opensearch/sql/prometheus/storage/PrometheusStorageFactoryTest.java

@@ -282,4 +281,3 @@ void createDataSourceSuccessWithHostnameRestrictions() {
  }

 }
-


Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Remove commented out spotless changes. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Adding Spotless to DEVELOPER_GUIDE.rst Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Added Google Java format to spotless. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Update DEVELOPER_GUIDE.rst Co-authored-by: Yury-Fridlyand <yury.fridlyand@improving.com> 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> Remove commented out spotless changes. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Adding Spotless to DEVELOPER_GUIDE.rst Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Added Google Java format to spotless. Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com> Update DEVELOPER_GUIDE.rst Co-authored-by: Yury-Fridlyand <yury.fridlyand@improving.com> Signed-off-by: Mitchell Gale <Mitchell.Gale@improving.com>

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

* Implement creation of ip2geo feature (#257) * Update gradle version to 7.6 (#265) Signed-off-by: Vijayan Balasubramanian <balasvij@amazon.com> * Implement creation of ip2geo feature * Implementation of ip2geo datasource creation * Implementation of ip2geo processor creation Signed-off-by: Heemin Kim <heemin@amazon.com> --------- Signed-off-by: Vijayan Balasubramanian <balasvij@amazon.com> Signed-off-by: Heemin Kim <heemin@amazon.com> Co-authored-by: Vijayan Balasubramanian <balasvij@amazon.com> * Added unit tests with some refactoring of codes (#271) * Add Unit tests * Set cache true for search query * Remove in memory cache implementation (Two way door decision) * Relying on search cache without custom cache * Renamed datasource state from FAILED to CREATE_FAILED * Renamed class name from *Helper to *Facade * Changed updateIntervalInDays to updateInterval * Changed value type of default update_interval from TimeValue to Long * Read setting value from cluster settings directly Signed-off-by: Heemin Kim <heemin@amazon.com> * Sync from main (#280) * Update gradle version to 7.6 (#265) Signed-off-by: Vijayan Balasubramanian <balasvij@amazon.com> * Exclude lombok generated code from jacoco coverage report (#268) Signed-off-by: Heemin Kim <heemin@amazon.com> * Make jacoco report to be generated faster in local (#267) Signed-off-by: Heemin Kim <heemin@amazon.com> * Update dependency org.json:json to v20230227 (#273) Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> * Baseline owners and maintainers (#275) Signed-off-by: Vijayan Balasubramanian <balasvij@amazon.com> --------- Signed-off-by: Vijayan Balasubramanian <balasvij@amazon.com> Signed-off-by: Heemin Kim <heemin@amazon.com> Co-authored-by: Vijayan Balasubramanian <balasvij@amazon.com> Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com> * Add datasource name validation (#281) Signed-off-by: Heemin Kim <heemin@amazon.com> * Refactoring of code (#282) 1. Change variable name from datasourceName to name 2. Change variable name from id to name 3. Added helper methods in test code Signed-off-by: Heemin Kim <heemin@amazon.com> * Change field name from md5 to sha256 (#285) Signed-off-by: Heemin Kim <heemin@amazon.com> * Implement get datasource api (#279) Signed-off-by: Heemin Kim <heemin@amazon.com> * Update index option (#284) 1. Make geodata index as hidden 2. Make geodata index as read only allow delete after creation is done 3. Refresh datasource index immediately after update Signed-off-by: Heemin Kim <heemin@amazon.com> * Make some fields in manifest file as mandatory (#289) Signed-off-by: Heemin Kim <heemin@amazon.com> * Create datasource index explicitly (#283) Signed-off-by: Heemin Kim <heemin@amazon.com> * Add wrapper class of job scheduler lock service (#290) Signed-off-by: Heemin Kim <heemin@amazon.com> * Remove all unused client attributes (#293) Signed-off-by: Heemin Kim <heemin@amazon.com> * Update copyright header (#298) Signed-off-by: Heemin Kim <heemin@amazon.com> * Run system index handling code with stashed thread context (#297) Signed-off-by: Heemin Kim <heemin@amazon.com> * Reduce lock duration and renew the lock during update (#299) Signed-off-by: Heemin Kim <heemin@amazon.com> * Implements delete datasource API (#291) Signed-off-by: Heemin Kim <heemin@amazon.com> * Set User-Agent in http request (#300) Signed-off-by: Heemin Kim <heemin@amazon.com> * Implement datasource update API (#292) Signed-off-by: Heemin Kim <heemin@amazon.com> * Refactoring test code (#302) Make buildGeoJSONFeatureProcessorConfig method to be more general Signed-off-by: Heemin Kim <heemin@amazon.com> * Add ip2geo processor integ test for failure case (#303) Signed-off-by: Heemin Kim <heemin@amazon.com> * Bug fix and refactoring of code (#305) 1. Bugfix: Ingest metadata can be null if there is no processor created 2. Refactoring: Moved private method to another class for better testing support 3. Refactoring: Set some private static final variable as public so that unit test can use it 4. Refactoring: Changed string value to static variable Signed-off-by: Heemin Kim <heemin@amazon.com> * Add integration test for Ip2GeoProcessor (#306) Signed-off-by: Heemin Kim <heemin@amazon.com> * Add ConcurrentModificationException (#308) Signed-off-by: Heemin Kim <heemin@amazon.com> * Add integration test for UpdateDatasource API (#307) Signed-off-by: Heemin Kim <heemin@amazon.com> * Bug fix on lock management and few performance improvements (#310) * Release lock before response back to caller for update/delete API * Release lock in background task for creation API * Change index settings to improve indexing performance Signed-off-by: Heemin Kim <heemin@amazon.com> * Change index setting from read_only_allow_delete to write (#311) read_only_allow_delete does not block write to an index. The disk-based shard allocator may add and remove this block automatically. Therefore, use index.blocks.write instead. Signed-off-by: Heemin Kim <heemin@amazon.com> * Fix bug in get datasource API and improve memory usage (#313) Signed-off-by: Heemin Kim <heemin@amazon.com> * Change package for Strings.hasText (#314) (#317) Signed-off-by: Heemin Kim <heemin@amazon.com> * Remove jitter and move index setting from DatasourceFacade to DatasourceExtension (#319) Signed-off-by: Heemin Kim <heemin@amazon.com> * Do not index blank value and do not enrich null property (#320) Signed-off-by: Heemin Kim <heemin@amazon.com> * Move index setting keys to constants (#321) Signed-off-by: Heemin Kim <heemin@amazon.com> * Return null index name for expired data (#322) Return null index name for expired data so that it can be deleted by clean up process. Clean up process exclude current index from deleting. Signed-off-by: Heemin Kim <heemin@amazon.com> * Add new fields in datasource (#325) Signed-off-by: Heemin Kim <heemin@amazon.com> * Delete index once it is expired (#326) Signed-off-by: Heemin Kim <heemin@amazon.com> * Add restoring event listener (#328) In the listener, we trigger a geoip data update Signed-off-by: Heemin Kim <heemin@amazon.com> * Reverse forcemerge and refresh order (#331) Otherwise, opensearch does not clear old segment files Signed-off-by: Heemin Kim <heemin@amazon.com> * Removed parameter and settings (#332) * Removed first_only parameter * Removed max_concurrency and batch_size setting first_only parameter was added as current geoip processor has it. However, the parameter have no benefit for ip2geo processor as we don't do a sequantial search for array data but use multi search. max_concurrency and batch_size setting is removed as these are only reveal internal implementation and could be a future blocker to improve performance later. Signed-off-by: Heemin Kim <heemin@amazon.com> * Add a field in datasource for current index name (#333) Signed-off-by: Heemin Kim <heemin@amazon.com> * Delete GeoIP data indices after restoring complete (#334) We don't want to use restored GeoIP data indices. Therefore we delete the indices once restoring process complete. When GeoIP metadata index is restored, we create a new GeoIP data index instead. Signed-off-by: Heemin Kim <heemin@amazon.com> * Use bool query for array form of IPs (#335) Signed-off-by: Heemin Kim <heemin@amazon.com> * Run update/delete request in a new thread (#337) This is not to block transport thread Signed-off-by: Heemin Kim <heemin@amazon.com> * Remove IP2Geo processor validation (#336) Cannot query index to get data to validate IP2Geo processor. Will add validation when we decide to store some of data in cluster state metadata. Signed-off-by: Heemin Kim <heemin@amazon.com> * Acquire lock sychronously (#339) By acquiring lock asychronously, the remaining part of the code is being run by transport thread which does not allow blocking code. We want only single update happen in a node using single thread. However, it cannot be acheived if I acquire lock asynchronously and pass the listener. Signed-off-by: Heemin Kim <heemin@amazon.com> * Added a cache to store datasource metadata (#338) Signed-off-by: Heemin Kim <heemin@amazon.com> * Changed class name and package (#341) Signed-off-by: Heemin Kim <heemin@amazon.com> * Refactoring of code (#342) 1. Changed class name from Ip2GeoCache to Ip2GeoCachedDao 2. Moved the Ip2GeoCachedDao from cache to dao package Signed-off-by: Heemin Kim <heemin@amazon.com> * Add geo data cache (#340) Signed-off-by: Heemin Kim <heemin@amazon.com> * Add cache layer to reduce GeoIp data retrieval latency (opensearch-project#343) Signed-off-by: Heemin Kim <heemin@amazon.com> * Use _primary in query preference and few changes (opensearch-project#347) 1. Use _primary preference to get datasource metadata so that it can read the latest data. RefreshPolicy.IMMEDIATE won't refresh replica shards immediately according to #346 2. Update datasource metadata index mapping 3. Move batch size from static value to setting Signed-off-by: Heemin Kim <heemin@amazon.com> * Wait until GeoIP data to be replicated to all data nodes (opensearch-project#348) Signed-off-by: Heemin Kim <heemin@amazon.com> * Update packages according to a change in OpenSearch core (opensearch-project#354) * Update packages according to a change in OpenSearch core Signed-off-by: Heemin Kim <heemin@amazon.com> * Update packages according to a change in OpenSearch core (opensearch-project#353) Signed-off-by: Heemin Kim <heemin@amazon.com> --------- Signed-off-by: Heemin Kim <heemin@amazon.com> --------- Signed-off-by: Vijayan Balasubramanian <balasvij@amazon.com> Signed-off-by: Heemin Kim <heemin@amazon.com> Co-authored-by: Vijayan Balasubramanian <balasvij@amazon.com> Co-authored-by: mend-for-github-com[bot] <50673670+mend-for-github-com[bot]@users.noreply.github.com>

MitchellGale requested review from MaxKsyunz, Yury-Fridlyand, forestmvey, acarbonetto and GumpacG as code owners July 12, 2023 08:09

MitchellGale changed the title ~~Removed unused imports.~~ Removed unused imports Jul 12, 2023

MitchellGale requested a review from matthewryanwells July 12, 2023 08:24

MitchellGale force-pushed the dev/spotless_importOrder branch from c356e46 to 6924aa7 Compare July 12, 2023 08:48

GumpacG approved these changes Jul 12, 2023

View reviewed changes

common/src/main/java/org/opensearch/sql/common/grok/Converter.java

@@ -1,168 +1,168 @@

/*

Copy link

GumpacG Jul 12, 2023

Choose a reason for hiding this comment

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

What changed here? Seems identical

Yury-Fridlyand reviewed Jul 12, 2023

View reviewed changes

MitchellGale and others added 8 commits July 13, 2023 09:43

Added apply false for spotless

c882ab3

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

Fixing import order.

914465e

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

Removed unused imports.

056881f

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

Undid changes to DEVELOPER_GUIDE.rst.

52abc21

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

reverted unrelated changes.

d4fd67f

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

Added apply false for spotless

fe99455

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

Yury-Fridlyand approved these changes Jul 13, 2023

View reviewed changes

MitchellGale and others added 7 commits July 13, 2023 09:50

Fixing import order.

bfc5216

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

Undid changes to DEVELOPER_GUIDE.rst.

db52b60

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

Removed new line at end of file for future PR.

f0e09e5

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

Reverted non import change.

4ae8b63

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

Reverted end of file changes.

106f411

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

Fixed PR changes of removing spaces added by deleting imports

5575439

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

Fixed PR changes of removing spaces added by deleting imports/packages

26ca8d6

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

MitchellGale force-pushed the dev/spotless_removeUnusedImports branch from 9040729 to 26ca8d6 Compare July 13, 2023 16:50

MitchellGale force-pushed the dev/spotless_importOrder branch 2 times, most recently from f9df235 to 8a4e470 Compare July 20, 2023 08:25

MitchellGale force-pushed the dev/spotless_importOrder branch from 8a4e470 to a996ecc Compare July 20, 2023 16:45

MitchellGale closed this Jul 20, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Removed unused imports #291

Removed unused imports #291

MitchellGale commented Jul 12, 2023 •

edited

Loading

codecov bot commented Jul 12, 2023 •

edited

Loading

GumpacG left a comment

GumpacG Jul 12, 2023

Yury-Fridlyand Jul 12, 2023

Yury-Fridlyand Jul 12, 2023

MitchellGale Jul 13, 2023

Yury-Fridlyand Jul 13, 2023

Yury-Fridlyand Jul 12, 2023

		@@ -7,7 +7,6 @@
		package org.opensearch.sql.legacy.rewriter.matchtoterm;

		import java.util.*;

		@@ -282,4 +281,3 @@ void createDataSourceSuccessWithHostnameRestrictions() {
		}

		}

Removed unused imports #291

Removed unused imports #291

Conversation

MitchellGale commented Jul 12, 2023 • edited Loading

Description

Check List

codecov bot commented Jul 12, 2023 • edited Loading

Codecov Report

GumpacG left a comment

Choose a reason for hiding this comment

GumpacG Jul 12, 2023

Choose a reason for hiding this comment

Yury-Fridlyand Jul 12, 2023

Choose a reason for hiding this comment

Yury-Fridlyand Jul 12, 2023

Choose a reason for hiding this comment

MitchellGale Jul 13, 2023

Choose a reason for hiding this comment

Yury-Fridlyand Jul 13, 2023

Choose a reason for hiding this comment

Yury-Fridlyand Jul 12, 2023

Choose a reason for hiding this comment

MitchellGale commented Jul 12, 2023 •

edited

Loading

codecov bot commented Jul 12, 2023 •

edited

Loading