You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2020/07/16 17:07:27 UTC
[accumulo] branch 1.9 updated (6b5b905 -> 1b2946f)
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a change to branch 1.9
in repository https://gitbox.apache.org/repos/asf/accumulo.git.
from 6b5b905 Merge pull request #1646 from ivakegg/ACCUMULO-1644
new ac479ba Rename yield method (future restricted identifier)
new 1b2946f Close unclosed Scanners
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../accumulo/core/conf/ConfigurationDocGen.java | 8 ++-
.../system/SourceSwitchingIteratorTest.java | 10 +--
.../accumulo/test/RewriteTabletDirectoriesIT.java | 11 ++--
.../accumulo/test/functional/CloneTestIT.java | 6 +-
.../test/replication/KerberosReplicationIT.java | 13 ++--
.../replication/MultiInstanceReplicationIT.java | 74 +++++++++++++---------
.../RemoveCompleteReplicationRecordsIT.java | 9 ++-
.../replication/ReplicationOperationsImplIT.java | 13 ++--
.../UnorderedWorkAssignerReplicationIT.java | 55 +++++++++-------
9 files changed, 120 insertions(+), 79 deletions(-)
[accumulo] 02/02: Close unclosed Scanners
Posted by ct...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch 1.9
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 1b2946f198c022be88f3628d6a217d6e45847ba8
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Thu Jul 16 02:11:52 2020 -0400
Close unclosed Scanners
Close unclosed scanners detected by Eclipse IDE
---
.../accumulo/core/conf/ConfigurationDocGen.java | 8 ++-
.../accumulo/test/RewriteTabletDirectoriesIT.java | 11 ++--
.../accumulo/test/functional/CloneTestIT.java | 6 +-
.../test/replication/KerberosReplicationIT.java | 13 ++--
.../replication/MultiInstanceReplicationIT.java | 74 +++++++++++++---------
.../RemoveCompleteReplicationRecordsIT.java | 9 ++-
.../replication/ReplicationOperationsImplIT.java | 13 ++--
.../UnorderedWorkAssignerReplicationIT.java | 55 +++++++++-------
8 files changed, 115 insertions(+), 74 deletions(-)
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java b/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
index b7753f6..738f1b5 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/ConfigurationDocGen.java
@@ -380,9 +380,13 @@ class ConfigurationDocGen {
public static void main(String[] args)
throws FileNotFoundException, UnsupportedEncodingException {
if (args.length == 2 && args[0].equals("--generate-html")) {
- new ConfigurationDocGen(new PrintStream(args[1], UTF_8.name())).generateHtml();
+ try (PrintStream p = new PrintStream(args[1], UTF_8.name())) {
+ new ConfigurationDocGen(p).generateHtml();
+ }
} else if (args.length == 2 && args[0].equals("--generate-asciidoc")) {
- new ConfigurationDocGen(new PrintStream(args[1], UTF_8.name())).generateAsciidoc();
+ try (PrintStream p = new PrintStream(args[1], UTF_8.name())) {
+ new ConfigurationDocGen(p).generateAsciidoc();
+ }
} else {
throw new IllegalArgumentException("Usage: " + ConfigurationDocGen.class.getName()
+ " --generate-html <filename> | --generate-asciidoc <filename>");
diff --git a/test/src/main/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java b/test/src/main/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java
index 2dc2ebf..a4b1a0f 100644
--- a/test/src/main/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/RewriteTabletDirectoriesIT.java
@@ -32,6 +32,7 @@ import java.util.TreeSet;
import org.apache.accumulo.core.client.BatchScanner;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Mutation;
@@ -166,10 +167,12 @@ public class RewriteTabletDirectoriesIT extends ConfigurableMacBase {
+ " " + v2Count, Math.abs(v1Count - v2Count) < 2);
// verify we can read the old data
count = 0;
- for (Entry<Key,Value> entry : c.createScanner(tableName, Authorizations.EMPTY)) {
- assertTrue("Found unexpected entry in table: " + entry,
- splits.contains(entry.getKey().getRow()));
- count++;
+ try (Scanner s = c.createScanner(tableName, Authorizations.EMPTY)) {
+ for (Entry<Key,Value> entry : s) {
+ assertTrue("Found unexpected entry in table: " + entry,
+ splits.contains(entry.getKey().getRow()));
+ count++;
+ }
}
assertEquals(splits.size(), count);
}
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT.java b/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT.java
index 0d88f7f..5201bcf 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT.java
@@ -338,8 +338,10 @@ public class CloneTestIT extends AccumuloClusterHarness {
List<String> rows = Arrays.asList("0", "1", "2", "3", "4", "9");
List<String> actualRows = new ArrayList<>();
- for (Entry<Key,Value> entry : conn.createScanner(tables[1], Authorizations.EMPTY)) {
- actualRows.add(entry.getKey().getRow().toString());
+ try (Scanner s = conn.createScanner(tables[1], Authorizations.EMPTY)) {
+ for (Entry<Key,Value> entry : s) {
+ actualRows.add(entry.getKey().getRow().toString());
+ }
}
assertEquals(rows, actualRows);
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/KerberosReplicationIT.java b/test/src/main/java/org/apache/accumulo/test/replication/KerberosReplicationIT.java
index e4d6027..805085e 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/KerberosReplicationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/KerberosReplicationIT.java
@@ -28,6 +28,7 @@ import org.apache.accumulo.cluster.ClusterUser;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.client.security.tokens.KerberosToken;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
import org.apache.accumulo.core.conf.Property;
@@ -245,10 +246,14 @@ public class KerberosReplicationIT extends AccumuloITBase {
primaryConn.replicationOperations().drain(primaryTable1, filesFor1);
long countTable = 0l;
- for (Entry<Key,Value> entry : peerConn.createScanner(peerTable1, Authorizations.EMPTY)) {
- countTable++;
- assertTrue("Found unexpected key-value" + entry.getKey().toStringNoTruncate() + " "
- + entry.getValue(), entry.getKey().getRow().toString().startsWith(primaryTable1));
+ try (Scanner s = peerConn.createScanner(peerTable1, Authorizations.EMPTY)) {
+ for (Entry<Key,Value> entry : s) {
+ countTable++;
+ assertTrue(
+ "Found unexpected key-value" + entry.getKey().toStringNoTruncate() + " "
+ + entry.getValue(),
+ entry.getKey().getRow().toString().startsWith(primaryTable1));
+ }
}
log.info("Found {} records in {}", countTable, peerTable1);
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java b/test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java
index 9f9974e..6e22b31 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/MultiInstanceReplicationIT.java
@@ -255,21 +255,24 @@ public class MultiInstanceReplicationIT extends ConfigurableMacBase {
log.info("");
log.info("Fetching metadata records:");
- for (Entry<Key,Value> kv : connMaster.createScanner(MetadataTable.NAME,
- Authorizations.EMPTY)) {
- if (ReplicationSection.COLF.equals(kv.getKey().getColumnFamily())) {
- log.info(kv.getKey().toStringNoTruncate() + " "
- + ProtobufUtil.toString(Status.parseFrom(kv.getValue().get())));
- } else {
- log.info(kv.getKey().toStringNoTruncate() + " " + kv.getValue());
+ try (Scanner s = connMaster.createScanner(MetadataTable.NAME, Authorizations.EMPTY)) {
+ for (Entry<Key,Value> kv : s) {
+ if (ReplicationSection.COLF.equals(kv.getKey().getColumnFamily())) {
+ log.info(kv.getKey().toStringNoTruncate() + " "
+ + ProtobufUtil.toString(Status.parseFrom(kv.getValue().get())));
+ } else {
+ log.info(kv.getKey().toStringNoTruncate() + " " + kv.getValue());
+ }
}
}
log.info("");
log.info("Fetching replication records:");
- for (Entry<Key,Value> kv : ReplicationTable.getScanner(connMaster)) {
- log.info(kv.getKey().toStringNoTruncate() + " "
- + ProtobufUtil.toString(Status.parseFrom(kv.getValue().get())));
+ try (Scanner s = ReplicationTable.getScanner(connMaster)) {
+ for (Entry<Key,Value> kv : s) {
+ log.info(kv.getKey().toStringNoTruncate() + " "
+ + ProtobufUtil.toString(Status.parseFrom(kv.getValue().get())));
+ }
}
Future<Boolean> future = executor.submit(new Callable<Boolean>() {
@@ -298,21 +301,24 @@ public class MultiInstanceReplicationIT extends ConfigurableMacBase {
log.info("");
log.info("Fetching metadata records:");
- for (Entry<Key,Value> kv : connMaster.createScanner(MetadataTable.NAME,
- Authorizations.EMPTY)) {
- if (ReplicationSection.COLF.equals(kv.getKey().getColumnFamily())) {
- log.info(kv.getKey().toStringNoTruncate() + " "
- + ProtobufUtil.toString(Status.parseFrom(kv.getValue().get())));
- } else {
- log.info(kv.getKey().toStringNoTruncate() + " " + kv.getValue());
+ try (Scanner s = connMaster.createScanner(MetadataTable.NAME, Authorizations.EMPTY)) {
+ for (Entry<Key,Value> kv : s) {
+ if (ReplicationSection.COLF.equals(kv.getKey().getColumnFamily())) {
+ log.info(kv.getKey().toStringNoTruncate() + " "
+ + ProtobufUtil.toString(Status.parseFrom(kv.getValue().get())));
+ } else {
+ log.info(kv.getKey().toStringNoTruncate() + " " + kv.getValue());
+ }
}
}
log.info("");
log.info("Fetching replication records:");
- for (Entry<Key,Value> kv : ReplicationTable.getScanner(connMaster)) {
- log.info(kv.getKey().toStringNoTruncate() + " "
- + ProtobufUtil.toString(Status.parseFrom(kv.getValue().get())));
+ try (Scanner s = ReplicationTable.getScanner(connMaster)) {
+ for (Entry<Key,Value> kv : s) {
+ log.info(kv.getKey().toStringNoTruncate() + " "
+ + ProtobufUtil.toString(Status.parseFrom(kv.getValue().get())));
+ }
}
Scanner master = connMaster.createScanner(masterTable, Authorizations.EMPTY),
@@ -474,20 +480,24 @@ public class MultiInstanceReplicationIT extends ConfigurableMacBase {
connMaster.replicationOperations().drain(masterTable2, filesFor2);
long countTable = 0l;
- for (Entry<Key,Value> entry : connPeer.createScanner(peerTable1, Authorizations.EMPTY)) {
- countTable++;
- assertTrue("Found unexpected key-value" + entry.getKey().toStringNoTruncate() + " "
- + entry.getValue(), entry.getKey().getRow().toString().startsWith(masterTable1));
+ try (Scanner s = connPeer.createScanner(peerTable1, Authorizations.EMPTY)) {
+ for (Entry<Key,Value> entry : s) {
+ countTable++;
+ assertTrue("Found unexpected key-value" + entry.getKey().toStringNoTruncate() + " "
+ + entry.getValue(), entry.getKey().getRow().toString().startsWith(masterTable1));
+ }
}
log.info("Found {} records in {}", countTable, peerTable1);
assertEquals(masterTable1Records, countTable);
countTable = 0l;
- for (Entry<Key,Value> entry : connPeer.createScanner(peerTable2, Authorizations.EMPTY)) {
- countTable++;
- assertTrue("Found unexpected key-value" + entry.getKey().toStringNoTruncate() + " "
- + entry.getValue(), entry.getKey().getRow().toString().startsWith(masterTable2));
+ try (Scanner s = connPeer.createScanner(peerTable2, Authorizations.EMPTY)) {
+ for (Entry<Key,Value> entry : s) {
+ countTable++;
+ assertTrue("Found unexpected key-value" + entry.getKey().toStringNoTruncate() + " "
+ + entry.getValue(), entry.getKey().getRow().toString().startsWith(masterTable2));
+ }
}
log.info("Found {} records in {}", countTable, peerTable2);
@@ -589,9 +599,11 @@ public class MultiInstanceReplicationIT extends ConfigurableMacBase {
Iterators.size(connMaster.createScanner(masterTable, Authorizations.EMPTY).iterator());
- for (Entry<Key,Value> kv : ReplicationTable.getScanner(connMaster)) {
- log.debug(kv.getKey().toStringNoTruncate() + " "
- + ProtobufUtil.toString(Status.parseFrom(kv.getValue().get())));
+ try (Scanner s = ReplicationTable.getScanner(connMaster)) {
+ for (Entry<Key,Value> kv : s) {
+ log.debug(kv.getKey().toStringNoTruncate() + " "
+ + ProtobufUtil.toString(Status.parseFrom(kv.getValue().get())));
+ }
}
connMaster.replicationOperations().drain(masterTable, files);
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/RemoveCompleteReplicationRecordsIT.java b/test/src/main/java/org/apache/accumulo/test/replication/RemoveCompleteReplicationRecordsIT.java
index 163422a..9c94a2f 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/RemoveCompleteReplicationRecordsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/RemoveCompleteReplicationRecordsIT.java
@@ -29,6 +29,7 @@ import org.apache.accumulo.core.client.BatchScanner;
import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.IteratorSetting;
+import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.data.Range;
@@ -290,9 +291,11 @@ public class RemoveCompleteReplicationRecordsIT extends ConfigurableMacBase {
}
int actualRecords = 0;
- for (Entry<Key,Value> entry : ReplicationTable.getScanner(conn)) {
- assertFalse(filesToRemove.contains(entry.getKey().getRow().toString()));
- actualRecords++;
+ try (Scanner s = ReplicationTable.getScanner(conn)) {
+ for (Entry<Key,Value> entry : s) {
+ assertFalse(filesToRemove.contains(entry.getKey().getRow().toString()));
+ actualRecords++;
+ }
}
assertEquals(finalNumRecords, actualRecords);
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/ReplicationOperationsImplIT.java b/test/src/main/java/org/apache/accumulo/test/replication/ReplicationOperationsImplIT.java
index 09ff754..f8f4c8f 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/ReplicationOperationsImplIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/ReplicationOperationsImplIT.java
@@ -31,6 +31,7 @@ import org.apache.accumulo.core.client.BatchWriter;
import org.apache.accumulo.core.client.BatchWriterConfig;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.client.impl.ClientContext;
import org.apache.accumulo.core.client.impl.Credentials;
@@ -408,8 +409,10 @@ public class ReplicationOperationsImplIT extends ConfigurableMacBase {
bw.close();
log.info("Reading metadata first time");
- for (Entry<Key,Value> e : conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY)) {
- log.info("{}", e.getKey());
+ try (Scanner s = conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY)) {
+ for (Entry<Key,Value> e : s) {
+ log.info("{}", e.getKey());
+ }
}
final AtomicBoolean done = new AtomicBoolean(false);
@@ -445,8 +448,10 @@ public class ReplicationOperationsImplIT extends ConfigurableMacBase {
bw.close();
log.info("Reading metadata second time");
- for (Entry<Key,Value> e : conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY)) {
- log.info("{}", e.getKey());
+ try (Scanner s = conn.createScanner(MetadataTable.NAME, Authorizations.EMPTY)) {
+ for (Entry<Key,Value> e : s) {
+ log.info("{}", e.getKey());
+ }
}
bw = ReplicationTable.getBatchWriter(conn);
diff --git a/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java b/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java
index a034ab4..889334b 100644
--- a/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/replication/UnorderedWorkAssignerReplicationIT.java
@@ -256,21 +256,24 @@ public class UnorderedWorkAssignerReplicationIT extends ConfigurableMacBase {
log.info("");
log.info("Fetching metadata records:");
- for (Entry<Key,Value> kv : connMaster.createScanner(MetadataTable.NAME,
- Authorizations.EMPTY)) {
- if (ReplicationSection.COLF.equals(kv.getKey().getColumnFamily())) {
- log.info(kv.getKey().toStringNoTruncate() + " "
- + ProtobufUtil.toString(Status.parseFrom(kv.getValue().get())));
- } else {
- log.info(kv.getKey().toStringNoTruncate() + " " + kv.getValue());
+ try (Scanner s = connMaster.createScanner(MetadataTable.NAME, Authorizations.EMPTY)) {
+ for (Entry<Key,Value> kv : s) {
+ if (ReplicationSection.COLF.equals(kv.getKey().getColumnFamily())) {
+ log.info(kv.getKey().toStringNoTruncate() + " "
+ + ProtobufUtil.toString(Status.parseFrom(kv.getValue().get())));
+ } else {
+ log.info(kv.getKey().toStringNoTruncate() + " " + kv.getValue());
+ }
}
}
log.info("");
log.info("Fetching replication records:");
- for (Entry<Key,Value> kv : ReplicationTable.getScanner(connMaster)) {
- log.info(kv.getKey().toStringNoTruncate() + " "
- + ProtobufUtil.toString(Status.parseFrom(kv.getValue().get())));
+ try (Scanner s = ReplicationTable.getScanner(connMaster)) {
+ for (Entry<Key,Value> kv : s) {
+ log.info(kv.getKey().toStringNoTruncate() + " "
+ + ProtobufUtil.toString(Status.parseFrom(kv.getValue().get())));
+ }
}
Future<Boolean> future = executor.submit(new Callable<Boolean>() {
@@ -296,21 +299,24 @@ public class UnorderedWorkAssignerReplicationIT extends ConfigurableMacBase {
log.info("");
log.info("Fetching metadata records:");
- for (Entry<Key,Value> kv : connMaster.createScanner(MetadataTable.NAME,
- Authorizations.EMPTY)) {
- if (ReplicationSection.COLF.equals(kv.getKey().getColumnFamily())) {
- log.info(kv.getKey().toStringNoTruncate() + " "
- + ProtobufUtil.toString(Status.parseFrom(kv.getValue().get())));
- } else {
- log.info(kv.getKey().toStringNoTruncate() + " " + kv.getValue());
+ try (Scanner s = connMaster.createScanner(MetadataTable.NAME, Authorizations.EMPTY)) {
+ for (Entry<Key,Value> kv : s) {
+ if (ReplicationSection.COLF.equals(kv.getKey().getColumnFamily())) {
+ log.info(kv.getKey().toStringNoTruncate() + " "
+ + ProtobufUtil.toString(Status.parseFrom(kv.getValue().get())));
+ } else {
+ log.info(kv.getKey().toStringNoTruncate() + " " + kv.getValue());
+ }
}
}
log.info("");
log.info("Fetching replication records:");
- for (Entry<Key,Value> kv : ReplicationTable.getScanner(connMaster)) {
- log.info(kv.getKey().toStringNoTruncate() + " "
- + ProtobufUtil.toString(Status.parseFrom(kv.getValue().get())));
+ try (Scanner s = ReplicationTable.getScanner(connMaster)) {
+ for (Entry<Key,Value> kv : s) {
+ log.info(kv.getKey().toStringNoTruncate() + " "
+ + ProtobufUtil.toString(Status.parseFrom(kv.getValue().get())));
+ }
}
Scanner master = connMaster.createScanner(masterTable, Authorizations.EMPTY),
@@ -595,10 +601,11 @@ public class UnorderedWorkAssignerReplicationIT extends ConfigurableMacBase {
Iterators.size(connMaster.createScanner(masterTable, Authorizations.EMPTY).iterator());
- for (Entry<Key,Value> kv : connMaster.createScanner(ReplicationTable.NAME,
- Authorizations.EMPTY)) {
- log.debug(kv.getKey().toStringNoTruncate() + " "
- + ProtobufUtil.toString(Status.parseFrom(kv.getValue().get())));
+ try (Scanner s = connMaster.createScanner(ReplicationTable.NAME, Authorizations.EMPTY)) {
+ for (Entry<Key,Value> kv : s) {
+ log.debug(kv.getKey().toStringNoTruncate() + " "
+ + ProtobufUtil.toString(Status.parseFrom(kv.getValue().get())));
+ }
}
connMaster.replicationOperations().drain(masterTable, files);
[accumulo] 01/02: Rename yield method (future restricted identifier)
Posted by ct...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch 1.9
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit ac479ba611fe33c3d7962ad51ad376f002b4f8e3
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Thu Jul 16 00:58:16 2020 -0400
Rename yield method (future restricted identifier)
(Backport of c5ecd474dbed016cc6653870fedcce863550a44f)
Rename a private yield method in SourceSwitchingIteratorTest to avoid
conflicting with future versions of Java. In future Java releases,
'yield' is a restricted keyword.
Verified failure (and fix) using the following on OpenJDK13:
```
mvn clean package -DskipTests -Dmaven.compiler.failOnWarning=true
```
---
.../core/iterators/system/SourceSwitchingIteratorTest.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java
index 56dde11..2b43bea 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/system/SourceSwitchingIteratorTest.java
@@ -293,7 +293,7 @@ public class SourceSwitchingIteratorTest {
}
- private Range yield(Range r, SourceSwitchingIterator ssi, YieldCallback<Key> yield)
+ private Range doYield(Range r, SourceSwitchingIterator ssi, YieldCallback<Key> yield)
throws IOException {
while (yield.hasYielded()) {
Key yieldPosition = yield.getPositionAndReset();
@@ -324,13 +324,13 @@ public class SourceSwitchingIteratorTest {
Range r = new Range();
ssi.seek(r, new ArrayList<ByteSequence>(), false);
- r = yield(r, ssi, yield);
+ r = doYield(r, ssi, yield);
testAndCallNext(ssi, "r1", "cf1", "cq1", 5, "v1", true);
- r = yield(r, ssi, yield);
+ r = doYield(r, ssi, yield);
testAndCallNext(ssi, "r1", "cf1", "cq3", 5, "v2", true);
- r = yield(r, ssi, yield);
+ r = doYield(r, ssi, yield);
testAndCallNext(ssi, "r2", "cf1", "cq1", 5, "v3", true);
- r = yield(r, ssi, yield);
+ r = doYield(r, ssi, yield);
assertFalse(ssi.hasTop());
}