fixes cmu-db#130 (cmu-db#131)

shaharuk-yb · Mar 11, 2022 · df03a43 · df03a43
1 parent d388a5f
commit df03a43
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/main/java/com/oltpbenchmark/DBWorkload.java b/src/main/java/com/oltpbenchmark/DBWorkload.java
@@ -30,7 +30,7 @@
 import org.apache.commons.configuration2.XMLConfiguration;
 import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder;
 import org.apache.commons.configuration2.builder.fluent.Parameters;
-import org.apache.commons.configuration2.convert.LegacyListDelimiterHandler;
+import org.apache.commons.configuration2.convert.DisabledListDelimiterHandler;
 import org.apache.commons.configuration2.ex.ConfigurationException;
 import org.apache.commons.configuration2.tree.ImmutableNode;
 import org.apache.commons.configuration2.tree.xpath.XPathExpressionEngine;
@@ -244,7 +244,7 @@ public static void main(String[] args) throws Exception {
 
                 // Get the weights for this grouping and make sure that there
                 // is an appropriate number of them.
-                List<String> groupingWeights = xmlConfig.getList(String.class, key + "/weights");
+                List<String> groupingWeights = Arrays.asList(xmlConfig.getString(key + "/weights").split("\\s*,\\s*"));
                 if (groupingWeights.size() != numTxnTypes) {
                     LOG.error(String.format("Grouping \"%s\" has %d weights," + " but there are %d transactions in this" + " benchmark.", groupingName, groupingWeights.size(), numTxnTypes));
                     System.exit(-1);
@@ -268,9 +268,9 @@ public static void main(String[] args) throws Exception {
                 // use a workaround if there are multiple workloads or single
                 // attributed workload
                 if (targetList.length > 1 || work.containsKey("weights[@bench]")) {
-                    weight_strings = work.getList(String.class, "weights" + pluginTest);
+                    weight_strings = Arrays.asList(work.getString("weights" + pluginTest).split("\\s*,\\s*"));
                 } else {
-                    weight_strings = work.getList(String.class, "weights[not(@bench)]");
+                    weight_strings = Arrays.asList(work.getString("weights[not(@bench)]").split("\\s*,\\s*"));
                 }
 
                 int rate = 1;
@@ -498,7 +498,7 @@ private static XMLConfiguration buildConfiguration(String filename) throws Confi
         FileBasedConfigurationBuilder<XMLConfiguration> builder = new FileBasedConfigurationBuilder<>(XMLConfiguration.class)
                 .configure(params.xml()
                         .setFileName(filename)
-                        .setListDelimiterHandler(new LegacyListDelimiterHandler(','))
+                        .setListDelimiterHandler(new DisabledListDelimiterHandler())
                         .setExpressionEngine(new XPathExpressionEngine()));
         return builder.getConfiguration();