luoyuxia commented on code in PR #21977:
URL: https://github.com/apache/flink/pull/21977#discussion_r1112512579
##########
flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/table/batch/BatchSink.java:
##########
@@ -52,6 +52,11 @@
/** Helper for creating batch file sink. */
@Internal
public class BatchSink {
+
+ public static final String COORDINATOR_OP_NAME = "coordinator";
Review Comment:
```suggestion
public static final String COORDINATOR_OP_NAME = "compact-coordinator";
```
##########
flink-connectors/flink-connector-files/src/main/java/org/apache/flink/connector/file/table/batch/BatchSink.java:
##########
@@ -52,6 +52,11 @@
/** Helper for creating batch file sink. */
@Internal
public class BatchSink {
+
+ public static final String COORDINATOR_OP_NAME = "coordinator";
+
+ public static final String COMPACT_OP_NAME = "compact";
Review Comment:
```suggestion
public static final String COMPACT_OP_NAME = "compact-operator";
```
##########
flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/HiveTableCompactSinkITCase.java:
##########
@@ -42,17 +44,18 @@
import static org.assertj.core.api.Assertions.assertThat;
/** IT case for Hive table compaction in batch mode. */
-public class HiveTableCompactSinkITCase {
+@ExtendWith(TestLoggerExtension.class)
+class HiveTableCompactSinkITCase {
@RegisterExtension
- private static final MiniClusterExtension MINI_CLUSTER = new
MiniClusterExtension();
+ public static final MiniClusterExtension MINI_CLUSTER = new
MiniClusterExtension();
Review Comment:
Must it be public?
##########
flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/HiveTableSinkITCase.java:
##########
@@ -398,39 +399,38 @@ public void testStreamingSinkWithTimestampLtzWatermark()
throws Exception {
}
@Test
- public void testStreamingSinkWithoutCommitPolicy() throws Exception {
+ void testStreamingSinkWithoutCommitPolicy() {
StreamExecutionEnvironment env =
StreamExecutionEnvironment.getExecutionEnvironment();
StreamTableEnvironment tableEnv =
HiveTestUtils.createTableEnvInStreamingMode(env);
tableEnv.registerCatalog(hiveCatalog.getName(), hiveCatalog);
tableEnv.useCatalog(hiveCatalog.getName());
tableEnv.executeSql("create database db1");
- try {
- tableEnv.useDatabase("db1");
- tableEnv.getConfig().setSqlDialect(SqlDialect.HIVE);
- tableEnv.executeSql("create table dest(x int) partitioned by (p
string)");
-
- tableEnv.getConfig().setSqlDialect(SqlDialect.DEFAULT);
- tableEnv.executeSql(
- "create table src (i int, p string) with ("
- + "'connector'='datagen',"
- + "'number-of-rows'='5')");
- tableEnv.executeSql("insert into dest select * from src").await();
- fail("Streaming write partitioned table without commit policy
should fail");
- } catch (FlinkHiveException e) {
- // expected
- assertThat(e.getMessage())
- .contains(
- String.format(
- "Streaming write to partitioned hive table
`%s`.`%s`.`%s` without providing a commit policy",
- hiveCatalog.getName(), "db1", "dest"));
- } finally {
- tableEnv.executeSql("drop database db1 cascade");
- }
+
+ tableEnv.useDatabase("db1");
+ tableEnv.getConfig().setSqlDialect(SqlDialect.HIVE);
+ tableEnv.executeSql("create table dest(x int) partitioned by (p
string)");
+
+ tableEnv.getConfig().setSqlDialect(SqlDialect.DEFAULT);
+ tableEnv.executeSql(
+ "create table src (i int, p string) with ("
+ + "'connector'='datagen',"
+ + "'number-of-rows'='5')");
+
+ assertThatThrownBy(
+ () -> tableEnv.executeSql("insert into dest select *
from src").await(),
+ "Streaming write partitioned table without commit
policy should fail")
+ .isInstanceOf(FlinkHiveException.class)
+ .hasMessageContaining(
+ String.format(
+ "Streaming write to partitioned hive table
`%s`.`%s`.`%s` without providing a commit policy",
+ hiveCatalog.getName(), "db1", "dest"));
+
+ tableEnv.executeSql("drop database db1 cascade");
Review Comment:
If the assert statement `assertThatThrownBy` fail, we should also drop
database db1.
##########
flink-connectors/flink-connector-hive/src/main/java/org/apache/flink/connectors/hive/HiveTableSink.java:
##########
@@ -123,6 +123,8 @@ public class HiveTableSink implements DynamicTableSink,
SupportsPartitioning, Su
private static final Logger LOG =
LoggerFactory.getLogger(HiveTableSink.class);
+ public static final String BATCH_COMPACT_WRITER_OP_NAME =
"batch_compact_writer";
Review Comment:
Maybe better to change to `batch_writer` since stream mode is `stream_writer`
```suggestion
public static final String BATCH_COMPACT_WRITER_OP_NAME = "batch_writer";
```
##########
flink-connectors/flink-connector-hive/src/test/java/org/apache/flink/connectors/hive/HiveTableCompactSinkTest.java:
##########
@@ -0,0 +1,195 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License 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.
+ */
+
+package org.apache.flink.connectors.hive;
+
+import org.apache.flink.api.common.RuntimeExecutionMode;
+import org.apache.flink.configuration.Configuration;
+import org.apache.flink.connector.file.table.FileSystemConnectorOptions;
+import org.apache.flink.connector.file.table.batch.BatchSink;
+import org.apache.flink.sql.parser.hive.ddl.SqlCreateHiveTable;
+import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
+import org.apache.flink.streaming.api.graph.StreamGraph;
+import org.apache.flink.streaming.api.graph.StreamNode;
+import org.apache.flink.table.api.DataTypes;
+import org.apache.flink.table.api.TableSchema;
+import org.apache.flink.table.catalog.CatalogDatabaseImpl;
+import org.apache.flink.table.catalog.CatalogTable;
+import org.apache.flink.table.catalog.CatalogTableImpl;
+import org.apache.flink.table.catalog.CatalogTest;
+import org.apache.flink.table.catalog.Column;
+import org.apache.flink.table.catalog.ObjectIdentifier;
+import org.apache.flink.table.catalog.ObjectPath;
+import org.apache.flink.table.catalog.ResolvedCatalogTable;
+import org.apache.flink.table.catalog.ResolvedSchema;
+import org.apache.flink.table.catalog.hive.HiveCatalog;
+import org.apache.flink.table.catalog.hive.HiveTestUtils;
+import org.apache.flink.table.connector.sink.DataStreamSinkProvider;
+import org.apache.flink.table.connector.sink.DynamicTableSink;
+import org.apache.flink.table.data.binary.BinaryRowData;
+import org.apache.flink.table.factories.DynamicTableSinkFactory;
+import org.apache.flink.table.factories.FactoryUtil;
+import
org.apache.flink.table.runtime.connector.sink.SinkRuntimeProviderContext;
+import org.apache.flink.util.TestLoggerExtension;
+
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Optional;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/** Tests for {@link HiveTableSink} enable auto-compaction. */
+@ExtendWith(TestLoggerExtension.class)
+class HiveTableCompactSinkTest {
+
+ private static HiveCatalog catalog;
+
+ private Configuration tableConf;
+
+ @BeforeAll
+ static void before() {
+ catalog = HiveTestUtils.createHiveCatalog();
+ catalog.open();
+ }
+
+ @AfterAll
+ static void after() {
+ catalog.close();
+ }
+
+ @BeforeEach
+ void resetTableConf() {
+ tableConf = new Configuration();
+ tableConf.set(FactoryUtil.CONNECTOR, SqlCreateHiveTable.IDENTIFIER);
+ tableConf.set(FileSystemConnectorOptions.AUTO_COMPACTION, true);
+ }
+
+ /** If only sink parallelism is set, compact operator should follow this
setting. */
+ @Test
+ void testOnlySetSinkParallelism() throws Exception {
+ final int sinkParallelism = 4;
+
+ tableConf.set(FileSystemConnectorOptions.SINK_PARALLELISM,
sinkParallelism);
+
+ assertSinkAndCompactOperatorParallelism(
+ tableConf, true, true, sinkParallelism, sinkParallelism);
+ }
+
+ @Test
+ void testOnlySetCompactParallelism() throws Exception {
+ final int compactParallelism = 4;
+
+ tableConf.set(FileSystemConnectorOptions.COMPACTION_PARALLELISM,
compactParallelism);
+
+ assertSinkAndCompactOperatorParallelism(tableConf, false, true, -1,
compactParallelism);
+ }
+
+ @Test
+ void testSetBothSinkAndCompactParallelism() throws Exception {
+ final int sinkParallelism = 8;
+ final int compactParallelism = 4;
+
+ tableConf.set(FileSystemConnectorOptions.SINK_PARALLELISM,
sinkParallelism);
+ tableConf.set(FileSystemConnectorOptions.COMPACTION_PARALLELISM,
compactParallelism);
+
+ assertSinkAndCompactOperatorParallelism(
+ tableConf, true, true, sinkParallelism, compactParallelism);
+ }
+
+ @Test
+ void testSinkAndCompactAllNotSetParallelism() throws Exception {
+ assertSinkAndCompactOperatorParallelism(tableConf, false, false, -1,
-1);
+ }
+
+ private void assertSinkAndCompactOperatorParallelism(
+ Configuration tableConf,
+ boolean isSinkParallelismConfigured,
+ boolean isCompactParallelismConfigured,
+ int expectedSinkParallelism,
+ int expectedCompactParallelism)
+ throws Exception {
+ StreamGraph streamGraph =
createAndGetStreamGraphContainsSink(tableConf.toMap());
+ assertThat(streamGraph.getStreamNodes()).hasSize(6);
+ StreamNode hiveSinkNode =
+ getFirstStreamNodeByName(streamGraph,
HiveTableSink.BATCH_COMPACT_WRITER_OP_NAME);
+ StreamNode compactNode = getFirstStreamNodeByName(streamGraph,
BatchSink.COMPACT_OP_NAME);
+
assertThat(hiveSinkNode.isParallelismConfigured()).isEqualTo(isSinkParallelismConfigured);
+
assertThat(compactNode.isParallelismConfigured()).isEqualTo(isCompactParallelismConfigured);
+ if (isSinkParallelismConfigured) {
+
assertThat(hiveSinkNode.getParallelism()).isEqualTo(expectedSinkParallelism);
+ }
+ if (isCompactParallelismConfigured) {
+
assertThat(compactNode.getParallelism()).isEqualTo(expectedCompactParallelism);
+ }
+ }
+
+ private StreamGraph createAndGetStreamGraphContainsSink(Map<String,
String> options)
Review Comment:
IIUC, this method is to construct a stream graph, but it looks hard to
understand and complex to me. Is it possible to follow what we done like method
`HiveTableSourceITCase#testParallelismSetting`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@flink.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
