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/03/04 16:30:51 UTC
cassandra git commit: fix merge(s)
Repository: cassandra
Updated Branches:
refs/heads/trunk e473ce066 -> 034e0179b
fix merge(s)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/034e0179
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/034e0179
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/034e0179
Branch: refs/heads/trunk
Commit: 034e0179b8da63e74e871030387948dd861beba6
Parents: e473ce0
Author: Benedict Elliott Smith <be...@apache.org>
Authored: Wed Mar 4 15:30:39 2015 +0000
Committer: Benedict Elliott Smith <be...@apache.org>
Committed: Wed Mar 4 15:30:39 2015 +0000
----------------------------------------------------------------------
src/java/org/apache/cassandra/cache/OHCProvider.java | 2 +-
.../org/apache/cassandra/io/sstable/IndexSummary.java | 2 +-
.../apache/cassandra/io/sstable/IndexSummaryBuilder.java | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/034e0179/src/java/org/apache/cassandra/cache/OHCProvider.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cache/OHCProvider.java b/src/java/org/apache/cassandra/cache/OHCProvider.java
index 365ca41..720121c 100644
--- a/src/java/org/apache/cassandra/cache/OHCProvider.java
+++ b/src/java/org/apache/cassandra/cache/OHCProvider.java
@@ -266,7 +266,7 @@ public class OHCProvider implements CacheProvider<RowCacheKey, IRowCacheEntry>
throw new UnsupportedOperationException("IMPLEMENT ME");
}
- public void write(Memory memory) throws IOException
+ public void write(Memory memory, long offset, long length) throws IOException
{
throw new UnsupportedOperationException("IMPLEMENT ME");
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/034e0179/src/java/org/apache/cassandra/io/sstable/IndexSummary.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/IndexSummary.java b/src/java/org/apache/cassandra/io/sstable/IndexSummary.java
index bad50b4..7e4619e 100644
--- a/src/java/org/apache/cassandra/io/sstable/IndexSummary.java
+++ b/src/java/org/apache/cassandra/io/sstable/IndexSummary.java
@@ -218,7 +218,7 @@ public class IndexSummary extends WrappedSharedCloseable
return entries;
}
- long getOffHeapSize()
+ public long getOffHeapSize()
{
return offsetCount * 4 + entriesLength;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/034e0179/src/java/org/apache/cassandra/io/sstable/IndexSummaryBuilder.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/IndexSummaryBuilder.java b/src/java/org/apache/cassandra/io/sstable/IndexSummaryBuilder.java
index 54e8dd2..892e240 100644
--- a/src/java/org/apache/cassandra/io/sstable/IndexSummaryBuilder.java
+++ b/src/java/org/apache/cassandra/io/sstable/IndexSummaryBuilder.java
@@ -69,11 +69,11 @@ public class IndexSummaryBuilder implements AutoCloseable
*/
public static class ReadableBoundary
{
- final DecoratedKey lastKey;
- final long indexLength;
- final long dataLength;
- final int summaryCount;
- final long entriesLength;
+ public final DecoratedKey lastKey;
+ public final long indexLength;
+ public final long dataLength;
+ public final int summaryCount;
+ public final long entriesLength;
public ReadableBoundary(DecoratedKey lastKey, long indexLength, long dataLength, int summaryCount, long entriesLength)
{
this.lastKey = lastKey;