You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2016/06/20 23:49:53 UTC
[01/23] accumulo git commit: ACCUMULO-4157 Remove warning (unused
private field)
Repository: accumulo
Updated Branches:
refs/heads/1.6 d5ea00fcd -> 31a222425
refs/heads/1.7 7b9205365 -> 976c0aaf9
refs/heads/1.8 519e5b790 -> 94bf129c8
refs/heads/master 371a95c22 -> 5c576af1e
ACCUMULO-4157 Remove warning (unused private field)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/40d24183
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/40d24183
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/40d24183
Branch: refs/heads/1.6
Commit: 40d2418346383809ecce322d4d3de62f17dd1558
Parents: d5ea00f
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jun 20 13:37:36 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jun 20 13:37:36 2016 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/40d24183/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
----------------------------------------------------------------------
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
index b7d8d92..a22a34e 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
@@ -16,7 +16,6 @@
*/
package org.apache.accumulo.gc;
-import com.google.common.annotations.VisibleForTesting;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;
@@ -28,10 +27,12 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.UUID;
+import java.util.concurrent.TimeUnit;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
+import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.gc.thrift.GCStatus;
import org.apache.accumulo.core.gc.thrift.GcCycleStats;
import org.apache.accumulo.core.tabletserver.log.LogEntry;
@@ -55,9 +56,8 @@ import org.apache.log4j.Logger;
import org.apache.thrift.TException;
import org.apache.zookeeper.KeeperException;
+import com.google.common.annotations.VisibleForTesting;
import com.google.common.net.HostAndPort;
-import java.util.concurrent.TimeUnit;
-import org.apache.accumulo.core.conf.Property;
public class GarbageCollectWriteAheadLogs {
private static final Logger log = Logger.getLogger(GarbageCollectWriteAheadLogs.class);
@@ -65,7 +65,6 @@ public class GarbageCollectWriteAheadLogs {
private final Instance instance;
private final VolumeManager fs;
private final Map<HostAndPort,Long> firstSeenDead = new HashMap<HostAndPort,Long>();
- private AccumuloConfiguration config;
private boolean useTrash;
[21/23] accumulo git commit: ACCUMULO-4318 Fix resource leak warnings
from AutoClosable
Posted by ct...@apache.org.
ACCUMULO-4318 Fix resource leak warnings from AutoClosable
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/94bf129c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/94bf129c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/94bf129c
Branch: refs/heads/master
Commit: 94bf129c8c3635bb99b272db009350a448503607
Parents: 4f7fbf4
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jun 20 19:37:47 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jun 20 19:45:36 2016 -0400
----------------------------------------------------------------------
.../core/metadata/MetadataLocationObtainer.java | 21 ++++---
.../core/client/impl/ScannerOptionsTest.java | 58 +++++++++++---------
2 files changed, 44 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/94bf129c/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java b/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java
index c59fab2..d6af8ba 100644
--- a/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java
@@ -149,6 +149,15 @@ public class MetadataLocationObtainer implements TabletLocationObtainer {
}
}
+ private static class SettableScannerOptions extends ScannerOptions {
+ public ScannerOptions setColumns(SortedSet<Column> locCols) {
+ this.fetchedColumns = locCols;
+ // see comment in lookupTablet about why iterator is used
+ addScanIterator(new IteratorSetting(10000, "WRI", WholeRowIterator.class.getName()));
+ return this;
+ }
+ }
+
@Override
public List<TabletLocation> lookupTablets(ClientContext context, String tserver, Map<KeyExtent,List<Range>> tabletsRanges, TabletLocator parent)
throws AccumuloSecurityException, AccumuloException {
@@ -169,14 +178,10 @@ public class MetadataLocationObtainer implements TabletLocationObtainer {
}
};
- ScannerOptions opts = new ScannerOptions() {
- ScannerOptions setOpts() {
- this.fetchedColumns = locCols;
- // see comment in lookupTablet about why iterator is used
- addScanIterator(new IteratorSetting(10000, "WRI", WholeRowIterator.class.getName()));
- return this;
- }
- }.setOpts();
+ ScannerOptions opts = null;
+ try (SettableScannerOptions unsetOpts = new SettableScannerOptions()) {
+ opts = unsetOpts.setColumns(locCols);
+ }
Map<KeyExtent,List<Range>> unscanned = new HashMap<KeyExtent,List<Range>>();
Map<KeyExtent,List<Range>> failures = new HashMap<KeyExtent,List<Range>>();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/94bf129c/core/src/test/java/org/apache/accumulo/core/client/impl/ScannerOptionsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/impl/ScannerOptionsTest.java b/core/src/test/java/org/apache/accumulo/core/client/impl/ScannerOptionsTest.java
index 920d687..cfdbe6f 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/impl/ScannerOptionsTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/impl/ScannerOptionsTest.java
@@ -38,44 +38,48 @@ public class ScannerOptionsTest {
*/
@Test
public void testAddRemoveIterator() throws Throwable {
- ScannerOptions options = new ScannerOptions();
- options.addScanIterator(new IteratorSetting(1, "NAME", WholeRowIterator.class));
- assertEquals(1, options.serverSideIteratorList.size());
- options.removeScanIterator("NAME");
- assertEquals(0, options.serverSideIteratorList.size());
+ try (ScannerOptions options = new ScannerOptions()) {
+ options.addScanIterator(new IteratorSetting(1, "NAME", WholeRowIterator.class));
+ assertEquals(1, options.serverSideIteratorList.size());
+ options.removeScanIterator("NAME");
+ assertEquals(0, options.serverSideIteratorList.size());
+ }
}
@Test
public void testIteratorConflict() {
- ScannerOptions options = new ScannerOptions();
- options.addScanIterator(new IteratorSetting(1, "NAME", DebugIterator.class));
- try {
- options.addScanIterator(new IteratorSetting(2, "NAME", DebugIterator.class));
- fail();
- } catch (IllegalArgumentException e) {}
- try {
- options.addScanIterator(new IteratorSetting(1, "NAME2", DebugIterator.class));
- fail();
- } catch (IllegalArgumentException e) {}
+ try (ScannerOptions options = new ScannerOptions()) {
+ options.addScanIterator(new IteratorSetting(1, "NAME", DebugIterator.class));
+ try {
+ options.addScanIterator(new IteratorSetting(2, "NAME", DebugIterator.class));
+ fail();
+ } catch (IllegalArgumentException e) {}
+ try {
+ options.addScanIterator(new IteratorSetting(1, "NAME2", DebugIterator.class));
+ fail();
+ } catch (IllegalArgumentException e) {}
+ }
}
@Test
public void testFetchColumn() {
- ScannerOptions options = new ScannerOptions();
- assertEquals(0, options.getFetchedColumns().size());
- IteratorSetting.Column col = new IteratorSetting.Column(new Text("family"), new Text("qualifier"));
- options.fetchColumn(col);
- SortedSet<Column> fetchedColumns = options.getFetchedColumns();
- assertEquals(1, fetchedColumns.size());
- Column fetchCol = fetchedColumns.iterator().next();
- assertEquals(col.getColumnFamily(), new Text(fetchCol.getColumnFamily()));
- assertEquals(col.getColumnQualifier(), new Text(fetchCol.getColumnQualifier()));
+ try (ScannerOptions options = new ScannerOptions()) {
+ assertEquals(0, options.getFetchedColumns().size());
+ IteratorSetting.Column col = new IteratorSetting.Column(new Text("family"), new Text("qualifier"));
+ options.fetchColumn(col);
+ SortedSet<Column> fetchedColumns = options.getFetchedColumns();
+ assertEquals(1, fetchedColumns.size());
+ Column fetchCol = fetchedColumns.iterator().next();
+ assertEquals(col.getColumnFamily(), new Text(fetchCol.getColumnFamily()));
+ assertEquals(col.getColumnQualifier(), new Text(fetchCol.getColumnQualifier()));
+ }
}
@Test(expected = IllegalArgumentException.class)
public void testFetchNullColumn() {
- ScannerOptions options = new ScannerOptions();
- // Require a non-null instance of Column
- options.fetchColumn((IteratorSetting.Column) null);
+ try (ScannerOptions options = new ScannerOptions()) {
+ // Require a non-null instance of Column
+ options.fetchColumn((IteratorSetting.Column) null);
+ }
}
}
[18/23] accumulo git commit: ACCUMULO-4344 cleanup-remove unused
logger/imports
Posted by ct...@apache.org.
ACCUMULO-4344 cleanup-remove unused logger/imports
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/78273df5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/78273df5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/78273df5
Branch: refs/heads/master
Commit: 78273df54c96116ba18e78ecdc92bd7ecf498352
Parents: 24844cc
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jun 20 19:25:14 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jun 20 19:25:14 2016 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/accumulo/core/conf/PropertyType.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/78273df5/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java b/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
index 6733fc6..22fcb8b 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
@@ -27,8 +27,6 @@ import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.util.Pair;
import org.apache.commons.lang.math.IntRange;
import org.apache.hadoop.fs.Path;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
@@ -270,7 +268,6 @@ public enum PropertyType {
public static class PortRange extends Matches {
- private static final Logger log = LoggerFactory.getLogger(PortRange.class);
private static final IntRange VALID_RANGE = new IntRange(1024, 65535);
public PortRange(final String pattern) {
[20/23] accumulo git commit: ACCUMULO-4331 cleanup-fix warnings
Posted by ct...@apache.org.
ACCUMULO-4331 cleanup-fix warnings
Fix warnings left from previous work:
* Fix broken javadoc
* Fix compiler warnings about overriding deprecated methods
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4f7fbf4d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4f7fbf4d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4f7fbf4d
Branch: refs/heads/1.8
Commit: 4f7fbf4d06409017d1c26f68f45d620635d75a60
Parents: 78273df
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jun 20 19:26:20 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jun 20 19:26:20 2016 -0400
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/server/rpc/TServerUtils.java | 4 ++--
.../java/org/apache/accumulo/server/util/TServerUtilsTest.java | 5 +++++
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f7fbf4d/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
index 74f4a0c..f874353 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
@@ -474,8 +474,8 @@ public class TServerUtils {
}
/**
- * @see #startTServer(HostAndPort, ThriftServerType, TimedProcessor, TProtocolFactory, String, String, int, int, long, long, SslConnectionParams,
- * SaslServerConnectionParams, long)
+ * @see #startTServer(ThriftServerType, TimedProcessor, TProtocolFactory, String, String, int, int, long, long, SslConnectionParams,
+ * SaslServerConnectionParams, long, HostAndPort...)
*/
public static ServerAddress startTServer(ThriftServerType serverType, TimedProcessor processor, String serverName, String threadName, int numThreads,
int numSTThreads, long timeBetweenThreadChecks, long maxMessageSize, SslConnectionParams sslParams, SaslServerConnectionParams saslParams,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f7fbf4d/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java
index e6761a5..7a69fca 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java
@@ -88,26 +88,31 @@ public class TServerUtilsTest {
return 30;
}
+ @Deprecated
@Override
public Connector getConnector(String user, byte[] pass) throws AccumuloException, AccumuloSecurityException {
throw new UnsupportedOperationException();
}
+ @Deprecated
@Override
public Connector getConnector(String user, ByteBuffer pass) throws AccumuloException, AccumuloSecurityException {
throw new UnsupportedOperationException();
}
+ @Deprecated
@Override
public Connector getConnector(String user, CharSequence pass) throws AccumuloException, AccumuloSecurityException {
throw new UnsupportedOperationException();
}
+ @Deprecated
@Override
public AccumuloConfiguration getConfiguration() {
throw new UnsupportedOperationException();
}
+ @Deprecated
@Override
public void setConfiguration(AccumuloConfiguration conf) {}
[16/23] accumulo git commit: Merge branch '1.7' into 1.8
Posted by ct...@apache.org.
Merge branch '1.7' into 1.8
Conflicts:
server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/24844cc2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/24844cc2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/24844cc2
Branch: refs/heads/master
Commit: 24844cc2c2409986e9ef0f4d7b7a543b1121cb3a
Parents: 519e5b7 976c0aa
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jun 20 19:23:51 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jun 20 19:23:51 2016 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
.../master/balancer/BaseHostRegexTableLoadBalancerTest.java | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/24844cc2/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/24844cc2/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java
----------------------------------------------------------------------
[12/23] accumulo git commit: ACCUMULO-4184 Fix compiler warnings
Posted by ct...@apache.org.
ACCUMULO-4184 Fix compiler warnings
Fix compiler warnings from overriding deprecated methods by making them
also deprecated.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/976c0aaf
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/976c0aaf
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/976c0aaf
Branch: refs/heads/1.8
Commit: 976c0aaf95a0b6c7866c74d3127bc457e27046ed
Parents: 2e4eddd
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jun 20 17:24:42 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jun 20 17:24:42 2016 -0400
----------------------------------------------------------------------
.../master/balancer/BaseHostRegexTableLoadBalancerTest.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/976c0aaf/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java
----------------------------------------------------------------------
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 aa1480f..144d1fc 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
@@ -22,9 +22,9 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.SortedMap;
import java.util.TreeMap;
-import java.util.Map.Entry;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -81,26 +81,31 @@ public abstract class BaseHostRegexTableLoadBalancerTest extends HostRegexTableL
return 30;
}
+ @Deprecated
@Override
public Connector getConnector(String user, byte[] pass) throws AccumuloException, AccumuloSecurityException {
throw new UnsupportedOperationException();
}
+ @Deprecated
@Override
public Connector getConnector(String user, ByteBuffer pass) throws AccumuloException, AccumuloSecurityException {
throw new UnsupportedOperationException();
}
+ @Deprecated
@Override
public Connector getConnector(String user, CharSequence pass) throws AccumuloException, AccumuloSecurityException {
throw new UnsupportedOperationException();
}
+ @Deprecated
@Override
public AccumuloConfiguration getConfiguration() {
throw new UnsupportedOperationException();
}
+ @Deprecated
@Override
public void setConfiguration(AccumuloConfiguration conf) {}
[02/23] accumulo git commit: ACCUMULO-4157 Remove warning (unused
private field)
Posted by ct...@apache.org.
ACCUMULO-4157 Remove warning (unused private field)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/40d24183
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/40d24183
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/40d24183
Branch: refs/heads/1.7
Commit: 40d2418346383809ecce322d4d3de62f17dd1558
Parents: d5ea00f
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jun 20 13:37:36 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jun 20 13:37:36 2016 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/40d24183/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
----------------------------------------------------------------------
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
index b7d8d92..a22a34e 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
@@ -16,7 +16,6 @@
*/
package org.apache.accumulo.gc;
-import com.google.common.annotations.VisibleForTesting;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;
@@ -28,10 +27,12 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.UUID;
+import java.util.concurrent.TimeUnit;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
+import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.gc.thrift.GCStatus;
import org.apache.accumulo.core.gc.thrift.GcCycleStats;
import org.apache.accumulo.core.tabletserver.log.LogEntry;
@@ -55,9 +56,8 @@ import org.apache.log4j.Logger;
import org.apache.thrift.TException;
import org.apache.zookeeper.KeeperException;
+import com.google.common.annotations.VisibleForTesting;
import com.google.common.net.HostAndPort;
-import java.util.concurrent.TimeUnit;
-import org.apache.accumulo.core.conf.Property;
public class GarbageCollectWriteAheadLogs {
private static final Logger log = Logger.getLogger(GarbageCollectWriteAheadLogs.class);
@@ -65,7 +65,6 @@ public class GarbageCollectWriteAheadLogs {
private final Instance instance;
private final VolumeManager fs;
private final Map<HostAndPort,Long> firstSeenDead = new HashMap<HostAndPort,Long>();
- private AccumuloConfiguration config;
private boolean useTrash;
[15/23] accumulo git commit: Merge branch '1.7' into 1.8
Posted by ct...@apache.org.
Merge branch '1.7' into 1.8
Conflicts:
server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/24844cc2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/24844cc2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/24844cc2
Branch: refs/heads/1.8
Commit: 24844cc2c2409986e9ef0f4d7b7a543b1121cb3a
Parents: 519e5b7 976c0aa
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jun 20 19:23:51 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jun 20 19:23:51 2016 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
.../master/balancer/BaseHostRegexTableLoadBalancerTest.java | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/24844cc2/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/24844cc2/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java
----------------------------------------------------------------------
[03/23] accumulo git commit: ACCUMULO-4157 Remove warning (unused
private field)
Posted by ct...@apache.org.
ACCUMULO-4157 Remove warning (unused private field)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/40d24183
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/40d24183
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/40d24183
Branch: refs/heads/1.8
Commit: 40d2418346383809ecce322d4d3de62f17dd1558
Parents: d5ea00f
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jun 20 13:37:36 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jun 20 13:37:36 2016 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/40d24183/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
----------------------------------------------------------------------
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
index b7d8d92..a22a34e 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
@@ -16,7 +16,6 @@
*/
package org.apache.accumulo.gc;
-import com.google.common.annotations.VisibleForTesting;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;
@@ -28,10 +27,12 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.UUID;
+import java.util.concurrent.TimeUnit;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
+import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.gc.thrift.GCStatus;
import org.apache.accumulo.core.gc.thrift.GcCycleStats;
import org.apache.accumulo.core.tabletserver.log.LogEntry;
@@ -55,9 +56,8 @@ import org.apache.log4j.Logger;
import org.apache.thrift.TException;
import org.apache.zookeeper.KeeperException;
+import com.google.common.annotations.VisibleForTesting;
import com.google.common.net.HostAndPort;
-import java.util.concurrent.TimeUnit;
-import org.apache.accumulo.core.conf.Property;
public class GarbageCollectWriteAheadLogs {
private static final Logger log = Logger.getLogger(GarbageCollectWriteAheadLogs.class);
@@ -65,7 +65,6 @@ public class GarbageCollectWriteAheadLogs {
private final Instance instance;
private final VolumeManager fs;
private final Map<HostAndPort,Long> firstSeenDead = new HashMap<HostAndPort,Long>();
- private AccumuloConfiguration config;
private boolean useTrash;
[11/23] accumulo git commit: Merge branch '1.6' into 1.7
Posted by ct...@apache.org.
Merge branch '1.6' into 1.7
Conflicts:
server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2e4eddda
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2e4eddda
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2e4eddda
Branch: refs/heads/1.7
Commit: 2e4eddda2d08f170f769b5d15eb2df7880e96c19
Parents: 7b92053 31a2224
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jun 20 17:24:25 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jun 20 17:24:25 2016 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
.../apache/accumulo/gc/GarbageCollectWriteAheadLogs.java | 9 ++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2e4eddda/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 20484ce,9b67614..27bed62
--- a/pom.xml
+++ b/pom.xml
@@@ -159,14 -156,9 +159,14 @@@
<version>1.32</version>
</dependency>
<dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <version>1.0-rc2</version>
+ </dependency>
+ <dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.2.2</version>
+ <version>2.2.4</version>
</dependency>
<!-- Hadoop-2.4.0 MiniDFSCluster uses classes dropped in Guava 15 -->
<dependency>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2e4eddda/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
----------------------------------------------------------------------
diff --cc server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
index a62ffb2,a22a34e..b57b8fc
--- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
@@@ -28,63 -27,44 +27,63 @@@ import java.util.Map
import java.util.Map.Entry;
import java.util.Set;
import java.util.UUID;
+ import java.util.concurrent.TimeUnit;
import org.apache.accumulo.core.Constants;
+import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.client.Scanner;
+import org.apache.accumulo.core.client.TableNotFoundException;
+ import org.apache.accumulo.core.conf.AccumuloConfiguration;
+ import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Range;
+import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.gc.thrift.GCStatus;
import org.apache.accumulo.core.gc.thrift.GcCycleStats;
+import org.apache.accumulo.core.metadata.MetadataTable;
+import org.apache.accumulo.core.metadata.schema.MetadataSchema.ReplicationSection;
+import org.apache.accumulo.core.protobuf.ProtobufUtil;
+import org.apache.accumulo.core.replication.ReplicationSchema.StatusSection;
+import org.apache.accumulo.core.replication.ReplicationTable;
+import org.apache.accumulo.core.replication.ReplicationTableOfflineException;
+import org.apache.accumulo.core.rpc.ThriftUtil;
+import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.tabletserver.log.LogEntry;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Client;
+import org.apache.accumulo.core.trace.Span;
+import org.apache.accumulo.core.trace.Trace;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.core.util.AddressUtil;
-import org.apache.accumulo.core.util.ThriftUtil;
import org.apache.accumulo.core.zookeeper.ZooUtil;
+import org.apache.accumulo.server.AccumuloServerContext;
import org.apache.accumulo.server.ServerConstants;
-import org.apache.accumulo.server.conf.ServerConfiguration;
import org.apache.accumulo.server.fs.VolumeManager;
-import org.apache.accumulo.server.security.SystemCredentials;
+import org.apache.accumulo.server.replication.StatusUtil;
+import org.apache.accumulo.server.replication.proto.Replication.Status;
import org.apache.accumulo.server.util.MetadataTableUtil;
import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Trace;
-import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.Path;
-import org.apache.log4j.Logger;
import org.apache.thrift.TException;
import org.apache.zookeeper.KeeperException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+ import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.Iterables;
import com.google.common.net.HostAndPort;
+import com.google.protobuf.InvalidProtocolBufferException;
- import java.util.concurrent.TimeUnit;
- import org.apache.accumulo.core.conf.AccumuloConfiguration;
- import org.apache.accumulo.core.conf.Property;
public class GarbageCollectWriteAheadLogs {
- private static final Logger log = Logger.getLogger(GarbageCollectWriteAheadLogs.class);
+ private static final Logger log = LoggerFactory.getLogger(GarbageCollectWriteAheadLogs.class);
- private final Instance instance;
+ private final AccumuloServerContext context;
private final VolumeManager fs;
private final Map<HostAndPort,Long> firstSeenDead = new HashMap<HostAndPort,Long>();
- private AccumuloConfiguration config;
private boolean useTrash;
[14/23] accumulo git commit: ACCUMULO-4184 Fix compiler warnings
Posted by ct...@apache.org.
ACCUMULO-4184 Fix compiler warnings
Fix compiler warnings from overriding deprecated methods by making them
also deprecated.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/976c0aaf
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/976c0aaf
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/976c0aaf
Branch: refs/heads/master
Commit: 976c0aaf95a0b6c7866c74d3127bc457e27046ed
Parents: 2e4eddd
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jun 20 17:24:42 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jun 20 17:24:42 2016 -0400
----------------------------------------------------------------------
.../master/balancer/BaseHostRegexTableLoadBalancerTest.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/976c0aaf/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java
----------------------------------------------------------------------
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 aa1480f..144d1fc 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
@@ -22,9 +22,9 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.SortedMap;
import java.util.TreeMap;
-import java.util.Map.Entry;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -81,26 +81,31 @@ public abstract class BaseHostRegexTableLoadBalancerTest extends HostRegexTableL
return 30;
}
+ @Deprecated
@Override
public Connector getConnector(String user, byte[] pass) throws AccumuloException, AccumuloSecurityException {
throw new UnsupportedOperationException();
}
+ @Deprecated
@Override
public Connector getConnector(String user, ByteBuffer pass) throws AccumuloException, AccumuloSecurityException {
throw new UnsupportedOperationException();
}
+ @Deprecated
@Override
public Connector getConnector(String user, CharSequence pass) throws AccumuloException, AccumuloSecurityException {
throw new UnsupportedOperationException();
}
+ @Deprecated
@Override
public AccumuloConfiguration getConfiguration() {
throw new UnsupportedOperationException();
}
+ @Deprecated
@Override
public void setConfiguration(AccumuloConfiguration conf) {}
[22/23] accumulo git commit: ACCUMULO-4318 Fix resource leak warnings
from AutoClosable
Posted by ct...@apache.org.
ACCUMULO-4318 Fix resource leak warnings from AutoClosable
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/94bf129c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/94bf129c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/94bf129c
Branch: refs/heads/1.8
Commit: 94bf129c8c3635bb99b272db009350a448503607
Parents: 4f7fbf4
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jun 20 19:37:47 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jun 20 19:45:36 2016 -0400
----------------------------------------------------------------------
.../core/metadata/MetadataLocationObtainer.java | 21 ++++---
.../core/client/impl/ScannerOptionsTest.java | 58 +++++++++++---------
2 files changed, 44 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/94bf129c/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java b/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java
index c59fab2..d6af8ba 100644
--- a/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/MetadataLocationObtainer.java
@@ -149,6 +149,15 @@ public class MetadataLocationObtainer implements TabletLocationObtainer {
}
}
+ private static class SettableScannerOptions extends ScannerOptions {
+ public ScannerOptions setColumns(SortedSet<Column> locCols) {
+ this.fetchedColumns = locCols;
+ // see comment in lookupTablet about why iterator is used
+ addScanIterator(new IteratorSetting(10000, "WRI", WholeRowIterator.class.getName()));
+ return this;
+ }
+ }
+
@Override
public List<TabletLocation> lookupTablets(ClientContext context, String tserver, Map<KeyExtent,List<Range>> tabletsRanges, TabletLocator parent)
throws AccumuloSecurityException, AccumuloException {
@@ -169,14 +178,10 @@ public class MetadataLocationObtainer implements TabletLocationObtainer {
}
};
- ScannerOptions opts = new ScannerOptions() {
- ScannerOptions setOpts() {
- this.fetchedColumns = locCols;
- // see comment in lookupTablet about why iterator is used
- addScanIterator(new IteratorSetting(10000, "WRI", WholeRowIterator.class.getName()));
- return this;
- }
- }.setOpts();
+ ScannerOptions opts = null;
+ try (SettableScannerOptions unsetOpts = new SettableScannerOptions()) {
+ opts = unsetOpts.setColumns(locCols);
+ }
Map<KeyExtent,List<Range>> unscanned = new HashMap<KeyExtent,List<Range>>();
Map<KeyExtent,List<Range>> failures = new HashMap<KeyExtent,List<Range>>();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/94bf129c/core/src/test/java/org/apache/accumulo/core/client/impl/ScannerOptionsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/impl/ScannerOptionsTest.java b/core/src/test/java/org/apache/accumulo/core/client/impl/ScannerOptionsTest.java
index 920d687..cfdbe6f 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/impl/ScannerOptionsTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/impl/ScannerOptionsTest.java
@@ -38,44 +38,48 @@ public class ScannerOptionsTest {
*/
@Test
public void testAddRemoveIterator() throws Throwable {
- ScannerOptions options = new ScannerOptions();
- options.addScanIterator(new IteratorSetting(1, "NAME", WholeRowIterator.class));
- assertEquals(1, options.serverSideIteratorList.size());
- options.removeScanIterator("NAME");
- assertEquals(0, options.serverSideIteratorList.size());
+ try (ScannerOptions options = new ScannerOptions()) {
+ options.addScanIterator(new IteratorSetting(1, "NAME", WholeRowIterator.class));
+ assertEquals(1, options.serverSideIteratorList.size());
+ options.removeScanIterator("NAME");
+ assertEquals(0, options.serverSideIteratorList.size());
+ }
}
@Test
public void testIteratorConflict() {
- ScannerOptions options = new ScannerOptions();
- options.addScanIterator(new IteratorSetting(1, "NAME", DebugIterator.class));
- try {
- options.addScanIterator(new IteratorSetting(2, "NAME", DebugIterator.class));
- fail();
- } catch (IllegalArgumentException e) {}
- try {
- options.addScanIterator(new IteratorSetting(1, "NAME2", DebugIterator.class));
- fail();
- } catch (IllegalArgumentException e) {}
+ try (ScannerOptions options = new ScannerOptions()) {
+ options.addScanIterator(new IteratorSetting(1, "NAME", DebugIterator.class));
+ try {
+ options.addScanIterator(new IteratorSetting(2, "NAME", DebugIterator.class));
+ fail();
+ } catch (IllegalArgumentException e) {}
+ try {
+ options.addScanIterator(new IteratorSetting(1, "NAME2", DebugIterator.class));
+ fail();
+ } catch (IllegalArgumentException e) {}
+ }
}
@Test
public void testFetchColumn() {
- ScannerOptions options = new ScannerOptions();
- assertEquals(0, options.getFetchedColumns().size());
- IteratorSetting.Column col = new IteratorSetting.Column(new Text("family"), new Text("qualifier"));
- options.fetchColumn(col);
- SortedSet<Column> fetchedColumns = options.getFetchedColumns();
- assertEquals(1, fetchedColumns.size());
- Column fetchCol = fetchedColumns.iterator().next();
- assertEquals(col.getColumnFamily(), new Text(fetchCol.getColumnFamily()));
- assertEquals(col.getColumnQualifier(), new Text(fetchCol.getColumnQualifier()));
+ try (ScannerOptions options = new ScannerOptions()) {
+ assertEquals(0, options.getFetchedColumns().size());
+ IteratorSetting.Column col = new IteratorSetting.Column(new Text("family"), new Text("qualifier"));
+ options.fetchColumn(col);
+ SortedSet<Column> fetchedColumns = options.getFetchedColumns();
+ assertEquals(1, fetchedColumns.size());
+ Column fetchCol = fetchedColumns.iterator().next();
+ assertEquals(col.getColumnFamily(), new Text(fetchCol.getColumnFamily()));
+ assertEquals(col.getColumnQualifier(), new Text(fetchCol.getColumnQualifier()));
+ }
}
@Test(expected = IllegalArgumentException.class)
public void testFetchNullColumn() {
- ScannerOptions options = new ScannerOptions();
- // Require a non-null instance of Column
- options.fetchColumn((IteratorSetting.Column) null);
+ try (ScannerOptions options = new ScannerOptions()) {
+ // Require a non-null instance of Column
+ options.fetchColumn((IteratorSetting.Column) null);
+ }
}
}
[05/23] accumulo git commit: ACCUMULO-4345 Bump gson version to
lastest 2.2.x
Posted by ct...@apache.org.
ACCUMULO-4345 Bump gson version to lastest 2.2.x
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/31a22242
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/31a22242
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/31a22242
Branch: refs/heads/master
Commit: 31a222425e242003b146c5b366feb8df7aa98614
Parents: 40d2418
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jun 20 13:38:14 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jun 20 13:38:14 2016 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/31a22242/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 45ca0ba..9b67614 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,7 +158,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.2.2</version>
+ <version>2.2.4</version>
</dependency>
<!-- Hadoop-2.4.0 MiniDFSCluster uses classes dropped in Guava 15 -->
<dependency>
[10/23] accumulo git commit: Merge branch '1.6' into 1.7
Posted by ct...@apache.org.
Merge branch '1.6' into 1.7
Conflicts:
server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2e4eddda
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2e4eddda
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2e4eddda
Branch: refs/heads/master
Commit: 2e4eddda2d08f170f769b5d15eb2df7880e96c19
Parents: 7b92053 31a2224
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jun 20 17:24:25 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jun 20 17:24:25 2016 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
.../apache/accumulo/gc/GarbageCollectWriteAheadLogs.java | 9 ++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2e4eddda/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 20484ce,9b67614..27bed62
--- a/pom.xml
+++ b/pom.xml
@@@ -159,14 -156,9 +159,14 @@@
<version>1.32</version>
</dependency>
<dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <version>1.0-rc2</version>
+ </dependency>
+ <dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.2.2</version>
+ <version>2.2.4</version>
</dependency>
<!-- Hadoop-2.4.0 MiniDFSCluster uses classes dropped in Guava 15 -->
<dependency>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2e4eddda/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
----------------------------------------------------------------------
diff --cc server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
index a62ffb2,a22a34e..b57b8fc
--- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
@@@ -28,63 -27,44 +27,63 @@@ import java.util.Map
import java.util.Map.Entry;
import java.util.Set;
import java.util.UUID;
+ import java.util.concurrent.TimeUnit;
import org.apache.accumulo.core.Constants;
+import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.client.Scanner;
+import org.apache.accumulo.core.client.TableNotFoundException;
+ import org.apache.accumulo.core.conf.AccumuloConfiguration;
+ import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Range;
+import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.gc.thrift.GCStatus;
import org.apache.accumulo.core.gc.thrift.GcCycleStats;
+import org.apache.accumulo.core.metadata.MetadataTable;
+import org.apache.accumulo.core.metadata.schema.MetadataSchema.ReplicationSection;
+import org.apache.accumulo.core.protobuf.ProtobufUtil;
+import org.apache.accumulo.core.replication.ReplicationSchema.StatusSection;
+import org.apache.accumulo.core.replication.ReplicationTable;
+import org.apache.accumulo.core.replication.ReplicationTableOfflineException;
+import org.apache.accumulo.core.rpc.ThriftUtil;
+import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.tabletserver.log.LogEntry;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Client;
+import org.apache.accumulo.core.trace.Span;
+import org.apache.accumulo.core.trace.Trace;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.core.util.AddressUtil;
-import org.apache.accumulo.core.util.ThriftUtil;
import org.apache.accumulo.core.zookeeper.ZooUtil;
+import org.apache.accumulo.server.AccumuloServerContext;
import org.apache.accumulo.server.ServerConstants;
-import org.apache.accumulo.server.conf.ServerConfiguration;
import org.apache.accumulo.server.fs.VolumeManager;
-import org.apache.accumulo.server.security.SystemCredentials;
+import org.apache.accumulo.server.replication.StatusUtil;
+import org.apache.accumulo.server.replication.proto.Replication.Status;
import org.apache.accumulo.server.util.MetadataTableUtil;
import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Trace;
-import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.Path;
-import org.apache.log4j.Logger;
import org.apache.thrift.TException;
import org.apache.zookeeper.KeeperException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+ import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.Iterables;
import com.google.common.net.HostAndPort;
+import com.google.protobuf.InvalidProtocolBufferException;
- import java.util.concurrent.TimeUnit;
- import org.apache.accumulo.core.conf.AccumuloConfiguration;
- import org.apache.accumulo.core.conf.Property;
public class GarbageCollectWriteAheadLogs {
- private static final Logger log = Logger.getLogger(GarbageCollectWriteAheadLogs.class);
+ private static final Logger log = LoggerFactory.getLogger(GarbageCollectWriteAheadLogs.class);
- private final Instance instance;
+ private final AccumuloServerContext context;
private final VolumeManager fs;
private final Map<HostAndPort,Long> firstSeenDead = new HashMap<HostAndPort,Long>();
- private AccumuloConfiguration config;
private boolean useTrash;
[23/23] accumulo git commit: Merge branch '1.8'
Posted by ct...@apache.org.
Merge branch '1.8'
Conflicts:
server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5c576af1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5c576af1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5c576af1
Branch: refs/heads/master
Commit: 5c576af1ecbff2ef276510375ba9db40d2ae9df2
Parents: 371a95c 94bf129
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jun 20 19:49:32 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jun 20 19:49:32 2016 -0400
----------------------------------------------------------------------
.../apache/accumulo/core/conf/PropertyType.java | 3 -
.../core/metadata/MetadataLocationObtainer.java | 21 ++++---
.../core/client/impl/ScannerOptionsTest.java | 58 +++++++++++---------
pom.xml | 2 +-
.../accumulo/server/rpc/TServerUtils.java | 4 +-
.../BaseHostRegexTableLoadBalancerTest.java | 5 ++
.../accumulo/server/util/TServerUtilsTest.java | 5 ++
7 files changed, 57 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c576af1/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
index 9c1a05d,22fcb8b..a5e27cb
--- a/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
@@@ -28,9 -27,12 +28,7 @@@ import org.apache.accumulo.core.Constan
import org.apache.accumulo.core.util.Pair;
import org.apache.commons.lang.math.IntRange;
import org.apache.hadoop.fs.Path;
- import org.slf4j.Logger;
- import org.slf4j.LoggerFactory;
-import com.google.common.base.Function;
-import com.google.common.base.Predicate;
-import com.google.common.base.Predicates;
-import com.google.common.collect.Collections2;
-
/**
* Types of {@link Property} values. Each type has a short name, a description, and a regex which valid values match. All of these fields are optional.
*/
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c576af1/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c576af1/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java
----------------------------------------------------------------------
[04/23] accumulo git commit: ACCUMULO-4157 Remove warning (unused
private field)
Posted by ct...@apache.org.
ACCUMULO-4157 Remove warning (unused private field)
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/40d24183
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/40d24183
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/40d24183
Branch: refs/heads/master
Commit: 40d2418346383809ecce322d4d3de62f17dd1558
Parents: d5ea00f
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jun 20 13:37:36 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jun 20 13:37:36 2016 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/40d24183/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
----------------------------------------------------------------------
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
index b7d8d92..a22a34e 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
@@ -16,7 +16,6 @@
*/
package org.apache.accumulo.gc;
-import com.google.common.annotations.VisibleForTesting;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.ArrayList;
@@ -28,10 +27,12 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.UUID;
+import java.util.concurrent.TimeUnit;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
+import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.gc.thrift.GCStatus;
import org.apache.accumulo.core.gc.thrift.GcCycleStats;
import org.apache.accumulo.core.tabletserver.log.LogEntry;
@@ -55,9 +56,8 @@ import org.apache.log4j.Logger;
import org.apache.thrift.TException;
import org.apache.zookeeper.KeeperException;
+import com.google.common.annotations.VisibleForTesting;
import com.google.common.net.HostAndPort;
-import java.util.concurrent.TimeUnit;
-import org.apache.accumulo.core.conf.Property;
public class GarbageCollectWriteAheadLogs {
private static final Logger log = Logger.getLogger(GarbageCollectWriteAheadLogs.class);
@@ -65,7 +65,6 @@ public class GarbageCollectWriteAheadLogs {
private final Instance instance;
private final VolumeManager fs;
private final Map<HostAndPort,Long> firstSeenDead = new HashMap<HostAndPort,Long>();
- private AccumuloConfiguration config;
private boolean useTrash;
[19/23] accumulo git commit: ACCUMULO-4331 cleanup-fix warnings
Posted by ct...@apache.org.
ACCUMULO-4331 cleanup-fix warnings
Fix warnings left from previous work:
* Fix broken javadoc
* Fix compiler warnings about overriding deprecated methods
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4f7fbf4d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4f7fbf4d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4f7fbf4d
Branch: refs/heads/master
Commit: 4f7fbf4d06409017d1c26f68f45d620635d75a60
Parents: 78273df
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jun 20 19:26:20 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jun 20 19:26:20 2016 -0400
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/server/rpc/TServerUtils.java | 4 ++--
.../java/org/apache/accumulo/server/util/TServerUtilsTest.java | 5 +++++
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f7fbf4d/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
index 74f4a0c..f874353 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
@@ -474,8 +474,8 @@ public class TServerUtils {
}
/**
- * @see #startTServer(HostAndPort, ThriftServerType, TimedProcessor, TProtocolFactory, String, String, int, int, long, long, SslConnectionParams,
- * SaslServerConnectionParams, long)
+ * @see #startTServer(ThriftServerType, TimedProcessor, TProtocolFactory, String, String, int, int, long, long, SslConnectionParams,
+ * SaslServerConnectionParams, long, HostAndPort...)
*/
public static ServerAddress startTServer(ThriftServerType serverType, TimedProcessor processor, String serverName, String threadName, int numThreads,
int numSTThreads, long timeBetweenThreadChecks, long maxMessageSize, SslConnectionParams sslParams, SaslServerConnectionParams saslParams,
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f7fbf4d/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java
index e6761a5..7a69fca 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/TServerUtilsTest.java
@@ -88,26 +88,31 @@ public class TServerUtilsTest {
return 30;
}
+ @Deprecated
@Override
public Connector getConnector(String user, byte[] pass) throws AccumuloException, AccumuloSecurityException {
throw new UnsupportedOperationException();
}
+ @Deprecated
@Override
public Connector getConnector(String user, ByteBuffer pass) throws AccumuloException, AccumuloSecurityException {
throw new UnsupportedOperationException();
}
+ @Deprecated
@Override
public Connector getConnector(String user, CharSequence pass) throws AccumuloException, AccumuloSecurityException {
throw new UnsupportedOperationException();
}
+ @Deprecated
@Override
public AccumuloConfiguration getConfiguration() {
throw new UnsupportedOperationException();
}
+ @Deprecated
@Override
public void setConfiguration(AccumuloConfiguration conf) {}
[17/23] accumulo git commit: ACCUMULO-4344 cleanup-remove unused
logger/imports
Posted by ct...@apache.org.
ACCUMULO-4344 cleanup-remove unused logger/imports
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/78273df5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/78273df5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/78273df5
Branch: refs/heads/1.8
Commit: 78273df54c96116ba18e78ecdc92bd7ecf498352
Parents: 24844cc
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jun 20 19:25:14 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jun 20 19:25:14 2016 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/accumulo/core/conf/PropertyType.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/78273df5/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java b/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
index 6733fc6..22fcb8b 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
@@ -27,8 +27,6 @@ import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.util.Pair;
import org.apache.commons.lang.math.IntRange;
import org.apache.hadoop.fs.Path;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
@@ -270,7 +268,6 @@ public enum PropertyType {
public static class PortRange extends Matches {
- private static final Logger log = LoggerFactory.getLogger(PortRange.class);
private static final IntRange VALID_RANGE = new IntRange(1024, 65535);
public PortRange(final String pattern) {
[13/23] accumulo git commit: ACCUMULO-4184 Fix compiler warnings
Posted by ct...@apache.org.
ACCUMULO-4184 Fix compiler warnings
Fix compiler warnings from overriding deprecated methods by making them
also deprecated.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/976c0aaf
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/976c0aaf
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/976c0aaf
Branch: refs/heads/1.7
Commit: 976c0aaf95a0b6c7866c74d3127bc457e27046ed
Parents: 2e4eddd
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jun 20 17:24:42 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jun 20 17:24:42 2016 -0400
----------------------------------------------------------------------
.../master/balancer/BaseHostRegexTableLoadBalancerTest.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/976c0aaf/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java
----------------------------------------------------------------------
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 aa1480f..144d1fc 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
@@ -22,9 +22,9 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.SortedMap;
import java.util.TreeMap;
-import java.util.Map.Entry;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -81,26 +81,31 @@ public abstract class BaseHostRegexTableLoadBalancerTest extends HostRegexTableL
return 30;
}
+ @Deprecated
@Override
public Connector getConnector(String user, byte[] pass) throws AccumuloException, AccumuloSecurityException {
throw new UnsupportedOperationException();
}
+ @Deprecated
@Override
public Connector getConnector(String user, ByteBuffer pass) throws AccumuloException, AccumuloSecurityException {
throw new UnsupportedOperationException();
}
+ @Deprecated
@Override
public Connector getConnector(String user, CharSequence pass) throws AccumuloException, AccumuloSecurityException {
throw new UnsupportedOperationException();
}
+ @Deprecated
@Override
public AccumuloConfiguration getConfiguration() {
throw new UnsupportedOperationException();
}
+ @Deprecated
@Override
public void setConfiguration(AccumuloConfiguration conf) {}
[09/23] accumulo git commit: Merge branch '1.6' into 1.7
Posted by ct...@apache.org.
Merge branch '1.6' into 1.7
Conflicts:
server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2e4eddda
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2e4eddda
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2e4eddda
Branch: refs/heads/1.8
Commit: 2e4eddda2d08f170f769b5d15eb2df7880e96c19
Parents: 7b92053 31a2224
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jun 20 17:24:25 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jun 20 17:24:25 2016 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
.../apache/accumulo/gc/GarbageCollectWriteAheadLogs.java | 9 ++++-----
2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2e4eddda/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 20484ce,9b67614..27bed62
--- a/pom.xml
+++ b/pom.xml
@@@ -159,14 -156,9 +159,14 @@@
<version>1.32</version>
</dependency>
<dependency>
+ <groupId>com.google.auto.service</groupId>
+ <artifactId>auto-service</artifactId>
+ <version>1.0-rc2</version>
+ </dependency>
+ <dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.2.2</version>
+ <version>2.2.4</version>
</dependency>
<!-- Hadoop-2.4.0 MiniDFSCluster uses classes dropped in Guava 15 -->
<dependency>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/2e4eddda/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
----------------------------------------------------------------------
diff --cc server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
index a62ffb2,a22a34e..b57b8fc
--- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
@@@ -28,63 -27,44 +27,63 @@@ import java.util.Map
import java.util.Map.Entry;
import java.util.Set;
import java.util.UUID;
+ import java.util.concurrent.TimeUnit;
import org.apache.accumulo.core.Constants;
+import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.client.Scanner;
+import org.apache.accumulo.core.client.TableNotFoundException;
+ import org.apache.accumulo.core.conf.AccumuloConfiguration;
+ import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.Range;
+import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.gc.thrift.GCStatus;
import org.apache.accumulo.core.gc.thrift.GcCycleStats;
+import org.apache.accumulo.core.metadata.MetadataTable;
+import org.apache.accumulo.core.metadata.schema.MetadataSchema.ReplicationSection;
+import org.apache.accumulo.core.protobuf.ProtobufUtil;
+import org.apache.accumulo.core.replication.ReplicationSchema.StatusSection;
+import org.apache.accumulo.core.replication.ReplicationTable;
+import org.apache.accumulo.core.replication.ReplicationTableOfflineException;
+import org.apache.accumulo.core.rpc.ThriftUtil;
+import org.apache.accumulo.core.security.Authorizations;
import org.apache.accumulo.core.tabletserver.log.LogEntry;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Client;
+import org.apache.accumulo.core.trace.Span;
+import org.apache.accumulo.core.trace.Trace;
+import org.apache.accumulo.core.trace.Tracer;
import org.apache.accumulo.core.util.AddressUtil;
-import org.apache.accumulo.core.util.ThriftUtil;
import org.apache.accumulo.core.zookeeper.ZooUtil;
+import org.apache.accumulo.server.AccumuloServerContext;
import org.apache.accumulo.server.ServerConstants;
-import org.apache.accumulo.server.conf.ServerConfiguration;
import org.apache.accumulo.server.fs.VolumeManager;
-import org.apache.accumulo.server.security.SystemCredentials;
+import org.apache.accumulo.server.replication.StatusUtil;
+import org.apache.accumulo.server.replication.proto.Replication.Status;
import org.apache.accumulo.server.util.MetadataTableUtil;
import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
-import org.apache.accumulo.trace.instrument.Span;
-import org.apache.accumulo.trace.instrument.Trace;
-import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.Path;
-import org.apache.log4j.Logger;
import org.apache.thrift.TException;
import org.apache.zookeeper.KeeperException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+ import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.Iterables;
import com.google.common.net.HostAndPort;
+import com.google.protobuf.InvalidProtocolBufferException;
- import java.util.concurrent.TimeUnit;
- import org.apache.accumulo.core.conf.AccumuloConfiguration;
- import org.apache.accumulo.core.conf.Property;
public class GarbageCollectWriteAheadLogs {
- private static final Logger log = Logger.getLogger(GarbageCollectWriteAheadLogs.class);
+ private static final Logger log = LoggerFactory.getLogger(GarbageCollectWriteAheadLogs.class);
- private final Instance instance;
+ private final AccumuloServerContext context;
private final VolumeManager fs;
private final Map<HostAndPort,Long> firstSeenDead = new HashMap<HostAndPort,Long>();
- private AccumuloConfiguration config;
private boolean useTrash;
[08/23] accumulo git commit: ACCUMULO-4345 Bump gson version to
lastest 2.2.x
Posted by ct...@apache.org.
ACCUMULO-4345 Bump gson version to lastest 2.2.x
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/31a22242
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/31a22242
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/31a22242
Branch: refs/heads/1.7
Commit: 31a222425e242003b146c5b366feb8df7aa98614
Parents: 40d2418
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jun 20 13:38:14 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jun 20 13:38:14 2016 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/31a22242/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 45ca0ba..9b67614 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,7 +158,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.2.2</version>
+ <version>2.2.4</version>
</dependency>
<!-- Hadoop-2.4.0 MiniDFSCluster uses classes dropped in Guava 15 -->
<dependency>
[06/23] accumulo git commit: ACCUMULO-4345 Bump gson version to
lastest 2.2.x
Posted by ct...@apache.org.
ACCUMULO-4345 Bump gson version to lastest 2.2.x
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/31a22242
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/31a22242
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/31a22242
Branch: refs/heads/1.8
Commit: 31a222425e242003b146c5b366feb8df7aa98614
Parents: 40d2418
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jun 20 13:38:14 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jun 20 13:38:14 2016 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/31a22242/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 45ca0ba..9b67614 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,7 +158,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.2.2</version>
+ <version>2.2.4</version>
</dependency>
<!-- Hadoop-2.4.0 MiniDFSCluster uses classes dropped in Guava 15 -->
<dependency>
[07/23] accumulo git commit: ACCUMULO-4345 Bump gson version to
lastest 2.2.x
Posted by ct...@apache.org.
ACCUMULO-4345 Bump gson version to lastest 2.2.x
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/31a22242
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/31a22242
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/31a22242
Branch: refs/heads/1.6
Commit: 31a222425e242003b146c5b366feb8df7aa98614
Parents: 40d2418
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jun 20 13:38:14 2016 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jun 20 13:38:14 2016 -0400
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/31a22242/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 45ca0ba..9b67614 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,7 +158,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.2.2</version>
+ <version>2.2.4</version>
</dependency>
<!-- Hadoop-2.4.0 MiniDFSCluster uses classes dropped in Guava 15 -->
<dependency>