Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/25524223 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25524223 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/25524223 Branch: refs/heads/trunk Commit: 255242237a49fb27740ab9da187eaa41b0611947 Parents: 3b56d4d 191ad7b Author: Sam Tunnicliffe <[email protected]> Authored: Thu Jun 14 18:19:36 2018 +0100 Committer: Sam Tunnicliffe <[email protected]> Committed: Thu Jun 14 18:22:28 2018 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/columniterator/AbstractSSTableIterator.java | 2 +- .../cassandra/db/columniterator/SSTableReversedIterator.java | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/25524223/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/25524223/src/java/org/apache/cassandra/db/columniterator/AbstractSSTableIterator.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/columniterator/AbstractSSTableIterator.java index 443fe49,4eaf8f6..cfc7da2 --- a/src/java/org/apache/cassandra/db/columniterator/AbstractSSTableIterator.java +++ b/src/java/org/apache/cassandra/db/columniterator/AbstractSSTableIterator.java @@@ -455,7 -492,19 +456,6 @@@ public abstract class AbstractSSTableIt currentIndexIdx = blockIdx; reader.openMarker = blockIdx > 0 ? index(blockIdx - 1).endOpenMarker : null; - mark = reader.file.mark(); - - // If we're reading an old format file and we move to the first block in the index (i.e. the - // head of the partition), we skip the static row as it's already been read when we first opened - // the iterator. If we don't do this and a static row is present, we'll re-read it but treat it - // as a regular row, causing deserialization to blow up later as that row's flags will be invalid - // see CASSANDRA-12088 & CASSANDRA-13236 - if (!reader.version.storeRows() - && blockIdx == 0 - && reader.deserializer.hasNext() - && reader.deserializer.nextIsStatic()) - { - reader.deserializer.skipNext(); - } } private long columnOffset(int i) throws IOException http://git-wip-us.apache.org/repos/asf/cassandra/blob/25524223/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
