diff options
author | Harald Musum <musum@oath.com> | 2018-12-20 10:56:56 +0100 |
---|---|---|
committer | Harald Musum <musum@oath.com> | 2018-12-20 10:56:56 +0100 |
commit | b6f3451ef5c2c6db8b606a5a10842c580e3710c1 (patch) | |
tree | f08fd6d85e1dc3ed59f60f27437958efc7fd7a37 /config | |
parent | 5c7caf75e8bdaf3064fb592585def406c88e5113 (diff) |
Simplify
Diffstat (limited to 'config')
-rw-r--r-- | config/src/main/java/com/yahoo/vespa/config/benchmark/LoadTester.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/config/src/main/java/com/yahoo/vespa/config/benchmark/LoadTester.java b/config/src/main/java/com/yahoo/vespa/config/benchmark/LoadTester.java index 432107199d4..0a128e3049b 100644 --- a/config/src/main/java/com/yahoo/vespa/config/benchmark/LoadTester.java +++ b/config/src/main/java/com/yahoo/vespa/config/benchmark/LoadTester.java @@ -5,13 +5,13 @@ import com.yahoo.collections.Tuple2; import com.yahoo.io.IOUtils; import com.yahoo.jrt.*; import com.yahoo.system.CommandLineParser; -import com.yahoo.text.Utf8; import com.yahoo.vespa.config.ConfigDefinitionKey; import com.yahoo.vespa.config.ConfigKey; import com.yahoo.vespa.config.protocol.*; import com.yahoo.vespa.config.util.ConfigUtils; import java.io.*; +import java.nio.charset.StandardCharsets; import java.util.*; /** @@ -93,11 +93,8 @@ public class LoadTester { for (File f : files) { String name = f.getName(); if (!name.endsWith(".def")) continue; - String[] splitted = name.split("\\."); - if (splitted.length<2) continue; - String nam = splitted[splitted.length - 2]; String contents = IOUtils.readFile(f); - ConfigDefinitionKey key = ConfigUtils.createConfigDefinitionKeyFromDefContent(nam, Utf8.toBytes(contents)); + ConfigDefinitionKey key = ConfigUtils.createConfigDefinitionKeyFromDefFile(f); ret.put(key, new Tuple2<>(ConfigUtils.getDefMd5(Arrays.asList(contents.split("\n"))), contents.split("\n"))); } System.out.println("# Read "+ret.size()+" def files from "+defDir.getPath()); |