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

Merge branch 'main' into environment_in_atfile

Browse Source
This commit is contained in:
Dave Fisher 2024-07-23 13:05:23 -07:00 committed by GitHub
commit cf5a94aed3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
nb-adapters/adapter-cqld4/src/main/java/io/nosqlbench/cqlgen/core/CGWorkloadExporter.java
View File

@ -72,6 +72,7 @@ public class CGWorkloadExporter implements BundledApp {
private String namingTemplate; private String namingTemplate;
private double partitionMultiplier; private double partitionMultiplier;
private int quantizerDigits; private int quantizerDigits;
private boolean enableIfExists = true;
private Map<String, List<String>> blockplan = Map.of(); private Map<String, List<String>> blockplan = Map.of();
private final Map<String, Double> timeouts = new HashMap<String, Double>(Map.of( private final Map<String, Double> timeouts = new HashMap<String, Double>(Map.of(
@ -163,6 +164,9 @@ public class CGWorkloadExporter implements BundledApp {
configureTimeouts(cfgmap.get("timeouts")); configureTimeouts(cfgmap.get("timeouts"));
configureBlocks(cfgmap.get("blockplan")); configureBlocks(cfgmap.get("blockplan"));
configureQuantizerDigits(cfgmap.get("quantizer_digits")); configureQuantizerDigits(cfgmap.get("quantizer_digits"));
if (cfgmap.get("enable_if_exists").equals(false)) {
enableIfExists = false;
}
this.model = CqlModelParser.parse(ddl, srcpath); this.model = CqlModelParser.parse(ddl, srcpath);
List<String> errorlist = model.getReferenceErrors(); List<String> errorlist = model.getReferenceErrors();
@ -639,7 +643,7 @@ public class CGWorkloadExporter implements BundledApp {
ops.put( ops.put(
namer.nameFor(table, "optype", "drop", "blockname", blockname), namer.nameFor(table, "optype", "drop", "blockname", blockname),
Map.of( Map.of(
"simple", "drop table if exists " + table.getFullName() + ";", "simple", (enableIfExists ? "drop table if exists " : "drop table ") + table.getFullName() + ";",
"timeout", timeouts.get("drop") "timeout", timeouts.get("drop")
) )
); );
@ -655,7 +659,7 @@ public class CGWorkloadExporter implements BundledApp {
ops.put( ops.put(
namer.nameFor(type, "optype", "drop-type", "blockname", blockname), namer.nameFor(type, "optype", "drop-type", "blockname", blockname),
Map.of( Map.of(
"simple", "drop type if exists " + type.getKeyspace() + "." + type.getName() + ";", "simple", (enableIfExists ? "drop type if exists " : "drop type ") + "." + type.getName() + ";",
"timeout", timeouts.get("drop") "timeout", timeouts.get("drop")
) )
); );
@ -671,7 +675,7 @@ public class CGWorkloadExporter implements BundledApp {
ops.put( ops.put(
namer.nameFor(type, "optype", "drop-keyspace", "blockname", blockname), namer.nameFor(type, "optype", "drop-keyspace", "blockname", blockname),
Map.of( Map.of(
"simple", "drop keyspace if exists " + type.getKeyspace() + ";", "simple", (enableIfExists ? "drop keyspace if exists " : "drop keyspace ") + type.getKeyspace() + ";",
"timeout", timeouts.get("drop") "timeout", timeouts.get("drop")
) )
); );
@ -736,9 +740,10 @@ public class CGWorkloadExporter implements BundledApp {
private String genKeyspaceDDL(CqlKeyspaceDef keyspace) { private String genKeyspaceDDL(CqlKeyspaceDef keyspace) {
return """ return """
create keyspace KEYSPACE create keyspace IF_NOT_EXISTS KEYSPACE
with replication = {REPLICATION}DURABLEWRITES?; with replication = {REPLICATION}DURABLEWRITES?;
""" """
.replace("IF_NOT_EXISTS", enableIfExists ? "if not exists" : "")
.replace("KEYSPACE", keyspace.getName()) .replace("KEYSPACE", keyspace.getName())
.replace("REPLICATION", keyspace.getReplicationData()) .replace("REPLICATION", keyspace.getReplicationData())
.replace("DURABLEWRITES?", keyspace.isDurableWrites() ? "" : "\n and durable writes = false") .replace("DURABLEWRITES?", keyspace.isDurableWrites() ? "" : "\n and durable writes = false")
@ -766,10 +771,11 @@ public class CGWorkloadExporter implements BundledApp {
private String genTypeDDL(CqlType type) { private String genTypeDDL(CqlType type) {
return """ return """
create type KEYSPACE.TYPENAME ( create type IF_NOT_EXISTS KEYSPACE.TYPENAME (
TYPEDEF TYPEDEF
); );
""" """
.replace("IF_NOT_EXISTS", enableIfExists ? "if not exists" : "")
.replace("KEYSPACE", type.getKeyspace().getName()) .replace("KEYSPACE", type.getKeyspace().getName())
.replace("TYPENAME", type.getName()) .replace("TYPENAME", type.getName())
.replace("TYPEDEF", type.getColumnDefs().stream() .replace("TYPEDEF", type.getColumnDefs().stream()
@ -782,11 +788,12 @@ public class CGWorkloadExporter implements BundledApp {
} }
return """ return """
create table if not exists KEYSPACE.TABLE ( create table IF_NOT_EXISTS KEYSPACE.TABLE (
COLUMN_DEFS, COLUMN_DEFS,
primary key (PRIMARYKEY) primary key (PRIMARYKEY)
)CLUSTERING; )CLUSTERING;
""" """
.replace("IF_NOT_EXISTS", enableIfExists ? "if not exists" : "")
.replace("KEYSPACE", cqltable.getKeyspace().getName()) .replace("KEYSPACE", cqltable.getKeyspace().getName())
.replace("TABLE", cqltable.getName()) .replace("TABLE", cqltable.getName())
.replace("COLUMN_DEFS", genTableColumnDDL(cqltable)) .replace("COLUMN_DEFS", genTableColumnDDL(cqltable))

4
nb-adapters/adapter-cqld4/src/main/resources/cqlgen/cqlgen.conf
View File

@ -145,6 +145,6 @@ blockplan:
# not needed when tags=block:'main.*' # not needed when tags=block:'main.*'
# main: insert, select, scan-10, update # main: insert, select, scan-10, update
# Configuration option for adding 'IF NOT EXISTS' or 'IF EXISTS' in all generated DDL statements
enable_if_exists: true