You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by lz...@apache.org on 2022/06/28 03:27:47 UTC
[flink-table-store] branch master updated: [hotfix] Fix merge conflicts in FileStoreExpireTest
This is an automated email from the ASF dual-hosted git repository.
lzljs3620320 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-table-store.git
The following commit(s) were added to refs/heads/master by this push:
new 2bc1d03c [hotfix] Fix merge conflicts in FileStoreExpireTest
2bc1d03c is described below
commit 2bc1d03c383cb67658ef11dd57d20a7441145c92
Author: JingsongLi <lz...@aliyun.com>
AuthorDate: Tue Jun 28 11:27:38 2022 +0800
[hotfix] Fix merge conflicts in FileStoreExpireTest
---
.../flink/table/store/file/operation/FileStoreExpireTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/FileStoreExpireTest.java b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/FileStoreExpireTest.java
index 999be1c9..b9fac9fd 100644
--- a/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/FileStoreExpireTest.java
+++ b/flink-table-store-core/src/test/java/org/apache/flink/table/store/file/operation/FileStoreExpireTest.java
@@ -25,8 +25,8 @@ import org.apache.flink.table.store.file.KeyValue;
import org.apache.flink.table.store.file.Snapshot;
import org.apache.flink.table.store.file.TestFileStore;
import org.apache.flink.table.store.file.TestKeyValueGenerator;
-import org.apache.flink.table.store.file.ValueKind;
import org.apache.flink.table.store.file.data.DataFileMeta;
+import org.apache.flink.table.store.file.manifest.FileKind;
import org.apache.flink.table.store.file.manifest.ManifestEntry;
import org.apache.flink.table.store.file.mergetree.compact.DeduplicateMergeFunction;
import org.apache.flink.table.store.file.utils.FileUtils;
@@ -105,8 +105,8 @@ public class FileStoreExpireTest {
0,
0,
extraFiles);
- ManifestEntry add = new ManifestEntry(ValueKind.ADD, partition, 0, 1, dataFile);
- ManifestEntry delete = new ManifestEntry(ValueKind.DELETE, partition, 0, 1, dataFile);
+ ManifestEntry add = new ManifestEntry(FileKind.ADD, partition, 0, 1, dataFile);
+ ManifestEntry delete = new ManifestEntry(FileKind.DELETE, partition, 0, 1, dataFile);
// expire
expire.expireDataFiles(Arrays.asList(add, delete));