Skip to content
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

[core] Exclude watermark and logOffsets for normal table #3331

Closed
wants to merge 2 commits into from
Closed

[core] Exclude watermark and logOffsets for normal table #3331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca40f98
[core] Exclude watermark and logOffsets for normark table
JingsongLi May 14, 2024
d3121a5
add test
JingsongLi May 14, 2024
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
18 changes: 16 additions & 2 deletions paimon-core/src/main/java/org/apache/paimon/Snapshot.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ public class Snapshot {
protected final long timeMillis;

@JsonProperty(FIELD_LOG_OFFSETS)
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonInclude(JsonInclude.Include.NON_EMPTY)
@Nullable
protected final Map<Integer, Long> logOffsets;

Expand Down Expand Up @@ -171,7 +171,7 @@ public class Snapshot {
// null if there is no watermark in new committing, and the previous snapshot does not have a
// watermark
@JsonProperty(FIELD_WATERMARK)
@JsonInclude(JsonInclude.Include.NON_NULL)
@JsonInclude(value = JsonInclude.Include.CUSTOM, valueFilter = WatermarkFilter.class)
@Nullable
protected final Long watermark;

Expand Down Expand Up @@ -516,4 +516,18 @@ public enum CommitKind {
/** Collect statistics. */
ANALYZE
}

/** Json Filter for watermark field. */
public static class WatermarkFilter {

@Override
public boolean equals(Object obj) {
if (!(obj instanceof Long)) {
return true;
}

long watermark = (long) obj;
return watermark == Long.MIN_VALUE;
}
}
}
8 changes: 6 additions & 2 deletions paimon-core/src/main/java/org/apache/paimon/tag/TagAutoCreation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,14 @@ public boolean forceCreatingSnapshot() {
return false;
}

Long watermark = latestSnapshot.watermark();
if (watermark == null) {
return false;
}

LocalDateTime snapshotTime =
LocalDateTime.ofInstant(
Instant.ofEpochMilli(latestSnapshot.watermark()),
ZoneId.systemDefault());
Instant.ofEpochMilli(watermark), ZoneId.systemDefault());

return isAfterOrEqual(LocalDateTime.now().minus(idlenessTimeout), snapshotTime);
} else if (timeExtractor instanceof ProcessTimeExtractor) {
Expand Down
72 changes: 72 additions & 0 deletions paimon-core/src/test/java/org/apache/paimon/SnapshotTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@

import org.junit.jupiter.api.Test;

import static org.assertj.core.api.Assertions.assertThat;

class SnapshotTest {

@Test
Expand All @@ -41,4 +43,74 @@ public void testJsonIgnoreProperties() {
+ " \"unknownKey\" : 22222\n"
+ "}");
}

@Test
public void testIgnoreLogOffset() {
Snapshot snapshot =
Snapshot.fromJson(
"{\n"
+ " \"version\" : 3,\n"
+ " \"id\" : 5,\n"
+ " \"schemaId\" : 0,\n"
+ " \"commitIdentifier\" : 0,\n"
+ " \"commitKind\" : \"APPEND\",\n"
+ " \"timeMillis\" : 1234,\n"
+ " \"logOffsets\" : { }\n"
+ "}");
assertThat(snapshot.toJson()).doesNotContain("logOffsets");

snapshot =
Snapshot.fromJson(
"{\n"
+ " \"version\" : 3,\n"
+ " \"id\" : 5,\n"
+ " \"schemaId\" : 0,\n"
+ " \"commitIdentifier\" : 0,\n"
+ " \"commitKind\" : \"APPEND\",\n"
+ " \"timeMillis\" : 1234,\n"
+ " \"logOffsets\" : {\"1\" : 2}\n"
+ "}");
assertThat(snapshot.toJson()).contains("logOffsets");
}

@Test
public void testIgnoreWatermark() {
Snapshot snapshot =
Snapshot.fromJson(
"{\n"
+ " \"version\" : 3,\n"
+ " \"id\" : 5,\n"
+ " \"schemaId\" : 0,\n"
+ " \"commitIdentifier\" : 0,\n"
+ " \"commitKind\" : \"APPEND\",\n"
+ " \"timeMillis\" : 1234,\n"
+ " \"watermark\" : -9223372036854775808\n"
+ "}");
assertThat(snapshot.toJson()).doesNotContain("watermark");

snapshot =
Snapshot.fromJson(
"{\n"
+ " \"version\" : 3,\n"
+ " \"id\" : 5,\n"
+ " \"schemaId\" : 0,\n"
+ " \"commitIdentifier\" : 0,\n"
+ " \"commitKind\" : \"APPEND\",\n"
+ " \"timeMillis\" : 1234\n"
+ "}");
assertThat(snapshot.toJson()).doesNotContain("watermark");

snapshot =
Snapshot.fromJson(
"{\n"
+ " \"version\" : 3,\n"
+ " \"id\" : 5,\n"
+ " \"schemaId\" : 0,\n"
+ " \"commitIdentifier\" : 0,\n"
+ " \"commitKind\" : \"APPEND\",\n"
+ " \"timeMillis\" : 1234,\n"
+ " \"watermark\" : 121312312\n"
+ "}");
assertThat(snapshot.toJson()).contains("watermark");
}
}
Loading