This is an automated email from the ASF dual-hosted git repository.
ctubbsii 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 8dfbdd4 Fix formatting
8dfbdd4 is described below
commit 8dfbdd4f0884fbe62a7e72264d9873a2bf3ef92b
Author: Christopher Tubbs <[email protected]>
AuthorDate: Fri May 4 19:24:26 2018 -0400
Fix formatting
---
.../accumulo/core/client/mapreduce/InputTableConfig.java | 3 ++-
.../org/apache/accumulo/core/client/rfile/RFileScanner.java | 3 +--
.../accumulo/core/conf/CredentialProviderFactoryShim.java | 5 +++--
.../master/balancer/BaseHostRegexTableLoadBalancerTest.java | 7 ++++---
.../main/java/org/apache/accumulo/tserver/TabletServer.java | 12 ++++++------
.../org/apache/accumulo/shell/commands/ConfigCommand.java | 2 +-
6 files changed, 17 insertions(+), 15 deletions(-)
diff --git
a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java
b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java
index d46bf07..40bdac1 100644
---
a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java
+++
b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java
@@ -375,7 +375,8 @@ public class InputTableConfig implements Writable {
return false;
if (ranges != null ? !ranges.equals(that.ranges) : that.ranges != null)
return false;
- return samplerConfig != null ? samplerConfig.equals(that.samplerConfig) :
that.samplerConfig == null;
+ return samplerConfig != null ? samplerConfig.equals(that.samplerConfig)
+ : that.samplerConfig == null;
}
@Override
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScanner.java
b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScanner.java
index 9c1e47c..57bc144 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScanner.java
@@ -388,8 +388,7 @@ class RFileScanner extends ScannerOptions implements
Scanner {
throw new RuntimeException(e);
}
- iterator.seek(getRange() == null ? EMPTY_RANGE : getRange(), families,
- families.size() != 0);
+ iterator.seek(getRange() == null ? EMPTY_RANGE : getRange(), families,
families.size() != 0);
return new IteratorAdapter(iterator);
} catch (IOException e) {
diff --git
a/core/src/main/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShim.java
b/core/src/main/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShim.java
index 9e6129b..bff0bd7 100644
---
a/core/src/main/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShim.java
+++
b/core/src/main/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShim.java
@@ -88,8 +88,9 @@ public class CredentialProviderFactoryShim {
if (null != hadoopClassesAvailable) {
// Make sure everything is initialized as expected
// Otherwise we failed to load it
- return hadoopClassesAvailable && null != getProvidersMethod && null !=
hadoopCredProviderFactory
- && null != getCredentialEntryMethod && null != getCredentialMethod;
+ return hadoopClassesAvailable && null != getProvidersMethod
+ && null != hadoopCredProviderFactory && null !=
getCredentialEntryMethod
+ && null != getCredentialMethod;
}
hadoopClassesAvailable = false;
diff --git
a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java
b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java
index b2b1503..cf7eed4 100644
---
a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java
+++
b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java
@@ -310,9 +310,10 @@ public abstract class BaseHostRegexTableLoadBalancerTest
extends HostRegexTableL
&& (host.equals("192.168.0.6") || host.equals("192.168.0.7") ||
host.equals("192.168.0.8")
|| host.equals("192.168.0.9") || host.equals("192.168.0.10"))) {
return true;
- } else return tid.equals("3") && (host.equals("192.168.0.11") ||
host.equals("192.168.0.12")
- || host.equals("192.168.0.13") || host.equals("192.168.0.14")
- || host.equals("192.168.0.15"));
+ } else
+ return tid.equals("3") && (host.equals("192.168.0.11") ||
host.equals("192.168.0.12")
+ || host.equals("192.168.0.13") || host.equals("192.168.0.14")
+ || host.equals("192.168.0.15"));
}
protected String idToTableName(Table.ID id) {
diff --git
a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index ddd7932..aa68d00 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -2964,12 +2964,12 @@ public class TabletServer extends AccumuloServerContext
implements Runnable {
if (extent.isMeta())
tableToVerify = RootTable.ID;
- List<ColumnFQ> columnsToFetch = Arrays
- .asList(TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN,
- TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN,
- TabletsSection.TabletColumnFamily.SPLIT_RATIO_COLUMN,
- TabletsSection.TabletColumnFamily.OLD_PREV_ROW_COLUMN,
- TabletsSection.ServerColumnFamily.TIME_COLUMN);
+ List<ColumnFQ> columnsToFetch = Arrays.asList(
+ TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN,
+ TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN,
+ TabletsSection.TabletColumnFamily.SPLIT_RATIO_COLUMN,
+ TabletsSection.TabletColumnFamily.OLD_PREV_ROW_COLUMN,
+ TabletsSection.ServerColumnFamily.TIME_COLUMN);
TreeMap<Key,Value> tkv = new TreeMap<>();
try (ScannerImpl scanner = new ScannerImpl(context, tableToVerify,
Authorizations.EMPTY)) {
diff --git
a/shell/src/main/java/org/apache/accumulo/shell/commands/ConfigCommand.java
b/shell/src/main/java/org/apache/accumulo/shell/commands/ConfigCommand.java
index 182f034..0251112 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/ConfigCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ConfigCommand.java
@@ -273,7 +273,7 @@ public class ConfigCommand extends Command {
}
return cl.hasOption(filterWithValuesOpt.getOpt())
&& !(key.contains(cl.getOptionValue(filterWithValuesOpt.getOpt()))
- || value.contains(cl.getOptionValue(filterWithValuesOpt.getOpt())));
+ ||
value.contains(cl.getOptionValue(filterWithValuesOpt.getOpt())));
}
private void printConfHeader(List<String> output) {
--
To stop receiving notification emails like this one, please contact
[email protected].
