You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2016/05/06 11:47:47 UTC
[9/9] cassandra git commit: Merge branch 'cassandra-3.7' into trunk
Merge branch 'cassandra-3.7' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/89a645ac
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89a645ac
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/89a645ac
Branch: refs/heads/trunk
Commit: 89a645ac4ca63114d74dedc2e94a869f769b15a2
Parents: 1dd33ec a87fd71
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri May 6 13:47:20 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Fri May 6 13:47:20 2016 +0200
----------------------------------------------------------------------
.../org/apache/cassandra/config/CFMetaData.java | 6 +
.../apache/cassandra/config/ViewDefinition.java | 1 -
.../cql3/statements/CreateViewStatement.java | 4 +-
.../cql3/statements/SelectStatement.java | 41 +-
.../apache/cassandra/db/ColumnFamilyStore.java | 6 +-
src/java/org/apache/cassandra/db/Keyspace.java | 2 +-
.../db/SinglePartitionReadCommand.java | 33 +
src/java/org/apache/cassandra/db/Slices.java | 7 +
.../apache/cassandra/db/filter/RowFilter.java | 24 +
.../SingletonUnfilteredPartitionIterator.java | 3 +-
.../apache/cassandra/db/rows/AbstractCell.java | 5 +
.../org/apache/cassandra/db/rows/BTreeRow.java | 35 +-
.../apache/cassandra/db/rows/BufferCell.java | 5 +
src/java/org/apache/cassandra/db/rows/Cell.java | 2 +
.../apache/cassandra/db/rows/ColumnData.java | 2 +
.../cassandra/db/rows/ComplexColumnData.java | 8 +
.../apache/cassandra/db/rows/NativeCell.java | 5 +
src/java/org/apache/cassandra/db/rows/Row.java | 35 +-
.../cassandra/db/rows/RowDiffListener.java | 2 +-
.../db/rows/UnfilteredRowIterators.java | 2 +-
.../apache/cassandra/db/view/TableViews.java | 481 ++++++++++++++
.../apache/cassandra/db/view/TemporalRow.java | 601 ------------------
src/java/org/apache/cassandra/db/view/View.java | 629 ++-----------------
.../apache/cassandra/db/view/ViewBuilder.java | 38 +-
.../apache/cassandra/db/view/ViewManager.java | 146 +----
.../cassandra/db/view/ViewUpdateGenerator.java | 549 ++++++++++++++++
.../org/apache/cassandra/cql3/ViewTest.java | 52 +-
.../org/apache/cassandra/db/rows/RowsTest.java | 6 +-
28 files changed, 1401 insertions(+), 1329 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/89a645ac/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/89a645ac/src/java/org/apache/cassandra/db/Slices.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/89a645ac/src/java/org/apache/cassandra/db/rows/BTreeRow.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/rows/BTreeRow.java
index 63aa157,0eed9e1..c699634
--- a/src/java/org/apache/cassandra/db/rows/BTreeRow.java
+++ b/src/java/org/apache/cassandra/db/rows/BTreeRow.java
@@@ -686,7 -704,11 +714,12 @@@ public class BTreeRow extends AbstractR
public void addCell(Cell cell)
{
assert cell.column().isStatic() == (clustering == Clustering.STATIC_CLUSTERING) : "Column is " + cell.column() + ", clustering = " + clustering;
++
+ // In practice, only unsorted builder have to deal with shadowed cells, but it doesn't cost us much to deal with it unconditionally in this case
+ if (deletion.deletes(cell))
+ return;
+
- cells.add(cell);
+ getCells().add(cell);
hasComplex |= cell.column.isComplex();
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/89a645ac/src/java/org/apache/cassandra/db/rows/ComplexColumnData.java
----------------------------------------------------------------------