opensearch-project · dai-chen · Apr 17, 2021 · Apr 13, 2021 · Apr 13, 2021 · Apr 13, 2021
diff --git a/.github/workflows/sql-odbc-release-workflow.yml b/.github/workflows/sql-odbc-release-workflow.yml
@@ -12,7 +12,7 @@ env:
   ODBC_BUILD_PATH: "./build/odbc/build"
   AWS_SDK_INSTALL_PATH: "./build/aws-sdk/install"
   PLUGIN_NAME: opendistro-sql-odbc
-  OD_VERSION: 1.13.0.0
+  OD_VERSION: 1.15.0.0
 
 jobs:
   build-mac:

diff --git a/.github/workflows/sql-odbc-rename-and-release-workflow.yml b/.github/workflows/sql-odbc-rename-and-release-workflow.yml
@@ -8,7 +8,7 @@ on:
       - rename*
 
 env:
-  OD_VERSION: 1.13.0.0
+  OD_VERSION: 1.15.0.0
 
 jobs:
   upload-odbc:

diff --git a/sql-odbc/README.md b/sql-odbc/README.md
@@ -1,6 +1,6 @@
 # Open Distro for Elasticsearch ODBC Driver
 
-ElasticsearchODBC is a read-only ODBC driver for Windows and Mac for connecting to Open Distro for Elasticsearch SQL support.
+OpenSearchODBC is a read-only ODBC driver for Windows and Mac for connecting to Open Distro for Elasticsearch SQL support.
 
 ## Specifications
 
@@ -60,7 +60,7 @@ A list of options available for configuring driver behaviour is available [here]
 To setup a connection, the driver uses an ODBC connection string. Connection strings are semicolon-delimited strings specifying the set of options to use for a connection. Typically, a connection string will either:
 
 1. specify a Data Source Name containing a pre-configured set of options (`DSN=xxx;User=xxx;Password=xxx;`)
-2. or configure options explicitly using the string (`Host=xxx;Port=xxx;LogLevel=ES_DEBUG;...`)
+2. or configure options explicitly using the string (`Host=xxx;Port=xxx;LogLevel=OPENSEARCH_DEBUG;...`)
 
 ## Building from source
 

diff --git a/sql-odbc/docs/dev/BUILD_INSTRUCTIONS.md b/sql-odbc/docs/dev/BUILD_INSTRUCTIONS.md
@@ -113,7 +113,7 @@ See [run_tests.md](./run_tests.md)
 
 To disable SSL/TLS in the tests, the main CMakeLists.txt file must be edited. This can be found in the project 'src' directory. In the 'General compiler definitions' in the CMakeLists.txt file, USE_SSL is set. Remove this from the add_compile_definitions function to stop SSL/TLS from being used in the tests.
 
-To enable SSL/TLS on Elasticsearch, you must edit the Elasticsearch.yml file, found in the config directory of Elasticsearch. An example Elasticsearch yml file can be found in the dev folder of this project. The certificates specified MUST be in the config directory of the Elasticsearch instance. For more information, please refer to the [Elasticsearch security settings documentation](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-settings.html).
+To enable SSL/TLS on OpenSearch, you must edit the OpenSearch.yml file, found in the config directory of OpenSearch. An example OpenSearch yml file can be found in the dev folder of this project. The certificates specified MUST be in the config directory of the OpenSearch instance. For more information, please refer to the [OpenSearch security settings documentation](https://www.elastic.co/guide/en/elasticsearch/reference/current/security-settings.html).
 
 If you plan to use Kibana, as suggested for this project, you must also edit the Kibana settings. Notice, when specifying a certificate for Kibana, you do not need to place it in the Kibana config directory, but instead must provide the absolute path to it. An example Kibana.yml file can be found in the dev folder of this project. For more information, please refer to the [Kibana settings documentation](https://www.elastic.co/guide/en/kibana/current/settings.html).
 

diff --git a/sql-odbc/docs/dev/Pagination.md b/sql-odbc/docs/dev/Pagination.md
@@ -1,9 +1,9 @@
 # Opendistro ODBC Driver Cursor (Pagination) Support Design Documentation
 
 ## Overview
-Elasticsearch ODBC Driver supports forward-only cursor. This document illustrates how the cursor(pagination) is handled in the driver. 
+OpenSearch ODBC Driver supports forward-only cursor. This document illustrates how the cursor(pagination) is handled in the driver. 
 
-For information on how the pagination is supported on Elasticsearch server, check [Opendistro SQL Cursor (Pagination) Support](https://github.com/opendistro-for-elasticsearch/sql/blob/master/docs/dev/Pagination.md).
+For information on how the pagination is supported on OpenSearch server, check [Opendistro SQL Cursor (Pagination) Support](https://github.com/opendistro-for-elasticsearch/sql/blob/master/docs/dev/Pagination.md).
 
 ## Data Flow
 <p align="center"> 

diff --git a/sql-odbc/docs/dev/example_config_files/example_tdc_file.tdc b/sql-odbc/docs/dev/example_config_files/example_tdc_file.tdc
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8' ?>
 <connection-customization class='genericodbc' enabled='true' version='7.8'>
-<vendor name='Elasticsearch' />
+<vendor name='OpenSearch' />
 <driver name='<your_driver_name>' />
 	<customizations>
 		<customization name='CAP_CREATE_TEMP_TABLES' value='no' />

diff --git a/sql-odbc/docs/dev/example_config_files/kibana.yml b/sql-odbc/docs/dev/example_config_files/kibana.yml
@@ -1,7 +1,7 @@
-# The URLs of the Elasticsearch instances to use for all your queries.
-elasticsearch.hosts: ["https://localhost:9200"]
+# The URLs of the OpenSearch instances to use for all your queries.
+opensearch.hosts: ["https://localhost:9200"]
 
-elasticsearch.ssl.verificationMode: none
+opensearch.ssl.verificationMode: none
 
 server.ssl.enabled: true
 server.ssl.certificate: <PATH_TO_YOUR_CERT>/certificate.pem

diff --git a/...ev/example_config_files/elasticsearch.yml → ...s/dev/example_config_files/opensearch.yml b/...ev/example_config_files/elasticsearch.yml → ...s/dev/example_config_files/opensearch.yml
diff --git a/sql-odbc/docs/dev/sequence_diagrams/SQLDriverConnect.txt b/sql-odbc/docs/dev/sequence_diagrams/SQLDriverConnect.txt
@@ -6,9 +6,9 @@ ESConn->libes (C interface):ESConn object
 libes (C interface)->ESConn:DB Parameters
 ESConn->libes (C interface):DB Parameters Validation Result
 libes (C interface)->ESConn:Connect to DB
-database ElasticSearch
-ESConn->ElasticSearch:Get
-ElasticSearch->ESConn:data
+database OpenSearch
+ESConn->OpenSearch:Get
+OpenSearch->ESConn:data
 ESConn->libes (C interface):DB Connection Result
 libes (C interface)->psqlodbc Driver:ESConn object with DB Connection
 psqlodbc Driver->ODBCTest:SQL Code Result
diff --git a/sql-odbc/docs/dev/sequence_diagrams/SQLExecDirect.txt b/sql-odbc/docs/dev/sequence_diagrams/SQLExecDirect.txt
@@ -4,9 +4,9 @@ psqlodbc Driver->libes (C interface):Query
 libes (C interface)->libes (C interface):Active Connection
 libes (C interface)->ESConn:Connection, Query
 ESConn->ESConn:Connection, Query validation
-database ElasticSearch
-ESConn->ElasticSearch:Post
-ElasticSearch->ESConn:Data
+database OpenSearch
+ESConn->OpenSearch:Post
+OpenSearch->ESConn:Data
 ESConn->libes (C interface):Data
 libes (C interface)->psqlodbc Driver:Data
 psqlodbc Driver->ODBCTest:Query Execution Status
diff --git a/sql-odbc/docs/test/excel_connection.md b/sql-odbc/docs/test/excel_connection.md
@@ -8,7 +8,7 @@
 
 ## Microsoft Excel Connectivity
 
-There are multiple ways to load data from Elasticsearch in Microsoft Excel.
+There are multiple ways to load data from OpenSearch in Microsoft Excel.
 * [ODBC as Data Source](odbc_data_source_connection.md)
 * [Microsoft Query](microsoft_query_connection.md)
 * [Query Wizard](query_wizard_connection.md)

diff --git a/sql-odbc/docs/test/query_wizard_connection.md b/sql-odbc/docs/test/query_wizard_connection.md
@@ -15,7 +15,7 @@
 
 <img src="img/query_wizard_select_tables.png" width="500">
 
-* Specify conditions to apply filter if needed. Ensure selected operations are supported by Elasticsearch. Click on **Next**.
+* Specify conditions to apply filter if needed. Ensure selected operations are supported by OpenSearch. Click on **Next**.
 
 <img src="img/query_wizard_filter_data.png" width="500">
 

diff --git a/sql-odbc/docs/user/configuration_options.md b/sql-odbc/docs/user/configuration_options.md
@@ -32,7 +32,7 @@
 
 | Option | Description | Type | Default |
 |--------|-------------|------|---------------|
-| `LogLevel` | Severity level for driver logs. | one of `ES_OFF`, `ES_FATAL`, `ES_ERROR`, `ES_INFO`, `ES_DEBUG`, `ES_TRACE`, `ES_ALL` | `ES_WARNING` |
+| `LogLevel` | Severity level for driver logs. | one of `OPENSEARCH_OFF`, `OPENSEARCH_FATAL`, `OPENSEARCH_ERROR`, `OPENSEARCH_INFO`, `OPENSEARCH_DEBUG`, `OPENSEARCH_TRACE`, `OPENSEARCH_ALL` | `OPENSEARCH_WARNING` |
 | `LogOutput` | Location for storing driver logs. | string | WIN: `C:\`, MAC: `/tmp` |
 
 **NOTE:** Administrative privileges are required to change the value of logging options on Windows.
diff --git a/sql-odbc/docs/user/power_bi_service_support.md b/sql-odbc/docs/user/power_bi_service_support.md
@@ -38,7 +38,7 @@ For **AWS_SIGV4**, select **Key** and set aws access credentials for user **PBIE
 
 ## Publish Report
 
-* Follow [instructions](./power_bi_support.md) to create graph using Open Disto For Elasticsearch Data connector.
+* Follow [instructions](./power_bi_support.md) to create graph using Open Distro For Elasticsearch Data connector.
 * Click on **Publish** to publish the report on Power BI service.
 
 <img src="img/pbi_publish_report.png">

diff --git a/sql-odbc/src/CMakeLists.txt b/sql-odbc/src/CMakeLists.txt
@@ -78,11 +78,11 @@ set(INSTALL_SRC "${CMAKE_CURRENT_SOURCE_DIR}/installer")
 set(DSN_INSTALLER_SRC "${CMAKE_CURRENT_SOURCE_DIR}/DSNInstaller")
 
 # ODBC Driver version 
-set(DRIVER_PACKAGE_VERSION "1.13.0.0")
-set(DRIVER_PACKAGE_VERSION_COMMA_SEPARATED "1,13,0,0")
-add_compile_definitions( ES_ODBC_VERSION="${DRIVER_PACKAGE_VERSION}"
+set(DRIVER_PACKAGE_VERSION "1.15.0.0")
+set(DRIVER_PACKAGE_VERSION_COMMA_SEPARATED "1,15,0,0")
+add_compile_definitions( OPENSEARCH_ODBC_VERSION="${DRIVER_PACKAGE_VERSION}"
                          # Comma separated version is required for odbc administrator's driver file.
-                         ES_ODBC_DRVFILE_VERSION=${DRIVER_PACKAGE_VERSION_COMMA_SEPARATED} )
+                         OPENSEARCH_ODBC_DRVFILE_VERSION=${DRIVER_PACKAGE_VERSION_COMMA_SEPARATED} )
 
 # Extensions of base directories
 set(PERFORMANCE_TESTS "${CMAKE_CURRENT_SOURCE_DIR}/PerformanceTests")

diff --git a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_aws_auth_dsn.reg b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_aws_auth_dsn.reg
@@ -1,14 +1,14 @@
 Windows Registry Editor Version 5.00
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers]
-"ElasticsearchODBC"="Installed"
+"OpenSearchODBC"="Installed"
 
-[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\ElasticsearchODBC]
+[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\OpenSearchODBC]
 "Driver"="<project-root>\\bin64\\Release\\odfesqlodbc.dll"
 "Setup"="<project-root>\\bin64\\Release\\odfesqlodbc.dll"
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBC.INI\ODBC Data Sources]
-"test_aws_auth_dsn"="ElasticsearchODBC"
+"test_aws_auth_dsn"="OpenSearchODBC"
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBC.INI\test_aws_auth_dsn]
 "host"="https://search-sept-cdg-david-test-domain-gouok3seqeupz64smuvfxyddui.eu-west-3.es.amazonaws.com"

diff --git a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_odbc.ini b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_odbc.ini
@@ -1,5 +1,5 @@
 [ODBC Data Sources]
-test_aws_auth_dsn = ElasticsearchODBC
+test_aws_auth_dsn = OpenSearchODBC
 
 [test_aws_auth_dsn]
 host              = https://search-sept-cdg-david-test-domain-gouok3seqeupz64smuvfxyddui.eu-west-3.es.amazonaws.com

diff --git a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_odbc_aws_auth.cpp b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_odbc_aws_auth.cpp
@@ -21,19 +21,19 @@
 
 std::wstring dsn_name = L"test_aws_auth_dsn";
 std::wstring aws_auth_conn_string =
-    L"Driver={Elasticsearch};DataBase=database_name;"
+    L"Driver={OpenSearch};DataBase=database_name;"
     L"Host=https://"
     L"search-bit-quill-cx3hpfoxvasohujxkllmgjwqde.us-west-2."
     L"es.amazonaws.com;"
     L"Auth=AWS_SIGV4;Region=us-west-2;LogLevel=1";
 std::wstring aws_auth_conn_string_invalid_region =
-    L"Driver={Elasticsearch};DataBase=database_name;"
+    L"Driver={OpenSearch};DataBase=database_name;"
     L"Host=https://"
     L"search-bit-quill-cx3hpfoxvasohujxkllmgjwqde.us-west-2."
     L"es.amazonaws.com;"
     L"Auth=AWS_SIGV4;Region=us-west-3;LogLevel=1";
 std::wstring aws_auth_conn_string_invalid_authtype =
-    L"Driver={Elasticsearch};DataBase=database_name;"
+    L"Driver={OpenSearch};DataBase=database_name;"
     L"Host=https://"
     L"search-bit-quill-cx3hpfoxvasohujxkllmgjwqde.us-west-2."
     L"es.amazonaws.com;"

diff --git a/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_odbcinst.ini b/sql-odbc/src/IntegrationTests/ITODBCAwsAuth/test_odbcinst.ini
@@ -1,6 +1,6 @@
 [ODBC Drivers]
-ElasticsearchODBC = Installed
+OpenSearchODBC = Installed
 
-[ElasticsearchODBC]
+[OpenSearchODBC]
 Driver = <project-root>/lib64/libodfesqlodbc.dylib
 Setup  = <project-root>/lib64/libodfesqlodbc.dylib
diff --git a/sql-odbc/src/IntegrationTests/ITODBCCatalog/test_odbc_catalog.cpp b/sql-odbc/src/IntegrationTests/ITODBCCatalog/test_odbc_catalog.cpp
@@ -92,7 +92,7 @@ const std::vector< short > flights_sql_data_type = {
     SQL_WVARCHAR, SQL_BIT,      SQL_REAL,     SQL_WVARCHAR,       SQL_WVARCHAR,
     SQL_WVARCHAR, SQL_WVARCHAR, SQL_WVARCHAR, SQL_WVARCHAR,       SQL_WVARCHAR};
 const std::string flights_catalog_odfe = "odfe-cluster";
-const std::string flights_catalog_elas = "elasticsearch";
+const std::string flights_catalog_elas = "opensearch";
 const std::string flights_table_name = "kibana_sample_data_flights";
 const std::string flights_decimal_digits = "10";
 const std::string flights_num_prec_radix = "2";

diff --git a/sql-odbc/src/IntegrationTests/ITODBCConnection/test_dsn.reg b/sql-odbc/src/IntegrationTests/ITODBCConnection/test_dsn.reg
@@ -1,14 +1,14 @@
 Windows Registry Editor Version 5.00
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\ODBC Drivers]
-"ElasticsearchODBC"="Installed"
+"OpenSearchODBC"="Installed"
 
-[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\ElasticsearchODBC]
+[HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBCINST.INI\OpenSearchODBC]
 "Driver"="<project-root>\\bin64\\Release\\odfesqlodbc.dll"
 "Setup"="<project-root>\\bin64\\Release\\odfesqlodbc.dll"
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBC.INI\ODBC Data Sources]
-"test_dsn"="ElasticsearchODBC"
+"test_dsn"="OpenSearchODBC"
 
 [HKEY_LOCAL_MACHINE\SOFTWARE\ODBC\ODBC.INI\test_dsn]
 "host"="localhost"

diff --git a/sql-odbc/src/IntegrationTests/ITODBCConnection/test_odbc.ini b/sql-odbc/src/IntegrationTests/ITODBCConnection/test_odbc.ini
@@ -1,5 +1,5 @@
 [ODBC Data Sources]
-test_dsn        = ElasticsearchODBC
+test_dsn        = OpenSearchODBC
 
 [test_dsn]
 host            = localhost
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ on: @@
           - rename*
     env:
-      OD_VERSION: 1.13.0.0
+      OD_VERSION: 1.15.0.0
     jobs:
       upload-odbc:
@@ Expand Down @@