Skip to content

Commit 3199f18

Browse files
committed
[hotfix] Update to support Flink 1.20.0
Signed-off-by: Andriy Redko <[email protected]>
1 parent 926c127 commit 3199f18

File tree

7 files changed

+36
-59
lines changed

7 files changed

+36
-59
lines changed

.github/workflows/weekly.yml

+6-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,12 @@ jobs:
3737
jdk: '8, 11, 17, 21',
3838
branch: main
3939
}, {
40-
flink: 1.20-SNAPSHOT,
40+
flink: 1.20-SNAPSHOT,
41+
jdk: '8, 11, 17, 21',
42+
branch: main
43+
},
44+
{
45+
flink: 1.20,
4146
jdk: '8, 11, 17, 21',
4247
branch: main
4348
}, {
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
Constructor <org.apache.flink.connector.opensearch.sink.BulkProcessorConfig.<init>(int, int, long, org.apache.flink.connector.opensearch.sink.FlushBackoffType, int, long)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (BulkProcessorConfig.java:44)
2-
Constructor <org.apache.flink.connector.opensearch.table.OpensearchConfiguration.<init>(org.apache.flink.configuration.ReadableConfig)> calls method <org.apache.flink.util.Preconditions.checkNotNull(java.lang.Object)> in (OpensearchConfiguration.java:61)
31
Method <org.apache.flink.connector.opensearch.table.IndexGeneratorFactory.createRuntimeIndexGenerator(java.lang.String, [Ljava.lang.String;, [Lorg.apache.flink.table.types.DataType;, org.apache.flink.connector.opensearch.table.IndexGeneratorFactory$IndexHelper, java.time.ZoneId)> has parameter of type <[Lorg.apache.flink.table.types.DataType;> in (IndexGeneratorFactory.java:0)

flink-connector-opensearch-base/src/test/java/org/apache/flink/connector/opensearch/test/DockerImageVersions.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@
2222
* integration tests.
2323
*/
2424
public class DockerImageVersions {
25-
public static final String OPENSEARCH_1 = "opensearchproject/opensearch:1.3.15";
26-
public static final String OPENSEARCH_2 = "opensearchproject/opensearch:2.13.0";
25+
public static final String OPENSEARCH_1 = "opensearchproject/opensearch:1.3.19";
26+
public static final String OPENSEARCH_2 = "opensearchproject/opensearch:2.17.1";
2727
}

flink-connector-opensearch/archunit-violations/5c4a6228-f9cb-4828-9625-43c57d133967

-52
Large diffs are not rendered by default.

flink-connector-opensearch/src/test/java/org/apache/flink/connector/opensearch/sink/OpensearchSinkBuilderTest.java

+13
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package org.apache.flink.connector.opensearch.sink;
1919

2020
import org.apache.flink.api.common.operators.MailboxExecutor;
21+
import org.apache.flink.api.common.operators.MailboxExecutor.MailOptions;
2122
import org.apache.flink.api.connector.sink2.Sink.InitContext;
2223
import org.apache.flink.connector.base.DeliveryGuarantee;
2324
import org.apache.flink.connector.opensearch.sink.BulkResponseInspector.BulkResponseInspectorFactory;
@@ -189,6 +190,18 @@ public void yield() throws InterruptedException, FlinkRuntimeException {}
189190
public boolean tryYield() throws FlinkRuntimeException {
190191
return false;
191192
}
193+
194+
public void execute(
195+
MailOptions mailOptions,
196+
ThrowingRunnable<? extends Exception> command,
197+
String descriptionFormat,
198+
Object... descriptionArgs) {
199+
execute(command, descriptionFormat, descriptionArgs);
200+
}
201+
202+
public boolean shouldInterrupt() {
203+
return false;
204+
}
192205
}
193206

194207
private OpensearchSinkBuilder<Object> createEmptyBuilder() {

flink-connector-opensearch/src/test/java/org/apache/flink/connector/opensearch/sink/OpensearchWriterITCase.java

+13
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
package org.apache.flink.connector.opensearch.sink;
1919

2020
import org.apache.flink.api.common.operators.MailboxExecutor;
21+
import org.apache.flink.api.common.operators.MailboxExecutor.MailOptions;
2122
import org.apache.flink.api.connector.sink2.SinkWriter;
2223
import org.apache.flink.api.java.tuple.Tuple2;
2324
import org.apache.flink.connector.opensearch.OpensearchUtil;
@@ -400,5 +401,17 @@ public void yield() throws InterruptedException, FlinkRuntimeException {
400401
public boolean tryYield() throws FlinkRuntimeException {
401402
return false;
402403
}
404+
405+
public void execute(
406+
MailOptions mailOptions,
407+
ThrowingRunnable<? extends Exception> command,
408+
String descriptionFormat,
409+
Object... descriptionArgs) {
410+
execute(command, descriptionFormat, descriptionArgs);
411+
}
412+
413+
public boolean shouldInterrupt() {
414+
return false;
415+
}
403416
}
404417
}

pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ under the License.
5555
</modules>
5656

5757
<properties>
58-
<flink.version>1.18.0</flink.version>
58+
<flink.version>1.20.0</flink.version>
5959
<commons-compress.version>1.26.1</commons-compress.version>
6060
<jackson-bom.version>2.16.2</jackson-bom.version>
6161
<junit5.version>5.10.2</junit5.version>
@@ -64,7 +64,7 @@ under the License.
6464
<mockito.version>3.12.4</mockito.version>
6565

6666
<japicmp.skip>false</japicmp.skip>
67-
<japicmp.referenceVersion>1.0.0-1.16</japicmp.referenceVersion>
67+
<japicmp.referenceVersion>1.0.0-1.19</japicmp.referenceVersion>
6868

6969
<slf4j.version>1.7.36</slf4j.version>
7070
<log4j.version>2.17.2</log4j.version>

0 commit comments

Comments
 (0)