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 2014/06/23 17:57:25 UTC
[1/4] git commit: Fix cqlsh DESC with CompositeType explanation
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 1e6493083 -> c33e77ae7
refs/heads/trunk 944c1716d -> cdf08084d
Fix cqlsh DESC with CompositeType
explanation
patch by mstepura; reviewed by thobbs for CASSANDRA-7399
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1e649308
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e649308
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e649308
Branch: refs/heads/trunk
Commit: 1e6493083f5d3a065f96994c7bf2d88975d3a7ba
Parents: a175f70
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Jun 23 17:50:08 2014 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Jun 23 17:50:08 2014 +0200
----------------------------------------------------------------------
bin/cqlsh | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/1e649308/bin/cqlsh
----------------------------------------------------------------------
diff --git a/bin/cqlsh b/bin/cqlsh
index eca641b..c3a4ea6 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -532,6 +532,10 @@ class Shell(cmd.Cmd):
self.empty_lines = 0
self.statement_error = False
self.single_statement = single_statement
+ #see CASSANDRA-7399
+ type_for_composites = lambda cls: "'%s'" % cls.cass_parameterized_type_with(cls.subtypes, True)
+ cassandra.cqltypes.CompositeType.cql_parameterized_type = classmethod(type_for_composites)
+ cassandra.cqltypes.DynamicCompositeType.cql_parameterized_type = classmethod(type_for_composites)
def set_expanded_cql_version(self, ver):
ver, vertuple = full_cql_version(ver)
[4/4] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by be...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cdf08084
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cdf08084
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cdf08084
Branch: refs/heads/trunk
Commit: cdf08084d46d4b9efb14a1e30bee6010caf16fea
Parents: 944c171 c33e77a
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Mon Jun 23 16:57:01 2014 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Mon Jun 23 16:57:01 2014 +0100
----------------------------------------------------------------------
bin/cqlsh | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
[2/4] git commit: Fix heap size calculation for
CompoundSparseCellName/.WithCollection
Posted by be...@apache.org.
Fix heap size calculation for CompoundSparseCellName/.WithCollection
patch by Benedict Elliott Smith; reviewed by Dave Brosius CASSANDRA-7421
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c33e77ae
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c33e77ae
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c33e77ae
Branch: refs/heads/trunk
Commit: c33e77ae777d9c639be4ab76f840c69e3617c5a2
Parents: 1e64930
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Mon Jun 23 16:52:50 2014 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Mon Jun 23 16:56:38 2014 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../apache/cassandra/cql3/ColumnIdentifier.java | 2 +-
.../apache/cassandra/db/AtomicBTreeColumns.java | 4 ++--
.../org/apache/cassandra/db/BufferCell.java | 4 ++--
src/java/org/apache/cassandra/db/Cell.java | 2 +-
.../org/apache/cassandra/db/NativeCell.java | 2 +-
.../apache/cassandra/db/NativeCounterCell.java | 2 +-
.../apache/cassandra/db/NativeDeletedCell.java | 2 +-
.../apache/cassandra/db/NativeExpiringCell.java | 2 +-
.../org/apache/cassandra/db/RowIndexEntry.java | 2 +-
.../cassandra/db/composites/CellName.java | 2 +-
.../db/composites/CompoundComposite.java | 8 +++----
.../db/composites/CompoundDenseCellName.java | 2 +-
.../db/composites/CompoundSparseCellName.java | 22 ++++++++++++++++----
.../db/composites/SimpleDenseCellName.java | 2 +-
.../db/composites/SimpleSparseCellName.java | 4 ++--
.../SimpleSparseInternedCellName.java | 2 +-
.../cassandra/io/sstable/IndexHelper.java | 2 +-
18 files changed, 42 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4f68cf7..04b148c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
2.1.0-rc2
+ * Fix heap size calculation for CompoundSparseCellName and
+ CompoundSparseCellName.WithCollection (CASSANDRA-7421)
* Allow counter mutations in UNLOGGED batches (CASSANDRA-7351)
* Modify reconcile logic to always pick a tombstone over a counter cell
(CASSANDRA-7346)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java b/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
index 1b232cf..fa151d2 100644
--- a/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
+++ b/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
@@ -89,7 +89,7 @@ public class ColumnIdentifier implements Selectable, IMeasurableMemory
+ ObjectSizes.sizeOf(text);
}
- public long excessHeapSizeExcludingData()
+ public long unsharedHeapSizeExcludingData()
{
return EMPTY_SIZE
+ ObjectSizes.sizeOnHeapExcludingData(bytes)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java b/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
index 0e38784..03cd0c5 100644
--- a/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
+++ b/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
@@ -344,7 +344,7 @@ public class AtomicBTreeColumns extends ColumnFamily
indexer.insert(insert);
insert = insert.localCopy(metadata, allocator, writeOp);
this.dataSize += insert.cellDataSize();
- this.heapSize += insert.excessHeapSizeExcludingData();
+ this.heapSize += insert.unsharedHeapSizeExcludingData();
if (inserted == null)
inserted = new ArrayList<>();
inserted.add(insert);
@@ -359,7 +359,7 @@ public class AtomicBTreeColumns extends ColumnFamily
{
reconciled = reconciled.localCopy(metadata, allocator, writeOp);
dataSize += reconciled.cellDataSize() - existing.cellDataSize();
- heapSize += reconciled.excessHeapSizeExcludingData() - existing.excessHeapSizeExcludingData();
+ heapSize += reconciled.unsharedHeapSizeExcludingData() - existing.unsharedHeapSizeExcludingData();
if (inserted == null)
inserted = new ArrayList<>();
inserted.add(reconciled);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/db/BufferCell.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/BufferCell.java b/src/java/org/apache/cassandra/db/BufferCell.java
index 93251c8..a7d632d 100644
--- a/src/java/org/apache/cassandra/db/BufferCell.java
+++ b/src/java/org/apache/cassandra/db/BufferCell.java
@@ -84,9 +84,9 @@ public class BufferCell extends AbstractCell
}
@Override
- public long excessHeapSizeExcludingData()
+ public long unsharedHeapSizeExcludingData()
{
- return EMPTY_SIZE + name.excessHeapSizeExcludingData() + ObjectSizes.sizeOnHeapExcludingData(value);
+ return EMPTY_SIZE + name.unsharedHeapSizeExcludingData() + ObjectSizes.sizeOnHeapExcludingData(value);
}
@Override
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/db/Cell.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Cell.java b/src/java/org/apache/cassandra/db/Cell.java
index f91376d..7c3926a 100644
--- a/src/java/org/apache/cassandra/db/Cell.java
+++ b/src/java/org/apache/cassandra/db/Cell.java
@@ -51,7 +51,7 @@ public interface Cell extends OnDiskAtom
// returns the size of the Cell and all references on the heap, excluding any costs associated with byte arrays
// that would be allocated by a localCopy, as these will be accounted for by the allocator
- public long excessHeapSizeExcludingData();
+ public long unsharedHeapSizeExcludingData();
public int serializedSize(CellNameType type, TypeSizes typeSizes);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/db/NativeCell.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/NativeCell.java b/src/java/org/apache/cassandra/db/NativeCell.java
index 1c8ebd9..dac5674 100644
--- a/src/java/org/apache/cassandra/db/NativeCell.java
+++ b/src/java/org/apache/cassandra/db/NativeCell.java
@@ -75,7 +75,7 @@ public class NativeCell extends AbstractNativeCell
}
@Override
- public long excessHeapSizeExcludingData()
+ public long unsharedHeapSizeExcludingData()
{
return SIZE;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/db/NativeCounterCell.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/NativeCounterCell.java b/src/java/org/apache/cassandra/db/NativeCounterCell.java
index d0df17e..3fe73ce 100644
--- a/src/java/org/apache/cassandra/db/NativeCounterCell.java
+++ b/src/java/org/apache/cassandra/db/NativeCounterCell.java
@@ -167,7 +167,7 @@ public class NativeCounterCell extends NativeCell implements CounterCell
}
@Override
- public long excessHeapSizeExcludingData()
+ public long unsharedHeapSizeExcludingData()
{
return SIZE;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/db/NativeDeletedCell.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/NativeDeletedCell.java b/src/java/org/apache/cassandra/db/NativeDeletedCell.java
index 20118a4..e900635 100644
--- a/src/java/org/apache/cassandra/db/NativeDeletedCell.java
+++ b/src/java/org/apache/cassandra/db/NativeDeletedCell.java
@@ -112,7 +112,7 @@ public class NativeDeletedCell extends NativeCell implements DeletedCell
}
@Override
- public long excessHeapSizeExcludingData()
+ public long unsharedHeapSizeExcludingData()
{
return SIZE;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/db/NativeExpiringCell.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/NativeExpiringCell.java b/src/java/org/apache/cassandra/db/NativeExpiringCell.java
index fcadb16..f265511 100644
--- a/src/java/org/apache/cassandra/db/NativeExpiringCell.java
+++ b/src/java/org/apache/cassandra/db/NativeExpiringCell.java
@@ -160,7 +160,7 @@ public class NativeExpiringCell extends NativeCell implements ExpiringCell
}
@Override
- public long excessHeapSizeExcludingData()
+ public long unsharedHeapSizeExcludingData()
{
return SIZE;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/db/RowIndexEntry.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/RowIndexEntry.java b/src/java/org/apache/cassandra/db/RowIndexEntry.java
index 618cd61..05c563c 100644
--- a/src/java/org/apache/cassandra/db/RowIndexEntry.java
+++ b/src/java/org/apache/cassandra/db/RowIndexEntry.java
@@ -207,7 +207,7 @@ public class RowIndexEntry implements IMeasurableMemory
{
long entrySize = 0;
for (IndexHelper.IndexInfo idx : columnsIndex)
- entrySize += idx.excessHeapSize();
+ entrySize += idx.unsharedHeapSize();
return BASE_SIZE
+ entrySize
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/db/composites/CellName.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/composites/CellName.java b/src/java/org/apache/cassandra/db/composites/CellName.java
index 22b3fbd..4d778d3 100644
--- a/src/java/org/apache/cassandra/db/composites/CellName.java
+++ b/src/java/org/apache/cassandra/db/composites/CellName.java
@@ -74,5 +74,5 @@ public interface CellName extends Composite
@Override
public CellName copy(CFMetaData cfm, AbstractAllocator allocator);
- public long excessHeapSizeExcludingData();
+ public long unsharedHeapSizeExcludingData();
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/db/composites/CompoundComposite.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/composites/CompoundComposite.java b/src/java/org/apache/cassandra/db/composites/CompoundComposite.java
index e16b48a..7a21b01 100644
--- a/src/java/org/apache/cassandra/db/composites/CompoundComposite.java
+++ b/src/java/org/apache/cassandra/db/composites/CompoundComposite.java
@@ -28,7 +28,7 @@ import org.apache.cassandra.utils.memory.AbstractAllocator;
*/
public class CompoundComposite extends AbstractComposite
{
- private static final long EMPTY_SIZE = ObjectSizes.measure(new CompoundComposite(null, 0, false));
+ private static final long HEAP_SIZE = ObjectSizes.measure(new CompoundComposite(null, 0, false));
// We could use a List, but we'll create such object *a lot* and using a array+size is not
// all that harder, so we save the List object allocation.
@@ -73,12 +73,12 @@ public class CompoundComposite extends AbstractComposite
public long unsharedHeapSize()
{
- return EMPTY_SIZE + ObjectSizes.sizeOnHeapOf(elements);
+ return HEAP_SIZE + ObjectSizes.sizeOnHeapOf(elements);
}
- public long excessHeapSizeExcludingData()
+ public long unsharedHeapSizeExcludingData()
{
- return EMPTY_SIZE + ObjectSizes.sizeOnHeapExcludingData(elements);
+ return HEAP_SIZE + ObjectSizes.sizeOnHeapExcludingData(elements);
}
public Composite copy(CFMetaData cfm, AbstractAllocator allocator)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/db/composites/CompoundDenseCellName.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/composites/CompoundDenseCellName.java b/src/java/org/apache/cassandra/db/composites/CompoundDenseCellName.java
index 0a157c2..1f471a8 100644
--- a/src/java/org/apache/cassandra/db/composites/CompoundDenseCellName.java
+++ b/src/java/org/apache/cassandra/db/composites/CompoundDenseCellName.java
@@ -73,7 +73,7 @@ public class CompoundDenseCellName extends CompoundComposite implements CellName
}
@Override
- public long excessHeapSizeExcludingData()
+ public long unsharedHeapSizeExcludingData()
{
return HEAP_SIZE + ObjectSizes.sizeOnHeapExcludingData(elements);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/db/composites/CompoundSparseCellName.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/composites/CompoundSparseCellName.java b/src/java/org/apache/cassandra/db/composites/CompoundSparseCellName.java
index ad7bb73..03af6d0 100644
--- a/src/java/org/apache/cassandra/db/composites/CompoundSparseCellName.java
+++ b/src/java/org/apache/cassandra/db/composites/CompoundSparseCellName.java
@@ -50,6 +50,18 @@ public class CompoundSparseCellName extends CompoundComposite implements CellNam
this.columnName = columnName;
}
+ @Override
+ public long unsharedHeapSize()
+ {
+ return HEAP_SIZE + ObjectSizes.sizeOnHeapOf(elements);
+ }
+
+ @Override
+ public long unsharedHeapSizeExcludingData()
+ {
+ return HEAP_SIZE + ObjectSizes.sizeOnHeapExcludingData(elements);
+ }
+
public int size()
{
return size + 1;
@@ -156,13 +168,15 @@ public class CompoundSparseCellName extends CompoundComposite implements CellNam
@Override
public long unsharedHeapSize()
{
- return super.unsharedHeapSize() + ObjectSizes.sizeOnHeapOf(collectionElement);
+ return HEAP_SIZE + ObjectSizes.sizeOnHeapOf(elements)
+ + ObjectSizes.sizeOnHeapExcludingData(collectionElement);
}
@Override
- public long excessHeapSizeExcludingData()
+ public long unsharedHeapSizeExcludingData()
{
- return super.excessHeapSizeExcludingData() + ObjectSizes.sizeOnHeapExcludingData(collectionElement);
+ return HEAP_SIZE + ObjectSizes.sizeOnHeapExcludingData(elements)
+ + ObjectSizes.sizeOnHeapExcludingData(collectionElement);
}
}
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/db/composites/SimpleDenseCellName.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/composites/SimpleDenseCellName.java b/src/java/org/apache/cassandra/db/composites/SimpleDenseCellName.java
index 5c0f976..2ca7d23 100644
--- a/src/java/org/apache/cassandra/db/composites/SimpleDenseCellName.java
+++ b/src/java/org/apache/cassandra/db/composites/SimpleDenseCellName.java
@@ -67,7 +67,7 @@ public class SimpleDenseCellName extends SimpleComposite implements CellName
}
@Override
- public long excessHeapSizeExcludingData()
+ public long unsharedHeapSizeExcludingData()
{
return EMPTY_SIZE + ObjectSizes.sizeOnHeapExcludingData(element);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/db/composites/SimpleSparseCellName.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/composites/SimpleSparseCellName.java b/src/java/org/apache/cassandra/db/composites/SimpleSparseCellName.java
index a7fafba..c6351f1 100644
--- a/src/java/org/apache/cassandra/db/composites/SimpleSparseCellName.java
+++ b/src/java/org/apache/cassandra/db/composites/SimpleSparseCellName.java
@@ -87,9 +87,9 @@ public class SimpleSparseCellName extends AbstractComposite implements CellName
return true;
}
- public long excessHeapSizeExcludingData()
+ public long unsharedHeapSizeExcludingData()
{
- return EMPTY_SIZE + columnName.excessHeapSizeExcludingData();
+ return EMPTY_SIZE + columnName.unsharedHeapSizeExcludingData();
}
public long unsharedHeapSize()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/db/composites/SimpleSparseInternedCellName.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/composites/SimpleSparseInternedCellName.java b/src/java/org/apache/cassandra/db/composites/SimpleSparseInternedCellName.java
index c5708d8..c613720 100644
--- a/src/java/org/apache/cassandra/db/composites/SimpleSparseInternedCellName.java
+++ b/src/java/org/apache/cassandra/db/composites/SimpleSparseInternedCellName.java
@@ -31,7 +31,7 @@ public class SimpleSparseInternedCellName extends SimpleSparseCellName
}
@Override
- public long excessHeapSizeExcludingData()
+ public long unsharedHeapSizeExcludingData()
{
return 0;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/io/sstable/IndexHelper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/IndexHelper.java b/src/java/org/apache/cassandra/io/sstable/IndexHelper.java
index 72a708b..7099a15 100644
--- a/src/java/org/apache/cassandra/io/sstable/IndexHelper.java
+++ b/src/java/org/apache/cassandra/io/sstable/IndexHelper.java
@@ -205,7 +205,7 @@ public class IndexHelper
}
}
- public long excessHeapSize()
+ public long unsharedHeapSize()
{
return EMPTY_SIZE + firstName.unsharedHeapSize() + lastName.unsharedHeapSize();
}
[3/4] git commit: Fix heap size calculation for
CompoundSparseCellName/.WithCollection
Posted by be...@apache.org.
Fix heap size calculation for CompoundSparseCellName/.WithCollection
patch by Benedict Elliott Smith; reviewed by Dave Brosius CASSANDRA-7421
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c33e77ae
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c33e77ae
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c33e77ae
Branch: refs/heads/cassandra-2.1
Commit: c33e77ae777d9c639be4ab76f840c69e3617c5a2
Parents: 1e64930
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Mon Jun 23 16:52:50 2014 +0100
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Mon Jun 23 16:56:38 2014 +0100
----------------------------------------------------------------------
CHANGES.txt | 2 ++
.../apache/cassandra/cql3/ColumnIdentifier.java | 2 +-
.../apache/cassandra/db/AtomicBTreeColumns.java | 4 ++--
.../org/apache/cassandra/db/BufferCell.java | 4 ++--
src/java/org/apache/cassandra/db/Cell.java | 2 +-
.../org/apache/cassandra/db/NativeCell.java | 2 +-
.../apache/cassandra/db/NativeCounterCell.java | 2 +-
.../apache/cassandra/db/NativeDeletedCell.java | 2 +-
.../apache/cassandra/db/NativeExpiringCell.java | 2 +-
.../org/apache/cassandra/db/RowIndexEntry.java | 2 +-
.../cassandra/db/composites/CellName.java | 2 +-
.../db/composites/CompoundComposite.java | 8 +++----
.../db/composites/CompoundDenseCellName.java | 2 +-
.../db/composites/CompoundSparseCellName.java | 22 ++++++++++++++++----
.../db/composites/SimpleDenseCellName.java | 2 +-
.../db/composites/SimpleSparseCellName.java | 4 ++--
.../SimpleSparseInternedCellName.java | 2 +-
.../cassandra/io/sstable/IndexHelper.java | 2 +-
18 files changed, 42 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4f68cf7..04b148c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,6 @@
2.1.0-rc2
+ * Fix heap size calculation for CompoundSparseCellName and
+ CompoundSparseCellName.WithCollection (CASSANDRA-7421)
* Allow counter mutations in UNLOGGED batches (CASSANDRA-7351)
* Modify reconcile logic to always pick a tombstone over a counter cell
(CASSANDRA-7346)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java b/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
index 1b232cf..fa151d2 100644
--- a/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
+++ b/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
@@ -89,7 +89,7 @@ public class ColumnIdentifier implements Selectable, IMeasurableMemory
+ ObjectSizes.sizeOf(text);
}
- public long excessHeapSizeExcludingData()
+ public long unsharedHeapSizeExcludingData()
{
return EMPTY_SIZE
+ ObjectSizes.sizeOnHeapExcludingData(bytes)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java b/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
index 0e38784..03cd0c5 100644
--- a/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
+++ b/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java
@@ -344,7 +344,7 @@ public class AtomicBTreeColumns extends ColumnFamily
indexer.insert(insert);
insert = insert.localCopy(metadata, allocator, writeOp);
this.dataSize += insert.cellDataSize();
- this.heapSize += insert.excessHeapSizeExcludingData();
+ this.heapSize += insert.unsharedHeapSizeExcludingData();
if (inserted == null)
inserted = new ArrayList<>();
inserted.add(insert);
@@ -359,7 +359,7 @@ public class AtomicBTreeColumns extends ColumnFamily
{
reconciled = reconciled.localCopy(metadata, allocator, writeOp);
dataSize += reconciled.cellDataSize() - existing.cellDataSize();
- heapSize += reconciled.excessHeapSizeExcludingData() - existing.excessHeapSizeExcludingData();
+ heapSize += reconciled.unsharedHeapSizeExcludingData() - existing.unsharedHeapSizeExcludingData();
if (inserted == null)
inserted = new ArrayList<>();
inserted.add(reconciled);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/db/BufferCell.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/BufferCell.java b/src/java/org/apache/cassandra/db/BufferCell.java
index 93251c8..a7d632d 100644
--- a/src/java/org/apache/cassandra/db/BufferCell.java
+++ b/src/java/org/apache/cassandra/db/BufferCell.java
@@ -84,9 +84,9 @@ public class BufferCell extends AbstractCell
}
@Override
- public long excessHeapSizeExcludingData()
+ public long unsharedHeapSizeExcludingData()
{
- return EMPTY_SIZE + name.excessHeapSizeExcludingData() + ObjectSizes.sizeOnHeapExcludingData(value);
+ return EMPTY_SIZE + name.unsharedHeapSizeExcludingData() + ObjectSizes.sizeOnHeapExcludingData(value);
}
@Override
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/db/Cell.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Cell.java b/src/java/org/apache/cassandra/db/Cell.java
index f91376d..7c3926a 100644
--- a/src/java/org/apache/cassandra/db/Cell.java
+++ b/src/java/org/apache/cassandra/db/Cell.java
@@ -51,7 +51,7 @@ public interface Cell extends OnDiskAtom
// returns the size of the Cell and all references on the heap, excluding any costs associated with byte arrays
// that would be allocated by a localCopy, as these will be accounted for by the allocator
- public long excessHeapSizeExcludingData();
+ public long unsharedHeapSizeExcludingData();
public int serializedSize(CellNameType type, TypeSizes typeSizes);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/db/NativeCell.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/NativeCell.java b/src/java/org/apache/cassandra/db/NativeCell.java
index 1c8ebd9..dac5674 100644
--- a/src/java/org/apache/cassandra/db/NativeCell.java
+++ b/src/java/org/apache/cassandra/db/NativeCell.java
@@ -75,7 +75,7 @@ public class NativeCell extends AbstractNativeCell
}
@Override
- public long excessHeapSizeExcludingData()
+ public long unsharedHeapSizeExcludingData()
{
return SIZE;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/db/NativeCounterCell.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/NativeCounterCell.java b/src/java/org/apache/cassandra/db/NativeCounterCell.java
index d0df17e..3fe73ce 100644
--- a/src/java/org/apache/cassandra/db/NativeCounterCell.java
+++ b/src/java/org/apache/cassandra/db/NativeCounterCell.java
@@ -167,7 +167,7 @@ public class NativeCounterCell extends NativeCell implements CounterCell
}
@Override
- public long excessHeapSizeExcludingData()
+ public long unsharedHeapSizeExcludingData()
{
return SIZE;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/db/NativeDeletedCell.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/NativeDeletedCell.java b/src/java/org/apache/cassandra/db/NativeDeletedCell.java
index 20118a4..e900635 100644
--- a/src/java/org/apache/cassandra/db/NativeDeletedCell.java
+++ b/src/java/org/apache/cassandra/db/NativeDeletedCell.java
@@ -112,7 +112,7 @@ public class NativeDeletedCell extends NativeCell implements DeletedCell
}
@Override
- public long excessHeapSizeExcludingData()
+ public long unsharedHeapSizeExcludingData()
{
return SIZE;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/db/NativeExpiringCell.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/NativeExpiringCell.java b/src/java/org/apache/cassandra/db/NativeExpiringCell.java
index fcadb16..f265511 100644
--- a/src/java/org/apache/cassandra/db/NativeExpiringCell.java
+++ b/src/java/org/apache/cassandra/db/NativeExpiringCell.java
@@ -160,7 +160,7 @@ public class NativeExpiringCell extends NativeCell implements ExpiringCell
}
@Override
- public long excessHeapSizeExcludingData()
+ public long unsharedHeapSizeExcludingData()
{
return SIZE;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/db/RowIndexEntry.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/RowIndexEntry.java b/src/java/org/apache/cassandra/db/RowIndexEntry.java
index 618cd61..05c563c 100644
--- a/src/java/org/apache/cassandra/db/RowIndexEntry.java
+++ b/src/java/org/apache/cassandra/db/RowIndexEntry.java
@@ -207,7 +207,7 @@ public class RowIndexEntry implements IMeasurableMemory
{
long entrySize = 0;
for (IndexHelper.IndexInfo idx : columnsIndex)
- entrySize += idx.excessHeapSize();
+ entrySize += idx.unsharedHeapSize();
return BASE_SIZE
+ entrySize
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/db/composites/CellName.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/composites/CellName.java b/src/java/org/apache/cassandra/db/composites/CellName.java
index 22b3fbd..4d778d3 100644
--- a/src/java/org/apache/cassandra/db/composites/CellName.java
+++ b/src/java/org/apache/cassandra/db/composites/CellName.java
@@ -74,5 +74,5 @@ public interface CellName extends Composite
@Override
public CellName copy(CFMetaData cfm, AbstractAllocator allocator);
- public long excessHeapSizeExcludingData();
+ public long unsharedHeapSizeExcludingData();
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/db/composites/CompoundComposite.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/composites/CompoundComposite.java b/src/java/org/apache/cassandra/db/composites/CompoundComposite.java
index e16b48a..7a21b01 100644
--- a/src/java/org/apache/cassandra/db/composites/CompoundComposite.java
+++ b/src/java/org/apache/cassandra/db/composites/CompoundComposite.java
@@ -28,7 +28,7 @@ import org.apache.cassandra.utils.memory.AbstractAllocator;
*/
public class CompoundComposite extends AbstractComposite
{
- private static final long EMPTY_SIZE = ObjectSizes.measure(new CompoundComposite(null, 0, false));
+ private static final long HEAP_SIZE = ObjectSizes.measure(new CompoundComposite(null, 0, false));
// We could use a List, but we'll create such object *a lot* and using a array+size is not
// all that harder, so we save the List object allocation.
@@ -73,12 +73,12 @@ public class CompoundComposite extends AbstractComposite
public long unsharedHeapSize()
{
- return EMPTY_SIZE + ObjectSizes.sizeOnHeapOf(elements);
+ return HEAP_SIZE + ObjectSizes.sizeOnHeapOf(elements);
}
- public long excessHeapSizeExcludingData()
+ public long unsharedHeapSizeExcludingData()
{
- return EMPTY_SIZE + ObjectSizes.sizeOnHeapExcludingData(elements);
+ return HEAP_SIZE + ObjectSizes.sizeOnHeapExcludingData(elements);
}
public Composite copy(CFMetaData cfm, AbstractAllocator allocator)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/db/composites/CompoundDenseCellName.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/composites/CompoundDenseCellName.java b/src/java/org/apache/cassandra/db/composites/CompoundDenseCellName.java
index 0a157c2..1f471a8 100644
--- a/src/java/org/apache/cassandra/db/composites/CompoundDenseCellName.java
+++ b/src/java/org/apache/cassandra/db/composites/CompoundDenseCellName.java
@@ -73,7 +73,7 @@ public class CompoundDenseCellName extends CompoundComposite implements CellName
}
@Override
- public long excessHeapSizeExcludingData()
+ public long unsharedHeapSizeExcludingData()
{
return HEAP_SIZE + ObjectSizes.sizeOnHeapExcludingData(elements);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/db/composites/CompoundSparseCellName.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/composites/CompoundSparseCellName.java b/src/java/org/apache/cassandra/db/composites/CompoundSparseCellName.java
index ad7bb73..03af6d0 100644
--- a/src/java/org/apache/cassandra/db/composites/CompoundSparseCellName.java
+++ b/src/java/org/apache/cassandra/db/composites/CompoundSparseCellName.java
@@ -50,6 +50,18 @@ public class CompoundSparseCellName extends CompoundComposite implements CellNam
this.columnName = columnName;
}
+ @Override
+ public long unsharedHeapSize()
+ {
+ return HEAP_SIZE + ObjectSizes.sizeOnHeapOf(elements);
+ }
+
+ @Override
+ public long unsharedHeapSizeExcludingData()
+ {
+ return HEAP_SIZE + ObjectSizes.sizeOnHeapExcludingData(elements);
+ }
+
public int size()
{
return size + 1;
@@ -156,13 +168,15 @@ public class CompoundSparseCellName extends CompoundComposite implements CellNam
@Override
public long unsharedHeapSize()
{
- return super.unsharedHeapSize() + ObjectSizes.sizeOnHeapOf(collectionElement);
+ return HEAP_SIZE + ObjectSizes.sizeOnHeapOf(elements)
+ + ObjectSizes.sizeOnHeapExcludingData(collectionElement);
}
@Override
- public long excessHeapSizeExcludingData()
+ public long unsharedHeapSizeExcludingData()
{
- return super.excessHeapSizeExcludingData() + ObjectSizes.sizeOnHeapExcludingData(collectionElement);
+ return HEAP_SIZE + ObjectSizes.sizeOnHeapExcludingData(elements)
+ + ObjectSizes.sizeOnHeapExcludingData(collectionElement);
}
}
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/db/composites/SimpleDenseCellName.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/composites/SimpleDenseCellName.java b/src/java/org/apache/cassandra/db/composites/SimpleDenseCellName.java
index 5c0f976..2ca7d23 100644
--- a/src/java/org/apache/cassandra/db/composites/SimpleDenseCellName.java
+++ b/src/java/org/apache/cassandra/db/composites/SimpleDenseCellName.java
@@ -67,7 +67,7 @@ public class SimpleDenseCellName extends SimpleComposite implements CellName
}
@Override
- public long excessHeapSizeExcludingData()
+ public long unsharedHeapSizeExcludingData()
{
return EMPTY_SIZE + ObjectSizes.sizeOnHeapExcludingData(element);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/db/composites/SimpleSparseCellName.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/composites/SimpleSparseCellName.java b/src/java/org/apache/cassandra/db/composites/SimpleSparseCellName.java
index a7fafba..c6351f1 100644
--- a/src/java/org/apache/cassandra/db/composites/SimpleSparseCellName.java
+++ b/src/java/org/apache/cassandra/db/composites/SimpleSparseCellName.java
@@ -87,9 +87,9 @@ public class SimpleSparseCellName extends AbstractComposite implements CellName
return true;
}
- public long excessHeapSizeExcludingData()
+ public long unsharedHeapSizeExcludingData()
{
- return EMPTY_SIZE + columnName.excessHeapSizeExcludingData();
+ return EMPTY_SIZE + columnName.unsharedHeapSizeExcludingData();
}
public long unsharedHeapSize()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/db/composites/SimpleSparseInternedCellName.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/composites/SimpleSparseInternedCellName.java b/src/java/org/apache/cassandra/db/composites/SimpleSparseInternedCellName.java
index c5708d8..c613720 100644
--- a/src/java/org/apache/cassandra/db/composites/SimpleSparseInternedCellName.java
+++ b/src/java/org/apache/cassandra/db/composites/SimpleSparseInternedCellName.java
@@ -31,7 +31,7 @@ public class SimpleSparseInternedCellName extends SimpleSparseCellName
}
@Override
- public long excessHeapSizeExcludingData()
+ public long unsharedHeapSizeExcludingData()
{
return 0;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c33e77ae/src/java/org/apache/cassandra/io/sstable/IndexHelper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/IndexHelper.java b/src/java/org/apache/cassandra/io/sstable/IndexHelper.java
index 72a708b..7099a15 100644
--- a/src/java/org/apache/cassandra/io/sstable/IndexHelper.java
+++ b/src/java/org/apache/cassandra/io/sstable/IndexHelper.java
@@ -205,7 +205,7 @@ public class IndexHelper
}
}
- public long excessHeapSize()
+ public long unsharedHeapSize()
{
return EMPTY_SIZE + firstName.unsharedHeapSize() + lastName.unsharedHeapSize();
}