natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cassandra-stress: cannot handle "value-less" tables 

patch by Cheng Ren reviewed by Robert Stupp for CASSANDRA-7739
This commit is contained in:
Cheng Ren 2016-03-28 19:30:22 +02:00 committed by Robert Stupp
parent ca2e71c381
commit 5beedbc662
2 changed files with 54 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -1,4 +1,5 @@
3.6
* cassandra-stress: cannot handle "value-less" tables (CASSANDRA-7739)
* Add/drop multiple columns in one ALTER TABLE statement (CASSANDRA-10411)
* Add require_endpoint_verification opt for internode encryption (CASSANDRA-9220)
* Add auto import java.util for UDF code block (CASSANDRA-11392)

83
tools/stress/src/org/apache/cassandra/stress/StressProfile.java
View File

@ -368,41 +368,50 @@ public class StressProfile implements Serializable
maybeLoadSchemaInfo(settings);
Set<ColumnMetadata> keyColumns = com.google.common.collect.Sets.newHashSet(tableMetaData.getPrimaryKey());
Set<ColumnMetadata> allColumns = com.google.common.collect.Sets.newHashSet(tableMetaData.getColumns());
boolean isKeyOnlyTable = (keyColumns.size() == allColumns.size());
//With compact storage
if (!isKeyOnlyTable && (keyColumns.size() == (allColumns.size() - 1)))
{
com.google.common.collect.Sets.SetView diff = com.google.common.collect.Sets.difference(allColumns, keyColumns);
for (Object obj : diff)
{
ColumnMetadata col = (ColumnMetadata)obj;
isKeyOnlyTable = col.getName().isEmpty();
break;
}
}
//Non PK Columns
StringBuilder sb = new StringBuilder();
sb.append("UPDATE \"").append(tableName).append("\" SET ");
//PK Columns
StringBuilder pred = new StringBuilder();
pred.append(" WHERE ");
boolean firstCol = true;
boolean firstPred = true;
for (ColumnMetadata c : tableMetaData.getColumns())
if (!isKeyOnlyTable)
{
sb.append("UPDATE \"").append(tableName).append("\" SET ");
//PK Columns
StringBuilder pred = new StringBuilder();
pred.append(" WHERE ");
if (keyColumns.contains(c))
{
if (firstPred)
firstPred = false;
else
pred.append(" AND ");
boolean firstCol = true;
boolean firstPred = true;
for (ColumnMetadata c : tableMetaData.getColumns()) {
pred.append(c.getName()).append(" = ?");
}
else
{
if (firstCol)
firstCol = false;
else
sb.append(",");
if (keyColumns.contains(c)) {
if (firstPred)
firstPred = false;
else
pred.append(" AND ");
sb.append(c.getName()).append(" = ");
pred.append(c.getName()).append(" = ?");
} else {
if (firstCol)
firstCol = false;
else
sb.append(',');
switch (c.getType().getName())
{
sb.append(c.getName()).append(" = ");
switch (c.getType().getName())
{
case SET:
case LIST:
case COUNTER:
@ -411,12 +420,26 @@ public class StressProfile implements Serializable
default:
sb.append("?");
break;
}
}
}
}
//Put PK predicates at the end
sb.append(pred);
//Put PK predicates at the end
sb.append(pred);
}
else
{
sb.append("INSERT INTO \"").append(tableName).append("\" (");
StringBuilder value = new StringBuilder();
for (ColumnMetadata c : tableMetaData.getPrimaryKey())
{
sb.append(c.getName()).append(", ");
value.append("?, ");
}
sb.delete(sb.lastIndexOf(","), sb.length());
value.delete(value.lastIndexOf(","), value.length());
sb.append(") ").append("values(").append(value).append(')');
}
if (insert == null)
insert = new HashMap<>();