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 2019/02/27 23:01:39 UTC
[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 <mw...@apache.org>
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<Key>, 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<Key>, 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<Key>, Cloneable {
* @return given <code>StringBuilder</code>
*/
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 String[]{"a", "b", "c", "d", "e", "f", "g", "h", "i"}, new String[]{"a"}};
+ 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 String[] {"a", "b", "c", "d", "e", "f", "g", "h", "i"}, new String[] {"a"}};
for (String[] suffixes : tests) {
for (int maxTS = 1; maxTS <= 4; maxTS++) {
@@ -219,10 +219,10 @@ public class GroupBalancerTest {
@Test
public void testTwoGroups() {
- 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 String[]{"a", "b", "c", "d", "e", "f", "g", "h", "i"}, new String[]{"a"}};
+ 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 String[] {"a", "b", "c", "d", "e", "f", "g", "h", "i"}, new String[] {"a"}};
for (String[] suffixes1 : tests) {
for (String[] suffixes2 : tests) {
@@ -248,10 +248,10 @@ public class GroupBalancerTest {
@Test
public void testThreeGroups() {
- 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 String[]{"a", "b", "c", "d", "e", "f", "g", "h", "i"}, new String[]{"a"}};
+ 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 String[] {"a", "b", "c", "d", "e", "f", "g", "h", "i"}, new String[] {"a"}};
for (String[] suffixes1 : tests) {
for (String[] suffixes2 : tests) {
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
index dc981d4..1d6c5f9 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/NativeMap.java
@@ -193,12 +193,12 @@ public class NativeMap implements Iterable<Map.Entry<Key,Value>> {
// long ts, boolean del, byte[] value);
private static native void singleUpdate(long nmPointer, byte[] row, byte[] cf, byte[] cq,
- byte[] cv, long ts, boolean del, byte[] value, int mutationCount);
+ byte[] cv, long ts, boolean del, byte[] value, int mutationCount);
private static native long startUpdate(long nmPointer, byte[] row);
private static native void update(long nmPointer, long updateID, byte[] cf, byte[] cq, byte[] cv,
- long ts, boolean del, byte[] value, int mutationCount);
+ long ts, boolean del, byte[] value, int mutationCount);
private static native int sizeNM(long nmPointer);
@@ -251,12 +251,12 @@ public class NativeMap implements Iterable<Map.Entry<Key,Value>> {
private static native long createNMI(long nmp, int[] fieldLens);
private static native long createNMI(long nmp, byte[] row, byte[] cf, byte[] cq, byte[] cv,
- long ts, boolean del, int[] fieldLens);
+ long ts, boolean del, int[] fieldLens);
private static native boolean nmiNext(long nmiPointer, int[] fieldLens);
private static native void nmiGetData(long nmiPointer, byte[] row, byte[] cf, byte[] cq,
- byte[] cv, byte[] valData);
+ byte[] cv, byte[] valData);
private static native long nmiGetTS(long nmiPointer);