This is an automated email from the ASF dual-hosted git repository. zirui pushed a change to branch release-1.3.0 in repository https://gitbox.apache.org/repos/asf/inlong.git
from 7abb87d13 [INLONG-5822][Sort] Fix the error of metric is empty for Elasticsearch (#5823) new bbffb2e84 [INLONG-5608][Sort] Reformat connector codes for reporting metrics (#5612) new 31ea1afd9 [INLONG-5193][Sort] Add dlc small file compact feture and adapt newest auth method (#5243) The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../inlong/sort/protocol/constant/DLCConstant.java | 33 +- .../protocol/node/load/DLCIcebergLoadNode.java | 21 +- .../protocol/node/load/DLCIcebergLoadNodeTest.java | 5 +- .../inlong/sort/base/metric/MetricOption.java | 89 ++ .../inlong/sort/base/metric/SinkMetricData.java | 9 +- .../inlong/sort/base/metric/SourceMetricData.java | 26 +- .../sort/elasticsearch6/ElasticsearchSink.java | 18 +- .../table/Elasticsearch6DynamicSink.java | 18 +- .../table/Elasticsearch6DynamicSinkFactory.java | 4 +- .../sort/elasticsearch7/ElasticsearchSink.java | 18 +- .../table/Elasticsearch7DynamicSink.java | 18 +- .../table/Elasticsearch7DynamicSinkFactory.java | 4 +- .../sort/elasticsearch/ElasticsearchSinkBase.java | 17 +- .../table/RowElasticsearchSinkFunction.java | 20 +- .../sort/hbase/HBase2DynamicTableFactory.java | 2 +- .../org/apache/inlong/sort/hive/HiveTableSink.java | 12 +- .../hive/filesystem/AbstractStreamingWriter.java | 18 +- .../sort/hive/filesystem/CompactFileWriter.java | 4 +- .../sort/hive/filesystem/StreamingFileWriter.java | 4 +- .../inlong/sort/hive/filesystem/StreamingSink.java | 8 +- .../sort/hive/table/HiveTableInlongFactory.java | 4 +- inlong-sort/sort-connectors/iceberg-dlc/pom.xml | 26 +- .../catalog/hybris/DlcWrappedHybrisCatalog.java | 45 +- .../sort/iceberg/flink/CompactTableProperties.java | 98 ++ .../inlong/sort/iceberg/flink}/FlinkCatalog.java | 1463 ++++++++++---------- .../sort/iceberg/flink}/FlinkCatalogFactory.java | 333 ++--- .../iceberg/flink}/FlinkDynamicTableFactory.java | 455 +++--- .../sort/iceberg/flink}/IcebergTableSink.java | 47 +- .../sort/iceberg/flink/actions/RewriteResult.java | 59 +- .../flink/actions/SyncRewriteDataFilesAction.java | 133 ++ .../actions/SyncRewriteDataFilesActionOption.java | 171 +++ .../iceberg/flink/sink/BaseDeltaTaskWriter.java | 122 ++ .../sort/iceberg/flink}/sink/DeltaManifests.java | 5 +- .../flink}/sink/DeltaManifestsSerializer.java | 5 +- .../iceberg/flink}/sink/FlinkManifestUtil.java | 12 +- .../inlong/sort/iceberg/flink}/sink/FlinkSink.java | 1034 +++++++------- .../iceberg/flink}/sink/IcebergFilesCommitter.java | 91 +- .../iceberg/flink}/sink/IcebergStreamWriter.java | 33 +- .../flink}/sink/ManifestOutputFileFactory.java | 13 +- .../iceberg/flink}/sink/PartitionKeySelector.java | 4 +- .../iceberg/flink/sink/PartitionedDeltaWriter.java | 91 ++ .../flink/sink/RowDataTaskWriterFactory.java | 140 ++ .../flink/sink/UnpartitionedDeltaWriter.java | 64 + .../org.apache.flink.table.factories.Factory | 2 +- .../apache/inlong/sort/iceberg/FlinkCatalog.java | 2 + .../inlong/sort/iceberg/FlinkCatalogFactory.java | 2 + .../sort/iceberg/FlinkDynamicTableFactory.java | 2 +- .../inlong/sort/iceberg/IcebergTableSink.java | 9 + .../sort/iceberg/sink/BaseDeltaTaskWriter.java | 122 ++ .../inlong/sort/iceberg/sink/DeltaManifests.java | 3 + .../iceberg/sink/DeltaManifestsSerializer.java | 3 + .../sort/iceberg/sink/FlinkManifestUtil.java | 3 + .../apache/inlong/sort/iceberg/sink/FlinkSink.java | 40 +- .../sort/iceberg/sink/IcebergFilesCommitter.java | 3 + .../sort/iceberg/sink/IcebergStreamWriter.java | 21 +- .../iceberg/sink/ManifestOutputFileFactory.java | 3 + .../sort/iceberg/sink/PartitionKeySelector.java | 2 + .../sort/iceberg/sink/PartitionedDeltaWriter.java | 91 ++ .../iceberg/sink/RowDataTaskWriterFactory.java | 140 ++ .../iceberg/sink/UnpartitionedDeltaWriter.java | 64 + .../jdbc/internal/JdbcBatchingOutputFormat.java | 38 +- .../jdbc/internal/TableJdbcUpsertOutputFormat.java | 8 +- .../jdbc/table/JdbcDynamicOutputFormatBuilder.java | 10 +- .../sort/jdbc/table/JdbcDynamicTableFactory.java | 4 +- .../sort/jdbc/table/JdbcDynamicTableSink.java | 14 +- .../inlong/sort/kafka/FlinkKafkaProducer.java | 30 +- .../apache/inlong/sort/kafka/KafkaDynamicSink.java | 14 +- .../table/DynamicKafkaDeserializationSchema.java | 22 +- .../sort/kafka/table/KafkaDynamicSource.java | 10 +- .../sort/kafka/table/KafkaDynamicTableFactory.java | 16 +- .../table/UpsertKafkaDynamicTableFactory.java | 4 +- .../sort/cdc/mongodb/DebeziumSourceFunction.java | 3 +- .../mongodb/table/MongoDBTableSourceFactory.java | 2 +- .../sort/cdc/debezium/DebeziumSourceFunction.java | 3 +- .../mysql/table/MySqlTableInlongSourceFactory.java | 2 +- .../sort/cdc/oracle/DebeziumSourceFunction.java | 3 +- .../cdc/oracle/table/OracleTableSourceFactory.java | 2 +- .../DebeziumSourceFunction.java | 3 +- .../cdc/postgres/table/PostgreSQLTableFactory.java | 2 +- .../pulsar/table/PulsarDynamicTableFactory.java | 8 +- .../table/UpsertPulsarDynamicTableFactory.java | 2 +- .../sqlserver/table/DebeziumSourceFunction.java | 16 +- .../cdc/sqlserver/table/SqlServerTableFactory.java | 2 +- inlong-sort/sort-core/pom.xml | 10 +- .../inlong/sort/parser/DLCIcebergSqlParseTest.java | 10 +- licenses/inlong-manager/LICENSE | 10 +- licenses/inlong-sort-connectors/LICENSE | 53 +- pom.xml | 19 +- 88 files changed, 3613 insertions(+), 2015 deletions(-) create mode 100644 inlong-sort/sort-connectors/base/src/main/java/org/apache/inlong/sort/base/metric/MetricOption.java create mode 100644 inlong-sort/sort-connectors/iceberg-dlc/src/main/java/org/apache/inlong/sort/iceberg/flink/CompactTableProperties.java copy inlong-sort/sort-connectors/{iceberg/src/main/java/org/apache/inlong/sort/iceberg => iceberg-dlc/src/main/java/org/apache/inlong/sort/iceberg/flink}/FlinkCatalog.java (95%) copy inlong-sort/sort-connectors/{iceberg/src/main/java/org/apache/inlong/sort/iceberg => iceberg-dlc/src/main/java/org/apache/inlong/sort/iceberg/flink}/FlinkCatalogFactory.java (91%) copy inlong-sort/sort-connectors/{iceberg/src/main/java/org/apache/inlong/sort/iceberg => iceberg-dlc/src/main/java/org/apache/inlong/sort/iceberg/flink}/FlinkDynamicTableFactory.java (78%) copy inlong-sort/sort-connectors/{iceberg/src/main/java/org/apache/inlong/sort/iceberg => iceberg-dlc/src/main/java/org/apache/inlong/sort/iceberg/flink}/IcebergTableSink.java (74%) copy inlong-dashboard/src/metas/clusters/common/types.ts => inlong-sort/sort-connectors/iceberg-dlc/src/main/java/org/apache/inlong/sort/iceberg/flink/actions/RewriteResult.java (74%) create mode 100644 inlong-sort/sort-connectors/iceberg-dlc/src/main/java/org/apache/inlong/sort/iceberg/flink/actions/SyncRewriteDataFilesAction.java create mode 100644 inlong-sort/sort-connectors/iceberg-dlc/src/main/java/org/apache/inlong/sort/iceberg/flink/actions/SyncRewriteDataFilesActionOption.java create mode 100644 inlong-sort/sort-connectors/iceberg-dlc/src/main/java/org/apache/inlong/sort/iceberg/flink/sink/BaseDeltaTaskWriter.java copy inlong-sort/sort-connectors/{iceberg/src/main/java/org/apache/inlong/sort/iceberg => iceberg-dlc/src/main/java/org/apache/inlong/sort/iceberg/flink}/sink/DeltaManifests.java (95%) copy inlong-sort/sort-connectors/{iceberg/src/main/java/org/apache/inlong/sort/iceberg => iceberg-dlc/src/main/java/org/apache/inlong/sort/iceberg/flink}/sink/DeltaManifestsSerializer.java (97%) copy inlong-sort/sort-connectors/{iceberg/src/main/java/org/apache/inlong/sort/iceberg => iceberg-dlc/src/main/java/org/apache/inlong/sort/iceberg/flink}/sink/FlinkManifestUtil.java (94%) copy inlong-sort/sort-connectors/{iceberg/src/main/java/org/apache/inlong/sort/iceberg => iceberg-dlc/src/main/java/org/apache/inlong/sort/iceberg/flink}/sink/FlinkSink.java (78%) copy inlong-sort/sort-connectors/{iceberg/src/main/java/org/apache/inlong/sort/iceberg => iceberg-dlc/src/main/java/org/apache/inlong/sort/iceberg/flink}/sink/IcebergFilesCommitter.java (81%) copy inlong-sort/sort-connectors/{iceberg/src/main/java/org/apache/inlong/sort/iceberg => iceberg-dlc/src/main/java/org/apache/inlong/sort/iceberg/flink}/sink/IcebergStreamWriter.java (82%) copy inlong-sort/sort-connectors/{iceberg/src/main/java/org/apache/inlong/sort/iceberg => iceberg-dlc/src/main/java/org/apache/inlong/sort/iceberg/flink}/sink/ManifestOutputFileFactory.java (84%) copy inlong-sort/sort-connectors/{iceberg/src/main/java/org/apache/inlong/sort/iceberg => iceberg-dlc/src/main/java/org/apache/inlong/sort/iceberg/flink}/sink/PartitionKeySelector.java (95%) create mode 100644 inlong-sort/sort-connectors/iceberg-dlc/src/main/java/org/apache/inlong/sort/iceberg/flink/sink/PartitionedDeltaWriter.java create mode 100644 inlong-sort/sort-connectors/iceberg-dlc/src/main/java/org/apache/inlong/sort/iceberg/flink/sink/RowDataTaskWriterFactory.java create mode 100644 inlong-sort/sort-connectors/iceberg-dlc/src/main/java/org/apache/inlong/sort/iceberg/flink/sink/UnpartitionedDeltaWriter.java copy inlong-sort/sort-connectors/{hive => iceberg-dlc}/src/main/resources/META-INF/services/org.apache.flink.table.factories.Factory (96%) create mode 100644 inlong-sort/sort-connectors/iceberg/src/main/java/org/apache/inlong/sort/iceberg/sink/BaseDeltaTaskWriter.java create mode 100644 inlong-sort/sort-connectors/iceberg/src/main/java/org/apache/inlong/sort/iceberg/sink/PartitionedDeltaWriter.java create mode 100644 inlong-sort/sort-connectors/iceberg/src/main/java/org/apache/inlong/sort/iceberg/sink/RowDataTaskWriterFactory.java create mode 100644 inlong-sort/sort-connectors/iceberg/src/main/java/org/apache/inlong/sort/iceberg/sink/UnpartitionedDeltaWriter.java