Skip to content

Commit

Permalink
[INLONG-10160][Sort] Upgrade elasticsearch version 7.9.2 to 7.17.13 (#…
Browse files Browse the repository at this point in the history 
…10166)

* [INLONG-10160][Sort] Upgrade elasticsearch version 7.9.2 to 7.17.13

* [INLONG-10160][Sort] Upgrade elasticsearch version 7.9.2 to 7.17.13 in LICENSE

* [INLONG-10160][Sort] Fix XContentType import path

* [INLONG-10160][Sort] Fix TimeValue import path

* [INLONG-10160][Sort] Remove incompatible unit test for elasticsearch7 XContentType
  • Loading branch information
@nicklaus-dev
nicklaus-dev authored May 10, 2024
1 parent 4da8c8e commit c373018
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 175 deletions.
126 changes: 0 additions & 126 deletions inlong-sort/sort-core/src/test/java/org/apache/inlong/sort/parser/ESMultipleSinkTest.java
View file

This file was deleted.

31 changes: 0 additions & 31 deletions ...ort/sort-core/src/test/java/org/apache/inlong/sort/parser/Elasticsearch7SqlParseTest.java
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ...ch-7/src/main/java/org/apache/inlong/sort/elasticsearch7/Elasticsearch7ApiCallBridge.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import org.elasticsearch.client.RestHighLevelClient;
import org.elasticsearch.common.unit.ByteSizeUnit;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.elasticsearch.common.unit.TimeValue;
import org.elasticsearch.core.TimeValue;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
2 changes: 1 addition & 1 deletion ...main/java/org/apache/inlong/sort/elasticsearch7/MultipleRowElasticsearchSinkFunction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import org.apache.flink.api.common.serialization.SerializationSchema;
import org.apache.flink.table.data.RowData;
import org.elasticsearch.action.DocWriteRequest;
import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.xcontent.XContentType;

import javax.annotation.Nullable;

Expand Down
2 changes: 1 addition & 1 deletion ...h-7/src/main/java/org/apache/inlong/sort/elasticsearch7/RowElasticsearchSinkFunction.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import org.apache.flink.api.common.serialization.SerializationSchema;
import org.apache.flink.table.data.RowData;
import org.elasticsearch.action.DocWriteRequest;
import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.xcontent.XContentType;

import javax.annotation.Nullable;

Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/org/apache/inlong/sort/elasticsearch7/table/Elasticsearch7DynamicSink.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
import org.elasticsearch.action.index.IndexRequest;
import org.elasticsearch.action.update.UpdateRequest;
import org.elasticsearch.client.RestClientBuilder;
import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.xcontent.XContentType;

import javax.annotation.Nullable;

Expand Down
26 changes: 13 additions & 13 deletions licenses/inlong-sort-connectors/LICENSE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,7 @@ The text of each license is the standard Apache 2.0 license.

net.minidev:accessors-smart:1.2 - ASM based accessors helper used by json-smart (https://github.com/netplex/json-smart-v2), (The Apache Software License, Version 2.0)
org.elasticsearch.plugin:aggs-matrix-stats-client:6.8.17 - aggs-matrix-stats (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch.plugin:aggs-matrix-stats-client:7.9.2 - aggs-matrix-stats (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch.plugin:aggs-matrix-stats-client:7.17.13 - aggs-matrix-stats (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
io.airlift:aircompressor:0.10 - aircompressor (http://github.com/airlift/aircompressor), (Apache License 2.0)
io.airlift:aircompressor:0.16 - aircompressor (http://github.com/airlift/aircompressor), (Apache License 2.0)
org.jetbrains:annotations:17.0.0 - JetBrains Java Annotations (https://github.com/JetBrains/java-annotations/tree/17.0.0), (The Apache Software License, Version 2.0)
Expand Down Expand Up @@ -914,20 +914,20 @@ The text of each license is the standard Apache 2.0 license.
io.debezium:debezium-embedded:1.5.4.Final - Debezium Embedded (https://github.com/debezium/debezium/tree/v1.5.4.Final/debezium-embedded), (Apache License, Version 2.0)
com.github.joshelser:dropwizard-metrics-hadoop-metrics2-reporter:0.1.2 - Hadoop Metrics2 Reporter for Dropwizard Metrics (https://github.com/joshelser/dropwizard-hadoop-metrics2), (Apache License, Version 2.0)
org.elasticsearch:elasticsearch:6.8.17 - server (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch:elasticsearch:7.9.2 - server (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch:elasticsearch:7.17.13 - server (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch:elasticsearch-cli:6.8.17 - cli (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch:elasticsearch-cli:7.9.2 - elasticsearch-cli (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch:elasticsearch-cli:7.17.13 - elasticsearch-cli (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch:elasticsearch-core:6.8.17 - core (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch:elasticsearch-core:7.9.2 - elasticsearch-core (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch:elasticsearch-geo:7.9.2 - elasticsearch-geo (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch:elasticsearch-core:7.17.13 - elasticsearch-core (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch:elasticsearch-geo:7.17.13 - elasticsearch-geo (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch.client:elasticsearch-rest-client:6.8.17 - rest (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch.client:elasticsearch-rest-client:7.9.2 - rest (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch.client:elasticsearch-rest-client:7.17.13 - rest (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch.client:elasticsearch-rest-high-level-client:6.8.17 - rest-high-level (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch.client:elasticsearch-rest-high-level-client:7.9.2 - rest-high-level (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch.client:elasticsearch-rest-high-level-client:7.17.13 - rest-high-level (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch:elasticsearch-secure-sm:6.8.17 - secure-sm (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch:elasticsearch-secure-sm:7.9.2 - elasticsearch-secure-sm (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch:elasticsearch-secure-sm:7.17.13 - elasticsearch-secure-sm (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch:elasticsearch-x-content:6.8.17 - x-content (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch:elasticsearch-x-content:7.9.2 - elasticsearch-x-content (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch:elasticsearch-x-content:7.17.13 - elasticsearch-x-content (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
com.google.errorprone:error_prone_annotations:2.3.3 - error-prone annotations (https://github.com/google/error-prone), (Apache 2.0)
com.google.errorprone:error_prone_annotations:2.3.4 - error-prone annotations (https://github.com/google/error-prone), (Apache 2.0)
com.google.errorprone:error_prone_annotations:2.7.1 - error-prone annotations (https://github.com/google/error-prone), (Apache 2.0)
Expand Down Expand Up @@ -1029,13 +1029,13 @@ The text of each license is the standard Apache 2.0 license.
org.apache.kerby:kerby-util:1.0.1 - Kerby Util (http://directory.apache.org/kerby/kerby-common/kerby-util), (Apache License, Version 2.0)
org.apache.kerby:kerby-xdr:1.0.1 - Kerby XDR Project (http://directory.apache.org/kerby/kerby-common/kerby-xdr), (Apache License, Version 2.0)
org.elasticsearch.plugin:lang-mustache-client:jar:6.8.17 - lang-mustache (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch.plugin:lang-mustache-client:jar:7.9.2 - lang-mustache (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch.plugin:lang-mustache-client:jar:7.17.13 - lang-mustache (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava - Guava ListenableFuture only (https://github.com/google/guava/listenablefuture), (The Apache Software License, Version 2.0)
org.apache.logging.log4j:log4j-api:2.17.2 - Apache Log4j API (https://logging.apache.org/log4j/2.x/log4j-api/), (Apache License, Version 2.0)
org.apache.logging.log4j:log4j-web:2.10.0 - Apache Log4j Web (https://logging.apache.org/log4j/2.x/log4j-web/), (Apache License, Version 2.0)
org.lz4:lz4-java:1.6.0 - LZ4 and xxHash (https://github.com/lz4/lz4-java/tree/1.6.0), (The Apache Software License, Version 2.0)
org.lz4:lz4-java:1.7.1 - LZ4 and xxHash (https://github.com/lz4/lz4-java/tree/1.7.1), (The Apache Software License, Version 2.0)
org.elasticsearch.plugin:mapper-extras-client:7.9.2 - mapper-extras (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch.plugin:mapper-extras-client:7.17.13 - mapper-extras (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.apache.maven:maven-artifact:3.6.3 - Maven Artifact (https://maven.apache.org/ref/3.6.3/maven-artifact/), (Apache License, Version 2.0)
io.dropwizard.metrics:metrics-core:3.1.0 - Metrics Core (https://github.com/dropwizard/metrics/tree/v3.1.0), (Apache License 2.0)
io.dropwizard.metrics:metrics-core:3.2.6 - Metrics Core (https://github.com/dropwizard/metrics/tree/v3.2.6), (Apache License 2.0)
Expand All @@ -1056,15 +1056,15 @@ The text of each license is the standard Apache 2.0 license.
org.apache.orc:orc-shims:1.5.6 - ORC Shims (http://orc.apache.org/orc-shims), (Apache License, Version 2.0)
org.apache.orc:orc-shims:1.6.7 - ORC Shims (http://orc.apache.org/orc-shims), (Apache License, Version 2.0)
org.elasticsearch.plugin:parent-join-client:6.8.17 - parent-join (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch.plugin:parent-join-client:7.9.2 - parent-join (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch.plugin:parent-join-client:7.17.13 - parent-join (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.codehaus.plexus:plexus-utils:3.2.1 - Plexus Common Utilities (http://codehaus-plexus.github.io/plexus-utils/), (Apache License, Version 2.0)
org.apache.pulsar:pulsar-client-admin-api:2.8.4 - Pulsar Client Admin :: API (https://github.com/apache/pulsar/tree/v2.8.4), (Apache License, Version 2.0)
org.apache.pulsar:pulsar-client-all:2.8.4 - Pulsar Client All (https://github.com/apache/pulsar/tree/v2.8.4), (Apache License, Version 2.0)
org.apache.pulsar:pulsar-client-api:2.8.4 - Pulsar Client :: API (https://github.com/apache/pulsar/tree/v2.8.4), (Apache License, Version 2.0)
io.streamnative.connectors:pulsar-flink-connector_2.11:1.13.6.1-rc9 - StreamNative :: Pulsar Flink Connector :: Scala 2.11 (https://github.com/streamnative/pulsar-flink), (Apache License, Version 2.0)
org.apache.pulsar:pulsar-package-core:2.8.4 - Apache Pulsar :: Package Management :: Core (https://github.com/apache/pulsar/tree/v2.8.4), (Apache License, Version 2.0)
org.elasticsearch.plugin:rank-eval-client:jar:6.8.17 - rank-eval (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch.plugin:rank-eval-client:jar:7.9.2 - rank-eval (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.elasticsearch.plugin:rank-eval-client:jar:7.17.13 - rank-eval (https://github.com/elastic/elasticsearch), (The Apache Software License, Version 2.0)
org.reflections:reflections:0.10.2 - Reflections (https://github.com/ronmamo/reflections/tree/0.10.2), (The Apache Software License, Version 2.0; WTFPL)
org.yaml:snakeyaml:1.17 - SnakeYAML (https://bitbucket.org/snakeyaml/snakeyaml/src/v1.17/), (Apache License, Version 2.0)
org.yaml:snakeyaml:1.26 - SnakeYAML (https://bitbucket.org/snakeyaml/snakeyaml/src/v1.26/), (Apache License, Version 2.0)
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
<mybatis.version>3.5.9</mybatis.version>
<druid.version>1.2.6</druid.version>
<elasticsearch6.version>6.8.17</elasticsearch6.version>
<elasticsearch7.version>7.9.2</elasticsearch7.version>
<elasticsearch7.version>7.17.13</elasticsearch7.version>
<shiro.version>1.13.0</shiro.version>

<snappy.version>1.1.10.4</snappy.version>
Expand Down

0 comments on commit c373018

Please sign in to comment.