From 303f4b5e7648195bfc2268d5a773fba015dc0a13 Mon Sep 17 00:00:00 2001 From: Aparajita Pandey Date: Fri, 4 Oct 2024 15:47:04 +0530 Subject: [PATCH] SpotlessCheck Signed-off-by: Aparajita Pandey Signed-off-by: Aparajita Pandey --- .../sql/legacy/SQLIntegTestCase.java | 4 ++- .../org/opensearch/sql/sql/PaginationIT.java | 32 ++++++++++--------- .../executor/format/SelectResultSet.java | 2 +- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/integ-test/src/test/java/org/opensearch/sql/legacy/SQLIntegTestCase.java b/integ-test/src/test/java/org/opensearch/sql/legacy/SQLIntegTestCase.java index a4d98dc79e..eed4e29c9c 100644 --- a/integ-test/src/test/java/org/opensearch/sql/legacy/SQLIntegTestCase.java +++ b/integ-test/src/test/java/org/opensearch/sql/legacy/SQLIntegTestCase.java @@ -463,7 +463,9 @@ protected String makeRequest(String query, int fetch_size) { } protected String makeRequest(String query, int fetch_size, String filterQuery) { - return String.format("{ \"fetch_size\": \"%s\", \"query\": \"%s\", \"filter\" : %s }", fetch_size, query, filterQuery); + return String.format( + "{ \"fetch_size\": \"%s\", \"query\": \"%s\", \"filter\" : %s }", + fetch_size, query, filterQuery); } protected String makeFetchLessRequest(String query) { diff --git a/integ-test/src/test/java/org/opensearch/sql/sql/PaginationIT.java b/integ-test/src/test/java/org/opensearch/sql/sql/PaginationIT.java index 1f01c04aa5..fbe1e378e2 100644 --- a/integ-test/src/test/java/org/opensearch/sql/sql/PaginationIT.java +++ b/integ-test/src/test/java/org/opensearch/sql/sql/PaginationIT.java @@ -18,8 +18,8 @@ import org.junit.Ignore; import org.junit.Test; import org.opensearch.client.Request; -import org.opensearch.client.Response; import org.opensearch.client.RequestOptions; +import org.opensearch.client.Response; import org.opensearch.client.ResponseException; import org.opensearch.sql.common.setting.Settings; import org.opensearch.sql.legacy.SQLIntegTestCase; @@ -217,23 +217,24 @@ public void testQueryWithoutFrom() { assertEquals(1, response.getInt("total")); assertEquals(1, response.getJSONArray("datarows").getJSONArray(0).getInt(0)); } + @Test public void testAlias() throws Exception { String indexName = Index.ONLINE.getName(); String aliasName = "alias_ONLINE"; - String filterQuery = "{\n" + - " \"term\": {\n" + - " \"107\": 72 \n" + - " }\n" + - "}"; + String filterQuery = "{\n" + " \"term\": {\n" + " \"107\": 72 \n" + " }\n" + "}"; - //Execute the SQL query with filter + // Execute the SQL query with filter String selectQuery = "SELECT * FROM " + TEST_INDEX_ONLINE; - JSONObject initialResponse = new JSONObject(executeFetchQuery(selectQuery, 10, "jdbc", filterQuery)); + JSONObject initialResponse = + new JSONObject(executeFetchQuery(selectQuery, 10, "jdbc", filterQuery)); assertEquals(initialResponse.getInt("size"), 10); - //Create an alias - String createAliasQuery = String.format("{ \"actions\": [ { \"add\": { \"index\": \"%s\", \"alias\": \"%s\" } } ] }", indexName, aliasName); + // Create an alias + String createAliasQuery = + String.format( + "{ \"actions\": [ { \"add\": { \"index\": \"%s\", \"alias\": \"%s\" } } ] }", + indexName, aliasName); Request createAliasRequest = new Request("POST", "/_aliases"); createAliasRequest.setJsonEntity(createAliasQuery); JSONObject aliasResponse = new JSONObject(executeRequest(createAliasRequest)); @@ -241,18 +242,19 @@ public void testAlias() throws Exception { // Assert that alias creation was acknowledged assertTrue(aliasResponse.getBoolean("acknowledged")); - //Query using the alias + // Query using the alias String aliasSelectQuery = String.format("SELECT * FROM %s", aliasName); JSONObject aliasQueryResponse = new JSONObject(executeFetchQuery(aliasSelectQuery, 4, "jdbc")); assertEquals(4, aliasQueryResponse.getInt("size")); - //Query using the alias with filter - JSONObject aliasFilteredResponse = new JSONObject(executeFetchQuery(aliasSelectQuery, 4, "jdbc", filterQuery)); + // Query using the alias with filter + JSONObject aliasFilteredResponse = + new JSONObject(executeFetchQuery(aliasSelectQuery, 4, "jdbc", filterQuery)); assertEquals(aliasFilteredResponse.getInt("size"), 4); } - - private String executeFetchQuery(String query, int fetchSize, String requestType, String filter) throws IOException{ + private String executeFetchQuery(String query, int fetchSize, String requestType, String filter) + throws IOException { String endpoint = "/_plugins/_sql?format=" + requestType; String requestBody = makeRequest(query, fetchSize, filter); diff --git a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/SelectResultSet.java b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/SelectResultSet.java index c99d6d6563..bc5c1fb162 100644 --- a/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/SelectResultSet.java +++ b/legacy/src/main/java/org/opensearch/sql/legacy/executor/format/SelectResultSet.java @@ -167,7 +167,7 @@ private void loadFromEsState(Query query) { String indexName = fetchIndexName(query); String[] fieldNames = fetchFieldsAsArray(query); GetAliasesResponse getAliasesResponse = - client.admin().indices().getAliases(new GetAliasesRequest(indexName)).actionGet(); + client.admin().indices().getAliases(new GetAliasesRequest(indexName)).actionGet(); if (getAliasesResponse != null && !getAliasesResponse.getAliases().isEmpty()) { indexName = getAliasesResponse.getAliases().keySet().iterator().next(); }