Skip to content

Commit a3ef2bf

Browse files
Max KsyunzYury-Fridlyand
authored andcommitted
Address issues flagged by checkstyle build step (#229)
Signed-off-by: MaxKsyunz <[email protected]>
1 parent 2a19e56 commit a3ef2bf

File tree

24 files changed

+52
-47
lines changed

24 files changed

+52
-47
lines changed

core/src/main/java/org/opensearch/sql/executor/CanPaginateVisitor.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,12 @@
55

66
package org.opensearch.sql.executor;
77

8+
import java.util.concurrent.atomic.AtomicBoolean;
89
import org.opensearch.sql.ast.AbstractNodeVisitor;
910
import org.opensearch.sql.ast.Node;
1011
import org.opensearch.sql.ast.expression.AllFields;
11-
import org.opensearch.sql.ast.tree.Filter;
12-
import org.opensearch.sql.ast.tree.Limit;
1312
import org.opensearch.sql.ast.tree.Project;
1413
import org.opensearch.sql.ast.tree.Relation;
15-
import org.opensearch.sql.ast.tree.Sort;
16-
import org.opensearch.sql.ast.tree.Values;
17-
18-
import java.util.concurrent.atomic.AtomicBoolean;
1914

2015
/**
2116
* Use this unresolved plan visitor to check if a plan can be serialized by PaginatedPlanCache.

core/src/main/java/org/opensearch/sql/executor/PaginatedPlanCache.java

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,15 @@ public Cursor convertToCursor(PhysicalPlan plan) {
5757
}
5858
}
5959

60+
/**
61+
* Compress serialized query plan.
62+
* @param str string representing a query plan
63+
* @return str compressed with gzip.
64+
*/
6065
@SneakyThrows
6166
public static String compress(String str) {
6267
if (str == null || str.length() == 0) {
63-
return null;
68+
return null;
6469
}
6570

6671
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -70,10 +75,15 @@ public static String compress(String str) {
7075
return HashCode.fromBytes(out.toByteArray()).toString();
7176
}
7277

78+
/**
79+
* Decompresses a query plan that was compress with {@link PaginatedPlanCache.compress}.
80+
* @param input compressed query plan
81+
* @return seria
82+
*/
7383
@SneakyThrows
7484
public static String decompress(String input) {
7585
if (input == null || input.length() == 0) {
76-
return null;
86+
return null;
7787
}
7888
GZIPInputStream gzip = new GZIPInputStream(new ByteArrayInputStream(
7989
HashCode.fromString(input).asBytes()));
@@ -114,10 +124,10 @@ public PhysicalPlan convertToPlan(String cursor) {
114124
throw new UnsupportedOperationException("Unsupported cursor");
115125
}
116126
cursor = cursor.substring(cursor.indexOf(',') + 1);
117-
int currentPageIndex = Integer.parseInt(cursor, 0, cursor.indexOf(','), 10);
127+
final int currentPageIndex = Integer.parseInt(cursor, 0, cursor.indexOf(','), 10);
118128

119129
cursor = cursor.substring(cursor.indexOf(',') + 1);
120-
int pageSize = Integer.parseInt(cursor, 0, cursor.indexOf(','), 10);
130+
final int pageSize = Integer.parseInt(cursor, 0, cursor.indexOf(','), 10);
121131

122132
cursor = cursor.substring(cursor.indexOf(',') + 1);
123133
if (!cursor.startsWith("(Project,")) {

core/src/main/java/org/opensearch/sql/planner/optimizer/rule/PushPageSize.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
import org.opensearch.sql.planner.logical.LogicalRelation;
1818
import org.opensearch.sql.planner.optimizer.Rule;
1919

20-
import java.util.Objects;
21-
2220
public class PushPageSize
2321
implements Rule<LogicalPaginate> {
2422
/** Capture the table inside matched logical paginate operator. */

core/src/test/java/org/opensearch/sql/planner/physical/RemoveOperatorTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,8 +117,7 @@ public void invalid_to_retrieve_schema_from_remove() {
117117
IllegalStateException exception =
118118
assertThrows(IllegalStateException.class, () -> plan.schema());
119119
assertEquals(
120-
"[BUG] schema can been only applied to ProjectOperator, "
121-
+ "instead of RemoveOperator(input=inputPlan, removeList=[response, referer])",
120+
"[BUG] schema can been only applied to ProjectOperator, instead of RemoveOperator",
122121
exception.getMessage());
123122
}
124123
}

opensearch/src/main/java/org/opensearch/sql/opensearch/storage/ContinueScrollRequest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55

66
package org.opensearch.sql.opensearch.storage;
77

8+
import static org.opensearch.sql.opensearch.request.OpenSearchScrollRequest.DEFAULT_SCROLL_TIMEOUT;
9+
810
import java.util.function.Consumer;
911
import java.util.function.Function;
1012
import lombok.EqualsAndHashCode;
@@ -18,8 +20,6 @@
1820
import org.opensearch.sql.opensearch.request.OpenSearchRequest;
1921
import org.opensearch.sql.opensearch.response.OpenSearchResponse;
2022

21-
import static org.opensearch.sql.opensearch.request.OpenSearchScrollRequest.DEFAULT_SCROLL_TIMEOUT;
22-
2323
public class ContinueScrollRequest implements OpenSearchRequest {
2424
final String initialScrollId;
2525

opensearch/src/main/java/org/opensearch/sql/opensearch/storage/OpenSearchPagedIndexScan.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,11 @@
77

88
import java.util.Collections;
99
import java.util.Iterator;
10-
import java.util.List;
11-
1210
import lombok.EqualsAndHashCode;
1311
import lombok.ToString;
1412
import org.opensearch.sql.data.model.ExprValue;
1513
import org.opensearch.sql.opensearch.client.OpenSearchClient;
1614
import org.opensearch.sql.opensearch.request.OpenSearchRequest;
17-
import org.opensearch.sql.opensearch.request.OpenSearchScrollRequest;
1815
import org.opensearch.sql.opensearch.response.OpenSearchResponse;
1916
import org.opensearch.sql.storage.TableScanOperator;
2017

opensearch/src/main/java/org/opensearch/sql/opensearch/storage/PagedRequestBuilder.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010

1111
public interface PagedRequestBuilder {
1212
OpenSearchRequest build();
13+
1314
OpenSearchRequest.IndexName getIndexName();
1415
}

opensearch/src/main/java/org/opensearch/sql/opensearch/storage/SubsequentPageRequestBuilder.java

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,15 @@
55

66
package org.opensearch.sql.opensearch.storage;
77

8+
import lombok.RequiredArgsConstructor;
89
import org.opensearch.sql.opensearch.data.value.OpenSearchExprValueFactory;
910
import org.opensearch.sql.opensearch.request.OpenSearchRequest;
1011

12+
@RequiredArgsConstructor
1113
public class SubsequentPageRequestBuilder implements PagedRequestBuilder {
12-
private OpenSearchRequest.IndexName indexName;
14+
final OpenSearchRequest.IndexName indexName;
1315
final String scrollId;
14-
private OpenSearchExprValueFactory exprValueFactory;
15-
16-
public SubsequentPageRequestBuilder(OpenSearchRequest.IndexName indexName, String scanAsString,
17-
OpenSearchExprValueFactory exprValueFactory) {
18-
this.indexName = indexName;
19-
scrollId = scanAsString;
20-
this.exprValueFactory = exprValueFactory;
21-
}
16+
final OpenSearchExprValueFactory exprValueFactory;
2217

2318
@Override
2419
public OpenSearchRequest build() {

opensearch/src/main/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanAggregationBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
import org.opensearch.sql.expression.NamedExpression;
1616
import org.opensearch.sql.expression.ReferenceExpression;
1717
import org.opensearch.sql.expression.aggregation.NamedAggregator;
18+
import org.opensearch.sql.expression.serialization.DefaultExpressionSerializer;
1819
import org.opensearch.sql.opensearch.response.agg.OpenSearchAggregationResponseParser;
1920
import org.opensearch.sql.opensearch.storage.OpenSearchIndexScan;
2021
import org.opensearch.sql.opensearch.storage.script.aggregation.AggregationQueryBuilder;
21-
import org.opensearch.sql.expression.serialization.DefaultExpressionSerializer;
2222
import org.opensearch.sql.planner.logical.LogicalAggregation;
2323
import org.opensearch.sql.planner.logical.LogicalSort;
2424
import org.opensearch.sql.storage.TableScanOperator;

opensearch/src/main/java/org/opensearch/sql/opensearch/storage/scan/OpenSearchIndexScanQueryBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
import org.opensearch.sql.expression.ExpressionNodeVisitor;
2121
import org.opensearch.sql.expression.NamedExpression;
2222
import org.opensearch.sql.expression.ReferenceExpression;
23+
import org.opensearch.sql.expression.serialization.DefaultExpressionSerializer;
2324
import org.opensearch.sql.opensearch.storage.OpenSearchIndexScan;
2425
import org.opensearch.sql.opensearch.storage.script.filter.FilterQueryBuilder;
2526
import org.opensearch.sql.opensearch.storage.script.sort.SortQueryBuilder;
26-
import org.opensearch.sql.expression.serialization.DefaultExpressionSerializer;
2727
import org.opensearch.sql.planner.logical.LogicalFilter;
2828
import org.opensearch.sql.planner.logical.LogicalHighlight;
2929
import org.opensearch.sql.planner.logical.LogicalLimit;

0 commit comments

Comments
 (0)