This is an automated email from the ASF dual-hosted git repository.
mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/master by this push:
new 226b583 Fix formatting
226b583 is described below
commit 226b5833788a65e0b55412b9b450392baea7b291
Author: Mike Miller <[email protected]>
AuthorDate: Fri Apr 20 12:33:24 2018 -0400
Fix formatting
---
.../accumulo/core/client/impl/TabletLocatorImpl.java | 4 ++--
.../accumulo/core/file/rfile/MultiLevelIndex.java | 3 ++-
.../org/apache/accumulo/core/iterators/Combiner.java | 7 ++++---
.../accumulo/server/client/ClientServiceHandler.java | 17 ++++++++---------
.../accumulo/server/AccumuloServerContextTest.java | 14 ++++++--------
.../apache/accumulo/gc/SimpleGarbageCollectorTest.java | 18 ++++++++----------
.../org/apache/accumulo/master/tableOps/LoadFiles.java | 4 ++--
.../accumulo/tserver/ConditionalMutationSet.java | 4 ++--
.../apache/accumulo/test/functional/ReadWriteIT.java | 9 ++++-----
.../gc/replication/CloseWriteAheadLogReferencesIT.java | 18 ++++++++----------
10 files changed, 46 insertions(+), 52 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java
b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java
index 7e232af..cc46d50 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletLocatorImpl.java
@@ -208,8 +208,8 @@ public class TabletLocatorImpl extends TabletLocator {
}
if (notInCache.size() > 0) {
- Collections.sort(notInCache, (o1, o2) ->
WritableComparator.compareBytes(o1.getRow(), 0, o1.getRow().length,
o2.getRow(), 0,
- o2.getRow().length));
+ Collections.sort(notInCache, (o1, o2) ->
WritableComparator.compareBytes(o1.getRow(), 0,
+ o1.getRow().length, o2.getRow(), 0, o2.getRow().length));
wLock.lock();
try {
diff --git
a/core/src/main/java/org/apache/accumulo/core/file/rfile/MultiLevelIndex.java
b/core/src/main/java/org/apache/accumulo/core/file/rfile/MultiLevelIndex.java
index ff11bc5..2943e85 100644
---
a/core/src/main/java/org/apache/accumulo/core/file/rfile/MultiLevelIndex.java
+++
b/core/src/main/java/org/apache/accumulo/core/file/rfile/MultiLevelIndex.java
@@ -607,7 +607,8 @@ public class MultiLevelIndex {
}
private Node lookup(Key key) throws IOException {
- int pos = Collections.binarySearch(indexBlock.getKeyIndex(), key,
Comparator.naturalOrder());
+ int pos = Collections.binarySearch(indexBlock.getKeyIndex(), key,
+ Comparator.naturalOrder());
if (pos < 0)
pos = (pos * -1) - 1;
diff --git
a/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
b/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
index fad9cc1..f6d31b2 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
@@ -190,9 +190,10 @@ public abstract class Combiner extends WrappingIterator
implements OptionDescrib
if (isMajorCompaction && !reduceOnFullCompactionOnly) {
try {
loggedMsgCache.get(this.getClass().getName(), () -> {
- sawDeleteLog.error("Combiner of type {} saw a delete during a"
- + " partial compaction. This could cause undesired results. See"
- + " ACCUMULO-2232. Will not log subsequent occurences for at
least" + " 1 hour.",
+ sawDeleteLog.error(
+ "Combiner of type {} saw a delete during a"
+ + " partial compaction. This could cause undesired results.
See"
+ + " ACCUMULO-2232. Will not log subsequent occurences for at
least" + " 1 hour.",
Combiner.this.getClass().getSimpleName());
// the value is not used and does not matter
return Boolean.TRUE;
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
b/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
index 98e3dc0..d63e5fc 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
@@ -343,15 +343,14 @@ public class ClientServiceHandler implements
ClientService.Iface {
SecurityErrorCode.PERMISSION_DENIED);
bulkImportStatus.updateBulkImportStatus(files, BulkImportState.INITIAL);
log.debug("Got request to bulk import files to table({}): {}", tableId,
files);
- return transactionWatcher.run(Constants.BULK_ARBITRATOR_TYPE, tid,
- () -> {
- bulkImportStatus.updateBulkImportStatus(files,
BulkImportState.PROCESSING);
- try {
- return BulkImporter.bulkLoad(context, tid, tableId, files,
errorDir, setTime);
- } finally {
- bulkImportStatus.removeBulkImportStatus(files);
- }
- });
+ return transactionWatcher.run(Constants.BULK_ARBITRATOR_TYPE, tid, () ->
{
+ bulkImportStatus.updateBulkImportStatus(files,
BulkImportState.PROCESSING);
+ try {
+ return BulkImporter.bulkLoad(context, tid, tableId, files, errorDir,
setTime);
+ } finally {
+ bulkImportStatus.removeBulkImportStatus(files);
+ }
+ });
} catch (AccumuloSecurityException e) {
throw e.asThriftException();
} catch (Exception ex) {
diff --git
a/server/base/src/test/java/org/apache/accumulo/server/AccumuloServerContextTest.java
b/server/base/src/test/java/org/apache/accumulo/server/AccumuloServerContextTest.java
index f356a9b..3946341 100644
---
a/server/base/src/test/java/org/apache/accumulo/server/AccumuloServerContextTest.java
+++
b/server/base/src/test/java/org/apache/accumulo/server/AccumuloServerContextTest.java
@@ -98,14 +98,12 @@ public class AccumuloServerContextTest {
// Just make the SiteConfiguration delegate to our ClientConfiguration
(by way of the
// AccumuloConfiguration)
// Presently, we only need get(Property) and iterator().
- EasyMock.expect(siteConfig.get(EasyMock.anyObject(Property.class)))
- .andAnswer(() -> {
- Object[] args = EasyMock.getCurrentArguments();
- return conf.get((Property) args[0]);
- }).anyTimes();
-
- EasyMock.expect(siteConfig.iterator())
- .andAnswer(() -> conf.iterator()).anyTimes();
+
EasyMock.expect(siteConfig.get(EasyMock.anyObject(Property.class))).andAnswer(()
-> {
+ Object[] args = EasyMock.getCurrentArguments();
+ return conf.get((Property) args[0]);
+ }).anyTimes();
+
+ EasyMock.expect(siteConfig.iterator()).andAnswer(() ->
conf.iterator()).anyTimes();
EasyMock.replay(factory, context, siteConfig);
diff --git
a/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java
b/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java
index 6716a07..848ed3b 100644
---
a/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java
+++
b/server/gc/src/test/java/org/apache/accumulo/gc/SimpleGarbageCollectorTest.java
@@ -73,16 +73,14 @@ public class SimpleGarbageCollectorTest {
// Just make the SiteConfiguration delegate to our AccumuloConfiguration
// Presently, we only need get(Property) and iterator().
- EasyMock.expect(siteConfig.get(EasyMock.anyObject(Property.class)))
- .andAnswer(() -> {
- Object[] args = EasyMock.getCurrentArguments();
- return systemConfig.get((Property) args[0]);
- }).anyTimes();
- EasyMock.expect(siteConfig.getBoolean(EasyMock.anyObject(Property.class)))
- .andAnswer(() -> {
- Object[] args = EasyMock.getCurrentArguments();
- return systemConfig.getBoolean((Property) args[0]);
- }).anyTimes();
+
EasyMock.expect(siteConfig.get(EasyMock.anyObject(Property.class))).andAnswer(()
-> {
+ Object[] args = EasyMock.getCurrentArguments();
+ return systemConfig.get((Property) args[0]);
+ }).anyTimes();
+
EasyMock.expect(siteConfig.getBoolean(EasyMock.anyObject(Property.class))).andAnswer(()
-> {
+ Object[] args = EasyMock.getCurrentArguments();
+ return systemConfig.getBoolean((Property) args[0]);
+ }).anyTimes();
EasyMock.expect(siteConfig.iterator()).andAnswer(() ->
systemConfig.iterator()).anyTimes();
diff --git
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
index 7bed4bf..243d649 100644
---
a/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
+++
b/server/master/src/main/java/org/apache/accumulo/master/tableOps/LoadFiles.java
@@ -170,8 +170,8 @@ class LoadFiles extends MasterRepo {
client = ThriftUtil.getTServerClient(server, master,
timeInMillis);
List<String> attempt1 = Collections.singletonList(file);
log.debug("Asking " + server + " to bulk import " + file);
- List<String> fail = client.bulkImportFiles(Tracer.traceInfo(),
master.rpcCreds(),
- tid, tableId.canonicalID(), attempt1, errorDir, setTime);
+ List<String> fail = client.bulkImportFiles(Tracer.traceInfo(),
master.rpcCreds(), tid,
+ tableId.canonicalID(), attempt1, errorDir, setTime);
if (fail.isEmpty()) {
loaded.add(file);
} else {
diff --git
a/server/tserver/src/main/java/org/apache/accumulo/tserver/ConditionalMutationSet.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/ConditionalMutationSet.java
index 19d19e3..2599ff6 100644
---
a/server/tserver/src/main/java/org/apache/accumulo/tserver/ConditionalMutationSet.java
+++
b/server/tserver/src/main/java/org/apache/accumulo/tserver/ConditionalMutationSet.java
@@ -82,8 +82,8 @@ public class ConditionalMutationSet {
static void
sortConditionalMutations(Map<KeyExtent,List<ServerConditionalMutation>>
updates) {
for (Entry<KeyExtent,List<ServerConditionalMutation>> entry :
updates.entrySet()) {
- Collections.sort(entry.getValue(), (o1, o2) ->
WritableComparator.compareBytes(o1.getRow(), 0, o1.getRow().length,
o2.getRow(), 0,
- o2.getRow().length));
+ Collections.sort(entry.getValue(), (o1, o2) ->
WritableComparator.compareBytes(o1.getRow(), 0,
+ o1.getRow().length, o2.getRow(), 0, o2.getRow().length));
}
}
}
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
index a28e520..de1bb50 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ReadWriteIT.java
@@ -271,9 +271,8 @@ public class ReadWriteIT extends AccumuloClusterHarness {
}
return control.exec(TestMultiTableIngest.class,
- args("--count", Integer.toString(ROWS), "-u", getAdminPrincipal(),
"-i", instance,
- "-z", keepers, "-p",
- new String(((PasswordToken) getAdminToken()).getPassword(),
UTF_8),
+ args("--count", Integer.toString(ROWS), "-u", getAdminPrincipal(),
"-i", instance, "-z",
+ keepers, "-p", new String(((PasswordToken)
getAdminToken()).getPassword(), UTF_8),
"--tablePrefix", prefix));
} catch (IOException e) {
log.error("Error running MultiTableIngest", e);
@@ -301,8 +300,8 @@ public class ReadWriteIT extends AccumuloClusterHarness {
return control.exec(TestMultiTableIngest.class,
args("--count", Integer.toString(ROWS), "--readonly", "-u",
getAdminPrincipal(), "-i",
instance, "-z", keepers, "-p",
- new String(((PasswordToken) getAdminToken()).getPassword(),
UTF_8),
- "--tablePrefix", prefix));
+ new String(((PasswordToken) getAdminToken()).getPassword(),
UTF_8), "--tablePrefix",
+ prefix));
} catch (IOException e) {
log.error("Error running MultiTableIngest", e);
return -1;
diff --git
a/test/src/main/java/org/apache/accumulo/test/gc/replication/CloseWriteAheadLogReferencesIT.java
b/test/src/main/java/org/apache/accumulo/test/gc/replication/CloseWriteAheadLogReferencesIT.java
index d187ee7..2f8be73 100644
---
a/test/src/main/java/org/apache/accumulo/test/gc/replication/CloseWriteAheadLogReferencesIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/gc/replication/CloseWriteAheadLogReferencesIT.java
@@ -99,16 +99,14 @@ public class CloseWriteAheadLogReferencesIT extends
ConfigurableMacBase {
// Just make the SiteConfiguration delegate to our AccumuloConfiguration
// Presently, we only need get(Property) and iterator().
- EasyMock.expect(siteConfig.get(EasyMock.anyObject(Property.class)))
- .andAnswer(() -> {
- Object[] args = EasyMock.getCurrentArguments();
- return systemConf.get((Property) args[0]);
- }).anyTimes();
- EasyMock.expect(siteConfig.getBoolean(EasyMock.anyObject(Property.class)))
- .andAnswer(() -> {
- Object[] args = EasyMock.getCurrentArguments();
- return systemConf.getBoolean((Property) args[0]);
- }).anyTimes();
+
EasyMock.expect(siteConfig.get(EasyMock.anyObject(Property.class))).andAnswer(()
-> {
+ Object[] args = EasyMock.getCurrentArguments();
+ return systemConf.get((Property) args[0]);
+ }).anyTimes();
+
EasyMock.expect(siteConfig.getBoolean(EasyMock.anyObject(Property.class))).andAnswer(()
-> {
+ Object[] args = EasyMock.getCurrentArguments();
+ return systemConf.getBoolean((Property) args[0]);
+ }).anyTimes();
EasyMock.expect(siteConfig.iterator()).andAnswer(() ->
systemConf.iterator()).anyTimes();
--
To stop receiving notification emails like this one, please contact
[email protected].
