Skip to content

Commit b10646c

Browse files
Yury-FridlyandYury-Fridlyand
authored
Merge pull request #26 from opensearch-project/main
Pull most recent changes from the upstream project
2 parents f88c33b + 7af51d3 commit b10646c

15 files changed

Lines changed: 46 additions & 19 deletions

File tree

‎.github/workflows/sql-test-and-build-workflow.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: SQL Java CI
33
on: [push, pull_request]
44

55
env:
6-
OPENSEARCH_VERSION: '1.2.1-SNAPSHOT'
6+
OPENSEARCH_VERSION: '1.3.0-SNAPSHOT'
77

88
jobs:
99
build:

‎README.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ The following projects have been merged into this repository as separate folders
7474
| [![features open][feature-badge]][feature-link] |
7575
| [![enhancements open][enhancement-badge]][enhancement-link] |
7676
| [![bugs open][bug-badge]][bug-link] |
77+
| [![untriaged open][untriaged-badge]][untriaged-link] |
78+
| [![nolabel open][nolabel-badge]][nolabel-link] |
7779

7880
[dco-badge]: https://github.com/opensearch-project/sql/actions/workflows/dco.yml/badge.svg
7981
[dco-badge-link]: https://github.com/opensearch-project/sql/actions/workflows/dco.yml
@@ -97,6 +99,10 @@ The following projects have been merged into this repository as separate folders
9799
[bug-link]: https://github.com/opensearch-project/sql/issues?q=is%3Aopen+is%3Aissue+label%3Abug+
98100
[enhancement-badge]: https://img.shields.io/github/issues/opensearch-project/sql/enhancement.svg
99101
[enhancement-link]: https://github.com/opensearch-project/sql/issues?q=is%3Aopen+is%3Aissue+label%3Aenhancement+
102+
[untriaged-badge]: https://img.shields.io/github/issues/opensearch-project/sql/untriaged.svg
103+
[untriaged-link]: https://github.com/opensearch-project/sql/issues?q=is%3Aopen+is%3Aissue+label%3Auntriaged+
104+
[nolabel-badge]: https://img.shields.io/github/issues-search/opensearch-project/sql?color=yellow&label=no%20label%20issues&query=is%3Aopen%20is%3Aissue%20no%3Alabel
105+
[nolabel-link]: https://github.com/opensearch-project/sql/issues?q=is%3Aopen+is%3Aissue+no%3Alabel+
100106
[workbench-build-badge]: https://github.com/opensearch-project/sql/actions/workflows/sql-workbench-test-and-build-workflow.yml/badge.svg
101107
[workbench-build-link]: https://github.com/opensearch-project/sql/actions/workflows/sql-workbench-test-and-build-workflow.yml
102108
[cypress-test-badge]: https://img.shields.io/badge/Cypress%20tests-in%20progress-yellow

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
buildscript {
88
ext {
9-
opensearch_version = System.getProperty("opensearch.version", "1.2.1-SNAPSHOT")
9+
opensearch_version = System.getProperty("opensearch.version", "1.3.0-SNAPSHOT")
1010
}
1111

1212
repositories {

‎common/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ dependencies {
3535
compile "org.antlr:antlr4-runtime:4.7.1"
3636
// https://github.com/google/guava/wiki/CVE-2018-10237
3737
compile group: 'com.google.guava', name: 'guava', version: '29.0-jre'
38-
compile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.15.0'
38+
compile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.1'
3939

4040
testCompile group: 'junit', name: 'junit', version: '4.12'
4141
}

‎integ-test/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ dependencies {
6060
testCompile group: 'org.opensearch.client', name: 'opensearch-rest-high-level-client', version: "${opensearch_version}"
6161
testCompile group: 'org.opensearch.client', name: 'opensearch-rest-client', version: "${opensearch_version}"
6262
testCompile group: 'org.hamcrest', name: 'hamcrest', version: '2.1'
63-
testCompile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.15.0'
63+
testCompile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.1'
6464
testCompile project(':plugin')
6565
testCompile project(':legacy')
6666
testImplementation('org.junit.jupiter:junit-jupiter-api:5.6.2')
@@ -212,7 +212,7 @@ String bwcFilePath = "src/test/resources/bwc/"
212212
testClusters {
213213
"${baseName}$i" {
214214
testDistribution = "ARCHIVE"
215-
versions = ["7.10.2", "1.2.1-SNAPSHOT"]
215+
versions = ["7.10.2", opensearch_version]
216216
numberOfNodes = 3
217217
plugin(provider(new Callable<RegularFile>() {
218218
@Override

‎ppl/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ dependencies {
5151
compile group: 'org.json', name: 'json', version: '20180813'
5252
compile group: 'org.springframework', name: 'spring-context', version: '5.2.5.RELEASE'
5353
compile group: 'org.springframework', name: 'spring-beans', version: '5.2.5.RELEASE'
54-
compile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.15.0'
54+
compile group: 'org.apache.logging.log4j', name: 'log4j-core', version:'2.17.1'
5555
compile project(':common')
5656
compile project(':core')
5757
compile project(':protocol')

‎release-notes/opensearch-sql.release-notes-1.2.2.0.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
### Version 1.2.2.0 Release Notes
2+
Compatible with OpenSearch and OpenSearch Dashboards Version 1.2.2
3+
4+
### Bug fixes
5+
6+
* Bump log4j to 2.16 and plugin to 1.2.2 ([#338](https://github.com/opensearch-project/sql/pull/338))

‎release-notes/opensearch-sql.release-notes-1.2.3.0.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
### Version 1.2.3.0 Release Notes
2+
Compatible with OpenSearch Version 1.2.3 and OpenSearch Dashboards Version 1.2.x
3+
4+
### Bug fixes
5+
6+
* Bump log4j to 2.17 and plugin to 1.2.3 ([#345](https://github.com/opensearch-project/sql/pull/345))

‎sql-odbc/src/IntegrationTests/ITODBCCatalog/test_odbc_catalog.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,8 @@ const std::vector< sample_data_getTypeInfo_struct > sample_data_all_types_info{
496496
{"float", SQL_REAL, 7, "", "", "", 2, 0, 3, 0, 0, 0, "", 0, 0, SQL_REAL, 0,
497497
10, 0},
498498
{"date", SQL_TYPE_TIMESTAMP, 24, "", "", "", 2, 0, 3, 1, 0, 0, "", 0, 0,
499+
SQL_TYPE_TIMESTAMP, 0, 10, 0},
500+
{"timestamp", SQL_TYPE_TIMESTAMP, 24, "", "", "", 2, 0, 3, 1, 0, 0, "", 0, 0,
499501
SQL_TYPE_TIMESTAMP, 0, 10, 0}};
500502

501503
const std::vector< sample_data_getTypeInfo_struct >

‎sql-odbc/src/sqlodbc/opensearch_info.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ const std::unordered_map< int, std::vector< int > > sql_opensearch_type_map = {
6767
{SQL_WVARCHAR,
6868
{OPENSEARCH_TYPE_KEYWORD, OPENSEARCH_TYPE_TEXT, OPENSEARCH_TYPE_NESTED,
6969
OPENSEARCH_TYPE_OBJECT}},
70-
{SQL_TYPE_TIMESTAMP, {OPENSEARCH_TYPE_DATETIME}}};
70+
{SQL_TYPE_TIMESTAMP, {OPENSEARCH_TYPE_DATETIME, OPENSEARCH_TYPE_TIMESTAMP}}};
7171

7272
const std::unordered_map< std::string, int > data_name_data_type_map = {
7373
{OPENSEARCH_TYPE_NAME_BOOLEAN, SQL_BIT},
@@ -82,6 +82,7 @@ const std::unordered_map< std::string, int > data_name_data_type_map = {
8282
{OPENSEARCH_TYPE_NAME_KEYWORD, SQL_WVARCHAR},
8383
{OPENSEARCH_TYPE_NAME_TEXT, SQL_WVARCHAR},
8484
{OPENSEARCH_TYPE_NAME_DATE, SQL_TYPE_TIMESTAMP},
85+
{OPENSEARCH_TYPE_NAME_TIMESTAMP, SQL_TYPE_TIMESTAMP},
8586
{OPENSEARCH_TYPE_NAME_OBJECT, SQL_WVARCHAR},
8687
{OPENSEARCH_TYPE_NAME_NESTED, SQL_WVARCHAR}};
8788

0 commit comments

Comments
 (0)