IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

removed doc name prepending on block tag names

Browse Source
This commit is contained in:
Jonathan Shook 2023-10-05 20:05:03 -05:00
parent 2b2e969fa6
commit 36a233eaa1
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
adapters-api/src/main/java/io/nosqlbench/adapters/api/activityconfig/yaml/OpsBlock.java
View File

@ -52,9 +52,10 @@ public class OpsBlock implements Tagged, Iterable<OpTemplate> {
public String getName() { public String getName() {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
if (!rawOpsDoc.getName().isEmpty()) { // TODO: document and fix this
sb.append(rawOpsDoc.getName()).append("--"); // if (!rawOpsDoc.getName().isEmpty()) {
} // sb.append(rawOpsDoc.getName()).append("--");
// }
if (!rawOpsBlock.getName().isEmpty()) { if (!rawOpsBlock.getName().isEmpty()) {
sb.append(rawOpsBlock.getName()); sb.append(rawOpsBlock.getName());
} else { } else {

7
engine-api/src/main/java/io/nosqlbench/engine/api/activityimpl/SimpleActivity.java
View File

@ -508,7 +508,6 @@ public class SimpleActivity implements Activity {
logger.warn("initialized {} op templates for dry run only. These ops will be synthesized for each cycle, but will not be executed.", dryrunCount); logger.warn("initialized {} op templates for dry run only. These ops will be synthesized for each cycle, but will not be executed.", dryrunCount);
} }
return planner.resolve(); return planner.resolve();
} catch (Exception e) { } catch (Exception e) {
@ -547,19 +546,19 @@ public class SimpleActivity implements Activity {
List<OpTemplate> unfilteredOps = opsDocList.getOps(); List<OpTemplate> unfilteredOps = opsDocList.getOps();
List<OpTemplate> filteredOps = opsDocList.getOps(tagfilter); List<OpTemplate> filteredOps = opsDocList.getOps(tagfilter);
if (0 == filteredOps.size()) { if (filteredOps.isEmpty()) {
// There were no ops, and it *wasn't* because they were all filtered out. // There were no ops, and it *wasn't* because they were all filtered out.
// In this case, let's try to synthesize the ops as long as at least a default driver was provided // In this case, let's try to synthesize the ops as long as at least a default driver was provided
// But if there were no ops, and there was no default driver provided, we can't continue // But if there were no ops, and there was no default driver provided, we can't continue
// There were no ops, and it was because they were all filtered out // There were no ops, and it was because they were all filtered out
if (0 < unfilteredOps.size()) { if (!unfilteredOps.isEmpty()) {
throw new BasicError("There were no active op templates with tag filter '" throw new BasicError("There were no active op templates with tag filter '"
+ tagfilter + "', since all " + unfilteredOps.size() + " were filtered out."); + tagfilter + "', since all " + unfilteredOps.size() + " were filtered out.");
} }
if (defaultDriverAdapter.isPresent() && defaultDriverAdapter.get() instanceof SyntheticOpTemplateProvider sotp) { if (defaultDriverAdapter.isPresent() && defaultDriverAdapter.get() instanceof SyntheticOpTemplateProvider sotp) {
filteredOps = sotp.getSyntheticOpTemplates(opsDocList, this.activityDef.getParams()); filteredOps = sotp.getSyntheticOpTemplates(opsDocList, this.activityDef.getParams());
Objects.requireNonNull(filteredOps); Objects.requireNonNull(filteredOps);
if (0 == filteredOps.size()) { if (filteredOps.isEmpty()) {
throw new BasicError("Attempted to create synthetic ops from driver '" + defaultDriverAdapter.get().getAdapterName() + '\'' + throw new BasicError("Attempted to create synthetic ops from driver '" + defaultDriverAdapter.get().getAdapterName() + '\'' +
" but no ops were created. You must provide either a workload or an op parameter. Activities require op templates."); " but no ops were created. You must provide either a workload or an op parameter. Activities require op templates.");
} }