Repository: cassandra Updated Branches: refs/heads/trunk 0565690de -> 2c4b30164
remove dead parm 'isDense', obsoleted by 9c3855b Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2c4b3016 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2c4b3016 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2c4b3016 Branch: refs/heads/trunk Commit: 2c4b3016413de3f329c8128b138827f828c86dd0 Parents: 0565690 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Mon Aug 8 22:57:19 2016 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Mon Aug 8 22:57:19 2016 -0400 ---------------------------------------------------------------------- .../apache/cassandra/cql3/SingleColumnRelation.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2c4b3016/src/java/org/apache/cassandra/cql3/SingleColumnRelation.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/SingleColumnRelation.java b/src/java/org/apache/cassandra/cql3/SingleColumnRelation.java index 1565102..22df6bd 100644 --- a/src/java/org/apache/cassandra/cql3/SingleColumnRelation.java +++ b/src/java/org/apache/cassandra/cql3/SingleColumnRelation.java @@ -161,10 +161,10 @@ public final class SingleColumnRelation extends Relation ColumnDefinition columnDef = entity.prepare(cfm); if (mapKey == null) { - Term term = toTerm(toReceivers(columnDef, cfm.isDense()), value, cfm.ksName, boundNames); + Term term = toTerm(toReceivers(columnDef), value, cfm.ksName, boundNames); return new SingleColumnRestriction.EQRestriction(columnDef, term); } - List<? extends ColumnSpecification> receivers = toReceivers(columnDef, cfm.isDense()); + List<? extends ColumnSpecification> receivers = toReceivers(columnDef); Term entryKey = toTerm(Collections.singletonList(receivers.get(0)), mapKey, cfm.ksName, boundNames); Term entryValue = toTerm(Collections.singletonList(receivers.get(1)), value, cfm.ksName, boundNames); return new SingleColumnRestriction.ContainsRestriction(columnDef, entryKey, entryValue); @@ -175,7 +175,7 @@ public final class SingleColumnRelation extends Relation VariableSpecifications boundNames) throws InvalidRequestException { ColumnDefinition columnDef = entity.prepare(cfm); - List<? extends ColumnSpecification> receivers = toReceivers(columnDef, cfm.isDense()); + List<? extends ColumnSpecification> receivers = toReceivers(columnDef); List<Term> terms = toTerms(receivers, inValues, cfm.ksName, boundNames); if (terms == null) { @@ -197,7 +197,7 @@ public final class SingleColumnRelation extends Relation boolean inclusive) throws InvalidRequestException { ColumnDefinition columnDef = entity.prepare(cfm); - Term term = toTerm(toReceivers(columnDef, cfm.isDense()), value, cfm.ksName, boundNames); + Term term = toTerm(toReceivers(columnDef), value, cfm.ksName, boundNames); return new SingleColumnRestriction.SliceRestriction(columnDef, bound, inclusive, term); } @@ -207,7 +207,7 @@ public final class SingleColumnRelation extends Relation boolean isKey) throws InvalidRequestException { ColumnDefinition columnDef = entity.prepare(cfm); - Term term = toTerm(toReceivers(columnDef, cfm.isDense()), value, cfm.ksName, boundNames); + Term term = toTerm(toReceivers(columnDef), value, cfm.ksName, boundNames); return new SingleColumnRestriction.ContainsRestriction(columnDef, term, isKey); } @@ -228,7 +228,7 @@ public final class SingleColumnRelation extends Relation throw invalidRequest("%s can't be used with collections.", operator()); ColumnDefinition columnDef = entity.prepare(cfm); - Term term = toTerm(toReceivers(columnDef, cfm.isDense()), value, cfm.ksName, boundNames); + Term term = toTerm(toReceivers(columnDef), value, cfm.ksName, boundNames); return new SingleColumnRestriction.LikeRestriction(columnDef, operator, term); } @@ -236,12 +236,10 @@ public final class SingleColumnRelation extends Relation /** * Returns the receivers for this relation. * @param columnDef the column definition - * @param isDense whether the table is a dense one - * * @return the receivers for the specified relation. * @throws InvalidRequestException if the relation is invalid */ - private List<? extends ColumnSpecification> toReceivers(ColumnDefinition columnDef, boolean isDense) throws InvalidRequestException + private List<? extends ColumnSpecification> toReceivers(ColumnDefinition columnDef) throws InvalidRequestException { ColumnSpecification receiver = columnDef;
