You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by be...@apache.org on 2015/09/04 14:56:42 UTC
[2/3] cassandra git commit: ninja fix comments and remove unused
method
ninja fix comments and remove unused method
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a22db5be
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a22db5be
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a22db5be
Branch: refs/heads/trunk
Commit: a22db5be2d07fddd6529d8a11a5409593af6e4c2
Parents: aa57626
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Fri Sep 4 13:56:07 2015 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Fri Sep 4 13:56:07 2015 +0100
----------------------------------------------------------------------
src/java/org/apache/cassandra/db/rows/BTreeRow.java | 5 -----
src/java/org/apache/cassandra/db/rows/Row.java | 9 ++-------
2 files changed, 2 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a22db5be/src/java/org/apache/cassandra/db/rows/BTreeRow.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/rows/BTreeRow.java b/src/java/org/apache/cassandra/db/rows/BTreeRow.java
index 653ffcd..af09cb5 100644
--- a/src/java/org/apache/cassandra/db/rows/BTreeRow.java
+++ b/src/java/org/apache/cassandra/db/rows/BTreeRow.java
@@ -164,11 +164,6 @@ public class BTreeRow extends AbstractRow
return Collections2.transform(this, ColumnData::column);
}
- public Collection<ColumnDefinition> actualColumns()
- {
- return Collections2.transform(this, ColumnData::column);
- }
-
public LivenessInfo primaryKeyLivenessInfo()
{
return primaryKeyLivenessInfo;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a22db5be/src/java/org/apache/cassandra/db/rows/Row.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/rows/Row.java b/src/java/org/apache/cassandra/db/rows/Row.java
index 1b18b38..a351306 100644
--- a/src/java/org/apache/cassandra/db/rows/Row.java
+++ b/src/java/org/apache/cassandra/db/rows/Row.java
@@ -52,13 +52,8 @@ public interface Row extends Unfiltered, Collection<ColumnData>
public Clustering clustering();
/**
- * The columns this row contains.
- *
- * Note that this is actually a superset of the columns the row contains. The row
- * may not have values for each of those columns, but it can't have values for other
- * columns.
- *
- * @return a superset of the columns contained in this row.
+ * An in-natural-order collection of the columns for which data (incl. simple tombstones)
+ * is present in this row.
*/
public Collection<ColumnDefinition> columns();