Repository: cassandra Updated Branches: refs/heads/trunk 1dea6b020 -> 2096bcefd
remove dead collections Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2096bcef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2096bcef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2096bcef Branch: refs/heads/trunk Commit: 2096bcefd510fd1e41f0b6a172805547ed06e9d4 Parents: 1dea6b0 Author: Dave Brosius <[email protected]> Authored: Mon May 4 21:58:52 2015 -0400 Committer: Dave Brosius <[email protected]> Committed: Mon May 4 21:58:52 2015 -0400 ---------------------------------------------------------------------- .../operations/userdefined/ValidatingSchemaQuery.java | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2096bcef/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/ValidatingSchemaQuery.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/ValidatingSchemaQuery.java b/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/ValidatingSchemaQuery.java index 2cbdcb4..1b10fcf 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/ValidatingSchemaQuery.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/ValidatingSchemaQuery.java @@ -131,8 +131,6 @@ public class ValidatingSchemaQuery extends Operation valueIndex[i++] = spec.partitionGenerator.indexOf(definition.getName()); } - List<Object[]> prev1 = new ArrayList<>(); - List<Object[]> prev2 = new ArrayList<>(); rowCount = 0; Iterator<com.datastax.driver.core.Row> results = rs.iterator(); if (!statements[statementIndex].inclusiveStart && iter.hasNext()) @@ -148,24 +146,16 @@ public class ValidatingSchemaQuery extends Operation rowCount++; com.datastax.driver.core.Row actualRow = results.next(); - Object[] vs1 = new Object[actualRow.getColumnDefinitions().size()]; - Object[] vs2 = vs1.clone(); for (int i = 0 ; i < actualRow.getColumnDefinitions().size() ; i++) { Object expectedValue = expectedRow.get(valueIndex[i]); Object actualValue = spec.partitionGenerator.convert(valueIndex[i], actualRow.getBytesUnsafe(i)); - vs1[i] = expectedValue; - vs2[i] = actualValue; if (!expectedValue.equals(actualValue)) return false; } - prev1.add(vs1); - prev2.add(vs2); } partitionCount = Math.min(1, rowCount); - if (!rs.isExhausted()) - return false; - return true; + return rs.isExhausted(); } }
