You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by mw...@apache.org on 2018/05/10 17:22:37 UTC
[accumulo] branch master updated: Fix formatting for #482
This is an automated email from the ASF dual-hosted git repository.
mwalch 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 b7f8815 Fix formatting for #482
b7f8815 is described below
commit b7f8815af0ea7ab5b56e2378e7beceaf67bc0f72
Author: Mike Walch <mw...@apache.org>
AuthorDate: Thu May 10 13:22:12 2018 -0400
Fix formatting for #482
---
.../java/org/apache/accumulo/core/client/rfile/RFile.java | 8 ++++----
.../org/apache/accumulo/core/client/summary/Summarizer.java | 2 +-
.../java/org/apache/accumulo/core/file/FileOperations.java | 11 +++++------
.../org/apache/accumulo/server/replication/ReplicaSystem.java | 3 +--
4 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFile.java b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFile.java
index b32df0d..cc5f23e 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFile.java
@@ -177,7 +177,7 @@ public class RFile {
* iterable over Accumulo table key value properties.
* @return this
*/
- ScannerOptions withTableProperties(Iterable<Entry<String, String>> props);
+ ScannerOptions withTableProperties(Iterable<Entry<String,String>> props);
/**
* @see #withTableProperties(Iterable)
@@ -185,7 +185,7 @@ public class RFile {
* a map instead of an Iterable
* @return this
*/
- ScannerOptions withTableProperties(Map<String, String> props);
+ ScannerOptions withTableProperties(Map<String,String> props);
/**
* @return a Scanner over RFile using the specified options.
@@ -405,12 +405,12 @@ public class RFile {
* sampler.
* @return this
*/
- WriterOptions withTableProperties(Iterable<Entry<String, String>> props);
+ WriterOptions withTableProperties(Iterable<Entry<String,String>> props);
/**
* @see #withTableProperties(Iterable)
*/
- WriterOptions withTableProperties(Map<String, String> props);
+ WriterOptions withTableProperties(Map<String,String> props);
/**
* @param maxSize
diff --git a/core/src/main/java/org/apache/accumulo/core/client/summary/Summarizer.java b/core/src/main/java/org/apache/accumulo/core/client/summary/Summarizer.java
index 869d087..618dfd4 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/summary/Summarizer.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/summary/Summarizer.java
@@ -220,7 +220,7 @@ public interface Summarizer {
* If first map is too large after this call, then it may not be stored. See the comment on
* {@link Collector#summarize(Summarizer.StatisticConsumer)}
*/
- void merge(Map<String, Long> statistics1, Map<String, Long> statistics2);
+ void merge(Map<String,Long> statistics1, Map<String,Long> statistics2);
}
/**
diff --git a/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java b/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java
index 83395e1..a6ee3bc 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/FileOperations.java
@@ -253,9 +253,8 @@ public abstract class FileOperations {
}
/** Builder interface parallel to {@link FileAccessOperation}. */
- protected interface FileAccessOperationBuilder<SubbuilderType>
- extends NeedsFile<SubbuilderType>, NeedsFileSystem<SubbuilderType>,
- NeedsTableConfiguration<SubbuilderType> {
+ protected interface FileAccessOperationBuilder<SubbuilderType> extends NeedsFile<SubbuilderType>,
+ NeedsFileSystem<SubbuilderType>, NeedsTableConfiguration<SubbuilderType> {
// no optional/generic methods.
}
@@ -576,7 +575,7 @@ public abstract class FileOperations {
public interface NeedsFile<ReturnType> {
/** Specify the file this operation should apply to. */
NeedsTableConfiguration<ReturnType> forFile(String filename, FileSystem fs,
- Configuration fsConf);
+ Configuration fsConf);
/** Specify the file this operation should apply to. */
NeedsFileSystem<ReturnType> forFile(String filename);
@@ -584,8 +583,8 @@ public abstract class FileOperations {
public interface NeedsFileOrOuputStream<ReturnType> extends NeedsFile<ReturnType> {
/** Specify the file this operation should apply to. */
- NeedsTableConfiguration<ReturnType> forOutputStream(String extenstion,
- FSDataOutputStream out, Configuration fsConf);
+ NeedsTableConfiguration<ReturnType> forOutputStream(String extenstion, FSDataOutputStream out,
+ Configuration fsConf);
}
/**
diff --git a/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicaSystem.java b/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicaSystem.java
index 1294b5b..66a4ca2 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicaSystem.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/replication/ReplicaSystem.java
@@ -38,8 +38,7 @@ public interface ReplicaSystem {
* Instance of ReplicaSystemHelper
* @return A new Status for the progress that was made
*/
- Status replicate(Path p, Status status, ReplicationTarget target,
- ReplicaSystemHelper helper);
+ Status replicate(Path p, Status status, ReplicationTarget target, ReplicaSystemHelper helper);
/**
* Configure the implementation with necessary information from the system configuration
--
To stop receiving notification emails like this one, please contact
mwalch@apache.org.