Merge pull request #1114 from nosqlbench/jeffb/fix-mongodb-scen-formats

Adapter and ops loader fixes

adapter-cqld4/src/main/resources/activities/baselines/cql-iot-dse.yaml

@@ -43,7 +43,7 @@ blocks:
         };
 
       truncate-table: |
-        truncate table <<keyspace:baselines>>.<<table:iot>>;
+        truncate table TEMPLATE(keyspace, baselines).TEMPLATE(table:iot);
   rampup:
     params:
       cl: <<write_cl:LOCAL_QUORUM>>

adapter-cqld4/src/main/resources/activities/baselines/cql-starter.yaml

@@ -40,7 +40,7 @@ blocks:
         PRIMARY KEY ((machine_id), time)
         ) WITH CLUSTERING ORDER BY (time DESC);
       truncate-table: |
-        truncate table <<keyspace:starter>>.<<table:cqlstarter>>;
+        truncate table TEMPLATE(keyspace,starter).TEMPLATE(table,cqlstarter);
   schema-astra:
     params:
       prepared: false

adapter-mongodb/src/main/resources/activities/mongodb-search-basic.yaml

@@ -104,8 +104,10 @@ blocks:
                 "debt":         null,
                 "match1":       {match1},
                 "match2":       "{match2}",
-                "match3":       {match2}
-                {additional_fields}
+                "match3":       {match2},
+                {
+                  additional_fields
+                }
               }
             ]
           }

adapters-api/src/main/java/io/nosqlbench/engine/api/activityconfig/OpsLoader.java

@@ -81,7 +81,9 @@ public class OpsLoader {
 
         transformer.checkpointAccesses().forEach((k, v) -> {
             layered.addTemplateVariable(k, v);
+            if (params.containsKey(k)) {
                 params.remove(k);
+            }
         });
 
         return layered;