diff --git a/integ-test/src/test/java/com/amazon/opendistroforelasticsearch/sql/correctness/CorrectnessIT.java b/integ-test/src/test/java/com/amazon/opendistroforelasticsearch/sql/correctness/CorrectnessIT.java index 8ab9f28e841..708d742950c 100644 --- a/integ-test/src/test/java/com/amazon/opendistroforelasticsearch/sql/correctness/CorrectnessIT.java +++ b/integ-test/src/test/java/com/amazon/opendistroforelasticsearch/sql/correctness/CorrectnessIT.java @@ -109,7 +109,7 @@ private DBConnection getESConnection(TestConfig config) { } else { client = RestClient.builder(HttpHost.create(esHost)).build(); } - return new ESConnection("jdbc:elasticsearch://" + esHost, client); + return new ESConnection("jdbc:opensearch://" + esHost, client); } /** diff --git a/integ-test/src/test/java/com/amazon/opendistroforelasticsearch/sql/correctness/tests/ESConnectionTest.java b/integ-test/src/test/java/com/amazon/opendistroforelasticsearch/sql/correctness/tests/ESConnectionTest.java index 8b17dd6793e..d9bed3b69bf 100644 --- a/integ-test/src/test/java/com/amazon/opendistroforelasticsearch/sql/correctness/tests/ESConnectionTest.java +++ b/integ-test/src/test/java/com/amazon/opendistroforelasticsearch/sql/correctness/tests/ESConnectionTest.java @@ -52,7 +52,7 @@ public class ESConnectionTest { @Before public void setUp() throws IOException { - conn = new ESConnection("jdbc:elasticsearch://localhost:12345", client); + conn = new ESConnection("jdbc:opensearch://localhost:12345", client); Response response = mock(Response.class); when(client.performRequest(any(Request.class))).thenReturn(response); diff --git a/integ-test/src/test/java/com/amazon/opendistroforelasticsearch/sql/sql/CorrectnessTestBase.java b/integ-test/src/test/java/com/amazon/opendistroforelasticsearch/sql/sql/CorrectnessTestBase.java index 69c58b2c5d7..d508148fe9e 100644 --- a/integ-test/src/test/java/com/amazon/opendistroforelasticsearch/sql/sql/CorrectnessTestBase.java +++ b/integ-test/src/test/java/com/amazon/opendistroforelasticsearch/sql/sql/CorrectnessTestBase.java @@ -100,7 +100,7 @@ protected void verify(String... queries) { */ private DBConnection getESConnection() { String esHost = client().getNodes().get(0).getHost().toString(); - return new ESConnection("jdbc:elasticsearch://" + esHost, client()); + return new ESConnection("jdbc:opensearch://" + esHost, client()); } /** diff --git a/sql-jdbc/README.md b/sql-jdbc/README.md index be2bb4ec041..78f42b91550 100644 --- a/sql-jdbc/README.md +++ b/sql-jdbc/README.md @@ -13,13 +13,13 @@ Java application that needs to use it. If using with JDBC compatible BI tools, refer to the tool documentation on configuring a new JDBC driver. Typically, all that's required is to make the tool aware of the location of the driver jar and then use it to setup database (i.e -Elasticsearch) connections. +OpenSearch) connections. ### Connection URL and other settings To setup a connection, the driver requires a JDBC connection URL. The connection URL is of the form: ``` - jdbc:elasticsearch://[scheme://][host][:port][/context-path]?[property-key=value]&[property-key2=value2]..&[property-keyN=valueN] + jdbc:opensearch://[scheme://][host][:port][/context-path]?[property-key=value]&[property-key2=value2]..&[property-keyN=valueN] ``` @@ -58,11 +58,11 @@ To setup a connection, the driver requires a JDBC connection URL. The connection | ------------- |-------------| -----|---------| | user | Connection username. mandatory if `auth` property selects a authentication scheme that mandates a username value | any string | `null` | | password | Connection password. mandatory if `auth` property selects a authentication scheme that mandates a password value | any string | `null` | - | fetchSize | Cursor page size | positive integer value. Max value is limited by `index.max_result_window` Elasticsearch setting | `0` (for non-paginated response) | + | fetchSize | Cursor page size | positive integer value. Max value is limited by `index.max_result_window` OpenSearch setting | `0` (for non-paginated response) | | logOutput | location where driver logs should be emitted | a valid file path | `null` (logs are disabled) | | logLevel | severity level for which driver logs should be emitted | in order from highest(least logging) to lowest(most logging): OFF, FATAL, ERROR, WARN, INFO, DEBUG, TRACE, ALL | OFF (logs are disabled) | | auth | authentication mechanism to use | `NONE` (no auth), `BASIC` (HTTP Basic), `AWS_SIGV4` (AWS SIGV4) | `basic` if username and/or password is specified, `NONE` otherwise | - | awsCredentialsProvider | The AWS credential provider to be used when authentication mechanism is `AWS_SIGV4` (AWS SIGV4). If not set, the driver will use DefaultAWSCredentialsProviderChain to sign the request. Note that the driver renamed the namespaces of its dependencies, so the value has to be an instance of com.amazonaws.opendistro.elasticsearch.sql.jdbc.shadow.com.amazonaws.auth.AWSCredentialsProvider| Instance of an AWSCredentialProvider | DefaultAWSCredentialsProviderChain | + | awsCredentialsProvider | The AWS credential provider to be used when authentication mechanism is `AWS_SIGV4` (AWS SIGV4). If not set, the driver will use DefaultAWSCredentialsProviderChain to sign the request. Note that the driver renamed the namespaces of its dependencies, so the value has to be an instance of com.amazonaws.opendistro.opensearch.sql.jdbc.shadow.com.amazonaws.auth.AWSCredentialsProvider| Instance of an AWSCredentialProvider | DefaultAWSCredentialsProviderChain | | region | if authentication type is `aws_sigv4`, then this is the region value to use when signing requests. Only needed if the driver can not determine the region for the host endpoint. The driver will detect the region if the host endpoint matches a known url pattern. | a valid AWS region value e.g. us-east-1 | `null` (auto-detected if possible from the host endpoint) | | requestCompression | whether to indicate acceptance of compressed (gzip) responses when making server requests | `true` or `false` | `false` | | useSSL | whether to establish the connection over SSL/TLS | `true` or `false` | `false` if scheme is `http`, `true` if scheme is `https` | @@ -89,7 +89,7 @@ import java.sql.DriverManager; import java.sql.Statement; . . -String url = "jdbc:elasticsearch://localhost:9200"; +String url = "jdbc:opensearch://localhost:9200"; Connection con = DriverManager.getConnection(url); Statement st = con.createStatement(); @@ -108,7 +108,7 @@ import java.sql.DriverManager; import java.sql.Statement; . . -String url = "jdbc:elasticsearch://https://remote-host-name"; +String url = "jdbc:opensearch://https://remote-host-name"; Connection con = DriverManager.getConnection(url); Statement st = con.createStatement(); @@ -127,7 +127,7 @@ import java.sql.DriverManager; import java.sql.Statement; . . -String url = "jdbc:elasticsearch://remote-host-name"; +String url = "jdbc:opensearch://remote-host-name"; Properties properties = new Properties(); properties.put("useSSL", "true"); @@ -149,7 +149,7 @@ import java.sql.DriverManager; import java.sql.Statement; . . -String url = "jdbc:elasticsearch://https://remote-host-name"; +String url = "jdbc:opensearch://https://remote-host-name"; String user = "username"; String password = "password"; @@ -170,7 +170,7 @@ import java.sql.DriverManager; import java.sql.Statement; . . -String url = "jdbc:elasticsearch://remote-host-name"; +String url = "jdbc:opensearch://remote-host-name"; Properties properties = new Properties(); properties.put("useSSL", "true"); @@ -194,7 +194,7 @@ import java.sql.DriverManager; import java.sql.Statement; . . -String url = "jdbc:elasticsearch://remote-host-name"; +String url = "jdbc:opensearch://remote-host-name"; Properties properties = new Properties(); properties.put("useSSL", "true"); @@ -224,7 +224,7 @@ import java.sql.DriverManager; import java.sql.Statement; . . -String url = "jdbc:elasticsearch://https://remote-host-name?auth=aws_sigv4"; +String url = "jdbc:opensearch://https://remote-host-name?auth=aws_sigv4"; Connection con = DriverManager.getConnection(url); Statement st = con.createStatement(); @@ -242,7 +242,7 @@ import java.sql.DriverManager; import java.sql.Statement; . . -String url = "jdbc:elasticsearch://https://remote-host-name"; +String url = "jdbc:opensearch://https://remote-host-name"; Properties properties = new Properties(); properties.put("auth", "aws_sigv4"); @@ -264,7 +264,7 @@ import java.sql.DriverManager; import java.sql.Statement; . . -String url = "jdbc:elasticsearch://https://remote-host-name"; +String url = "jdbc:opensearch://https://remote-host-name"; Properties properties = new Properties(); properties.put("awsCredentialsProvider", new EnvironmentVariableCredentialsProvider()); @@ -286,7 +286,7 @@ import java.sql.DriverManager; import java.sql.Statement; . . -String url = "jdbc:elasticsearch://https://remote-host-name?auth=aws_sigv4®ion=us-west-1"; +String url = "jdbc:opensearch://https://remote-host-name?auth=aws_sigv4®ion=us-west-1"; Connection con = DriverManager.getConnection(url); Statement st = con.createStatement(); @@ -305,7 +305,7 @@ import java.sql.DriverManager; import java.sql.Statement; . . -String url = "jdbc:elasticsearch://https://remote-host-name"; +String url = "jdbc:opensearch://https://remote-host-name"; Properties properties = new Properties(); properties.put("auth", "aws_sigv4"); @@ -321,7 +321,7 @@ con.close(); ``` ### Connecting using the DataSource interface -The driver also provides a javax.sql.DataSource implementation via the `com.amazon.opendistroforelasticsearch.jdbc.ElasticsearchDataSource` class that can be used to obtain a connection. Here are some typical code samples: +The driver also provides a javax.sql.DataSource implementation via the `com.amazon.opendistroforelasticsearch.jdbc.OpenSearchDataSource` class that can be used to obtain a connection. Here are some typical code samples: * Connect to localhost on port 9200 with no authentication over a plain connection @@ -331,13 +331,13 @@ import java.sql.Connection; import java.sql.Statement; import javax.sql.DataSource; -import com.amazon.opendistroforelasticsearch.jdbc.ElasticsearchDataSource; +import com.amazon.opendistroforelasticsearch.jdbc.OpenSearchDataSource; . . -String url = "jdbc:elasticsearch://localhost:9200"; +String url = "jdbc:opensearch://localhost:9200"; -ElasticsearchDataSource ds = new ElasticsearchDataSource(); +OpenSearchDataSource ds = new OpenSearchDataSource(); ds.setUrl(url); Connection con = ds.getConnection(url); @@ -356,13 +356,13 @@ import java.sql.Connection; import java.sql.Statement; import javax.sql.DataSource; -import com.amazon.opendistroforelasticsearch.jdbc.ElasticsearchDataSource; +import com.amazon.opendistroforelasticsearch.jdbc.OpenSearchDataSource; . . -String url = "jdbc:elasticsearch://https://remote-host-name"; +String url = "jdbc:opensearch://https://remote-host-name"; -ElasticsearchDataSource ds = new ElasticsearchDataSource(); +OpenSearchDataSource ds = new OpenSearchDataSource(); ds.setUrl(url); Connection con = ds.getConnection(url); @@ -381,13 +381,13 @@ import java.sql.Connection; import java.sql.Statement; import javax.sql.DataSource; -import com.amazon.opendistroforelasticsearch.jdbc.ElasticsearchDataSource; +import com.amazon.opendistroforelasticsearch.jdbc.OpenSearchDataSource; . . -String url = "jdbc:elasticsearch://https://remote-host-name"; +String url = "jdbc:opensearch://https://remote-host-name"; -ElasticsearchDataSource ds = new ElasticsearchDataSource(); +OpenSearchDataSource ds = new OpenSearchDataSource(); ds.setUrl(url); Connection con = ds.getConnection(url, "user", "password"); @@ -407,13 +407,13 @@ import java.sql.Connection; import java.sql.Statement; import javax.sql.DataSource; -import com.amazon.opendistroforelasticsearch.jdbc.ElasticsearchDataSource; +import com.amazon.opendistroforelasticsearch.jdbc.OpenSearchDataSource; . . -String url = "jdbc:elasticsearch://https://remote-host-name?auth=aws_sigv4"; +String url = "jdbc:opensearch://https://remote-host-name?auth=aws_sigv4"; -ElasticsearchDataSource ds = new ElasticsearchDataSource(); +OpenSearchDataSource ds = new OpenSearchDataSource(); ds.setUrl(url); Connection con = ds.getConnection(url); @@ -432,13 +432,13 @@ import java.sql.Connection; import java.sql.Statement; import javax.sql.DataSource; -import com.amazon.opendistroforelasticsearch.jdbc.ElasticsearchDataSource; +import com.amazon.opendistroforelasticsearch.jdbc.OpenSearchDataSource; . . -String url = "jdbc:elasticsearch://https://remote-host-name?auth=aws_sigv4®ion=us-west-1"; +String url = "jdbc:opensearch://https://remote-host-name?auth=aws_sigv4®ion=us-west-1"; -ElasticsearchDataSource ds = new ElasticsearchDataSource(); +OpenSearchDataSource ds = new OpenSearchDataSource(); ds.setUrl(url); ds.setAwsCredentialProvider(new EnvironmentVariableCredentialsProvider()); @@ -458,13 +458,13 @@ import java.sql.Connection; import java.sql.Statement; import javax.sql.DataSource; -import com.amazon.opendistroforelasticsearch.jdbc.ElasticsearchDataSource; +import com.amazon.opendistroforelasticsearch.jdbc.OpenSearchDataSource; . . -String url = "jdbc:elasticsearch://https://remote-host-name?auth=aws_sigv4®ion=us-west-1"; +String url = "jdbc:opensearch://https://remote-host-name?auth=aws_sigv4®ion=us-west-1"; -ElasticsearchDataSource ds = new ElasticsearchDataSource(); +OpenSearchDataSource ds = new OpenSearchDataSource(); ds.setUrl(url); Connection con = ds.getConnection(url); diff --git a/sql-jdbc/build.gradle b/sql-jdbc/build.gradle index 7c829053d00..6c92e879909 100644 --- a/sql-jdbc/build.gradle +++ b/sql-jdbc/build.gradle @@ -32,7 +32,7 @@ plugins { group 'com.amazon.opendistroforelasticsearch.client' // keep version in sync with version in Driver source -version '1.13.0.0' +version '1.15.0.0' boolean snapshot = "true".equals(System.getProperty("build.snapshot", "true")); if (snapshot) { @@ -71,7 +71,7 @@ tasks.withType(JavaCompile) { } static def getShadowPath(String path) { - return 'com.amazonaws.opendistro.elasticsearch.sql.jdbc.shadow.' + path + return 'com.amazonaws.opendistro.opensearch.sql.jdbc.shadow.' + path } shadowJar { diff --git a/sql-jdbc/docs/tableau.md b/sql-jdbc/docs/tableau.md index c572a7b23aa..ffbe0fcfeec 100644 --- a/sql-jdbc/docs/tableau.md +++ b/sql-jdbc/docs/tableau.md @@ -20,12 +20,12 @@ Place the `opendistro-sql-jdbc-x.x.x.x.jar` file in the folder for your operatin ### Create TDC file -TDC file is required to add customization for the data connection. For reference, see the following sample `elasticsearch.tdc` file. +TDC file is required to add customization for the data connection. For reference, see the following sample `opensearch.tdc` file. ``` - + @@ -39,7 +39,7 @@ TDC file is required to add customization for the data connection. For reference ``` * Using a text editor, add `` section. -* Name the file `elasticsearch.tdc` and save it to `My Tableau Repository\Datasources`. +* Name the file `opensearch.tdc` and save it to `My Tableau Repository\Datasources`. * Restart Tableau to apply the change. For futher details check [using a .tdc file with Tableau](https://kb.tableau.com/articles/howto/using-a-tdc-file-with-tableau-server) @@ -49,11 +49,11 @@ For futher details check [using a .tdc file with Tableau](https://kb.tableau.com You will need: * [JDBC connection string](https://github.com/opendistro-for-elasticsearch/sql/blob/master/sql-jdbc/README.md#connection-url-and-other-settings) to enter in the URL field when you connect. - Sample connection string for connecting to localhost: `jdbc:elasticsearch://localhost:9200`. + Sample connection string for connecting to localhost: `jdbc:opensearch://localhost:9200`. * Credentials for signing in to the server (user name and password). * (Optional) JDBC properties file to customize the driver behavior. For more details check [Customize JDBC Connections Using a Properties File](https://community.tableau.com/docs/DOC-17978) - * Create a properties file called `elasticsearch.properties`. + * Create a properties file called `opensearch.properties`. * Save the file to the `My Tableau Repository\Datasources` directory. diff --git a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/ConnectionImpl.java b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/ConnectionImpl.java index 7a5fce48224..247f933768f 100644 --- a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/ConnectionImpl.java +++ b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/ConnectionImpl.java @@ -55,7 +55,7 @@ import java.util.Properties; import java.util.concurrent.Executor; -public class ConnectionImpl implements ElasticsearchConnection, JdbcWrapper, LoggingSource { +public class ConnectionImpl implements OpenSearchConnection, JdbcWrapper, LoggingSource { private String url; private String user; diff --git a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/DatabaseMetaDataImpl.java b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/DatabaseMetaDataImpl.java index 638058f2a04..5ae8a1b7f6a 100644 --- a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/DatabaseMetaDataImpl.java +++ b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/DatabaseMetaDataImpl.java @@ -21,7 +21,7 @@ import com.amazon.opendistroforelasticsearch.jdbc.logging.LoggingSource; import com.amazon.opendistroforelasticsearch.jdbc.protocol.ColumnDescriptor; import com.amazon.opendistroforelasticsearch.jdbc.protocol.QueryResponse; -import com.amazon.opendistroforelasticsearch.jdbc.types.ElasticsearchType; +import com.amazon.opendistroforelasticsearch.jdbc.types.OpenSearchType; import com.amazon.opendistroforelasticsearch.jdbc.logging.Logger; import java.sql.Connection; @@ -93,7 +93,7 @@ public boolean nullsAreSortedAtEnd() throws SQLException { @Override public String getDatabaseProductName() throws SQLException { - return "Elasticsearch"; + return "OpenSearch"; } @Override @@ -103,7 +103,7 @@ public String getDatabaseProductVersion() throws SQLException { @Override public String getDriverName() throws SQLException { - return "Elasticsearch JDBC Driver"; + return "OpenSearch JDBC Driver"; } @Override @@ -647,7 +647,7 @@ public ResultSet getProcedures(String catalog, String schemaPattern, String proc rscd("RESERVED5"), rscd("RESERVED6"), rscd("REMARKS"), - rscd("PROCEDURE_TYPE", ElasticsearchType.SHORT.getTypeName()), + rscd("PROCEDURE_TYPE", OpenSearchType.SHORT.getTypeName()), rscd("SPECIFIC_NAME") ); } @@ -660,20 +660,20 @@ public ResultSet getProcedureColumns(String catalog, String schemaPattern, Strin rscd("PROCEDURE_SCHEM"), rscd("PROCEDURE_NAME"), rscd("COLUMN_NAME"), - rscd("COLUMN_TYPE", ElasticsearchType.SHORT.getTypeName()), - rscd("DATA_TYPE", ElasticsearchType.INTEGER.getTypeName()), + rscd("COLUMN_TYPE", OpenSearchType.SHORT.getTypeName()), + rscd("DATA_TYPE", OpenSearchType.INTEGER.getTypeName()), rscd("TYPE_NAME"), - rscd("PRECISION", ElasticsearchType.INTEGER.getTypeName()), - rscd("LENGTH", ElasticsearchType.INTEGER.getTypeName()), - rscd("SCALE", ElasticsearchType.SHORT.getTypeName()), - rscd("RADIX", ElasticsearchType.SHORT.getTypeName()), - rscd("NULLABLE", ElasticsearchType.SHORT.getTypeName()), + rscd("PRECISION", OpenSearchType.INTEGER.getTypeName()), + rscd("LENGTH", OpenSearchType.INTEGER.getTypeName()), + rscd("SCALE", OpenSearchType.SHORT.getTypeName()), + rscd("RADIX", OpenSearchType.SHORT.getTypeName()), + rscd("NULLABLE", OpenSearchType.SHORT.getTypeName()), rscd("REMARKS"), rscd("COLUMN_DEF"), - rscd("SQL_DATA_TYPE", ElasticsearchType.INTEGER.getTypeName()), - rscd("SQL_DATETIME_SUB", ElasticsearchType.INTEGER.getTypeName()), - rscd("CHAR_OCTET_LENGTH", ElasticsearchType.INTEGER.getTypeName()), - rscd("ORDINAL_POSITION", ElasticsearchType.INTEGER.getTypeName()), + rscd("SQL_DATA_TYPE", OpenSearchType.INTEGER.getTypeName()), + rscd("SQL_DATETIME_SUB", OpenSearchType.INTEGER.getTypeName()), + rscd("CHAR_OCTET_LENGTH", OpenSearchType.INTEGER.getTypeName()), + rscd("ORDINAL_POSITION", OpenSearchType.INTEGER.getTypeName()), rscd("IS_NULLABLE"), rscd("SPECIFIC_NAME") ); @@ -824,37 +824,37 @@ public ResultSet getTypeInfo() throws SQLException { List columnDescriptors = new ArrayList<>(); columnDescriptors.add(rscd("TYPE_NAME")); - columnDescriptors.add(rscd("DATA_TYPE", ElasticsearchType.INTEGER.getTypeName())); - columnDescriptors.add(rscd("PRECISION", ElasticsearchType.INTEGER.getTypeName())); + columnDescriptors.add(rscd("DATA_TYPE", OpenSearchType.INTEGER.getTypeName())); + columnDescriptors.add(rscd("PRECISION", OpenSearchType.INTEGER.getTypeName())); columnDescriptors.add(rscd("LITERAL_PREFIX")); columnDescriptors.add(rscd("LITERAL_SUFFIX")); columnDescriptors.add(rscd("CREATE_PARAMS")); - columnDescriptors.add(rscd("NULLABLE", ElasticsearchType.SHORT.getTypeName())); - columnDescriptors.add(rscd("CASE_SENSITIVE", ElasticsearchType.BOOLEAN.getTypeName())); - columnDescriptors.add(rscd("SEARCHABLE", ElasticsearchType.SHORT.getTypeName())); - columnDescriptors.add(rscd("UNSIGNED_ATTRIBUTE", ElasticsearchType.BOOLEAN.getTypeName())); - columnDescriptors.add(rscd("FIXED_PREC_SCALE", ElasticsearchType.BOOLEAN.getTypeName())); - columnDescriptors.add(rscd("AUTO_INCREMENT", ElasticsearchType.BOOLEAN.getTypeName())); + columnDescriptors.add(rscd("NULLABLE", OpenSearchType.SHORT.getTypeName())); + columnDescriptors.add(rscd("CASE_SENSITIVE", OpenSearchType.BOOLEAN.getTypeName())); + columnDescriptors.add(rscd("SEARCHABLE", OpenSearchType.SHORT.getTypeName())); + columnDescriptors.add(rscd("UNSIGNED_ATTRIBUTE", OpenSearchType.BOOLEAN.getTypeName())); + columnDescriptors.add(rscd("FIXED_PREC_SCALE", OpenSearchType.BOOLEAN.getTypeName())); + columnDescriptors.add(rscd("AUTO_INCREMENT", OpenSearchType.BOOLEAN.getTypeName())); columnDescriptors.add(rscd("LOCAL_TYPE_NAME")); - columnDescriptors.add(rscd("MINIMUM_SCALE", ElasticsearchType.SHORT.getTypeName())); - columnDescriptors.add(rscd("MAXIMUM_SCALE", ElasticsearchType.SHORT.getTypeName())); - columnDescriptors.add(rscd("SQL_DATA_TYPE", ElasticsearchType.INTEGER.getTypeName())); - columnDescriptors.add(rscd("SQL_DATETIME_SUB", ElasticsearchType.INTEGER.getTypeName())); - columnDescriptors.add(rscd("NUM_PREC_RADIX", ElasticsearchType.INTEGER.getTypeName())); + columnDescriptors.add(rscd("MINIMUM_SCALE", OpenSearchType.SHORT.getTypeName())); + columnDescriptors.add(rscd("MAXIMUM_SCALE", OpenSearchType.SHORT.getTypeName())); + columnDescriptors.add(rscd("SQL_DATA_TYPE", OpenSearchType.INTEGER.getTypeName())); + columnDescriptors.add(rscd("SQL_DATETIME_SUB", OpenSearchType.INTEGER.getTypeName())); + columnDescriptors.add(rscd("NUM_PREC_RADIX", OpenSearchType.INTEGER.getTypeName())); List> dataRows = new ArrayList<>(); - for (ElasticsearchType esType : ElasticsearchType.values()) { + for (OpenSearchType openSearchType : OpenSearchType.values()) { dataRows.add(Arrays.asList( - esType.name(), - esType.getJdbcType().getVendorTypeNumber(), - esType.getPrecision(), + openSearchType.name(), + openSearchType.getJdbcType().getVendorTypeNumber(), + openSearchType.getPrecision(), "'", "'", null, typeNullableUnknown, - (esType == ElasticsearchType.TEXT || esType == ElasticsearchType.KEYWORD), // case sensitive + (openSearchType == OpenSearchType.TEXT || openSearchType == OpenSearchType.KEYWORD), // case sensitive typeSearchable, - !esType.isSigned(), + !openSearchType.isSigned(), false, false, null, @@ -944,9 +944,9 @@ public ResultSet getUDTs(String catalog, String schemaPattern, String typeNamePa rscd("TYPE_SCHEM"), rscd("TYPE_NAME"), rscd("CLASS_NAME"), - rscd("DATA_TYPE", ElasticsearchType.INTEGER.getTypeName()), + rscd("DATA_TYPE", OpenSearchType.INTEGER.getTypeName()), rscd("REMARKS"), - rscd("BASE_TYPE", ElasticsearchType.SHORT.getTypeName()) + rscd("BASE_TYPE", OpenSearchType.SHORT.getTypeName()) ); } @@ -1005,23 +1005,23 @@ public ResultSet getAttributes(String catalog, String schemaPattern, String type rscd("TYPE_SCHEM"), rscd("TYPE_NAME"), rscd("ATTR_NAME"), - rscd("DATA_TYPE", ElasticsearchType.INTEGER.getTypeName()), + rscd("DATA_TYPE", OpenSearchType.INTEGER.getTypeName()), rscd("ATTR_TYPE_NAME"), - rscd("ATTR_SIZE", ElasticsearchType.INTEGER.getTypeName()), - rscd("DECIMAL_DIGITS", ElasticsearchType.INTEGER.getTypeName()), - rscd("NUM_PREC_RADIX", ElasticsearchType.INTEGER.getTypeName()), - rscd("NULLABLE", ElasticsearchType.INTEGER.getTypeName()), + rscd("ATTR_SIZE", OpenSearchType.INTEGER.getTypeName()), + rscd("DECIMAL_DIGITS", OpenSearchType.INTEGER.getTypeName()), + rscd("NUM_PREC_RADIX", OpenSearchType.INTEGER.getTypeName()), + rscd("NULLABLE", OpenSearchType.INTEGER.getTypeName()), rscd("REMARKS"), rscd("ATTR_DEF"), - rscd("SQL_DATA_TYPE", ElasticsearchType.INTEGER.getTypeName()), - rscd("SQL_DATETIME_SUB", ElasticsearchType.INTEGER.getTypeName()), - rscd("CHAR_OCTET_LENGTH", ElasticsearchType.INTEGER.getTypeName()), - rscd("ORDINAL_POSITION", ElasticsearchType.INTEGER.getTypeName()), + rscd("SQL_DATA_TYPE", OpenSearchType.INTEGER.getTypeName()), + rscd("SQL_DATETIME_SUB", OpenSearchType.INTEGER.getTypeName()), + rscd("CHAR_OCTET_LENGTH", OpenSearchType.INTEGER.getTypeName()), + rscd("ORDINAL_POSITION", OpenSearchType.INTEGER.getTypeName()), rscd("IS_NULLABLE"), rscd("SCOPE_CATALOG"), rscd("SCOPE_SCHEMA"), rscd("SCOPE_TABLE"), - rscd("SOURCE_DATA_TYPE", ElasticsearchType.SHORT.getTypeName()) + rscd("SOURCE_DATA_TYPE", OpenSearchType.SHORT.getTypeName()) ); } @@ -1097,7 +1097,7 @@ public ResultSet getFunctions(String catalog, String schemaPattern, String funct rscd("FUNCTION_SCHEM"), rscd("FUNCTION_NAME"), rscd("REMARKS"), - rscd("FUNCTION_TYPE", ElasticsearchType.SHORT.getTypeName()), + rscd("FUNCTION_TYPE", OpenSearchType.SHORT.getTypeName()), rscd("SPECIFIC_NAME") ); } @@ -1110,17 +1110,17 @@ public ResultSet getFunctionColumns(String catalog, String schemaPattern, String rscd("FUNCTION_SCHEM"), rscd("FUNCTION_NAME"), rscd("COLUMN_NAME"), - rscd("COLUMN_TYPE", ElasticsearchType.SHORT.getTypeName()), - rscd("DATA_TYPE", ElasticsearchType.INTEGER.getTypeName()), + rscd("COLUMN_TYPE", OpenSearchType.SHORT.getTypeName()), + rscd("DATA_TYPE", OpenSearchType.INTEGER.getTypeName()), rscd("TYPE_NAME"), - rscd("PRECISION", ElasticsearchType.INTEGER.getTypeName()), - rscd("LENGTH", ElasticsearchType.INTEGER.getTypeName()), - rscd("SCALE", ElasticsearchType.SHORT.getTypeName()), - rscd("RADIX", ElasticsearchType.SHORT.getTypeName()), - rscd("NULLABLE", ElasticsearchType.SHORT.getTypeName()), + rscd("PRECISION", OpenSearchType.INTEGER.getTypeName()), + rscd("LENGTH", OpenSearchType.INTEGER.getTypeName()), + rscd("SCALE", OpenSearchType.SHORT.getTypeName()), + rscd("RADIX", OpenSearchType.SHORT.getTypeName()), + rscd("NULLABLE", OpenSearchType.SHORT.getTypeName()), rscd("REMARKS"), - rscd("CHAR_OCTET_LENGTH", ElasticsearchType.INTEGER.getTypeName()), - rscd("ORDINAL_POSITION", ElasticsearchType.INTEGER.getTypeName()), + rscd("CHAR_OCTET_LENGTH", OpenSearchType.INTEGER.getTypeName()), + rscd("ORDINAL_POSITION", OpenSearchType.INTEGER.getTypeName()), rscd("IS_NULLABLE"), rscd("SPECIFIC_NAME") ); @@ -1135,13 +1135,13 @@ public ResultSet getPseudoColumns(String catalog, String schemaPattern, String t rscd("TABLE_SCHEM"), rscd("TABLE_NAME"), rscd("COLUMN_NAME"), - rscd("DATA_TYPE", ElasticsearchType.INTEGER.getTypeName()), - rscd("COLUMN_SIZE", ElasticsearchType.INTEGER.getTypeName()), - rscd("DECIMAL_DIGITS", ElasticsearchType.INTEGER.getTypeName()), - rscd("NUM_PREC_RADIX", ElasticsearchType.INTEGER.getTypeName()), + rscd("DATA_TYPE", OpenSearchType.INTEGER.getTypeName()), + rscd("COLUMN_SIZE", OpenSearchType.INTEGER.getTypeName()), + rscd("DECIMAL_DIGITS", OpenSearchType.INTEGER.getTypeName()), + rscd("NUM_PREC_RADIX", OpenSearchType.INTEGER.getTypeName()), rscd("COLUMN_USAGE"), rscd("REMARKS"), - rscd("CHAR_OCTET_LENGTH", ElasticsearchType.INTEGER.getTypeName()), + rscd("CHAR_OCTET_LENGTH", OpenSearchType.INTEGER.getTypeName()), rscd("IS_NULLABLE") ); } @@ -1152,7 +1152,7 @@ public boolean generatedKeyAlwaysReturned() throws SQLException { } static ResultSetColumnDescriptor rscd(String name) { - return rscd(name, ElasticsearchType.TEXT.getTypeName(), null); + return rscd(name, OpenSearchType.TEXT.getTypeName(), null); } static ResultSetColumnDescriptor rscd(String name, String type) { @@ -1231,17 +1231,17 @@ static class ColumnMetadataResultSet extends ResultSetImpl { private int getDataType() { String esDataType = (String) cursor.getColumn(5); - return ElasticsearchType.fromTypeName(esDataType, false).sqlTypeNumber(); + return OpenSearchType.fromTypeName(esDataType, false).sqlTypeNumber(); } private String getDataTypeName() { String esDataType = (String) cursor.getColumn(5); - return ElasticsearchType.fromTypeName(esDataType, false).name(); + return OpenSearchType.fromTypeName(esDataType, false).name(); } private int getColumnSize() { String esDataType = (String) cursor.getColumn(5); - return ElasticsearchType.fromTypeName(esDataType, false).getPrecision(); + return OpenSearchType.fromTypeName(esDataType, false).getPrecision(); } @Override @@ -1277,7 +1277,7 @@ protected ResultSetImpl buildResultSet(QueryResponse queryResponse) throws SQLEx for (ColumnDescriptor cd : queryResponse.getColumnDescriptors()) { if ("DATA_TYPE".equals(cd.getName()) || "COLUMN_SIZE".equals(cd.getName())) { columnDescriptors.add( - rscd(cd.getName(), ElasticsearchType.INTEGER.getTypeName())); + rscd(cd.getName(), OpenSearchType.INTEGER.getTypeName())); } else { columnDescriptors.add(rscd(cd.getName(), cd.getType())); } diff --git a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/ElasticsearchConnection.java b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/OpenSearchConnection.java similarity index 91% rename from sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/ElasticsearchConnection.java rename to sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/OpenSearchConnection.java index 60e75e6d7e9..8dfe7284d7e 100644 --- a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/ElasticsearchConnection.java +++ b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/OpenSearchConnection.java @@ -18,7 +18,7 @@ import java.sql.SQLException; -public interface ElasticsearchConnection extends java.sql.Connection { +public interface OpenSearchConnection extends java.sql.Connection { String getClusterName() throws SQLException; diff --git a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/ElasticsearchDataSource.java b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/OpenSearchDataSource.java similarity index 98% rename from sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/ElasticsearchDataSource.java rename to sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/OpenSearchDataSource.java index 59593247f4b..df1f2a0115b 100644 --- a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/ElasticsearchDataSource.java +++ b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/OpenSearchDataSource.java @@ -39,7 +39,7 @@ import java.util.logging.Logger; /** - * Elasticsearch {@link DataSource} implementation. + * OpenSearch {@link DataSource} implementation. *

* Connection properties are expected to be included in a * JDBC connection URL and supplied to the DataSource via @@ -52,7 +52,7 @@ * for such properties return the value that was explicitly set on * the DataSource, and not the value that might be present on the JDBC URL. */ -public class ElasticsearchDataSource implements DataSource, JdbcWrapper, LoggingSource { +public class OpenSearchDataSource implements DataSource, JdbcWrapper, LoggingSource { private String url; diff --git a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/ElasticsearchVersion.java b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/OpenSearchVersion.java similarity index 94% rename from sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/ElasticsearchVersion.java rename to sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/OpenSearchVersion.java index b2b413b6dea..2e2fd0c1699 100644 --- a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/ElasticsearchVersion.java +++ b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/OpenSearchVersion.java @@ -16,7 +16,7 @@ package com.amazon.opendistroforelasticsearch.jdbc; -public interface ElasticsearchVersion { +public interface OpenSearchVersion { int getMajor(); int getMinor(); diff --git a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/PreparedStatementImpl.java b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/PreparedStatementImpl.java index ae83d1116dc..d4457566243 100644 --- a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/PreparedStatementImpl.java +++ b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/PreparedStatementImpl.java @@ -17,7 +17,7 @@ package com.amazon.opendistroforelasticsearch.jdbc; import com.amazon.opendistroforelasticsearch.jdbc.protocol.JdbcQueryRequest; -import com.amazon.opendistroforelasticsearch.jdbc.types.ElasticsearchType; +import com.amazon.opendistroforelasticsearch.jdbc.types.OpenSearchType; import com.amazon.opendistroforelasticsearch.jdbc.types.TypeConverters; import com.amazon.opendistroforelasticsearch.jdbc.internal.util.SqlParser; import com.amazon.opendistroforelasticsearch.jdbc.logging.Logger; @@ -96,7 +96,7 @@ public int executeUpdate() throws SQLException { public void setNull(int parameterIndex, int sqlType) throws SQLException { log.debug(() -> logEntry("setNull(%d, %d)", parameterIndex, sqlType)); checkOpen(); - setParameter(parameterIndex, ElasticsearchType.fromJdbcType(JDBCType.valueOf(sqlType)).getTypeName(), null); + setParameter(parameterIndex, OpenSearchType.fromJdbcType(JDBCType.valueOf(sqlType)).getTypeName(), null); log.debug(() -> logExit("setNull")); } @@ -165,7 +165,7 @@ public void setBigDecimal(int parameterIndex, BigDecimal x) throws SQLException public void setString(int parameterIndex, String x) throws SQLException { log.debug(() -> logEntry("setString(%d, %s)", parameterIndex, x)); checkOpen(); - setParameter(parameterIndex, ElasticsearchType.fromJdbcType(JDBCType.VARCHAR).getTypeName(), x); + setParameter(parameterIndex, OpenSearchType.fromJdbcType(JDBCType.VARCHAR).getTypeName(), x); log.debug(() -> logExit("setString")); } @@ -233,7 +233,7 @@ private void setObjectX(int parameterIndex, Object x, int targetSqlType) throws private void setObjectX(int parameterIndex, Object x, int targetSqlType, Map conversionParams) throws SQLException { JDBCType jdbcType = JDBCType.valueOf(targetSqlType); - ElasticsearchType esType = ElasticsearchType.fromJdbcType(jdbcType); + OpenSearchType openSearchType = OpenSearchType.fromJdbcType(jdbcType); Object value = TypeConverters.getInstance(jdbcType).convert(x, null, conversionParams); @@ -244,7 +244,7 @@ private void setObjectX(int parameterIndex, Object x, int targetSqlType, Map * Column names or labels received in APIs are treated in a - * case-sensitive manner since Elasticsearch field names are + * case-sensitive manner since OpenSearch field names are * case-sensitive. *

* The lookup @@ -112,7 +112,7 @@ public ResultSetImpl(StatementImpl statement, List c this.cursorId = cursorId; this.open = true; - } catch (UnrecognizedElasticsearchTypeException ex) { + } catch (UnrecognizedOpenSearchTypeException ex) { logAndThrowSQLException(log, new SQLException("Exception creating a ResultSet.", ex)); } @@ -585,7 +585,7 @@ protected T getObjectX(int columnIndex, Class javaClass) throws SQLExcept protected T getObjectX(int columnIndex, Class javaClass, Map conversionParams) throws SQLException { Object value = getColumn(columnIndex); - TypeConverter tc = TypeConverters.getInstance(getColumnMetaData(columnIndex).getEsType().getJdbcType()); + TypeConverter tc = TypeConverters.getInstance(getColumnMetaData(columnIndex).getOpenSearchType().getJdbcType()); return tc.convert(value, javaClass, conversionParams); } @@ -1025,7 +1025,7 @@ private Object getObjectX(int columnIndex, Map> map) throws SQL String columnSQLTypeName = null; Class targetClass = null; if (map != null) { - columnSQLTypeName = getColumnMetaData(columnIndex).getEsType().getJdbcType().getName(); + columnSQLTypeName = getColumnMetaData(columnIndex).getOpenSearchType().getJdbcType().getName(); targetClass = map.get(columnSQLTypeName); } diff --git a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/ResultSetMetaDataImpl.java b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/ResultSetMetaDataImpl.java index ec2dc9698d5..c7592fb06ca 100644 --- a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/ResultSetMetaDataImpl.java +++ b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/ResultSetMetaDataImpl.java @@ -70,13 +70,13 @@ public int isNullable(int column) throws SQLException { @Override public boolean isSigned(int column) throws SQLException { checkAccessible(column); - return schema.getColumnMetaData(column-1).getEsType().isSigned(); + return schema.getColumnMetaData(column-1).getOpenSearchType().isSigned(); } @Override public int getColumnDisplaySize(int column) throws SQLException { checkAccessible(column); - return schema.getColumnMetaData(column-1).getEsType().getDisplaySize(); + return schema.getColumnMetaData(column-1).getOpenSearchType().getDisplaySize(); } @Override @@ -124,13 +124,13 @@ public String getCatalogName(int column) throws SQLException { @Override public int getColumnType(int column) throws SQLException { checkAccessible(column); - return schema.getElasticsearchType(column-1).getJdbcType().getVendorTypeNumber(); + return schema.getOpenSearchType(column-1).getJdbcType().getVendorTypeNumber(); } @Override public String getColumnTypeName(int column) throws SQLException { checkAccessible(column); - return schema.getElasticsearchType(column-1).getJdbcType().getName(); + return schema.getOpenSearchType(column-1).getJdbcType().getName(); } @Override @@ -154,7 +154,7 @@ public boolean isDefinitelyWritable(int column) throws SQLException { @Override public String getColumnClassName(int column) throws SQLException { checkAccessible(column); - return schema.getElasticsearchType(column-1).getJavaClassName(); + return schema.getOpenSearchType(column-1).getJavaClassName(); } private void checkAccessible(int columnIndex) throws SQLException { diff --git a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/internal/Version.java b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/internal/Version.java index 31fe878a27f..d4577a18b1e 100644 --- a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/internal/Version.java +++ b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/internal/Version.java @@ -19,7 +19,7 @@ public enum Version { // keep this in sync with the gradle version - Current(1, 13, 0, 0); + Current(1, 15, 0, 0); private int major; private int minor; diff --git a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/internal/results/ColumnMetaData.java b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/internal/results/ColumnMetaData.java index 2e080b67b2f..d976b7a6105 100644 --- a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/internal/results/ColumnMetaData.java +++ b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/internal/results/ColumnMetaData.java @@ -16,7 +16,7 @@ package com.amazon.opendistroforelasticsearch.jdbc.internal.results; -import com.amazon.opendistroforelasticsearch.jdbc.types.ElasticsearchType; +import com.amazon.opendistroforelasticsearch.jdbc.types.OpenSearchType; import com.amazon.opendistroforelasticsearch.jdbc.protocol.ColumnDescriptor; public class ColumnMetaData { @@ -27,8 +27,8 @@ public class ColumnMetaData { private int scale = -1; private String tableName; private String catalogName; - private String esTypeName; - private ElasticsearchType esType; + private String openSearchTypeName; + private OpenSearchType openSearchType; public ColumnMetaData(ColumnDescriptor descriptor) { this.name = descriptor.getName(); @@ -36,11 +36,11 @@ public ColumnMetaData(ColumnDescriptor descriptor) { // if a label isn't specified, the name is the label this.label = descriptor.getLabel() == null ? this.name : descriptor.getLabel(); - this.esTypeName = descriptor.getType(); - this.esType = ElasticsearchType.fromTypeName(esTypeName); + this.openSearchTypeName = descriptor.getType(); + this.openSearchType = OpenSearchType.fromTypeName(openSearchTypeName); // use canned values until server can return this - this.precision = this.esType.getPrecision(); + this.precision = this.openSearchType.getPrecision(); this.scale = 0; // JDBC has these, but our protocol does not yet convey these @@ -77,11 +77,11 @@ public String getCatalogName() { return catalogName; } - public ElasticsearchType getEsType() { - return esType; + public OpenSearchType getOpenSearchType() { + return openSearchType; } - public String getEsTypeName() { - return esTypeName; + public String getOpenSearchTypeName() { + return openSearchTypeName; } } diff --git a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/internal/results/Schema.java b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/internal/results/Schema.java index dd309d92152..341926c8925 100644 --- a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/internal/results/Schema.java +++ b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/internal/results/Schema.java @@ -16,7 +16,7 @@ package com.amazon.opendistroforelasticsearch.jdbc.internal.results; -import com.amazon.opendistroforelasticsearch.jdbc.types.ElasticsearchType; +import com.amazon.opendistroforelasticsearch.jdbc.types.OpenSearchType; import java.util.List; @@ -51,14 +51,14 @@ public ColumnMetaData getColumnMetaData(int index) { } /** - * Returns the {@link ElasticsearchType} corresponding to a specific + * Returns the {@link OpenSearchType} corresponding to a specific * column in the result. * * @param index the index of the column to return the type for * - * @return {@link ElasticsearchType} for the specified column + * @return {@link OpenSearchType} for the specified column */ - public ElasticsearchType getElasticsearchType(int index) { - return columnMetaDataList.get(index).getEsType(); + public OpenSearchType getOpenSearchType(int index) { + return columnMetaDataList.get(index).getOpenSearchType(); } } diff --git a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/internal/util/UrlParser.java b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/internal/util/UrlParser.java index 5454eecb12e..eb4d700089b 100644 --- a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/internal/util/UrlParser.java +++ b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/internal/util/UrlParser.java @@ -29,7 +29,7 @@ public class UrlParser { - public static final String URL_PREFIX = "jdbc:elasticsearch://"; + public static final String URL_PREFIX = "jdbc:opensearch://"; private static final int URL_PREFIX_LEN = URL_PREFIX.length(); private static final String SCHEME_DELIM = "://"; diff --git a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/protocol/ClusterMetadata.java b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/protocol/ClusterMetadata.java index a3bca481b32..d2df09c53eb 100644 --- a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/protocol/ClusterMetadata.java +++ b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/protocol/ClusterMetadata.java @@ -16,12 +16,12 @@ package com.amazon.opendistroforelasticsearch.jdbc.protocol; -import com.amazon.opendistroforelasticsearch.jdbc.ElasticsearchVersion; +import com.amazon.opendistroforelasticsearch.jdbc.OpenSearchVersion; public interface ClusterMetadata { String getClusterName(); String getClusterUUID(); - ElasticsearchVersion getVersion(); + OpenSearchVersion getVersion(); } diff --git a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/protocol/http/JsonClusterMetadata.java b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/protocol/http/JsonClusterMetadata.java index 865b82120b4..71098e39f1c 100644 --- a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/protocol/http/JsonClusterMetadata.java +++ b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/protocol/http/JsonClusterMetadata.java @@ -30,7 +30,7 @@ public class JsonClusterMetadata implements ClusterMetadata { private String clusterUUID; @JsonProperty("version") - private JsonElasticsearchVersion version; + private JsonOpenSearchVersion version; @Override public String getClusterName() { @@ -43,7 +43,7 @@ public String getClusterUUID() { } @Override - public JsonElasticsearchVersion getVersion() { + public JsonOpenSearchVersion getVersion() { return version; } @@ -55,7 +55,7 @@ public void setClusterUUID(String clusterUUID) { this.clusterUUID = clusterUUID; } - public void setVersion(JsonElasticsearchVersion version) { + public void setVersion(JsonOpenSearchVersion version) { this.version = version; } } \ No newline at end of file diff --git a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/protocol/http/JsonElasticsearchVersion.java b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/protocol/http/JsonOpenSearchVersion.java similarity index 88% rename from sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/protocol/http/JsonElasticsearchVersion.java rename to sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/protocol/http/JsonOpenSearchVersion.java index faa6eb1a7d2..84cbf405ee6 100644 --- a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/protocol/http/JsonElasticsearchVersion.java +++ b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/protocol/http/JsonOpenSearchVersion.java @@ -16,17 +16,17 @@ package com.amazon.opendistroforelasticsearch.jdbc.protocol.http; -import com.amazon.opendistroforelasticsearch.jdbc.ElasticsearchVersion; +import com.amazon.opendistroforelasticsearch.jdbc.OpenSearchVersion; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; @JsonIgnoreProperties(ignoreUnknown = true) -public class JsonElasticsearchVersion implements ElasticsearchVersion { +public class JsonOpenSearchVersion implements OpenSearchVersion { private String fullVersion; private int[] version = new int[3]; - public JsonElasticsearchVersion(@JsonProperty("number") String fullVersion) { + public JsonOpenSearchVersion(@JsonProperty("number") String fullVersion) { if (fullVersion == null) return; diff --git a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/types/ElasticsearchType.java b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/types/OpenSearchType.java similarity index 70% rename from sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/types/ElasticsearchType.java rename to sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/types/OpenSearchType.java index a4a49fd381e..b95239174e3 100644 --- a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/types/ElasticsearchType.java +++ b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/types/OpenSearchType.java @@ -25,12 +25,12 @@ import java.util.Map; /** - * Enum for Elasticsearch Data Types. + * Enum for OpenSearch Data Types. *

* Each type encapsulates mapping to its corresponding JDBC Type and * associated properties. *

- * Where required, an Elasticsearch data type is mapped to the least + * Where required, an OpenSearch data type is mapped to the least * precise {@link JDBCType} that can accurately represent it based on * the following: * @@ -41,19 +41,19 @@ * the JDBC Spec - Table B-1: JDBC Types Mapped to Java Types * *

  • - * Precision of Elasticsearch types is based on - * Elasticsearch Reference > Mapping > Field datatypes + * Precision of OpenSearch types is based on + * OpenSearch Reference > Mapping > Field datatypes *
    • * */ -public enum ElasticsearchType { +public enum OpenSearchType { // Precision values based on number of decimal digits supported by Java types // Display size values based on precision plus additional buffer for visual representation // - Java long is a 64-bit integral value ~ 19 decimal digits // - Java double has 53-bit precision ~ 15 decimal digits // - Java float has 24-bit precision ~ 7 decimal digits - // - scaled_float is internally an elasticsearch long, but treated as Java Double here + // - scaled_float is internally an OpenSearch long, but treated as Java Double here // - ISO8601 representation of DateTime values as yyyy-mm-ddThh:mm:ss.mmmZ ~ 24 chars // Some Types not fully supported yet: VARBINARY, GEO_POINT, NESTED @@ -80,29 +80,29 @@ public enum ElasticsearchType { UNDEFINED(JDBCType.NULL, null, 0, 0, false), UNSUPPORTED(JDBCType.OTHER, null, 0, 0, false); - private static final Map jdbcTypeToESTypeMap; + private static final Map jdbcTypeToOpenSearchTypeMap; static { // Map JDBCType to corresponding ElasticsearchType - jdbcTypeToESTypeMap = new HashMap<>(); - jdbcTypeToESTypeMap.put(JDBCType.NULL, UNDEFINED); - jdbcTypeToESTypeMap.put(JDBCType.BOOLEAN, BOOLEAN); - jdbcTypeToESTypeMap.put(JDBCType.TINYINT, BYTE); - jdbcTypeToESTypeMap.put(JDBCType.SMALLINT, SHORT); - jdbcTypeToESTypeMap.put(JDBCType.INTEGER, INTEGER); - jdbcTypeToESTypeMap.put(JDBCType.BIGINT, LONG); - jdbcTypeToESTypeMap.put(JDBCType.DOUBLE, DOUBLE); - jdbcTypeToESTypeMap.put(JDBCType.REAL, FLOAT); - jdbcTypeToESTypeMap.put(JDBCType.FLOAT, DOUBLE); - jdbcTypeToESTypeMap.put(JDBCType.VARCHAR, KEYWORD); - jdbcTypeToESTypeMap.put(JDBCType.TIMESTAMP, TIMESTAMP); - jdbcTypeToESTypeMap.put(JDBCType.TIME, TIME); - jdbcTypeToESTypeMap.put(JDBCType.DATE, DATE); - jdbcTypeToESTypeMap.put(JDBCType.VARBINARY, BINARY); + jdbcTypeToOpenSearchTypeMap = new HashMap<>(); + jdbcTypeToOpenSearchTypeMap.put(JDBCType.NULL, UNDEFINED); + jdbcTypeToOpenSearchTypeMap.put(JDBCType.BOOLEAN, BOOLEAN); + jdbcTypeToOpenSearchTypeMap.put(JDBCType.TINYINT, BYTE); + jdbcTypeToOpenSearchTypeMap.put(JDBCType.SMALLINT, SHORT); + jdbcTypeToOpenSearchTypeMap.put(JDBCType.INTEGER, INTEGER); + jdbcTypeToOpenSearchTypeMap.put(JDBCType.BIGINT, LONG); + jdbcTypeToOpenSearchTypeMap.put(JDBCType.DOUBLE, DOUBLE); + jdbcTypeToOpenSearchTypeMap.put(JDBCType.REAL, FLOAT); + jdbcTypeToOpenSearchTypeMap.put(JDBCType.FLOAT, DOUBLE); + jdbcTypeToOpenSearchTypeMap.put(JDBCType.VARCHAR, KEYWORD); + jdbcTypeToOpenSearchTypeMap.put(JDBCType.TIMESTAMP, TIMESTAMP); + jdbcTypeToOpenSearchTypeMap.put(JDBCType.TIME, TIME); + jdbcTypeToOpenSearchTypeMap.put(JDBCType.DATE, DATE); + jdbcTypeToOpenSearchTypeMap.put(JDBCType.VARBINARY, BINARY); } /** - * Elasticsearch designated type name + * OpenSearch designated type name */ private final String typeName; @@ -152,8 +152,8 @@ public enum ElasticsearchType { */ private final boolean isSigned; - ElasticsearchType(JDBCType jdbcType, Class javaClass, int precision, - int displaySize, boolean isSigned) { + OpenSearchType(JDBCType jdbcType, Class javaClass, int precision, + int displaySize, boolean isSigned) { this.typeName = name().toLowerCase(Locale.ROOT); this.jdbcType = jdbcType; this.javaClassName = javaClass == null ? null : javaClass.getName(); @@ -162,39 +162,39 @@ public enum ElasticsearchType { this.isSigned = isSigned; } - public static ElasticsearchType fromJdbcType(JDBCType jdbcType) { - if (!jdbcTypeToESTypeMap.containsKey(jdbcType)) { + public static OpenSearchType fromJdbcType(JDBCType jdbcType) { + if (!jdbcTypeToOpenSearchTypeMap.containsKey(jdbcType)) { throw new IllegalArgumentException("Unsupported JDBC type \"" + jdbcType + "\""); } - return jdbcTypeToESTypeMap.get(jdbcType); + return jdbcTypeToOpenSearchTypeMap.get(jdbcType); } /** - * Returns the {@link ElasticsearchType} for the specified elasticsearch + * Returns the {@link OpenSearchType} for the specified OpenSearch * data type name. */ - public static ElasticsearchType fromTypeName(String typeName) { + public static OpenSearchType fromTypeName(String typeName) { return fromTypeName(typeName, false); } /** - * Parses a specified Elasticsearch type name to determine - * the corresponding {@link ElasticsearchType} + * Parses a specified OpenSearch type name to determine + * the corresponding {@link OpenSearchType} * - * @param typeName The Elasticsearch Type name to parse + * @param typeName The OpenSearch Type name to parse * @param errorOnUnknownType If true, the method throws an - * {@link UnrecognizedElasticsearchTypeException} + * {@link UnrecognizedOpenSearchTypeException} * if the type name specified is not recognized. * - * @return the {@link ElasticsearchType} value corresponding to the + * @return the {@link OpenSearchType} value corresponding to the * specified type name */ - public static ElasticsearchType fromTypeName(String typeName, boolean errorOnUnknownType) { + public static OpenSearchType fromTypeName(String typeName, boolean errorOnUnknownType) { try { - return ElasticsearchType.valueOf(typeName.toUpperCase(Locale.ROOT)); + return OpenSearchType.valueOf(typeName.toUpperCase(Locale.ROOT)); } catch (IllegalArgumentException iae) { if (errorOnUnknownType) - throw new UnrecognizedElasticsearchTypeException("Unknown Type: \"" + typeName + "\"", iae); + throw new UnrecognizedOpenSearchTypeException("Unknown Type: \"" + typeName + "\"", iae); else return UNSUPPORTED; } diff --git a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/types/UnrecognizedElasticsearchTypeException.java b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/types/UnrecognizedOpenSearchTypeException.java similarity index 68% rename from sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/types/UnrecognizedElasticsearchTypeException.java rename to sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/types/UnrecognizedOpenSearchTypeException.java index 3b4e32e486b..1c887273ef8 100644 --- a/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/types/UnrecognizedElasticsearchTypeException.java +++ b/sql-jdbc/src/main/java/com/amazon/opendistroforelasticsearch/jdbc/types/UnrecognizedOpenSearchTypeException.java @@ -16,20 +16,20 @@ package com.amazon.opendistroforelasticsearch.jdbc.types; -public class UnrecognizedElasticsearchTypeException extends IllegalArgumentException { +public class UnrecognizedOpenSearchTypeException extends IllegalArgumentException { - public UnrecognizedElasticsearchTypeException() { + public UnrecognizedOpenSearchTypeException() { } - public UnrecognizedElasticsearchTypeException(String s) { + public UnrecognizedOpenSearchTypeException(String s) { super(s); } - public UnrecognizedElasticsearchTypeException(String message, Throwable cause) { + public UnrecognizedOpenSearchTypeException(String message, Throwable cause) { super(message, cause); } - public UnrecognizedElasticsearchTypeException(Throwable cause) { + public UnrecognizedOpenSearchTypeException(Throwable cause) { super(cause); } } diff --git a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/ConnectionTests.java b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/ConnectionTests.java index 33c3e7e4d81..9972c3c7a7d 100644 --- a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/ConnectionTests.java +++ b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/ConnectionTests.java @@ -25,7 +25,7 @@ import com.amazon.opendistroforelasticsearch.jdbc.protocol.http.JsonHttpProtocol; import com.amazon.opendistroforelasticsearch.jdbc.test.PerTestWireMockServerExtension; import com.amazon.opendistroforelasticsearch.jdbc.test.WireMockServerHelpers; -import com.amazon.opendistroforelasticsearch.jdbc.test.mocks.MockES; +import com.amazon.opendistroforelasticsearch.jdbc.test.mocks.MockOpenSearch; import com.amazon.opendistroforelasticsearch.jdbc.test.mocks.QueryMock; import com.amazonaws.auth.SdkClock; import com.github.tomakehurst.wiremock.WireMockServer; @@ -54,14 +54,14 @@ void testGetConnection(final WireMockServer mockServer) throws SQLException { mockServer.stubFor(get(urlEqualTo("/")) .willReturn(aResponse() .withHeader("Content-Type", "application/json") - .withBody(MockES.INSTANCE.getConnectionResponse()))); + .withBody(MockOpenSearch.INSTANCE.getConnectionResponse()))); Driver driver = new Driver(); Connection con = Assertions.assertDoesNotThrow( () -> driver.connect(getBaseURLForMockServer(mockServer), (Properties) null)); assertConnectionOpen(con); - MockES.INSTANCE.assertMockESConnectionResponse((ElasticsearchConnection) con); + MockOpenSearch.INSTANCE.assertMockOpenSearchConnectionResponse((OpenSearchConnection) con); con.close(); } @@ -79,7 +79,7 @@ void testConnectWithBasicAuth(final WireMockServer mockServer) throws Connection .withBasicAuth("user-name", "password-$#@!*%^123") .willReturn(aResponse() .withHeader("Content-Type", "application/json") - .withBody(MockES.INSTANCE.getConnectionResponse()))); + .withBody(MockOpenSearch.INSTANCE.getConnectionResponse()))); Properties props = new Properties(); props.put(AuthConnectionProperty.KEY, "basic"); @@ -91,7 +91,7 @@ void testConnectWithBasicAuth(final WireMockServer mockServer) throws Connection mockServer.verify(2, getRequestedFor(urlEqualTo("/")) .withHeader("Accept", equalTo("application/json"))); - MockES.INSTANCE.assertMockESConnectionResponse((ElasticsearchConnection) con); + MockOpenSearch.INSTANCE.assertMockOpenSearchConnectionResponse((OpenSearchConnection) con); con.close(); } @@ -112,7 +112,7 @@ void testConnectDefaultAuthWithUsername(final WireMockServer mockServer) throws .withBasicAuth("user-name", "password-$#@!*%^123") .willReturn(aResponse() .withHeader("Content-Type", "application/json") - .withBody(MockES.INSTANCE.getConnectionResponse()))); + .withBody(MockOpenSearch.INSTANCE.getConnectionResponse()))); Properties props = new Properties(); props.put(UserConnectionProperty.KEY, "user-name"); @@ -123,7 +123,7 @@ void testConnectDefaultAuthWithUsername(final WireMockServer mockServer) throws mockServer.verify(2, getRequestedFor(urlEqualTo("/")) .withHeader("Accept", equalTo("application/json"))); - MockES.INSTANCE.assertMockESConnectionResponse((ElasticsearchConnection) con); + MockOpenSearch.INSTANCE.assertMockOpenSearchConnectionResponse((OpenSearchConnection) con); con.close(); } @@ -136,7 +136,7 @@ void testConnectWithRequestCompression(final WireMockServer mockServer) throws S .withHeader("Accept-Encoding", equalTo("gzip,deflate")) .willReturn(aResponse() .withHeader("Content-Type", "application/json") - .withBody(MockES.INSTANCE.getConnectionResponse()))); + .withBody(MockOpenSearch.INSTANCE.getConnectionResponse()))); Properties props = new Properties(); props.setProperty(RequestCompressionConnectionProperty.KEY, "true"); @@ -144,7 +144,7 @@ void testConnectWithRequestCompression(final WireMockServer mockServer) throws S // WireMockServer returns a gzip response by default // if Accept-Enconding: gzip,deflate is present in the request Connection con = Assertions.assertDoesNotThrow(() -> new Driver().connect(getBaseURLForMockServer(mockServer), props)); - MockES.INSTANCE.assertMockESConnectionResponse((ElasticsearchConnection) con); + MockOpenSearch.INSTANCE.assertMockOpenSearchConnectionResponse((OpenSearchConnection) con); con.close(); } @@ -156,7 +156,7 @@ void testConnectWithoutRequestCompression(final WireMockServer mockServer) throw get(urlEqualTo("/")) .willReturn(aResponse() .withHeader("Content-Type", "application/json") - .withBody(MockES.INSTANCE.getConnectionResponse()))); + .withBody(MockOpenSearch.INSTANCE.getConnectionResponse()))); mockServer.stubFor( get(urlEqualTo("/")) @@ -172,7 +172,7 @@ void testConnectWithoutRequestCompression(final WireMockServer mockServer) throw // WireMockServer returns a gzip response by default // if Accept-Enconding: gzip,deflate is present in the request Connection con = Assertions.assertDoesNotThrow(() -> new Driver().connect(getBaseURLForMockServer(mockServer), props)); - MockES.INSTANCE.assertMockESConnectionResponse((ElasticsearchConnection) con); + MockOpenSearch.INSTANCE.assertMockOpenSearchConnectionResponse((OpenSearchConnection) con); con.close(); } @@ -184,7 +184,7 @@ void testConnectWithDefaultRequestCompression(final WireMockServer mockServer) t get(urlEqualTo("/")) .willReturn(aResponse() .withHeader("Content-Type", "application/json") - .withBody(MockES.INSTANCE.getConnectionResponse()))); + .withBody(MockOpenSearch.INSTANCE.getConnectionResponse()))); // return HTTP 400 if request contains Accept-Encoding: gzip mockServer.stubFor( @@ -198,7 +198,7 @@ void testConnectWithDefaultRequestCompression(final WireMockServer mockServer) t Properties props = new Properties(); Connection con = Assertions.assertDoesNotThrow(() -> new Driver().connect(getBaseURLForMockServer(mockServer), props)); - MockES.INSTANCE.assertMockESConnectionResponse((ElasticsearchConnection) con); + MockOpenSearch.INSTANCE.assertMockOpenSearchConnectionResponse((OpenSearchConnection) con); con.close(); } @@ -218,7 +218,7 @@ void testConnectWithAwsSigV4Auth(final WireMockServer mockServer) throws SQLExce "Signature=80088eaaa2e7766ccee12014a5ab80d323635347157ea29935e990d34bcbff12")) .willReturn(aResponse() .withHeader("Content-Type", "application/json") - .withBody(MockES.INSTANCE.getConnectionResponse()))); + .withBody(MockOpenSearch.INSTANCE.getConnectionResponse()))); Properties props = new Properties(); @@ -232,7 +232,7 @@ void testConnectWithAwsSigV4Auth(final WireMockServer mockServer) throws SQLExce Connection con = Assertions.assertDoesNotThrow(() -> new Driver().connect(getBaseURLForMockServer(mockServer), props)); - MockES.INSTANCE.assertMockESConnectionResponse((ElasticsearchConnection) con); + MockOpenSearch.INSTANCE.assertMockOpenSearchConnectionResponse((OpenSearchConnection) con); con.close(); } @@ -254,7 +254,7 @@ void testConnectionWithContextPath(final String userContextPath, final WireMockS () -> driver.connect(getURLForMockServerWithContext(mockServer, userContextPath), (Properties) null)); assertConnectionOpen(con); - queryMock.assertConnectionResponse((ElasticsearchConnection) con); + queryMock.assertConnectionResponse((OpenSearchConnection) con); Statement st = con.createStatement(); diff --git a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/CursorTests.java b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/CursorTests.java index 8927d1944e4..a47654870f2 100644 --- a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/CursorTests.java +++ b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/CursorTests.java @@ -21,7 +21,7 @@ import com.amazon.opendistroforelasticsearch.jdbc.internal.results.Row; import com.amazon.opendistroforelasticsearch.jdbc.internal.results.Schema; import com.amazon.opendistroforelasticsearch.jdbc.protocol.http.JsonQueryResponse; -import com.amazon.opendistroforelasticsearch.jdbc.types.ElasticsearchType; +import com.amazon.opendistroforelasticsearch.jdbc.types.OpenSearchType; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; @@ -39,7 +39,7 @@ public class CursorTests { @ValueSource(ints = {0, 1, 2, 7, 10, 11}) void testCursorNext(final int rowCount) { Schema schema = new Schema(Arrays.asList( - toColumnMetaData("rownum", ElasticsearchType.INTEGER.getTypeName()))); + toColumnMetaData("rownum", OpenSearchType.INTEGER.getTypeName()))); List rows = new ArrayList<>(); for (int rowNum = 1; rowNum <= rowCount; rowNum++) { @@ -67,10 +67,10 @@ void testCursorNextWithMultipleColumns(final int rowCount) { final double DOUBLEVAL = 100.25; final List columnMetaDatas = Arrays.asList( - toColumnMetaData("rownum", ElasticsearchType.INTEGER.getTypeName()), - toColumnMetaData("stringval", ElasticsearchType.TEXT.getTypeName()), - toColumnMetaData("longval", ElasticsearchType.LONG.getTypeName()), - toColumnMetaData("doubleval", ElasticsearchType.DOUBLE.getTypeName()) + toColumnMetaData("rownum", OpenSearchType.INTEGER.getTypeName()), + toColumnMetaData("stringval", OpenSearchType.TEXT.getTypeName()), + toColumnMetaData("longval", OpenSearchType.LONG.getTypeName()), + toColumnMetaData("doubleval", OpenSearchType.DOUBLE.getTypeName()) ); Schema schema = new Schema(columnMetaDatas); @@ -111,10 +111,10 @@ void testCursorFindColumn(final int rowCount) { final double DOUBLEVAL = 100.25; final List columnMetaDatas = Arrays.asList( - toColumnMetaData("rownum", ElasticsearchType.INTEGER.getTypeName()), - toColumnMetaData("stringval", ElasticsearchType.TEXT.getTypeName(), "stringlabel"), - toColumnMetaData("longval", ElasticsearchType.LONG.getTypeName()), - toColumnMetaData("doubleval", ElasticsearchType.DOUBLE.getTypeName(), "doubleLabel") + toColumnMetaData("rownum", OpenSearchType.INTEGER.getTypeName()), + toColumnMetaData("stringval", OpenSearchType.TEXT.getTypeName(), "stringlabel"), + toColumnMetaData("longval", OpenSearchType.LONG.getTypeName()), + toColumnMetaData("doubleval", OpenSearchType.DOUBLE.getTypeName(), "doubleLabel") ); Schema schema = new Schema(columnMetaDatas); diff --git a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/DataSourceTests.java b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/DataSourceTests.java index d0e8e46a224..80deff6bbda 100644 --- a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/DataSourceTests.java +++ b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/DataSourceTests.java @@ -49,7 +49,7 @@ public class DataSourceTests implements WireMockServerHelpers { @Test void testDataSourceConfig() throws SQLException { - ElasticsearchDataSource eds = new ElasticsearchDataSource(); + OpenSearchDataSource eds = new OpenSearchDataSource(); Properties props = new Properties(); props.setProperty(HostConnectionProperty.KEY, "some-host"); @@ -70,7 +70,7 @@ void testDataSourceConfig() throws SQLException { @Test void testDataSourceConfigWithDefaults() throws SQLException { - ElasticsearchDataSource eds = new ElasticsearchDataSource(); + OpenSearchDataSource eds = new OpenSearchDataSource(); Properties defaults = new Properties(); defaults.setProperty(UserConnectionProperty.KEY, "default-user"); @@ -96,7 +96,7 @@ void testDataSourceConfigWithDefaults() throws SQLException { @Test void testDataSourceConfigUpdate() throws SQLException { - ElasticsearchDataSource eds = new ElasticsearchDataSource(); + OpenSearchDataSource eds = new OpenSearchDataSource(); Properties props = new Properties(); props.setProperty(HostConnectionProperty.KEY, "some-host"); props.setProperty(PortConnectionProperty.KEY, "1100"); @@ -119,7 +119,7 @@ void testDataSourceConfigUpdate() throws SQLException { @Test void testDataSourceConfigUpdateWithOverrides() throws SQLException { - ElasticsearchDataSource eds = new ElasticsearchDataSource(); + OpenSearchDataSource eds = new OpenSearchDataSource(); Properties props = new Properties(); props.setProperty(HostConnectionProperty.KEY, "some-host"); props.setProperty(PortConnectionProperty.KEY, "2100"); @@ -139,7 +139,7 @@ void testDataSourceConfigUpdateWithOverrides() throws SQLException { @Test void testDataSourceConfigUpdateWithOverridesPrecedence() throws SQLException { - ElasticsearchDataSource eds = new ElasticsearchDataSource(); + OpenSearchDataSource eds = new OpenSearchDataSource(); Properties props = new Properties(); props.setProperty(HostConnectionProperty.KEY, "some-host"); props.setProperty(PortConnectionProperty.KEY, "1100"); @@ -178,8 +178,8 @@ void testDataSourceFromUrlNycTaxisQuery(WireMockServer mockServer) throws SQLExc QueryMock queryMock = new QueryMock.NycTaxisQueryMock(); queryMock.setupMockServerStub(mockServer); - DataSource ds = new ElasticsearchDataSource(); - ((ElasticsearchDataSource) ds).setUrl(getBaseURLForMockServer(mockServer)); + DataSource ds = new OpenSearchDataSource(); + ((OpenSearchDataSource) ds).setUrl(getBaseURLForMockServer(mockServer)); Connection con = ds.getConnection(); Statement st = con.createStatement(); @@ -194,8 +194,8 @@ void testDataSourceFromPropsNycTaxisQuery(WireMockServer mockServer) throws SQLE QueryMock queryMock = new QueryMock.NycTaxisQueryMock(); queryMock.setupMockServerStub(mockServer); - DataSource ds = new ElasticsearchDataSource(); - ((ElasticsearchDataSource) ds).setProperties(getConnectionPropertiesForMockServer(mockServer)); + DataSource ds = new OpenSearchDataSource(); + ((OpenSearchDataSource) ds).setProperties(getConnectionPropertiesForMockServer(mockServer)); Connection con = ds.getConnection(); Statement st = con.createStatement(); diff --git a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/DatabaseMetaDataTests.java b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/DatabaseMetaDataTests.java index aa8e854f06e..75d2abff694 100644 --- a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/DatabaseMetaDataTests.java +++ b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/DatabaseMetaDataTests.java @@ -26,7 +26,7 @@ import com.amazon.opendistroforelasticsearch.jdbc.protocol.exceptions.ResponseException; import com.amazon.opendistroforelasticsearch.jdbc.transport.Transport; import com.amazon.opendistroforelasticsearch.jdbc.transport.TransportFactory; -import com.amazon.opendistroforelasticsearch.jdbc.types.ElasticsearchType; +import com.amazon.opendistroforelasticsearch.jdbc.types.OpenSearchType; import com.amazon.opendistroforelasticsearch.jdbc.test.mocks.MockResultSet; import com.amazon.opendistroforelasticsearch.jdbc.test.mocks.MockResultSetMetaData; import com.amazon.opendistroforelasticsearch.jdbc.test.mocks.MockResultSetRows; @@ -54,7 +54,7 @@ void testClusterMetaData() throws ResponseException, IOException, SQLException { assertEquals("6.3.2", dbmd.getDatabaseProductVersion()); assertEquals(6, dbmd.getDatabaseMajorVersion()); assertEquals(3, dbmd.getDatabaseMinorVersion()); - assertEquals("Elasticsearch", dbmd.getDatabaseProductName()); + assertEquals("OpenSearch", dbmd.getDatabaseProductName()); assertFalse(con.isClosed()); } @@ -68,23 +68,23 @@ void testGetAttributes() throws ResponseException, IOException, SQLException { .column("TYPE_SCHEM") .column("TYPE_NAME") .column("ATTR_NAME") - .column("DATA_TYPE", ElasticsearchType.INTEGER) + .column("DATA_TYPE", OpenSearchType.INTEGER) .column("ATTR_TYPE_NAME") - .column("ATTR_SIZE", ElasticsearchType.INTEGER) - .column("DECIMAL_DIGITS", ElasticsearchType.INTEGER) - .column("NUM_PREC_RADIX", ElasticsearchType.INTEGER) - .column("NULLABLE", ElasticsearchType.INTEGER) + .column("ATTR_SIZE", OpenSearchType.INTEGER) + .column("DECIMAL_DIGITS", OpenSearchType.INTEGER) + .column("NUM_PREC_RADIX", OpenSearchType.INTEGER) + .column("NULLABLE", OpenSearchType.INTEGER) .column("REMARKS") .column("ATTR_DEF") - .column("SQL_DATA_TYPE", ElasticsearchType.INTEGER) - .column("SQL_DATETIME_SUB", ElasticsearchType.INTEGER) - .column("CHAR_OCTET_LENGTH", ElasticsearchType.INTEGER) - .column("ORDINAL_POSITION", ElasticsearchType.INTEGER) + .column("SQL_DATA_TYPE", OpenSearchType.INTEGER) + .column("SQL_DATETIME_SUB", OpenSearchType.INTEGER) + .column("CHAR_OCTET_LENGTH", OpenSearchType.INTEGER) + .column("ORDINAL_POSITION", OpenSearchType.INTEGER) .column("IS_NULLABLE") .column("SCOPE_CATALOG") .column("SCOPE_SCHEMA") .column("SCOPE_TABLE") - .column("SOURCE_DATA_TYPE", ElasticsearchType.SHORT) + .column("SOURCE_DATA_TYPE", OpenSearchType.SHORT) .build(); DatabaseMetaData dbmd = con.getMetaData(); @@ -150,9 +150,9 @@ void testGetUDTs() throws ResponseException, IOException, SQLException { .column("TYPE_SCHEM") .column("TYPE_NAME") .column("CLASS_NAME") - .column("DATA_TYPE", ElasticsearchType.INTEGER) + .column("DATA_TYPE", OpenSearchType.INTEGER) .column("REMARKS") - .column("BASE_TYPE", ElasticsearchType.SHORT) + .column("BASE_TYPE", OpenSearchType.SHORT) .build(); DatabaseMetaData dbmd = con.getMetaData(); @@ -177,7 +177,7 @@ void testGetProcedures() throws ResponseException, IOException, SQLException { .column("RESERVED5") .column("RESERVED6") .column("REMARKS") - .column("PROCEDURE_TYPE", ElasticsearchType.SHORT) + .column("PROCEDURE_TYPE", OpenSearchType.SHORT) .column("SPECIFIC_NAME") .build(); @@ -200,20 +200,20 @@ void testGetProcedureColumns() throws ResponseException, IOException, SQLExcepti .column("PROCEDURE_SCHEM") .column("PROCEDURE_NAME") .column("COLUMN_NAME") - .column("COLUMN_TYPE", ElasticsearchType.SHORT) - .column("DATA_TYPE", ElasticsearchType.INTEGER) + .column("COLUMN_TYPE", OpenSearchType.SHORT) + .column("DATA_TYPE", OpenSearchType.INTEGER) .column("TYPE_NAME") - .column("PRECISION", ElasticsearchType.INTEGER) - .column("LENGTH", ElasticsearchType.INTEGER) - .column("SCALE", ElasticsearchType.SHORT) - .column("RADIX", ElasticsearchType.SHORT) - .column("NULLABLE", ElasticsearchType.SHORT) + .column("PRECISION", OpenSearchType.INTEGER) + .column("LENGTH", OpenSearchType.INTEGER) + .column("SCALE", OpenSearchType.SHORT) + .column("RADIX", OpenSearchType.SHORT) + .column("NULLABLE", OpenSearchType.SHORT) .column("REMARKS") .column("COLUMN_DEF") - .column("SQL_DATA_TYPE", ElasticsearchType.INTEGER) - .column("SQL_DATETIME_SUB", ElasticsearchType.INTEGER) - .column("CHAR_OCTET_LENGTH", ElasticsearchType.INTEGER) - .column("ORDINAL_POSITION", ElasticsearchType.INTEGER) + .column("SQL_DATA_TYPE", OpenSearchType.INTEGER) + .column("SQL_DATETIME_SUB", OpenSearchType.INTEGER) + .column("CHAR_OCTET_LENGTH", OpenSearchType.INTEGER) + .column("ORDINAL_POSITION", OpenSearchType.INTEGER) .column("IS_NULLABLE") .column("SPECIFIC_NAME") .build(); @@ -237,7 +237,7 @@ void testGetFunctions() throws ResponseException, IOException, SQLException { .column("FUNCTION_SCHEM") .column("FUNCTION_NAME") .column("REMARKS") - .column("FUNCTION_TYPE", ElasticsearchType.SHORT) + .column("FUNCTION_TYPE", OpenSearchType.SHORT) .column("SPECIFIC_NAME") .build(); @@ -261,17 +261,17 @@ void testGetFunctionColumns() throws ResponseException, IOException, SQLExceptio .column("FUNCTION_SCHEM") .column("FUNCTION_NAME") .column("COLUMN_NAME") - .column("COLUMN_TYPE", ElasticsearchType.SHORT) - .column("DATA_TYPE", ElasticsearchType.INTEGER) + .column("COLUMN_TYPE", OpenSearchType.SHORT) + .column("DATA_TYPE", OpenSearchType.INTEGER) .column("TYPE_NAME") - .column("PRECISION", ElasticsearchType.INTEGER) - .column("LENGTH", ElasticsearchType.INTEGER) - .column("SCALE", ElasticsearchType.SHORT) - .column("RADIX", ElasticsearchType.SHORT) - .column("NULLABLE", ElasticsearchType.SHORT) + .column("PRECISION", OpenSearchType.INTEGER) + .column("LENGTH", OpenSearchType.INTEGER) + .column("SCALE", OpenSearchType.SHORT) + .column("RADIX", OpenSearchType.SHORT) + .column("NULLABLE", OpenSearchType.SHORT) .column("REMARKS") - .column("CHAR_OCTET_LENGTH", ElasticsearchType.INTEGER) - .column("ORDINAL_POSITION", ElasticsearchType.INTEGER) + .column("CHAR_OCTET_LENGTH", OpenSearchType.INTEGER) + .column("ORDINAL_POSITION", OpenSearchType.INTEGER) .column("IS_NULLABLE") .column("SPECIFIC_NAME") .build(); @@ -295,13 +295,13 @@ void testPseudoColumns() throws ResponseException, IOException, SQLException { .column("TABLE_SCHEM") .column("TABLE_NAME") .column("COLUMN_NAME") - .column("DATA_TYPE", ElasticsearchType.INTEGER) - .column("COLUMN_SIZE", ElasticsearchType.INTEGER) - .column("DECIMAL_DIGITS", ElasticsearchType.INTEGER) - .column("NUM_PREC_RADIX", ElasticsearchType.INTEGER) + .column("DATA_TYPE", OpenSearchType.INTEGER) + .column("COLUMN_SIZE", OpenSearchType.INTEGER) + .column("DECIMAL_DIGITS", OpenSearchType.INTEGER) + .column("NUM_PREC_RADIX", OpenSearchType.INTEGER) .column("COLUMN_USAGE") .column("REMARKS") - .column("CHAR_OCTET_LENGTH", ElasticsearchType.INTEGER) + .column("CHAR_OCTET_LENGTH", OpenSearchType.INTEGER) .column("IS_NULLABLE") .build(); @@ -397,7 +397,7 @@ private void assertEmptySchemaResultSet(ResultSet rs) throws SQLException { private MockResultSet getExpectedCatalogsResultSet() { MockResultSetMetaData mockResultSetMetaData = MockResultSetMetaData.builder() - .column("TABLE_CAT", ElasticsearchType.TEXT) + .column("TABLE_CAT", OpenSearchType.TEXT) .build(); MockResultSetRows mockResultSetRows = MockResultSetRows.builder() @@ -426,8 +426,8 @@ private MockResultSet getEmptySchemaResultSet() { private MockResultSetMetaData getMockSchemaResultSetMetaData() { return MockResultSetMetaData.builder() - .column("TABLE_SCHEM", ElasticsearchType.TEXT) - .column("TABLE_CATALOG", ElasticsearchType.TEXT) + .column("TABLE_SCHEM", OpenSearchType.TEXT) + .column("TABLE_CATALOG", OpenSearchType.TEXT) .build(); } @@ -443,7 +443,7 @@ private Connection getMockConnection() throws ResponseException, IOException, SQ .thenReturn(mockProtocol); ClusterMetadata mockClusterMetaData = mock(ClusterMetadata.class); - ElasticsearchVersion mockEV = mock(ElasticsearchVersion.class); + OpenSearchVersion mockEV = mock(OpenSearchVersion.class); when(mockEV.getFullVersion()).thenReturn("6.3.2"); when(mockEV.getMajor()).thenReturn(6); diff --git a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/DriverTests.java b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/DriverTests.java index 0e266df482d..d4bd5f05596 100644 --- a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/DriverTests.java +++ b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/DriverTests.java @@ -18,7 +18,7 @@ import com.amazon.opendistroforelasticsearch.jdbc.test.PerClassWireMockServerExtension; import com.amazon.opendistroforelasticsearch.jdbc.test.WireMockServerHelpers; -import com.amazon.opendistroforelasticsearch.jdbc.test.mocks.MockES; +import com.amazon.opendistroforelasticsearch.jdbc.test.mocks.MockOpenSearch; import com.github.tomakehurst.wiremock.WireMockServer; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -38,14 +38,14 @@ public void testConnect(WireMockServer mockServer) throws SQLException { mockServer.stubFor(get(urlEqualTo("/")) .willReturn(aResponse() .withHeader("Content-Type", "application/json") - .withBody(MockES.INSTANCE.getConnectionResponse()))); + .withBody(MockOpenSearch.INSTANCE.getConnectionResponse()))); Driver driver = new Driver(); Connection con = assertDoesNotThrow(() -> driver.connect( getBaseURLForMockServer(mockServer), (Properties) null)); assertConnectionOpen(con); - MockES.INSTANCE.assertMockESConnectionResponse((ElasticsearchConnection) con); + MockOpenSearch.INSTANCE.assertMockOpenSearchConnectionResponse((OpenSearchConnection) con); } diff --git a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/PreparedStatementTests.java b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/PreparedStatementTests.java index eacec90c156..5a070303bd4 100644 --- a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/PreparedStatementTests.java +++ b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/PreparedStatementTests.java @@ -159,7 +159,7 @@ void testEffectiveFetchSizeOnPreparedStatement() throws ResponseException, IOExc when(mockProtocol.execute(any(QueryRequest.class))) .thenReturn(mock(QueryResponse.class)); - String url = "jdbc:elasticsearch://localhost:9200?fetchSize=400"; + String url = "jdbc:opensearch://localhost:9200?fetchSize=400"; ConnectionConfig connectionConfig = ConnectionConfig.builder().setUrl(url).build(); Connection con = new ConnectionImpl(connectionConfig, tf, pf, NoOpLogger.INSTANCE); diff --git a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/ResultSetTests.java b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/ResultSetTests.java index 5e1ea54b23b..9ded6ad16bb 100644 --- a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/ResultSetTests.java +++ b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/ResultSetTests.java @@ -21,8 +21,8 @@ import com.amazon.opendistroforelasticsearch.jdbc.protocol.QueryResponse; import com.amazon.opendistroforelasticsearch.jdbc.protocol.http.JsonHttpProtocol; import com.amazon.opendistroforelasticsearch.jdbc.test.TestResources; -import com.amazon.opendistroforelasticsearch.jdbc.test.mocks.MockES; -import com.amazon.opendistroforelasticsearch.jdbc.types.ElasticsearchType; +import com.amazon.opendistroforelasticsearch.jdbc.test.mocks.MockOpenSearch; +import com.amazon.opendistroforelasticsearch.jdbc.types.OpenSearchType; import com.amazon.opendistroforelasticsearch.jdbc.test.PerTestWireMockServerExtension; import com.amazon.opendistroforelasticsearch.jdbc.test.WireMockServerHelpers; import com.amazon.opendistroforelasticsearch.jdbc.test.mocks.MockResultSet; @@ -189,18 +189,18 @@ void testNullableFieldsQuery(WireMockServer mockServer) throws SQLException, IOE assertNotNull(rs); MockResultSetMetaData mockResultSetMetaData = MockResultSetMetaData.builder() - .column("testBoolean", ElasticsearchType.BOOLEAN) - .column("docId", ElasticsearchType.TEXT) - .column("testByte", ElasticsearchType.BYTE) - .column("testFloat", ElasticsearchType.FLOAT) - .column("testLong", ElasticsearchType.LONG) - .column("testShort", ElasticsearchType.SHORT) - .column("testHalfFloat", ElasticsearchType.HALF_FLOAT) - .column("testTimeStamp", ElasticsearchType.TIMESTAMP) - .column("testScaledFloat", ElasticsearchType.SCALED_FLOAT) - .column("testKeyword", ElasticsearchType.KEYWORD) - .column("testText", ElasticsearchType.TEXT) - .column("testDouble", ElasticsearchType.DOUBLE) + .column("testBoolean", OpenSearchType.BOOLEAN) + .column("docId", OpenSearchType.TEXT) + .column("testByte", OpenSearchType.BYTE) + .column("testFloat", OpenSearchType.FLOAT) + .column("testLong", OpenSearchType.LONG) + .column("testShort", OpenSearchType.SHORT) + .column("testHalfFloat", OpenSearchType.HALF_FLOAT) + .column("testTimeStamp", OpenSearchType.TIMESTAMP) + .column("testScaledFloat", OpenSearchType.SCALED_FLOAT) + .column("testKeyword", OpenSearchType.KEYWORD) + .column("testText", OpenSearchType.TEXT) + .column("testDouble", OpenSearchType.DOUBLE) .build(); MockResultSetRows mockResultSetRows = MockResultSetRows.builder() @@ -273,7 +273,7 @@ public void setupStubForConnect(final WireMockServer mockServer, final String co .withHeader("Accept", equalTo("application/json")) .willReturn(aResponse() .withHeader("Content-Type", "application/json") - .withBody(MockES.INSTANCE.getConnectionResponse()))); + .withBody(MockOpenSearch.INSTANCE.getConnectionResponse()))); } } diff --git a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/SSLClientAuthTests.java b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/SSLClientAuthTests.java index d46cb1386b6..0061b19ad09 100644 --- a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/SSLClientAuthTests.java +++ b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/SSLClientAuthTests.java @@ -22,7 +22,7 @@ import com.amazon.opendistroforelasticsearch.jdbc.config.TrustStorePasswordConnectionProperty; import com.amazon.opendistroforelasticsearch.jdbc.test.TLSServer; import com.amazon.opendistroforelasticsearch.jdbc.test.TestResources; -import com.amazon.opendistroforelasticsearch.jdbc.test.mocks.MockES; +import com.amazon.opendistroforelasticsearch.jdbc.test.mocks.MockOpenSearch; import org.eclipse.jetty.server.Server; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; @@ -65,7 +65,7 @@ static void beforeAll(@TempDirectory.TempDir Path tempDir) throws Exception { "changeit", "JKS", true, - new TLSServer.MockESConnectionHandler()); + new TLSServer.MockOpenSearchConnectionHandler()); connectURL = TLSServer.getBaseURLForConnect(jettyServer); System.out.println("Started on: " + connectURL); @@ -93,7 +93,7 @@ void testTLSClientAuth(@TempDirectory.TempDir Path tempDir) throws Exception { props.setProperty(KeyStorePasswordConnectionProperty.KEY, "changeit"); Connection con = Assertions.assertDoesNotThrow(() -> new Driver().connect(connectURL, props)); - MockES.INSTANCE.assertMockESConnectionResponse((ElasticsearchConnection) con); + MockOpenSearch.INSTANCE.assertMockOpenSearchConnectionResponse((OpenSearchConnection) con); } diff --git a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/SSLConnectionTests.java b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/SSLConnectionTests.java index 286f238822f..17ce52c1e8f 100644 --- a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/SSLConnectionTests.java +++ b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/SSLConnectionTests.java @@ -21,7 +21,7 @@ import com.amazon.opendistroforelasticsearch.jdbc.config.TrustStorePasswordConnectionProperty; import com.amazon.opendistroforelasticsearch.jdbc.test.TLSServer; import com.amazon.opendistroforelasticsearch.jdbc.test.TestResources; -import com.amazon.opendistroforelasticsearch.jdbc.test.mocks.MockES; +import com.amazon.opendistroforelasticsearch.jdbc.test.mocks.MockOpenSearch; import org.eclipse.jetty.server.Server; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; @@ -62,7 +62,7 @@ static void beforeAll(@TempDirectory.TempDir Path tempDir) throws Exception { keyStoreFile.toAbsolutePath().toString(), "changeit", "JKS", - new TLSServer.MockESConnectionHandler()); + new TLSServer.MockOpenSearchConnectionHandler()); connectURL = TLSServer.getBaseURLForConnect(jettyServer); System.out.println("Started on: " + connectURL); @@ -81,7 +81,7 @@ void testTrustSelfSignedEnabled() throws Exception { Connection con = Assertions.assertDoesNotThrow(() -> new Driver().connect(connectURL, props)); - MockES.INSTANCE.assertMockESConnectionResponse((ElasticsearchConnection) con); + MockOpenSearch.INSTANCE.assertMockOpenSearchConnectionResponse((OpenSearchConnection) con); } @Test @@ -115,7 +115,7 @@ void testTrustCustomCert(@TempDirectory.TempDir Path tempDir) throws IOException props.setProperty(TrustStorePasswordConnectionProperty.KEY, "changeit"); Connection con = Assertions.assertDoesNotThrow(() -> new Driver().connect(connectURL, props)); - MockES.INSTANCE.assertMockESConnectionResponse((ElasticsearchConnection) con); + MockOpenSearch.INSTANCE.assertMockOpenSearchConnectionResponse((OpenSearchConnection) con); } } diff --git a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/SSLHostnameVerificationTests.java b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/SSLHostnameVerificationTests.java index 8a520445b22..cec29183587 100644 --- a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/SSLHostnameVerificationTests.java +++ b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/SSLHostnameVerificationTests.java @@ -20,7 +20,7 @@ import com.amazon.opendistroforelasticsearch.jdbc.config.TrustSelfSignedConnectionProperty; import com.amazon.opendistroforelasticsearch.jdbc.test.TLSServer; import com.amazon.opendistroforelasticsearch.jdbc.test.TestResources; -import com.amazon.opendistroforelasticsearch.jdbc.test.mocks.MockES; +import com.amazon.opendistroforelasticsearch.jdbc.test.mocks.MockOpenSearch; import org.eclipse.jetty.server.Server; import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Assertions; @@ -59,7 +59,7 @@ static void beforeAll(@TempDirectory.TempDir Path tempDir) throws Exception { keyStoreFile.toAbsolutePath().toString(), "changeit", "JKS", - new TLSServer.MockESConnectionHandler()); + new TLSServer.MockOpenSearchConnectionHandler()); connectURL = TLSServer.getBaseURLForConnect(jettyServer); System.out.println("Started on: " + connectURL); @@ -79,7 +79,7 @@ void testTrustSelfSignedEnabledHostnameVerificationDisabled() throws Exception { Connection con = Assertions.assertDoesNotThrow(() -> new Driver().connect(connectURL, props)); - MockES.INSTANCE.assertMockESConnectionResponse((ElasticsearchConnection) con); + MockOpenSearch.INSTANCE.assertMockOpenSearchConnectionResponse((OpenSearchConnection) con); } @Test diff --git a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/StatementTests.java b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/StatementTests.java index d333b62e539..a586b90ee46 100644 --- a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/StatementTests.java +++ b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/StatementTests.java @@ -111,7 +111,7 @@ void testEffectiveFetchSizeOnStatement() throws ResponseException, IOException, when(mockProtocol.execute(any(QueryRequest.class))) .thenReturn(mock(QueryResponse.class)); - String url = "jdbc:elasticsearch://localhost:9200?fetchSize=400"; + String url = "jdbc:opensearch://localhost:9200?fetchSize=400"; ConnectionConfig connectionConfig = ConnectionConfig.builder().setUrl(url).build(); Connection con = new ConnectionImpl(connectionConfig, tf, pf, NoOpLogger.INSTANCE); @@ -154,8 +154,6 @@ void testQueryInternalServerError(WireMockServer mockServer) throws SQLException InternalServerErrorException.class, () -> st.executeQuery(queryMock.getSql())); String expectedDetails = "java.lang.NullPointerException\n\t" + - "at org.elasticsearch.plugin.nlpcn.Schema.getTypeFromMetaData(Schema.java:156)\n\t" + - "at org.elasticsearch.plugin.nlpcn.Schema.populateColumns(Schema.java:146)\n\t" + "at java.base/java.lang.Thread.run(Thread.java:844)\n"; assertEquals("error reason", ex.getReason()); diff --git a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/internal/util/UrlParserTests.java b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/internal/util/UrlParserTests.java index 1580c154bde..b458a670ae7 100644 --- a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/internal/util/UrlParserTests.java +++ b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/internal/util/UrlParserTests.java @@ -37,14 +37,14 @@ class UrlParserTests { @ParameterizedTest @ValueSource(strings = { - "jdbc:elasticsearch://host:9200", - "jdbc:elasticsearch://host:9200/path", - "jdbc:elasticsearch://host:9200/path/", - "jdbc:elasticsearch://host:9200/path?option=value", - "jdbc:elasticsearch://host:9200/path?option=value&option2=value2", - "jdbc:elasticsearch://host/path", - "jdbc:elasticsearch://host/path/", - "jdbc:elasticsearch://host/path?option=value&option2=value2", + "jdbc:opensearch://host:9200", + "jdbc:opensearch://host:9200/path", + "jdbc:opensearch://host:9200/path/", + "jdbc:opensearch://host:9200/path?option=value", + "jdbc:opensearch://host:9200/path?option=value&option2=value2", + "jdbc:opensearch://host/path", + "jdbc:opensearch://host/path/", + "jdbc:opensearch://host/path?option=value&option2=value2", }) void testIsAcceptable(String url) { assertTrue(UrlParser.isAcceptable(url), () -> url + " was not accepted"); @@ -52,10 +52,10 @@ void testIsAcceptable(String url) { @ParameterizedTest @ValueSource(strings = { - "jdbc:elasticsearch:/", - "elasticsearch://host:9200/path", - "jdbc:elasticsearch:", - "jdbc:elasticsearch", + "jdbc:opensearch:/", + "opensearch://host:9200/path", + "jdbc:opensearch:", + "jdbc:opensearch", "jdbc://host:9200/" }) void testIsNotAcceptable(String url) { @@ -70,29 +70,29 @@ void testNullNotAcceptable() { @Test void testPropertiesFromURL() throws URISyntaxException { - propertiesFromUrl("jdbc:elasticsearch://") + propertiesFromUrl("jdbc:opensearch://") .match(); // empty properties - propertiesFromUrl("jdbc:elasticsearch://https://localhost:9200/") + propertiesFromUrl("jdbc:opensearch://https://localhost:9200/") .match( KeyValuePairs.skvp(HostConnectionProperty.KEY, "localhost"), KeyValuePairs.skvp(PortConnectionProperty.KEY, "9200"), KeyValuePairs.skvp(UseSSLConnectionProperty.KEY, "true"), KeyValuePairs.skvp(PathConnectionProperty.KEY, "/")); - propertiesFromUrl("jdbc:elasticsearch://localhost:9200") + propertiesFromUrl("jdbc:opensearch://localhost:9200") .match( KeyValuePairs.skvp(HostConnectionProperty.KEY, "localhost"), KeyValuePairs.skvp(PortConnectionProperty.KEY, "9200"), KeyValuePairs.skvp(UseSSLConnectionProperty.KEY, "false")); - propertiesFromUrl("jdbc:elasticsearch://es-domain-name.sub.hostname.com:1080") + propertiesFromUrl("jdbc:opensearch://es-domain-name.sub.hostname.com:1080") .match( KeyValuePairs.skvp(HostConnectionProperty.KEY, "es-domain-name.sub.hostname.com"), KeyValuePairs.skvp(PortConnectionProperty.KEY, "1080"), KeyValuePairs.skvp(UseSSLConnectionProperty.KEY, "false")); - propertiesFromUrl("jdbc:elasticsearch://es-domain-name.sub.hostname.com:1090/") + propertiesFromUrl("jdbc:opensearch://es-domain-name.sub.hostname.com:1090/") .match( KeyValuePairs.skvp(HostConnectionProperty.KEY, "es-domain-name.sub.hostname.com"), KeyValuePairs.skvp(PortConnectionProperty.KEY, "1090"), @@ -104,10 +104,10 @@ void testPropertiesFromURL() throws URISyntaxException { @Test public void testPropertiesFromLongUrl() { propertiesFromUrl( - "jdbc:elasticsearch://search-elasticsearch-es23-dedm-za-1-edmwao5g64rlo3hcohapy2jpru.us-east-1.es.a9.com") + "jdbc:opensearch://search-opensearch-es23-dedm-za-1-edmwao5g64rlo3hcohapy2jpru.us-east-1.es.a9.com") .match( KeyValuePairs.skvp(HostConnectionProperty.KEY, - "search-elasticsearch-es23-dedm-za-1-edmwao5g64rlo3hcohapy2jpru.us-east-1.es.a9.com"), + "search-opensearch-es23-dedm-za-1-edmwao5g64rlo3hcohapy2jpru.us-east-1.es.a9.com"), KeyValuePairs.skvp(UseSSLConnectionProperty.KEY, "false")); } @@ -121,7 +121,7 @@ public void testPropertiesFromUrlInvalidPrefix() { @Test public void testPropertiesFromUrlInvalidScheme() { - String url = "jdbc:elasticsearch://tcp://domain-name.sub-domain.com:9023"; + String url = "jdbc:opensearch://tcp://domain-name.sub-domain.com:9023"; URISyntaxException ex = assertThrows(URISyntaxException.class, () -> UrlParser.parseProperties(url)); assertTrue(ex.getMessage().contains("Invalid scheme:tcp")); @@ -129,9 +129,9 @@ public void testPropertiesFromUrlInvalidScheme() { @Test public void testPropertiesFromUrlHttpsScheme() { - String url = "jdbc:elasticsearch://https://domain-name.sub-domain.com:9023"; + String url = "jdbc:opensearch://https://domain-name.sub-domain.com:9023"; - propertiesFromUrl("jdbc:elasticsearch://https://domain-name.sub-domain.com:9023") + propertiesFromUrl("jdbc:opensearch://https://domain-name.sub-domain.com:9023") .match( KeyValuePairs.skvp(HostConnectionProperty.KEY, "domain-name.sub-domain.com"), KeyValuePairs.skvp(PortConnectionProperty.KEY, "9023"), @@ -140,7 +140,7 @@ public void testPropertiesFromUrlHttpsScheme() { @Test public void testPropertiesFromUrlHttpsSchemeAndPath() { - propertiesFromUrl("jdbc:elasticsearch://https://domain-name.sub-domain.com:9023/context/path") + propertiesFromUrl("jdbc:opensearch://https://domain-name.sub-domain.com:9023/context/path") .match( KeyValuePairs.skvp(HostConnectionProperty.KEY, "domain-name.sub-domain.com"), KeyValuePairs.skvp(PortConnectionProperty.KEY, "9023"), @@ -150,7 +150,7 @@ public void testPropertiesFromUrlHttpsSchemeAndPath() { @Test public void testPropertiesFromUrlAndQueryString() { - propertiesFromUrl("jdbc:elasticsearch://https://domain-name.sub-domain.com:9023/context/path?" + + propertiesFromUrl("jdbc:opensearch://https://domain-name.sub-domain.com:9023/context/path?" + "user=username123&password=pass@$!w0rd") .match( KeyValuePairs.skvp(HostConnectionProperty.KEY, "domain-name.sub-domain.com"), @@ -163,7 +163,7 @@ public void testPropertiesFromUrlAndQueryString() { @Test public void testPropertiesFromUrlWithInvalidQueryString() { - final String url = "jdbc:elasticsearch://https://domain-name.sub-domain.com:9023/context/path?prop=value=3"; + final String url = "jdbc:opensearch://https://domain-name.sub-domain.com:9023/context/path?prop=value=3"; URISyntaxException ex = assertThrows(URISyntaxException.class, () -> UrlParser.parseProperties(url)); assertTrue(ex.getMessage().contains("Expected key=value pairs")); diff --git a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/protocol/JsonHttpProtocolTests.java b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/protocol/JsonHttpProtocolTests.java index 474ffdd78c9..22fb6bb6aab 100644 --- a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/protocol/JsonHttpProtocolTests.java +++ b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/protocol/JsonHttpProtocolTests.java @@ -25,7 +25,7 @@ import com.amazon.opendistroforelasticsearch.jdbc.protocol.http.JsonQueryRequest; import com.amazon.opendistroforelasticsearch.jdbc.protocol.http.JsonQueryResponse; import com.amazon.opendistroforelasticsearch.jdbc.test.mocks.MockCloseableHttpResponseBuilder; -import com.amazon.opendistroforelasticsearch.jdbc.test.mocks.MockES; +import com.amazon.opendistroforelasticsearch.jdbc.test.mocks.MockOpenSearch; import com.amazon.opendistroforelasticsearch.jdbc.test.mocks.MockHttpTransport; import com.amazon.opendistroforelasticsearch.jdbc.test.mocks.QueryMock; import com.amazon.opendistroforelasticsearch.jdbc.transport.TransportException; @@ -52,7 +52,7 @@ public class JsonHttpProtocolTests { void testConnect() throws IOException { CloseableHttpResponse mockResponse = new MockCloseableHttpResponseBuilder() .withHttpReturnCode(200) - .withResponseBody(MockES.INSTANCE.getConnectionResponse()) + .withResponseBody(MockOpenSearch.INSTANCE.getConnectionResponse()) .build(); HttpTransport mockTransport = mock(HttpTransport.class); @@ -299,8 +299,6 @@ void testQueryResponseInternalServerError() throws IOException { error.setType("java.lang.NullPointerException"); error.setDetails( "java.lang.NullPointerException\n\t" + - "at org.elasticsearch.plugin.nlpcn.Schema.getTypeFromMetaData(Schema.java:156)\n\t" + - "at org.elasticsearch.plugin.nlpcn.Schema.populateColumns(Schema.java:146)\n\t" + "at java.base/java.lang.Thread.run(Thread.java:844)\n" ); diff --git a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/test/TLSServer.java b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/test/TLSServer.java index f1eb46bccf0..3cc1f24b8b0 100644 --- a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/test/TLSServer.java +++ b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/test/TLSServer.java @@ -17,7 +17,7 @@ package com.amazon.opendistroforelasticsearch.jdbc.test; import com.amazon.opendistroforelasticsearch.jdbc.internal.util.UrlParser; -import com.amazon.opendistroforelasticsearch.jdbc.test.mocks.MockES; +import com.amazon.opendistroforelasticsearch.jdbc.test.mocks.MockOpenSearch; import org.eclipse.jetty.server.ConnectionFactory; import org.eclipse.jetty.server.Connector; import org.eclipse.jetty.server.Handler; @@ -113,7 +113,7 @@ public static Server startSecureServer( return jettyServer; } - public static class MockESConnectionHandler extends AbstractHandler { + public static class MockOpenSearchConnectionHandler extends AbstractHandler { @Override public void handle( String target, @@ -123,7 +123,7 @@ public void handle( response.setContentType("application/json"); response.setStatus(200); baseRequest.setHandled(true); - response.getWriter().write(MockES.INSTANCE.getConnectionResponse()); + response.getWriter().write(MockOpenSearch.INSTANCE.getConnectionResponse()); } } diff --git a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/test/mocks/MockES.java b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/test/mocks/MockOpenSearch.java similarity index 66% rename from sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/test/mocks/MockES.java rename to sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/test/mocks/MockOpenSearch.java index 4750c65e07e..a996ff5b49e 100644 --- a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/test/mocks/MockES.java +++ b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/test/mocks/MockOpenSearch.java @@ -16,7 +16,7 @@ package com.amazon.opendistroforelasticsearch.jdbc.test.mocks; -import com.amazon.opendistroforelasticsearch.jdbc.ElasticsearchConnection; +import com.amazon.opendistroforelasticsearch.jdbc.OpenSearchConnection; import java.sql.SQLException; @@ -24,14 +24,14 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; /** - * Utility class for obtaining mocked ES responses for tests. + * Utility class for obtaining mocked OpenSearch responses for tests. */ -public class MockES { - // can be turned into a mock that can serve ES version specific +public class MockOpenSearch { + // can be turned into a mock that can serve OpenSearch version specific // responses - public static final MockES INSTANCE = new MockES(); + public static final MockOpenSearch INSTANCE = new MockOpenSearch(); - private MockES() { + private MockOpenSearch() { } @@ -55,13 +55,13 @@ public String getConnectionResponse() { "}"; } - public void assertMockESConnectionResponse(ElasticsearchConnection esCon) throws SQLException { - assertEquals("c1", esCon.getClusterName()); - assertEquals("JpZSfOJiSLOntGp0zljpVQ", esCon.getClusterUUID()); + public void assertMockOpenSearchConnectionResponse(OpenSearchConnection openSearchCon) throws SQLException { + assertEquals("c1", openSearchCon.getClusterName()); + assertEquals("JpZSfOJiSLOntGp0zljpVQ", openSearchCon.getClusterUUID()); - assertNotNull(esCon.getMetaData().getDatabaseProductVersion()); - assertEquals("6.3.1", esCon.getMetaData().getDatabaseProductVersion()); - assertEquals(6, esCon.getMetaData().getDatabaseMajorVersion()); - assertEquals(3, esCon.getMetaData().getDatabaseMinorVersion()); + assertNotNull(openSearchCon.getMetaData().getDatabaseProductVersion()); + assertEquals("6.3.1", openSearchCon.getMetaData().getDatabaseProductVersion()); + assertEquals(6, openSearchCon.getMetaData().getDatabaseMajorVersion()); + assertEquals(3, openSearchCon.getMetaData().getDatabaseMinorVersion()); } } diff --git a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/test/mocks/MockResultSetMetaData.java b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/test/mocks/MockResultSetMetaData.java index 1be141cfdb4..5acfd4279ed 100644 --- a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/test/mocks/MockResultSetMetaData.java +++ b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/test/mocks/MockResultSetMetaData.java @@ -17,7 +17,7 @@ package com.amazon.opendistroforelasticsearch.jdbc.test.mocks; import com.amazon.opendistroforelasticsearch.jdbc.internal.JdbcWrapper; -import com.amazon.opendistroforelasticsearch.jdbc.types.ElasticsearchType; +import com.amazon.opendistroforelasticsearch.jdbc.types.OpenSearchType; import java.sql.ResultSetMetaData; import java.sql.SQLException; @@ -167,14 +167,14 @@ Builder column() { } public Builder column(String columnName) { - column(columnName, ElasticsearchType.TEXT); + column(columnName, OpenSearchType.TEXT); return this; } - public Builder column(String columnName, ElasticsearchType columnType) { + public Builder column(String columnName, OpenSearchType columnType) { column(); setColumnName(columnName); - setColumnESType(columnType); + setColumnOpenSearchType(columnType); return this; } @@ -233,13 +233,13 @@ public Builder setColumnName(String columnName) { return this; } - public Builder setColumnESType(final ElasticsearchType esType) { - setColumnType(esType.getJdbcType().getVendorTypeNumber()); - setPrecision(esType.getPrecision()); - setColumnDisplaySize(esType.getDisplaySize()); - setColumnClassName(esType.getJavaClassName()); - setColumnTypeName(esType.getJdbcType().getName()); - setSigned(esType.isSigned()); + public Builder setColumnOpenSearchType(final OpenSearchType openSearchType) { + setColumnType(openSearchType.getJdbcType().getVendorTypeNumber()); + setPrecision(openSearchType.getPrecision()); + setColumnDisplaySize(openSearchType.getDisplaySize()); + setColumnClassName(openSearchType.getJavaClassName()); + setColumnTypeName(openSearchType.getJdbcType().getName()); + setSigned(openSearchType.isSigned()); return this; } diff --git a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/test/mocks/QueryMock.java b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/test/mocks/QueryMock.java index 13e7056c18e..c33757d3c36 100644 --- a/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/test/mocks/QueryMock.java +++ b/sql-jdbc/src/test/java/com/amazon/opendistroforelasticsearch/jdbc/test/mocks/QueryMock.java @@ -16,10 +16,10 @@ package com.amazon.opendistroforelasticsearch.jdbc.test.mocks; -import com.amazon.opendistroforelasticsearch.jdbc.ElasticsearchConnection; +import com.amazon.opendistroforelasticsearch.jdbc.OpenSearchConnection; import com.amazon.opendistroforelasticsearch.jdbc.protocol.http.JsonHttpProtocol; import com.amazon.opendistroforelasticsearch.jdbc.test.TestResources; -import com.amazon.opendistroforelasticsearch.jdbc.types.ElasticsearchType; +import com.amazon.opendistroforelasticsearch.jdbc.types.OpenSearchType; import com.github.tomakehurst.wiremock.WireMockServer; import java.io.IOException; @@ -66,15 +66,15 @@ protected void setupStubForConnect(final WireMockServer mockServer, final String .withHeader("Accept", equalTo("application/json")) .willReturn(aResponse() .withHeader("Content-Type", "application/json") - .withBody(MockES.INSTANCE.getConnectionResponse()))); + .withBody(MockOpenSearch.INSTANCE.getConnectionResponse()))); } public String getResponseBody() throws IOException { return TestResources.readResourceAsString(getResponseResourcePath()); } - public void assertConnectionResponse(ElasticsearchConnection esConnection) throws SQLException { - MockES.INSTANCE.assertMockESConnectionResponse(esConnection); + public void assertConnectionResponse(OpenSearchConnection esConnection) throws SQLException { + MockOpenSearch.INSTANCE.assertMockOpenSearchConnectionResponse(esConnection); } public static class NycTaxisQueryMock extends QueryMock { @@ -92,12 +92,12 @@ public String getResponseResourcePath() { @Override public MockResultSet getMockResultSet() { MockResultSetMetaData mockResultSetMetaData = MockResultSetMetaData.builder() - .column("pickup_datetime", ElasticsearchType.TIMESTAMP) - .column("trip_type", ElasticsearchType.KEYWORD) - .column("passenger_count", ElasticsearchType.INTEGER) - .column("fare_amount", ElasticsearchType.SCALED_FLOAT) - .column("extra", ElasticsearchType.SCALED_FLOAT) - .column("vendor_id", ElasticsearchType.KEYWORD) + .column("pickup_datetime", OpenSearchType.TIMESTAMP) + .column("trip_type", OpenSearchType.KEYWORD) + .column("passenger_count", OpenSearchType.INTEGER) + .column("fare_amount", OpenSearchType.SCALED_FLOAT) + .column("extra", OpenSearchType.SCALED_FLOAT) + .column("vendor_id", OpenSearchType.KEYWORD) .build(); MockResultSetRows mockResultSetRows = MockResultSetRows.builder() @@ -157,14 +157,14 @@ public String getResponseResourcePath() { @Override public MockResultSet getMockResultSet() { MockResultSetMetaData mockResultSetMetaData = MockResultSetMetaData.builder() - .column("pickup_datetime", ElasticsearchType.TIMESTAMP) + .column("pickup_datetime", OpenSearchType.TIMESTAMP) .setColumnLabel("pdt") - .column("trip_type", ElasticsearchType.KEYWORD) - .column("passenger_count", ElasticsearchType.INTEGER) + .column("trip_type", OpenSearchType.KEYWORD) + .column("passenger_count", OpenSearchType.INTEGER) .setColumnLabel("pc") - .column("fare_amount", ElasticsearchType.SCALED_FLOAT) - .column("extra", ElasticsearchType.SCALED_FLOAT) - .column("vendor_id", ElasticsearchType.KEYWORD) + .column("fare_amount", OpenSearchType.SCALED_FLOAT) + .column("extra", OpenSearchType.SCALED_FLOAT) + .column("vendor_id", OpenSearchType.KEYWORD) .build(); MockResultSetRows mockResultSetRows = MockResultSetRows.builder() diff --git a/sql-jdbc/src/test/resources/mock/protocol/json/queryresponse_internal_server_error.json b/sql-jdbc/src/test/resources/mock/protocol/json/queryresponse_internal_server_error.json index 4fa8d9154bc..83a21830ec4 100644 --- a/sql-jdbc/src/test/resources/mock/protocol/json/queryresponse_internal_server_error.json +++ b/sql-jdbc/src/test/resources/mock/protocol/json/queryresponse_internal_server_error.json @@ -1,7 +1,7 @@ { "error": { "reason": "error reason", - "details": "java.lang.NullPointerException\n\tat org.elasticsearch.plugin.nlpcn.Schema.getTypeFromMetaData(Schema.java:156)\n\tat org.elasticsearch.plugin.nlpcn.Schema.populateColumns(Schema.java:146)\n\tat java.base/java.lang.Thread.run(Thread.java:844)\n", + "details": "java.lang.NullPointerException\n\tat java.base/java.lang.Thread.run(Thread.java:844)\n", "type": "java.lang.NullPointerException" }, "status": 500