Skip to content

[WIP][FLINK-38726][fluss] Bump Fluss version to 0.8.0-incubating #4180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP][FLINK-38726][fluss] Bump Fluss version to 0.8.0-incubating #4180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-fluss/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ limitations under the License.


<properties>
<fluss.version>0.7.0</fluss.version>
<fluss.version>0.8.0-incubating</fluss.version>
</properties>

<dependencies>
<dependency>
<groupId>com.alibaba.fluss</groupId>
<groupId>org.apache.fluss</groupId>
<artifactId>fluss-client</artifactId>
<version>${fluss.version}</version>
</dependency>
Expand All @@ -60,34 +60,34 @@ limitations under the License.
</dependency>

<dependency>
<groupId>com.alibaba.fluss</groupId>
<groupId>org.apache.fluss</groupId>
<artifactId>fluss-server</artifactId>
<version>${fluss.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.alibaba.fluss</groupId>
<groupId>org.apache.fluss</groupId>
<artifactId>fluss-server</artifactId>
<version>${fluss.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.alibaba.fluss</groupId>
<groupId>org.apache.fluss</groupId>
<artifactId>fluss-test-utils</artifactId>
<version>${fluss.version}</version>
<scope>test</scope>
</dependency>
<!-- In Flink CDC project has Pipeline Sink Connector for Fluss. we import fluss-fink for Fluss Sink Connector just for test purpose -->
<dependency>
<groupId>com.alibaba.fluss</groupId>
<groupId>org.apache.fluss</groupId>
<artifactId>fluss-flink-common</artifactId>
<version>${fluss.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.alibaba.fluss</groupId>
<groupId>org.apache.fluss</groupId>
<artifactId>fluss-flink-1.20</artifactId>
<version>${fluss.version}</version>
<scope>test</scope>
Expand Down Expand Up @@ -123,7 +123,7 @@ limitations under the License.
<shadeTestJar>false</shadeTestJar>
<artifactSet>
<includes>
<include>com.alibaba.fluss:*</include>
<include>org.apache.fluss:*</include>
</includes>
</artifactSet>
</configuration>
Expand Down
4 changes: 2 additions & 2 deletions ...uss/src/main/java/org/apache/flink/cdc/connectors/fluss/factory/FlussDataSinkFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
import org.apache.flink.cdc.common.sink.DataSink;
import org.apache.flink.cdc.connectors.fluss.sink.FlussDataSink;

import com.alibaba.fluss.config.ConfigOptions;
import com.alibaba.fluss.config.Configuration;
import org.apache.fluss.config.ConfigOptions;
import org.apache.fluss.config.Configuration;

import java.util.HashMap;
import java.util.HashSet;
Expand Down
10 changes: 5 additions & 5 deletions ...nnector-fluss/src/main/java/org/apache/flink/cdc/connectors/fluss/sink/CdcAsFlussRow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
import org.apache.flink.cdc.common.data.RecordData;
import org.apache.flink.cdc.common.data.TimestampData;

import com.alibaba.fluss.row.BinaryString;
import com.alibaba.fluss.row.Decimal;
import com.alibaba.fluss.row.InternalRow;
import com.alibaba.fluss.row.TimestampLtz;
import com.alibaba.fluss.row.TimestampNtz;
import org.apache.fluss.row.BinaryString;
import org.apache.fluss.row.Decimal;
import org.apache.fluss.row.InternalRow;
import org.apache.fluss.row.TimestampLtz;
import org.apache.fluss.row.TimestampNtz;

import java.util.Map;
import java.util.stream.Collectors;
Expand Down
2 changes: 1 addition & 1 deletion ...nnector-fluss/src/main/java/org/apache/flink/cdc/connectors/fluss/sink/FlussDataSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import org.apache.flink.cdc.common.sink.MetadataApplier;
import org.apache.flink.cdc.connectors.fluss.sink.v2.FlussSink;

import com.alibaba.fluss.config.Configuration;
import org.apache.fluss.config.Configuration;

import java.util.List;
import java.util.Map;
Expand Down
16 changes: 8 additions & 8 deletions ...c/main/java/org/apache/flink/cdc/connectors/fluss/sink/FlussEventSerializationSchema.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
import org.apache.flink.cdc.connectors.fluss.sink.v2.FlussEventSerializer;
import org.apache.flink.cdc.connectors.fluss.sink.v2.FlussRowWithOp;

import com.alibaba.fluss.client.Connection;
import com.alibaba.fluss.client.table.Table;
import com.alibaba.fluss.metadata.TablePath;
import com.alibaba.fluss.types.DataType;
import org.apache.fluss.client.Connection;
import org.apache.fluss.client.table.Table;
import org.apache.fluss.metadata.TablePath;
import org.apache.fluss.types.DataType;

import java.io.IOException;
import java.util.Collections;
Expand Down Expand Up @@ -129,12 +129,12 @@ private TablePath getTablePath(TableId tableId) {

private static class TableSchemaInfo {
org.apache.flink.cdc.common.schema.Schema upstreamCdcSchema;
com.alibaba.fluss.metadata.Schema downStreamFlusstreamSchema;
org.apache.fluss.metadata.Schema downStreamFlusstreamSchema;
Map<Integer, Integer> indexMapping;

private TableSchemaInfo(
org.apache.flink.cdc.common.schema.Schema upstreamCdcSchema,
com.alibaba.fluss.metadata.Schema downStreamFlusstreamSchema) {
org.apache.fluss.metadata.Schema downStreamFlusstreamSchema) {
this.upstreamCdcSchema = upstreamCdcSchema;
this.downStreamFlusstreamSchema = downStreamFlusstreamSchema;
this.indexMapping =
Expand All @@ -144,8 +144,8 @@ private TableSchemaInfo(
}

static Map<Integer, Integer> sanityCheckAndGenerateIndexMapping(
com.alibaba.fluss.metadata.Schema inferredFlussSchema,
com.alibaba.fluss.metadata.Schema currentFlussnewSchema) {
org.apache.fluss.metadata.Schema inferredFlussSchema,
org.apache.fluss.metadata.Schema currentFlussnewSchema) {
List<String> inferredSchemaColumnNames = inferredFlussSchema.getColumnNames();
Map<String, Integer> reverseIndex = new HashMap<>();
for (int i = 0; i < inferredSchemaColumnNames.size(); i++) {
Expand Down
16 changes: 8 additions & 8 deletions ...-fluss/src/main/java/org/apache/flink/cdc/connectors/fluss/sink/FlussMetaDataApplier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@
import org.apache.flink.cdc.common.sink.MetadataApplier;
import org.apache.flink.table.api.ValidationException;

import com.alibaba.fluss.client.Connection;
import com.alibaba.fluss.client.ConnectionFactory;
import com.alibaba.fluss.client.admin.Admin;
import com.alibaba.fluss.config.Configuration;
import com.alibaba.fluss.metadata.DatabaseDescriptor;
import com.alibaba.fluss.metadata.TableDescriptor;
import com.alibaba.fluss.metadata.TableInfo;
import com.alibaba.fluss.metadata.TablePath;
import org.apache.fluss.client.Connection;
import org.apache.fluss.client.ConnectionFactory;
import org.apache.fluss.client.admin.Admin;
import org.apache.fluss.config.Configuration;
import org.apache.fluss.metadata.DatabaseDescriptor;
import org.apache.fluss.metadata.TableDescriptor;
import org.apache.fluss.metadata.TableInfo;
import org.apache.fluss.metadata.TablePath;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
2 changes: 1 addition & 1 deletion ...nnector-fluss/src/main/java/org/apache/flink/cdc/connectors/fluss/sink/v2/FlussEvent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

package org.apache.flink.cdc.connectors.fluss.sink.v2;

import com.alibaba.fluss.metadata.TablePath;
import org.apache.fluss.metadata.TablePath;

import java.util.List;

Expand Down
2 changes: 1 addition & 1 deletion ...uss/src/main/java/org/apache/flink/cdc/connectors/fluss/sink/v2/FlussEventSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

package org.apache.flink.cdc.connectors.fluss.sink.v2;

import com.alibaba.fluss.client.Connection;
import org.apache.fluss.client.Connection;

import java.io.IOException;
import java.io.Serializable;
Expand Down
4 changes: 2 additions & 2 deletions ...tor-fluss/src/main/java/org/apache/flink/cdc/connectors/fluss/sink/v2/FlussRowWithOp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@

package org.apache.flink.cdc.connectors.fluss.sink.v2;

import com.alibaba.fluss.row.InternalRow;
import org.apache.fluss.row.InternalRow;

import javax.annotation.Nullable;

import java.util.Objects;

import static com.alibaba.fluss.utils.Preconditions.checkNotNull;
import static org.apache.fluss.utils.Preconditions.checkNotNull;

/* This file is based on source code of Apache Fluss Project (https://fluss.apache.org/), licensed by the Apache
* Software Foundation (ASF) under the Apache License, Version 2.0. See the NOTICE file distributed with this work for
Expand Down
2 changes: 1 addition & 1 deletion ...onnector-fluss/src/main/java/org/apache/flink/cdc/connectors/fluss/sink/v2/FlussSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.apache.flink.api.connector.sink2.WriterInitContext;
import org.apache.flink.runtime.metrics.groups.InternalSinkWriterMetricGroup;

import com.alibaba.fluss.config.Configuration;
import org.apache.fluss.config.Configuration;

import java.io.IOException;

Expand Down
24 changes: 12 additions & 12 deletions ...or-fluss/src/main/java/org/apache/flink/cdc/connectors/fluss/sink/v2/FlussSinkWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@
import org.apache.flink.metrics.Counter;
import org.apache.flink.metrics.groups.SinkWriterMetricGroup;

import com.alibaba.fluss.client.Connection;
import com.alibaba.fluss.client.ConnectionFactory;
import com.alibaba.fluss.client.table.Table;
import com.alibaba.fluss.client.table.writer.AppendWriter;
import com.alibaba.fluss.client.table.writer.TableWriter;
import com.alibaba.fluss.client.table.writer.UpsertWriter;
import com.alibaba.fluss.config.Configuration;
import com.alibaba.fluss.metadata.TablePath;
import com.alibaba.fluss.metrics.Gauge;
import com.alibaba.fluss.metrics.Metric;
import com.alibaba.fluss.metrics.MetricNames;
import com.alibaba.fluss.row.InternalRow;
import org.apache.fluss.client.Connection;
import org.apache.fluss.client.ConnectionFactory;
import org.apache.fluss.client.table.Table;
import org.apache.fluss.client.table.writer.AppendWriter;
import org.apache.fluss.client.table.writer.TableWriter;
import org.apache.fluss.client.table.writer.UpsertWriter;
import org.apache.fluss.config.Configuration;
import org.apache.fluss.metadata.TablePath;
import org.apache.fluss.metrics.Gauge;
import org.apache.fluss.metrics.Metric;
import org.apache.fluss.metrics.MetricNames;
import org.apache.fluss.row.InternalRow;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

Expand Down
4 changes: 2 additions & 2 deletions .../main/java/org/apache/flink/cdc/connectors/fluss/sink/v2/metrics/WarppedFlussCounter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
/** An implementation of Flink's {@link Counter} which wraps Fluss's Counter. */
public class WarppedFlussCounter implements Counter {

private final com.alibaba.fluss.metrics.Counter flussCounter;
private final org.apache.fluss.metrics.Counter flussCounter;

public WarppedFlussCounter(com.alibaba.fluss.metrics.Counter flussCounter) {
public WarppedFlussCounter(org.apache.fluss.metrics.Counter flussCounter) {
this.flussCounter = flussCounter;
}

Expand Down
4 changes: 2 additions & 2 deletions ...rc/main/java/org/apache/flink/cdc/connectors/fluss/sink/v2/metrics/WrappedFlussGauge.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
/** An implementation of Flink's {@link Gauge} which wraps Fluss's Gauge. */
public class WrappedFlussGauge<T> implements Gauge<T> {

private final com.alibaba.fluss.metrics.Gauge<T> flussGauge;
private final org.apache.fluss.metrics.Gauge<T> flussGauge;

public WrappedFlussGauge(com.alibaba.fluss.metrics.Gauge<T> flussGauge) {
public WrappedFlussGauge(org.apache.fluss.metrics.Gauge<T> flussGauge) {
this.flussGauge = flussGauge;
}

Expand Down
8 changes: 4 additions & 4 deletions ...ain/java/org/apache/flink/cdc/connectors/fluss/sink/v2/metrics/WrapperFlussHistogram.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
/** An implementation of Flink's {@link Histogram} which wraps Fluss's Histogram. */
public class WrapperFlussHistogram implements Histogram {

private final com.alibaba.fluss.metrics.Histogram flussHistogram;
private final org.apache.fluss.metrics.Histogram flussHistogram;

public WrapperFlussHistogram(com.alibaba.fluss.metrics.Histogram flussHistogram) {
public WrapperFlussHistogram(org.apache.fluss.metrics.Histogram flussHistogram) {
this.flussHistogram = flussHistogram;
}

Expand All @@ -53,10 +53,10 @@ public HistogramStatistics getStatistics() {

private static class FlinkHistogramStatistics extends HistogramStatistics {

private final com.alibaba.fluss.metrics.HistogramStatistics flussHistogramStatistics;
private final org.apache.fluss.metrics.HistogramStatistics flussHistogramStatistics;

public FlinkHistogramStatistics(
com.alibaba.fluss.metrics.HistogramStatistics flussHistogramStatistics) {
org.apache.fluss.metrics.HistogramStatistics flussHistogramStatistics) {
this.flussHistogramStatistics = flussHistogramStatistics;
}

Expand Down
4 changes: 2 additions & 2 deletions ...rc/main/java/org/apache/flink/cdc/connectors/fluss/sink/v2/metrics/WrapperFlussMeter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
/** An implementation of Flink's {@link Meter} which wraps Fluss's Meter. */
public class WrapperFlussMeter implements Meter {

private final com.alibaba.fluss.metrics.Meter flussMeter;
private final org.apache.fluss.metrics.Meter flussMeter;

public WrapperFlussMeter(com.alibaba.fluss.metrics.Meter flussMeter) {
public WrapperFlussMeter(org.apache.fluss.metrics.Meter flussMeter) {
this.flussMeter = flussMeter;
}

Expand Down
16 changes: 8 additions & 8 deletions ...ava/org/apache/flink/cdc/connectors/fluss/sink/v2/metrics/WrapperFlussMetricRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@

import org.apache.flink.metrics.MetricGroup;

import com.alibaba.fluss.metrics.CharacterFilter;
import com.alibaba.fluss.metrics.Counter;
import com.alibaba.fluss.metrics.Gauge;
import com.alibaba.fluss.metrics.Histogram;
import com.alibaba.fluss.metrics.Meter;
import com.alibaba.fluss.metrics.Metric;
import com.alibaba.fluss.metrics.groups.AbstractMetricGroup;
import com.alibaba.fluss.metrics.registry.MetricRegistry;
import org.apache.fluss.metrics.CharacterFilter;
import org.apache.fluss.metrics.Counter;
import org.apache.fluss.metrics.Gauge;
import org.apache.fluss.metrics.Histogram;
import org.apache.fluss.metrics.Meter;
import org.apache.fluss.metrics.Metric;
import org.apache.fluss.metrics.groups.AbstractMetricGroup;
import org.apache.fluss.metrics.registry.MetricRegistry;

import java.util.Collections;
import java.util.HashMap;
Expand Down
Loading
Loading