(flink-benchmarks) branch master updated: [hotfix] Extract common preparing directory code into one function for state benchmark

[hangxiang]

This is an automated email from the ASF dual-hosted git repository.

hangxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-benchmarks.git


The following commit(s) were added to refs/heads/master by this push:
     new 8b0b1c6  [hotfix] Extract common preparing directory code into one 
function for state benchmark
8b0b1c6 is described below

commit 8b0b1c620107282548c8b6014eb303a10c79d921
Author: Zakelly <zakelly....@gmail.com>
AuthorDate: Sun Jan 7 11:31:47 2024 +0800

    [hotfix] Extract common preparing directory code into one function for 
state benchmark
---
 .../state/benchmark/RescalingBenchmarkBase.java      | 20 +++-----------------
 .../flink/state/benchmark/StateBenchmarkBase.java    |  6 +++++-
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git 
a/src/main/java/org/apache/flink/state/benchmark/RescalingBenchmarkBase.java 
b/src/main/java/org/apache/flink/state/benchmark/RescalingBenchmarkBase.java
index ef03389..be25fd7 100644
--- a/src/main/java/org/apache/flink/state/benchmark/RescalingBenchmarkBase.java
+++ b/src/main/java/org/apache/flink/state/benchmark/RescalingBenchmarkBase.java
@@ -46,6 +46,8 @@ import java.util.Arrays;
 import java.util.Iterator;
 import java.util.Random;
 
+import static 
org.apache.flink.state.benchmark.StateBenchmarkBase.createStateDataDir;
+
 public class RescalingBenchmarkBase extends BenchmarkBase {
 
     @Param({"RESCALE_IN", "RESCALE_OUT"})
@@ -64,23 +66,7 @@ public class RescalingBenchmarkBase extends BenchmarkBase {
     }
 
     protected static File prepareDirectory(String prefix) throws IOException {
-        Configuration benchMarkConfig = ConfigUtil.loadBenchMarkConf();
-        String stateDataDirPath = 
benchMarkConfig.getString(StateBenchmarkOptions.STATE_DATA_DIR);
-        File dataDir = null;
-        if (stateDataDirPath != null) {
-            dataDir = new File(stateDataDirPath);
-            if (!dataDir.exists()) {
-                Files.createDirectories(Paths.get(stateDataDirPath));
-            }
-        }
-        File target = File.createTempFile(prefix, "", dataDir);
-        if (target.exists() && !target.delete()) {
-            throw new IOException("Target dir {" + target.getAbsolutePath() + 
"} exists but failed to clean it up");
-        } else if (!target.mkdirs()) {
-            throw new IOException("Failed to create target directory: " + 
target.getAbsolutePath());
-        } else {
-            return target;
-        }
+        return StateBackendBenchmarkUtils.prepareDirectory(prefix, 
createStateDataDir());
     }
 
     @State(Scope.Thread)
diff --git 
a/src/main/java/org/apache/flink/state/benchmark/StateBenchmarkBase.java 
b/src/main/java/org/apache/flink/state/benchmark/StateBenchmarkBase.java
index 99e9c48..345063c 100644
--- a/src/main/java/org/apache/flink/state/benchmark/StateBenchmarkBase.java
+++ b/src/main/java/org/apache/flink/state/benchmark/StateBenchmarkBase.java
@@ -67,6 +67,10 @@ public class StateBenchmarkBase extends BenchmarkBase {
     }
 
     protected KeyedStateBackend<Long> createKeyedStateBackend(TtlTimeProvider 
ttlTimeProvider) throws Exception {
+        return StateBackendBenchmarkUtils.createKeyedStateBackend(backendType, 
createStateDataDir());
+    }
+
+    public static File createStateDataDir() throws IOException {
         Configuration benchMarkConfig = ConfigUtil.loadBenchMarkConf();
         String stateDataDirPath = 
benchMarkConfig.getString(StateBenchmarkOptions.STATE_DATA_DIR);
         File dataDir = null;
@@ -76,7 +80,7 @@ public class StateBenchmarkBase extends BenchmarkBase {
                 Files.createDirectories(Paths.get(stateDataDirPath));
             }
         }
-        return StateBackendBenchmarkUtils.createKeyedStateBackend(backendType, 
dataDir);
+        return dataDir;
     }
 
     private static int getCurrentIndex() {