Skip to content

[lake/paimon] Bump Paimon version to 1.4.2 #3545

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
sd4324530 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[lake/paimon] Bump Paimon version to 1.4.2 #3545

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
4 changes: 2 additions & 2 deletions fluss-common/src/test/java/org/apache/fluss/row/encode/paimon/PaimonKeyEncoderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ private BinaryRow genPaimonRowForAllTypes(int arity) {
(int)
TypeUtils.castFromString(
"09:30:00.0", org.apache.fluss.types.DataTypes.TIME()));
binaryRowWriter.writeBinary(9, "1234567890".getBytes());
binaryRowWriter.writeBinary(10, "20".getBytes());
binaryRowWriter.writeBinary(9, "1234567890".getBytes(), 0, "1234567890".getBytes().length);
binaryRowWriter.writeBinary(10, "20".getBytes(), 0, "20".getBytes().length);
binaryRowWriter.writeString(11, BinaryString.fromString("1"));
binaryRowWriter.writeString(12, BinaryString.fromString("hello"));
binaryRowWriter.writeDecimal(13, Decimal.fromUnscaledLong(9, 5, 2), 5);
Expand Down
4 changes: 0 additions & 4 deletions fluss-lake/fluss-lake-paimon/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@

<packaging>jar</packaging>

<properties>
<paimon.version>1.3.1</paimon.version>
</properties>

<dependencies>
<dependency>
<groupId>org.apache.fluss</groupId>
Expand Down
14 changes: 14 additions & 0 deletions ...ake-paimon/src/main/java/org/apache/fluss/lake/paimon/source/FlussArrayAsPaimonArray.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@
import org.apache.fluss.row.TimestampNtz;

import org.apache.paimon.data.BinaryString;
import org.apache.paimon.data.Blob;
import org.apache.paimon.data.Decimal;
import org.apache.paimon.data.InternalArray;
import org.apache.paimon.data.InternalMap;
import org.apache.paimon.data.InternalRow;
import org.apache.paimon.data.InternalVector;
import org.apache.paimon.data.Timestamp;
import org.apache.paimon.data.variant.Variant;
import org.apache.paimon.types.ArrayType;
Expand Down Expand Up @@ -149,6 +151,12 @@ public Variant getVariant(int pos) {
"getVariant is not supported for Fluss array currently.");
}

@Override
public Blob getBlob(int pos) {
throw new UnsupportedOperationException(
"getBlob is not supported for Fluss array currently.");
}

@Override
public InternalArray getArray(int pos) {
org.apache.fluss.row.InternalArray innerArray = flussArray.getArray(pos);
Expand All @@ -158,6 +166,12 @@ public InternalArray getArray(int pos) {
innerArray, ((ArrayType) elementType).getElementType());
}

@Override
public InternalVector getVector(int pos) {
throw new UnsupportedOperationException(
"getVector is not supported for Fluss array currently.");
}

@Override
public InternalMap getMap(int pos) {
org.apache.fluss.row.InternalMap flussMap = flussArray.getMap(pos);
Expand Down
14 changes: 14 additions & 0 deletions ...ss-lake-paimon/src/main/java/org/apache/fluss/lake/paimon/source/FlussRowAsPaimonRow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@
import org.apache.fluss.row.TimestampNtz;

import org.apache.paimon.data.BinaryString;
import org.apache.paimon.data.Blob;
import org.apache.paimon.data.Decimal;
import org.apache.paimon.data.InternalArray;
import org.apache.paimon.data.InternalMap;
import org.apache.paimon.data.InternalRow;
import org.apache.paimon.data.InternalVector;
import org.apache.paimon.data.Timestamp;
import org.apache.paimon.data.variant.Variant;
import org.apache.paimon.types.ArrayType;
Expand Down Expand Up @@ -158,6 +160,12 @@ public Variant getVariant(int i) {
"getVariant is not support for Fluss record currently.");
}

@Override
public Blob getBlob(int pos) {
throw new UnsupportedOperationException(
"getBlob is not support for Fluss record currently.");
}

@Override
public InternalArray getArray(int pos) {
org.apache.fluss.row.InternalArray flussArray = internalRow.getArray(pos);
Expand All @@ -167,6 +175,12 @@ public InternalArray getArray(int pos) {
flussArray, ((ArrayType) tableRowType.getTypeAt(pos)).getElementType());
}

@Override
public InternalVector getVector(int pos) {
throw new UnsupportedOperationException(
"getVector is not support for Fluss record currently.");
}

@Override
public InternalMap getMap(int pos) {
org.apache.fluss.row.InternalMap flussMap = internalRow.getMap(pos);
Expand Down
11 changes: 2 additions & 9 deletions ...s-lake-paimon/src/main/java/org/apache/fluss/lake/paimon/tiering/PaimonLakeCommitter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@
import org.apache.paimon.Snapshot;
import org.apache.paimon.catalog.Catalog;
import org.apache.paimon.catalog.Identifier;
import org.apache.paimon.manifest.IndexManifestEntry;
import org.apache.paimon.manifest.ManifestCommittable;
import org.apache.paimon.manifest.ManifestEntry;
import org.apache.paimon.manifest.SimpleFileEntry;
import org.apache.paimon.table.FileStoreTable;
import org.apache.paimon.table.TableSnapshot;
import org.apache.paimon.table.sink.CommitCallback;
Expand Down Expand Up @@ -287,12 +284,8 @@ private FileStoreTable getTable(TablePath tablePath, boolean isAutoSnapshotExpir
public static class PaimonCommitCallback implements CommitCallback {

@Override
public void call(
List<SimpleFileEntry> baseFiles,
List<ManifestEntry> deltaFiles,
List<IndexManifestEntry> indexFiles,
Snapshot snapshot) {
currentCommitSnapshotId.set(snapshot.id());
public void call(Context context) {
currentCommitSnapshotId.set(context.snapshot.id());
}

@Override
Expand Down
12 changes: 12 additions & 0 deletions ...e-paimon/src/main/java/org/apache/paimon/arrow/converter/Arrow2PaimonVectorConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
import org.apache.paimon.types.ArrayType;
import org.apache.paimon.types.BigIntType;
import org.apache.paimon.types.BinaryType;
import org.apache.paimon.types.BlobType;
import org.apache.paimon.types.BooleanType;
import org.apache.paimon.types.CharType;
import org.apache.paimon.types.DataField;
Expand All @@ -85,6 +86,7 @@
import org.apache.paimon.types.VarBinaryType;
import org.apache.paimon.types.VarCharType;
import org.apache.paimon.types.VariantType;
import org.apache.paimon.types.VectorType;

import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -478,6 +480,11 @@ public Arrow2PaimonVectorConverter visit(VariantType variantType) {
throw new UnsupportedOperationException();
}

@Override
public Arrow2PaimonVectorConverter visit(BlobType blobType) {
throw new UnsupportedOperationException();
}

@Override
public Arrow2PaimonVectorConverter visit(ArrayType arrayType) {
final Arrow2PaimonVectorConverter arrowVectorConvertor =
Expand Down Expand Up @@ -519,6 +526,11 @@ public ColumnVector getColumnVector() {
};
}

@Override
public Arrow2PaimonVectorConverter visit(VectorType vectorType) {
throw new UnsupportedOperationException();
}

@Override
public Arrow2PaimonVectorConverter visit(MultisetType multisetType) {
throw new UnsupportedOperationException("Doesn't support MultisetType.");
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<curator.version>5.4.0</curator.version>
<netty.version>4.1.104.Final</netty.version>
<arrow.version>15.0.0</arrow.version>
<paimon.version>1.3.1</paimon.version>
<paimon.version>1.4.2</paimon.version>
<iceberg.version>1.10.1</iceberg.version>
<hudi.version>1.1.0</hudi.version>
<roaringbitmap.version>1.3.0</roaringbitmap.version>
Expand Down
Loading