[accumulo] branch master updated: Formatting

[mmiller]

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 240d137  Formatting
240d137 is described below

commit 240d13701833ed3a937685a45d2e464d628ecdf0
Author: Mike Miller <mmil...@apache.org>
AuthorDate: Mon Apr 6 10:47:48 2020 -0400

    Formatting
---
 .../java/org/apache/accumulo/server/util/MasterMetadataUtil.java    | 4 ++--
 .../java/org/apache/accumulo/tserver/tablet/DatafileManager.java    | 2 +-
 .../src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java    | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
 
b/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
index f60aa36..56112df 100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/util/MasterMetadataUtil.java
@@ -210,8 +210,8 @@ public class MasterMetadataUtil {
    */
   public static StoredTabletFile updateTabletDataFile(ServerContext context, 
KeyExtent extent,
       TabletFile path, StoredTabletFile mergeFile, DataFileValue dfv, 
MetadataTime time,
-      Set<StoredTabletFile> filesInUseByScans,  ZooLock zooLock,
-      Set<String> unusedWalLogs,  long flushId) {
+      Set<StoredTabletFile> filesInUseByScans, ZooLock zooLock, Set<String> 
unusedWalLogs,
+      long flushId) {
 
     TabletMutator tablet = context.getAmple().mutateTablet(extent);
     StoredTabletFile newFile = null;
diff --git 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
index 4c0e9ed..6f5d71a 100644
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/DatafileManager.java
@@ -548,7 +548,7 @@ class DatafileManager {
     if (filesInUseByScans.size() > 0)
       log.debug("Adding scan refs to metadata {} {}", extent, 
filesInUseByScans);
     MasterMetadataUtil.replaceDatafiles(tablet.getContext(), extent, 
oldDatafiles,
-      filesInUseByScans, newFile, compactionId, dfv, 
tablet.getTabletServer().getLock());
+        filesInUseByScans, newFile, compactionId, dfv, 
tablet.getTabletServer().getLock());
     removeFilesAfterScan(filesInUseByScans);
 
     if (log.isTraceEnabled()) {
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 9d237ac..effa25a 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
@@ -2684,9 +2684,9 @@ public class Tablet {
         persistedTime = maxCommittedTime;
       }
 
-     return 
MasterMetadataUtil.updateTabletDataFile(getTabletServer().getContext(), extent, 
newDatafile,
-          absMergeFile, dfv, tabletTime.getMetadataTime(persistedTime), 
filesInUseByScans,
-          tabletServer.getLock(), unusedWalLogs, flushId);
+      return 
MasterMetadataUtil.updateTabletDataFile(getTabletServer().getContext(), extent,
+          newDatafile, absMergeFile, dfv, 
tabletTime.getMetadataTime(persistedTime),
+          filesInUseByScans, tabletServer.getLock(), unusedWalLogs, flushId);
     }
 
   }