diff --git a/.github/workflows/mac-build.yml b/.github/workflows/mac-build.yml index 2afd4505e..aaab0bee4 100644 --- a/.github/workflows/mac-build.yml +++ b/.github/workflows/mac-build.yml @@ -45,7 +45,7 @@ jobs: sudo mkdir /Library/ODBC sudo mv ./src/IntegrationTests/ITODBCConnection/odbc.ini /Library/ODBC mkdir ${{ github.workspace }}/odbc-logs - - name: run-integration-tests + - name: run-integration-connection-tests run: | ./build/odbc/bin/itodbc_connection - name: run-integration-execution-tests @@ -70,7 +70,6 @@ jobs: if: failure() run: | cat /tmp/timestreamodbc_*.log - cat /tmp/elasticodbc_*.log cat ./aws_sdk_*.log - name: print-memory-leak-logs if: always() diff --git a/THIRD-PARTY b/THIRD-PARTY index 354c86da0..c671de7cd 100644 --- a/THIRD-PARTY +++ b/THIRD-PARTY @@ -1,4 +1,4 @@ -** aws-cpp-sdk-core -- https://github.com/aws/aws-sdk-cpp (1.8.108) +** aws-cpp-sdk-core -- https://github.com/aws/aws-sdk-cpp (1.8.186) ** rapidjson -- https://github.com/Tencent/rapidjson (1.1.0) ** rabbit -- https://github.com/mashiro/rabbit (master branch on November 18th, 2019) ** PostgreSQL v12.0 -- https://www.postgresql.org/ftp/source/v12.0/ (v12.0) diff --git a/aws_sdk_cpp_setup.sh b/aws_sdk_cpp_setup.sh deleted file mode 100644 index 7ded1ee46..000000000 --- a/aws_sdk_cpp_setup.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -# -# Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"). -# You may not use this file except in compliance with the License. -# A copy of the License is located at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# or in the "license" file accompanying this file. This file is distributed -# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either -# express or implied. See the License for the specific language governing -# permissions and limitations under the License. -# - -cd src -git clone -b "1.7.329" "https://github.com/aws/aws-sdk-cpp.git" -cd .. \ No newline at end of file diff --git a/build_mac_debug64.sh b/build_mac_debug64.sh index ae4d65659..9404c6ac3 100755 --- a/build_mac_debug64.sh +++ b/build_mac_debug64.sh @@ -2,7 +2,7 @@ # $BITNESS=64 cd src -git clone -b "1.8.108" "https://github.com/aws/aws-sdk-cpp.git" +git clone --recurse-submodules -b "1.8.186" "https://github.com/aws/aws-sdk-cpp.git" cd .. PREFIX_PATH=$(pwd) diff --git a/build_mac_release64.sh b/build_mac_release64.sh index ecc992203..427b5871d 100755 --- a/build_mac_release64.sh +++ b/build_mac_release64.sh @@ -2,7 +2,7 @@ # $BITNESS=64 cd src -git clone --recurse-submodules -b "1.8.108" "https://github.com/aws/aws-sdk-cpp.git" +git clone --recurse-submodules -b "1.8.186" "https://github.com/aws/aws-sdk-cpp.git" cd .. PREFIX_PATH=$(pwd) diff --git a/opendistro-elasticsearch-odbc.release-notes.md b/opendistro-elasticsearch-odbc.release-notes.md deleted file mode 100644 index 070d15b31..000000000 --- a/opendistro-elasticsearch-odbc.release-notes.md +++ /dev/null @@ -1,13 +0,0 @@ -## 2020-05-05, Version 1.7 - -### Notable Changes - -This is the first release of OpenDistro For ELasticsearch ODBC driver. - -OpenDistro ODBC provides a driver for ODBC connectivity for OpenDistro SQL plugin. The driver has been developed from scratch and offers the following features in this initial release: - -* ODBC API implementation as per ODBC 3.51 specifications -* Support for MacOS and Windows installers -* Support for HTTP BASIC and AWS SIGV4 authentication mechanisms -* Full support for Elasticsearch Datatypes: BOOLEAN, BYTE, SHORT, INTEGER, LONG, HALF_FLOAT, FLOAT, DOUBLE, SCALED_FLOAT, KEYWORD, TEXT - diff --git a/scripts/build_aws-sdk-cpp.ps1 b/scripts/build_aws-sdk-cpp.ps1 index e7a1d4dba..a8a198a49 100644 --- a/scripts/build_aws-sdk-cpp.ps1 +++ b/scripts/build_aws-sdk-cpp.ps1 @@ -7,7 +7,7 @@ $INSTALL_DIR = $args[4] Write-Host $args # Clone the AWS SDK CPP repo -git clone --recurse-submodules -b "1.8.108" "https://github.com/aws/aws-sdk-cpp.git" $SRC_DIR +git clone --recurse-submodules -b "1.8.186" "https://github.com/aws/aws-sdk-cpp.git" $SRC_DIR # Make and move to build directory New-Item -Path $BUILD_DIR -ItemType Directory -Force | Out-Null diff --git a/src/IntegrationTests/ITODBCInfo/test_odbc_info.cpp b/src/IntegrationTests/ITODBCInfo/test_odbc_info.cpp index 95c07d2cd..b4e42b62e 100644 --- a/src/IntegrationTests/ITODBCInfo/test_odbc_info.cpp +++ b/src/IntegrationTests/ITODBCInfo/test_odbc_info.cpp @@ -172,7 +172,7 @@ TEST_SQL_GET_INFO_STRING(SQLCatalogTerm, SQL_CATALOG_TERM, L"database"); /////////////// TEST_SQL_GET_INFO_STRING(SQLDBMSName, SQL_DBMS_NAME, L"Amazon Timestream"); -TEST_SQL_GET_INFO_VERSION_GE(SQLDBMSVer, SQL_DBMS_VER, L"1.8.108"); +TEST_SQL_GET_INFO_VERSION_GE(SQLDBMSVer, SQL_DBMS_VER, L"0.2.0"); /////////////////// // Supported SQL // diff --git a/src/odfesqlodbc/es_connection.cpp b/src/odfesqlodbc/es_connection.cpp index 33001318f..1e605ae37 100644 --- a/src/odfesqlodbc/es_connection.cpp +++ b/src/odfesqlodbc/es_connection.cpp @@ -45,6 +45,7 @@ #include "multibyte.h" #include "qresult.h" #include "statement.h" +#include "version.h" #define ERROR_BUFF_SIZE 200 @@ -82,7 +83,7 @@ void* LIB_connect(ConnectionClass *self) { if (conn == nullptr) { throw std::runtime_error("Communication is nullptr."); } - // Set sdk version + // Set driver version std::string version = GetVersion(conn); STRCPY_FIXED(self->version, version.c_str()); @@ -176,10 +177,10 @@ int CC_send_client_encoding(ConnectionClass *self, const char *encoding) { } void CC_initialize_version(ConnectionClass *self) { - STRCPY_FIXED(self->version, "1.8.108"); - self->version_major = 1; - self->version_minor = 8; - self->version_patch = 108; + STRCPY_FIXED(self->version, TIMESTREAMDRIVERVERSION); + self->version_major = 0; + self->version_minor = 2; + self->version_patch = 0; } void LIB_disconnect(void *conn) { diff --git a/src/odfesqlodbc/es_connection.h b/src/odfesqlodbc/es_connection.h index a25678174..ddfe9d296 100644 --- a/src/odfesqlodbc/es_connection.h +++ b/src/odfesqlodbc/es_connection.h @@ -282,9 +282,7 @@ struct ConnectionClass_ { DriverToDataSourceProc DriverToDataSource; char transact_status; /* Is a transaction is currently * in progress */ - char version[MAX_INFO_STRING]; /* Version of AWS sdk - * we're using "1.8.108" - */ + char version[MAX_INFO_STRING]; /* Version of driver */ Int2 version_major; Int2 version_minor; Int2 version_patch; diff --git a/src/odfesqlodbc/es_helper.cpp b/src/odfesqlodbc/es_helper.cpp index 5e9d9bfa8..ed3b3161e 100644 --- a/src/odfesqlodbc/es_helper.cpp +++ b/src/odfesqlodbc/es_helper.cpp @@ -46,7 +46,7 @@ ConnStatusType GetStatus(void* conn) { std::string GetVersion(void* conn) { return conn ? static_cast< Communication* >(conn)->GetVersion() - : "1.8.108"; + : "0.2.0"; } int ESExecDirect(void* conn, StatementClass* stmt, const char* statement) { diff --git a/src/odfesqlodbc/ts_communication.cpp b/src/odfesqlodbc/ts_communication.cpp index 185f34038..41e648e1a 100644 --- a/src/odfesqlodbc/ts_communication.cpp +++ b/src/odfesqlodbc/ts_communication.cpp @@ -15,12 +15,13 @@ */ #include "ts_communication.h" -#include "es_statement.h" // odfesqlodbc needs to be included before mylog, otherwise mylog will generate // compiler warnings // clang-format off #include "es_odbc.h" +#include "es_statement.h" +#include "version.h" #include "mylog.h" #include #include @@ -166,8 +167,7 @@ void TSCommunication::Disconnect() { } std::string TSCommunication::GetVersion() { - // AWS SDK version - return "1.8.108"; + return TIMESTREAMDRIVERVERSION; } std::string TSCommunication::GetErrorPrefix() { diff --git a/src/odfesqlodbc/ts_communication.h b/src/odfesqlodbc/ts_communication.h index 0e0645231..c4eb922b4 100644 --- a/src/odfesqlodbc/ts_communication.h +++ b/src/odfesqlodbc/ts_communication.h @@ -65,7 +65,7 @@ class TSCommunication : public Communication { */ virtual int ExecDirect(StatementClass* stmt, const char* query) override; /** - * Get version + * Get driver version * @return std::string */ virtual std::string GetVersion() override;