Skip to content

Commit bf4f80b

Browse files
committed
Fix jacoco test
Signed-off-by: Chen Dai <[email protected]>
1 parent 9ec3c85 commit bf4f80b

File tree

3 files changed

+43
-30
lines changed

3 files changed

+43
-30
lines changed

async-query-core/src/main/java/org/opensearch/sql/spark/utils/SQLQueryUtils.java

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -267,31 +267,6 @@ public Void visitDropMaterializedViewStatement(
267267
return super.visitDropMaterializedViewStatement(ctx);
268268
}
269269

270-
@Override
271-
public Void visitVacuumSkippingIndexStatement(
272-
FlintSparkSqlExtensionsParser.VacuumSkippingIndexStatementContext ctx) {
273-
indexQueryDetailsBuilder.indexQueryActionType(IndexQueryActionType.VACUUM);
274-
indexQueryDetailsBuilder.indexType(FlintIndexType.SKIPPING);
275-
return super.visitVacuumSkippingIndexStatement(ctx);
276-
}
277-
278-
@Override
279-
public Void visitVacuumCoveringIndexStatement(
280-
FlintSparkSqlExtensionsParser.VacuumCoveringIndexStatementContext ctx) {
281-
indexQueryDetailsBuilder.indexQueryActionType(IndexQueryActionType.VACUUM);
282-
indexQueryDetailsBuilder.indexType(FlintIndexType.COVERING);
283-
return super.visitVacuumCoveringIndexStatement(ctx);
284-
}
285-
286-
@Override
287-
public Void visitVacuumMaterializedViewStatement(
288-
FlintSparkSqlExtensionsParser.VacuumMaterializedViewStatementContext ctx) {
289-
indexQueryDetailsBuilder.indexQueryActionType(IndexQueryActionType.VACUUM);
290-
indexQueryDetailsBuilder.indexType(FlintIndexType.MATERIALIZED_VIEW);
291-
indexQueryDetailsBuilder.mvName(ctx.mvName.getText());
292-
return super.visitVacuumMaterializedViewStatement(ctx);
293-
}
294-
295270
@Override
296271
public Void visitDescribeCoveringIndexStatement(
297272
FlintSparkSqlExtensionsParser.DescribeCoveringIndexStatementContext ctx) {

async-query-core/src/test/java/org/opensearch/sql/spark/utils/SQLQueryUtilsTest.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ void testExtractionFromFlintSkippingIndexQueries() {
142142
+ " WHERE elb_status_code = 500 "
143143
+ " WITH (auto_refresh = true)",
144144
"DROP SKIPPING INDEX ON myS3.default.alb_logs",
145-
"VACUUM SKIPPING INDEX ON myS3.default.alb_logs",
146145
"ALTER SKIPPING INDEX ON myS3.default.alb_logs WITH (auto_refresh = false)",
147146
};
148147

@@ -171,7 +170,6 @@ void testExtractionFromFlintCoveringIndexQueries() {
171170
+ " WHERE elb_status_code = 500 "
172171
+ " WITH (auto_refresh = true)",
173172
"DROP INDEX elb_and_requestUri ON myS3.default.alb_logs",
174-
"VACUUM INDEX elb_and_requestUri ON myS3.default.alb_logs",
175173
"ALTER INDEX elb_and_requestUri ON myS3.default.alb_logs WITH (auto_refresh = false)"
176174
};
177175

@@ -203,9 +201,7 @@ void testExtractionFromCreateMVQuery() {
203201
@Test
204202
void testExtractionFromFlintMVQuery() {
205203
String[] mvQueries = {
206-
"DROP MATERIALIZED VIEW mv_1",
207-
"VACUUM MATERIALIZED VIEW mv_1",
208-
"ALTER MATERIALIZED VIEW mv_1 WITH (auto_refresh = false)",
204+
"DROP MATERIALIZED VIEW mv_1", "ALTER MATERIALIZED VIEW mv_1 WITH (auto_refresh = false)",
209205
};
210206

211207
for (String query : mvQueries) {
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/*
2+
* Copyright OpenSearch Contributors
3+
* SPDX-License-Identifier: Apache-2.0
4+
*/
5+
6+
package org.opensearch.sql.spark.flint;
7+
8+
import static org.mockito.Answers.RETURNS_DEEP_STUBS;
9+
import static org.mockito.Mockito.any;
10+
import static org.mockito.Mockito.verify;
11+
import static org.mockito.Mockito.when;
12+
13+
import org.junit.jupiter.api.Test;
14+
import org.junit.jupiter.api.extension.ExtendWith;
15+
import org.mockito.InjectMocks;
16+
import org.mockito.Mock;
17+
import org.mockito.junit.jupiter.MockitoExtension;
18+
import org.opensearch.action.admin.indices.delete.DeleteIndexRequest;
19+
import org.opensearch.action.support.master.AcknowledgedResponse;
20+
import org.opensearch.client.Client;
21+
22+
@ExtendWith(MockitoExtension.class)
23+
public class OpenSearchFlintIndexClientTest {
24+
25+
@Mock(answer = RETURNS_DEEP_STUBS)
26+
private Client client;
27+
28+
@Mock private AcknowledgedResponse acknowledgedResponse;
29+
30+
@InjectMocks private OpenSearchFlintIndexClient openSearchFlintIndexClient;
31+
32+
@Test
33+
public void testDeleteIndex() {
34+
when(client.admin().indices().delete(any(DeleteIndexRequest.class)).actionGet())
35+
.thenReturn(acknowledgedResponse);
36+
when(acknowledgedResponse.isAcknowledged()).thenReturn(true);
37+
38+
openSearchFlintIndexClient.deleteIndex("test-index");
39+
verify(client.admin().indices()).delete(any(DeleteIndexRequest.class));
40+
verify(acknowledgedResponse).isAcknowledged();
41+
}
42+
}

0 commit comments

Comments
 (0)