You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2015/06/26 19:10:21 UTC
[1/3] accumulo git commit: ACCUMULO-3795 Fix checkstyle failures
Repository: accumulo
Updated Branches:
refs/heads/master 250d74ceb -> a1988ff94
ACCUMULO-3795 Fix checkstyle failures
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/433f40ff
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/433f40ff
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/433f40ff
Branch: refs/heads/master
Commit: 433f40ffc11efa9af7607e9e20576fd920cc382b
Parents: 250d74c
Author: Josh Elser <el...@apache.org>
Authored: Fri Jun 26 13:08:01 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Jun 26 13:08:01 2015 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/accumulo/core/client/ScannerBase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/433f40ff/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java b/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
index d33df03..f35befc 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
@@ -167,7 +167,7 @@ public interface ScannerBase extends Iterable<Entry<Key,Value>> {
* the units of the timeout
* @since 1.8.0
*/
- void setBatchTimeout(long timeout, TimeUnit milliseconds);
+ void setBatchTimeout(long timeOut, TimeUnit timeUnit);
/**
* Returns the timeout to fill a batch in the given TimeUnit.
[2/3] accumulo git commit: ACCUMULO-3795 Commit automatic checkstyle
line wrap
Posted by el...@apache.org.
ACCUMULO-3795 Commit automatic checkstyle line wrap
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/98ed75d9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/98ed75d9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/98ed75d9
Branch: refs/heads/master
Commit: 98ed75d99a31afbb04475dd8c17c5d2435bca973
Parents: 433f40f
Author: Josh Elser <el...@apache.org>
Authored: Fri Jun 26 13:09:09 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Jun 26 13:09:56 2015 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/98ed75d9/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
index 4930219..8b4c7d1 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
@@ -719,8 +719,8 @@ public class Tablet implements TabletCommitter {
}
}
- private LookupResult lookup(SortedKeyValueIterator<Key,Value> mmfi, List<Range> ranges, HashSet<Column> columnSet, List<KVEntry> results, long maxResultsSize, long batchTimeOut)
- throws IOException {
+ private LookupResult lookup(SortedKeyValueIterator<Key,Value> mmfi, List<Range> ranges, HashSet<Column> columnSet, List<KVEntry> results,
+ long maxResultsSize, long batchTimeOut) throws IOException {
LookupResult lookupResult = new LookupResult();
[3/3] accumulo git commit: ACCUMULO-3919 Commit automatic style change
Posted by el...@apache.org.
ACCUMULO-3919 Commit automatic style change
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a1988ff9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a1988ff9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a1988ff9
Branch: refs/heads/master
Commit: a1988ff94d5211e1dd51fc19ed97f2e4faba1ed6
Parents: 98ed75d
Author: Josh Elser <el...@apache.org>
Authored: Fri Jun 26 13:09:30 2015 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Fri Jun 26 13:10:14 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/accumulo/tracer/AsyncSpanReceiverTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a1988ff9/server/tracer/src/test/java/org/apache/accumulo/tracer/AsyncSpanReceiverTest.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/test/java/org/apache/accumulo/tracer/AsyncSpanReceiverTest.java b/server/tracer/src/test/java/org/apache/accumulo/tracer/AsyncSpanReceiverTest.java
index f76d5c9..06e3099 100644
--- a/server/tracer/src/test/java/org/apache/accumulo/tracer/AsyncSpanReceiverTest.java
+++ b/server/tracer/src/test/java/org/apache/accumulo/tracer/AsyncSpanReceiverTest.java
@@ -92,7 +92,7 @@ public class AsyncSpanReceiverTest {
@Test
public void testKeepAll() throws InterruptedException {
- try( TestReceiver receiver = new TestReceiver(HTraceConfiguration.fromMap(Collections.singletonMap(AsyncSpanReceiver.SPAN_MIN_MS, "0")))) {
+ try (TestReceiver receiver = new TestReceiver(HTraceConfiguration.fromMap(Collections.singletonMap(AsyncSpanReceiver.SPAN_MIN_MS, "0")))) {
receiver.receiveSpan(createSpan(0));
while (receiver.getQueueSize() > 0) {