Skip to content

Commit 84fd47b

Browse files
Revert DSP-23657 (#1765)
This reverts commit 229854b due to test failures in cndb.
1 parent 70118b6 commit 84fd47b

File tree

96 files changed

+225
-4634
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+225
-4634
lines changed

src/java/org/apache/cassandra/cache/ChunkCache.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ public SingleRegionChunk(long offset, ByteBuffer buffer)
549549
public ByteBuffer buffer()
550550
{
551551
assert isReferenced() : "Already unreferenced";
552-
return buffer.duplicate().limit(bytesRead);
552+
return buffer.duplicate();
553553
}
554554

555555
public long offset()
@@ -689,12 +689,6 @@ public void invalidateIfCached(long position)
689689
synchronousCache.invalidate(new Key(readerId, pageAlignedPos));
690690
}
691691

692-
@Override
693-
public long adjustPosition(long position)
694-
{
695-
return source.adjustPosition(position);
696-
}
697-
698692
@Override
699693
public void close()
700694
{

src/java/org/apache/cassandra/crypto/IKeyProvider.java

Lines changed: 0 additions & 39 deletions
This file was deleted.

src/java/org/apache/cassandra/crypto/IKeyProviderFactory.java

Lines changed: 0 additions & 43 deletions
This file was deleted.

src/java/org/apache/cassandra/crypto/IMultiKeyProvider.java

Lines changed: 0 additions & 68 deletions
This file was deleted.

src/java/org/apache/cassandra/crypto/KeyAccessException.java

Lines changed: 0 additions & 39 deletions
This file was deleted.

src/java/org/apache/cassandra/crypto/KeyGenerationException.java

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)