[accumulo] branch master updated: Formatting
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
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 filesInUseByScans, ZooLock zooLock,
- Set unusedWalLogs, long flushId) {
+ Set filesInUseByScans, ZooLock zooLock, Set
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);
}
}
[accumulo] branch master updated: Formatting
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 a1b1ae6 Formatting
a1b1ae6 is described below
commit a1b1ae6bfef2ca11d92b86ab60930b3c56971f6e
Author: Mike Miller
AuthorDate: Wed May 22 11:56:46 2019 -0400
Formatting
---
test/src/main/java/org/apache/accumulo/test/BulkImportVolumeIT.java| 3 ++-
test/src/main/java/org/apache/accumulo/test/functional/BulkFileIT.java | 2 +-
.../main/java/org/apache/accumulo/test/functional/CompactionIT.java| 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git
a/test/src/main/java/org/apache/accumulo/test/BulkImportVolumeIT.java
b/test/src/main/java/org/apache/accumulo/test/BulkImportVolumeIT.java
index 9e13eae..4164288 100644
--- a/test/src/main/java/org/apache/accumulo/test/BulkImportVolumeIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/BulkImportVolumeIT.java
@@ -70,7 +70,8 @@ public class BulkImportVolumeIT extends
AccumuloClusterHarness {
try (AccumuloClient client =
Accumulo.newClient().from(getClientProps()).build()) {
client.tableOperations().create(tableName);
FileSystem fs = getFileSystem();
- Path rootPath = new Path(fs.getUri().toString() +
cluster.getTemporaryPath(), getClass().getName());
+ Path rootPath =
+ new Path(fs.getUri().toString() + cluster.getTemporaryPath(),
getClass().getName());
fs.deleteOnExit(rootPath);
Path bulk = new Path(rootPath, "bulk");
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/BulkFileIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/BulkFileIT.java
index cd7e870..53d08e9 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BulkFileIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BulkFileIT.java
@@ -74,7 +74,7 @@ public class BulkFileIT extends AccumuloClusterHarness {
Configuration conf = new Configuration();
AccumuloConfiguration aconf =
getCluster().getServerContext().getConfiguration();
FileSystem fs = getCluster().getFileSystem();
- String rootPath = fs.getUri().toString() +
cluster.getTemporaryPath().toString();
+ String rootPath = fs.getUri().toString() +
cluster.getTemporaryPath().toString();
String dir = rootPath + "/bulk_test_diff_files_89723987592_" +
getUniqueNames(1)[0];
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
index debee5a..51415dc 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java
@@ -115,7 +115,8 @@ public class CompactionIT extends AccumuloClusterHarness {
c.tableOperations().create(tableName);
c.tableOperations().setProperty(tableName,
Property.TABLE_MAJC_RATIO.getKey(), "1.0");
FileSystem fs = getFileSystem();
- Path root = new Path(fs.getUri().toString() +
cluster.getTemporaryPath(), getClass().getName());
+ Path root =
+ new Path(fs.getUri().toString() + cluster.getTemporaryPath(),
getClass().getName());
fs.deleteOnExit(root);
Path testrf = new Path(root, "testrf");
fs.deleteOnExit(testrf);
[accumulo] branch master updated: formatting
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 9fdfa55 formatting
9fdfa55 is described below
commit 9fdfa554aaaf23d558689fa3239ab79eda2d0645
Author: Mike Walch
AuthorDate: Wed Feb 27 18:01:27 2019 -0500
formatting
---
.../java/org/apache/accumulo/core/data/Key.java| 6 +++---
.../org/apache/accumulo/core/util/FastFormat.java | 4 ++--
.../core/util/format/DefaultFormatter.java | 2 +-
.../server/master/balancer/GroupBalancerTest.java | 24 +++---
.../org/apache/accumulo/tserver/NativeMap.java | 8
5 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/core/src/main/java/org/apache/accumulo/core/data/Key.java
b/core/src/main/java/org/apache/accumulo/core/data/Key.java
index 3859bfb..ea99d4b 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/Key.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/Key.java
@@ -95,7 +95,7 @@ public class Key implements WritableComparable,
Cloneable {
}
private final void init(byte[] r, int rOff, int rLen, byte[] cf, int cfOff,
int cfLen, byte[] cq,
- int cqOff, int cqLen, byte[] cv, int cvOff, int
cvLen, long ts, boolean del, boolean copy) {
+ int cqOff, int cqLen, byte[] cv, int cvOff, int cvLen, long ts, boolean
del, boolean copy) {
row = copyIfNeeded(r, rOff, rLen, copy);
colFamily = copyIfNeeded(cf, cfOff, cfLen, copy);
colQualifier = copyIfNeeded(cq, cqOff, cqLen, copy);
@@ -216,7 +216,7 @@ public class Key implements WritableComparable,
Cloneable {
* @see #builder()
*/
public Key(byte[] row, int rOff, int rLen, byte[] cf, int cfOff, int cfLen,
byte[] cq, int cqOff,
- int cqLen, byte[] cv, int cvOff, int cvLen, long ts) {
+ int cqLen, byte[] cv, int cvOff, int cvLen, long ts) {
init(row, rOff, rLen, cf, cfOff, cfLen, cq, cqOff, cqLen, cv, cvOff,
cvLen, ts, false, true);
}
@@ -1068,7 +1068,7 @@ public class Key implements WritableComparable,
Cloneable {
* @return given StringBuilder
*/
public static StringBuilder appendPrintableString(byte[] ba, int offset, int
len, int maxLen,
-StringBuilder sb) {
+ StringBuilder sb) {
int plen = Math.min(len, maxLen);
for (int i = 0; i < plen; i++) {
diff --git a/core/src/main/java/org/apache/accumulo/core/util/FastFormat.java
b/core/src/main/java/org/apache/accumulo/core/util/FastFormat.java
index f1f9aca..d153d66 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/FastFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/FastFormat.java
@@ -34,7 +34,7 @@ public class FastFormat {
}
public static int toZeroPaddedString(byte[] output, int outputOffset, long
num, int width,
- int radix, byte[] prefix) {
+ int radix, byte[] prefix) {
Preconditions.checkArgument(num >= 0);
String strNum = Long.toString(num, radix);
@@ -43,7 +43,7 @@ public class FastFormat {
}
private static int toZeroPaddedString(byte[] output, int outputOffset,
String strNum, int width,
-byte[] prefix) {
+ byte[] prefix) {
int index = outputOffset;
diff --git
a/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
b/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
index 14e6c46..eeb8af7 100644
---
a/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
+++
b/core/src/main/java/org/apache/accumulo/core/util/format/DefaultFormatter.java
@@ -182,7 +182,7 @@ public class DefaultFormatter implements Formatter {
}
static StringBuilder appendBytes(StringBuilder sb, byte[] ba, int offset,
int len,
- int shownLength) {
+ int shownLength) {
int length = Math.min(len, shownLength);
return DefaultFormatter.appendBytes(sb, ba, offset, length);
}
diff --git
a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java
b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java
index 14548a5..8222ed3 100644
---
a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java
+++
b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/GroupBalancerTest.java
@@ -196,10 +196,10 @@ public class GroupBalancerTest {
@Test
public void testSingleGroup() {
-String[][] tests = {new String[]{"a", "b", "c", "d"}, new String[]{"a",
"b", "c"},
-new String[]{"a", "b", "c", "d", "e"}, new String[]{"a", "b", "c",
"d", "e", "f", "g"},
-new String[]{"a", "b", "c", "d", "e", "f", "g", "h"},
-new
[accumulo] branch master updated: Formatting
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 bdb59cd Formatting
bdb59cd is described below
commit bdb59cdb2c9cac44a7ca19a5848217dfc88d4bbc
Author: Mike Miller
AuthorDate: Wed Dec 19 14:57:34 2018 -0500
Formatting
---
.../main/java/org/apache/accumulo/tserver/log/DfsLogger.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
index d7cd7eb..776639e 100644
---
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
+++
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
@@ -48,7 +48,6 @@ import org.apache.accumulo.core.crypto.CryptoUtils;
import org.apache.accumulo.core.crypto.streams.NoFlushOutputStream;
import org.apache.accumulo.core.cryptoImpl.CryptoEnvironmentImpl;
import org.apache.accumulo.core.cryptoImpl.NoCryptoService;
-import org.apache.accumulo.core.cryptoImpl.NoFileEncrypter;
import org.apache.accumulo.core.data.Mutation;
import org.apache.accumulo.core.dataImpl.KeyExtent;
import org.apache.accumulo.core.spi.crypto.CryptoEnvironment;
@@ -436,13 +435,14 @@ public class DfsLogger implements Comparable {
byte[] cryptoParams = encrypter.getDecryptionParameters();
CryptoUtils.writeParams(cryptoParams, logFile);
- /** Always wrap the WAL in a NoFlushOutputStream to prevent extra
flushing to HDFS.
- * The {@link #write(LogFileKey, LogFileValue)} method will flush crypto
data or do nothing
- * when crypto is not enabled.
+ /**
+ * Always wrap the WAL in a NoFlushOutputStream to prevent extra
flushing to HDFS. The
+ * {@link #write(LogFileKey, LogFileValue)} method will flush crypto
data or do nothing when
+ * crypto is not enabled.
**/
OutputStream encryptedStream = encrypter.encryptStream(new
NoFlushOutputStream(logFile));
if (encryptedStream instanceof NoFlushOutputStream) {
-encryptingLogFile = (NoFlushOutputStream)encryptedStream;
+encryptingLogFile = (NoFlushOutputStream) encryptedStream;
} else {
encryptingLogFile = new DataOutputStream(encryptedStream);
}
