Rebase

apache · May 11, 2020 · e5127c6 · e5127c6
1 parent 2a206df
commit e5127c6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...-blink/src/main/java/org/apache/flink/table/filesystem/stream/PartitionCommitManager.java b/...-blink/src/main/java/org/apache/flink/table/filesystem/stream/PartitionCommitManager.java
@@ -41,12 +41,12 @@
 import java.util.Set;
 import java.util.TreeMap;
 
+import static org.apache.flink.table.filesystem.DefaultPartTimeExtractor.toMills;
 import static org.apache.flink.table.filesystem.FileSystemOptions.PARTITION_TIME_EXTRACTOR_CLASS;
 import static org.apache.flink.table.filesystem.FileSystemOptions.PARTITION_TIME_EXTRACTOR_TIMESTAMP_PATTERN;
 import static org.apache.flink.table.filesystem.FileSystemOptions.PARTITION_TIME_EXTRACTOR_TYPE;
 import static org.apache.flink.table.filesystem.FileSystemOptions.PARTITION_TIME_INTERVAL;
-import static org.apache.flink.table.filesystem.PartitionPathUtils.extractPartitionValues;
-import static org.apache.flink.table.filesystem.DefaultPartTimeExtractor.toMills;
+import static org.apache.flink.table.utils.PartitionPathUtils.extractPartitionValues;
 
 /**
  * Manage partition and watermark information.

diff --git a/...-blink/src/main/java/org/apache/flink/table/filesystem/stream/StreamingFileCommitter.java b/...-blink/src/main/java/org/apache/flink/table/filesystem/stream/StreamingFileCommitter.java
@@ -38,8 +38,8 @@
 
 import static org.apache.flink.table.filesystem.FileSystemOptions.PARTITION_COMMIT_POLICY_SUCCESS_FILE_NAME;
 import static org.apache.flink.table.filesystem.FileSystemOptions.PARTITION_COMMIT_POLICY_TYPE;
-import static org.apache.flink.table.filesystem.PartitionPathUtils.extractPartitionSpecFromPath;
-import static org.apache.flink.table.filesystem.PartitionPathUtils.generatePartitionPath;
+import static org.apache.flink.table.utils.PartitionPathUtils.extractPartitionSpecFromPath;
+import static org.apache.flink.table.utils.PartitionPathUtils.generatePartitionPath;
 
 /**
  * Committer for {@link StreamingFileWriter}. This is the single (non-parallel) task.