Add integration JDBC tests for cursor/fetch_size feature. #208
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,129 @@ | ||
| /* | ||
| * Copyright OpenSearch Contributors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package org.opensearch.sql.devJdbc; | ||
|
|
||
| import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_BANK; | ||
| import static org.opensearch.sql.legacy.TestsConstants.TEST_INDEX_CALCS; | ||
| import static org.opensearch.sql.legacy.plugin.RestSqlAction.QUERY_API_ENDPOINT; | ||
| import static org.opensearch.sql.util.TestUtils.getResponseBody; | ||
|
|
||
| import java.io.File; | ||
| import java.net.URL; | ||
| import java.net.URLClassLoader; | ||
| import java.sql.Connection; | ||
| import java.sql.Driver; | ||
| import java.sql.ResultSet; | ||
| import java.sql.Statement; | ||
| import java.util.List; | ||
| import javax.annotation.Nullable; | ||
| import lombok.SneakyThrows; | ||
| import org.json.JSONObject; | ||
| import org.junit.AfterClass; | ||
| import org.junit.Assume; | ||
| import org.junit.BeforeClass; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.AfterAll; | ||
| import org.junit.jupiter.api.BeforeAll; | ||
| import org.opensearch.client.Request; | ||
| import org.opensearch.client.RequestOptions; | ||
| import org.opensearch.client.Response; | ||
| import org.opensearch.sql.legacy.SQLIntegTestCase; | ||
|
|
||
| public class CursorIT extends SQLIntegTestCase { | ||
|
|
||
| private static Connection connection; | ||
| private static Driver driver; | ||
| private boolean initialized = false; | ||
|
|
||
| @BeforeEach | ||
| @SneakyThrows | ||
| public void init() { | ||
| if (!initialized) { | ||
|
There was a problem hiding this comment. why isn't this under the @BeforeAll below? There was a problem hiding this comment. I call There was a problem hiding this comment. You could also do like the other classes. There was a problem hiding this comment.
|
||
| initClient(); | ||
| resetQuerySizeLimit(); | ||
| loadIndex(Index.BANK); | ||
| loadIndex(Index.CALCS); | ||
| loadIndex(Index.ONLINE); | ||
| loadIndex(Index.ACCOUNT); | ||
| initialized = true; | ||
| } | ||
| } | ||
|
|
||
| @BeforeAll | ||
| @BeforeClass | ||
| @SneakyThrows | ||
| public static void loadDriver() { | ||
| var buildDir = String.format("%s/build/sql-jdbc/build/libs", System.getProperty("project.root")); | ||
| var driverFiles = new File(buildDir). | ||
| listFiles(pathname -> pathname.getAbsolutePath().endsWith(".jar")); | ||
|
|
||
| Assume.assumeTrue("Driver load failed", driverFiles != null && 1 == driverFiles.length); | ||
|
|
||
| URLClassLoader loader = new URLClassLoader( | ||
| new URL[] { driverFiles[0].toURI().toURL() }, | ||
| ClassLoader.getSystemClassLoader() | ||
| ); | ||
| driver = (Driver)Class.forName("org.opensearch.jdbc.Driver", true, loader) | ||
| .getDeclaredConstructor().newInstance(); | ||
| connection = driver.connect(getConnectionString(), null); | ||
| } | ||
|
|
||
| @AfterAll | ||
| @AfterClass | ||
| @SneakyThrows | ||
| public static void closeConnection() { | ||
| // TODO should we close Statement and ResultSet? | ||
| if (connection != null) { | ||
| connection.close(); | ||
| connection = null; | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| @SneakyThrows | ||
| public void dev_select_all_small_table_small_cursor() { | ||
| Statement stmt = connection.createStatement(); | ||
|
|
||
| for (var table : List.of(TEST_INDEX_CALCS, TEST_INDEX_BANK)) { | ||
| var query = String.format("SELECT * FROM %s", table); | ||
| stmt.setFetchSize(3); | ||
| ResultSet rs = stmt.executeQuery(query); | ||
| int rows = 0; | ||
| for (; rs.next(); rows++) ; | ||
|
|
||
| var restResponse = executeRestQuery(query, null); | ||
| assertEquals(rows, restResponse.getInt("total")); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Use OpenSearch cluster initialized by OpenSearch Gradle task. | ||
| */ | ||
| private static String getConnectionString() { | ||
| // string like "[::1]:46751,127.0.0.1:34403" | ||
| var clusterUrls = System.getProperty("tests.rest.cluster").split(","); | ||
| return String.format("jdbc:opensearch://%s", clusterUrls[clusterUrls.length - 1]); | ||
| } | ||
|
|
||
| @SneakyThrows | ||
| protected JSONObject executeRestQuery(String query, @Nullable Integer fetch_size) { | ||
| Request request = new Request("POST", QUERY_API_ENDPOINT); | ||
| if (fetch_size != null) { | ||
| request.setJsonEntity(String.format("{ \"query\": \"%s\", \"fetch_size\": %d }", query, fetch_size)); | ||
| } else { | ||
| request.setJsonEntity(String.format("{ \"query\": \"%s\" }", query)); | ||
| } | ||
|
|
||
| RequestOptions.Builder restOptionsBuilder = RequestOptions.DEFAULT.toBuilder(); | ||
| restOptionsBuilder.addHeader("Content-Type", "application/json"); | ||
| request.setOptions(restOptionsBuilder); | ||
|
|
||
| Response response = client().performRequest(request); | ||
| return new JSONObject(getResponseBody(response)); | ||
| } | ||
|
|
||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Or better yet, separate clone from build so that we don't need to delete/download the JDBC driver from repo each and every time.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It was your requirement to run tests on in-development JDBC driver. Note, this executed in
:integ-test:integDevJdbcTestgradle task only ifjdbcFileparameter not given. This gradle task is not a part ofbuildor:integ-test:integTesttasks.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes. I just think those two tasks could be split into separate tasks rather than having to download + build... in case the build fails.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Mostly a suggestion I think at this point.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in 0b817f4