From d6ec955da577da614de0c093625ae175158362c3 Mon Sep 17 00:00:00 2001 From: Andrew Whang Date: Mon, 11 Dec 2017 12:33:11 -0800 Subject: [PATCH] Remove improper iterator copy in digest calculation --- .../db/partitions/UnfilteredPartitionIterators.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/java/org/apache/cassandra/db/partitions/UnfilteredPartitionIterators.java b/src/java/org/apache/cassandra/db/partitions/UnfilteredPartitionIterators.java index dff6daee0158..51edd759d5b0 100644 --- a/src/java/org/apache/cassandra/db/partitions/UnfilteredPartitionIterators.java +++ b/src/java/org/apache/cassandra/db/partitions/UnfilteredPartitionIterators.java @@ -240,14 +240,11 @@ public void close() */ public static void digest(UnfilteredPartitionIterator iterator, Hasher hasher, int version) { - try (UnfilteredPartitionIterator iter = iterator) + while (iterator.hasNext()) { - while (iter.hasNext()) + try (UnfilteredRowIterator partition = iterator.next()) { - try (UnfilteredRowIterator partition = iter.next()) - { - UnfilteredRowIterators.digest(partition, hasher, version); - } + UnfilteredRowIterators.digest(partition, hasher, version); } } }