Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/567f9066 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/567f9066 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/567f9066 Branch: refs/heads/trunk Commit: 567f90666293c05ac0b9b9d74b7cf8e053d6dc4c Parents: 091e5fb 6b8da36 Author: Benjamin Lerer <[email protected]> Authored: Mon Mar 20 12:34:33 2017 +0100 Committer: Benjamin Lerer <[email protected]> Committed: Mon Mar 20 12:34:33 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../apache/cassandra/db/filter/RowFilter.java | 21 +++++----- src/java/org/apache/cassandra/db/rows/Row.java | 2 +- .../validation/entities/SecondaryIndexTest.java | 39 ++++++++++++++++++ .../cql3/validation/operations/SelectTest.java | 42 ++++++++++++++++++++ 5 files changed, 95 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/567f9066/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/567f9066/src/java/org/apache/cassandra/db/filter/RowFilter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/567f9066/src/java/org/apache/cassandra/db/rows/Row.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/rows/Row.java index 04092a6,2915a46..7449e51 --- a/src/java/org/apache/cassandra/db/rows/Row.java +++ b/src/java/org/apache/cassandra/db/rows/Row.java @@@ -132,9 -132,9 +132,9 @@@ public interface Row extends Unfiltered * The returned object groups all the cells for the column, as well as it's complex deletion (if relevant). * * @param c the complex column for which to return the complex data. - * @return the data for {@code c} or {@code null} is the row has no data for this column. + * @return the data for {@code c} or {@code null} if the row has no data for this column. */ - public ComplexColumnData getComplexColumnData(ColumnDefinition c); + public ComplexColumnData getComplexColumnData(ColumnMetadata c); /** * An iterable over the cells of this row. http://git-wip-us.apache.org/repos/asf/cassandra/blob/567f9066/test/unit/org/apache/cassandra/cql3/validation/entities/SecondaryIndexTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/567f9066/test/unit/org/apache/cassandra/cql3/validation/operations/SelectTest.java ----------------------------------------------------------------------
