You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2015/04/27 19:47:02 UTC
[1/4] accumulo git commit: ACCUMULO-3753 use Iterator.size to run
over the metadata table
Repository: accumulo
Updated Branches:
refs/heads/master 488f441f7 -> ead923a20
ACCUMULO-3753 use Iterator.size to run over the metadata table
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/951257ac
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/951257ac
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/951257ac
Branch: refs/heads/master
Commit: 951257ac39290d50df06c134da76baecd7a0ebc9
Parents: ac08cc4
Author: Eric C. Newton <er...@gmail.com>
Authored: Mon Apr 27 13:46:06 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Mon Apr 27 13:46:06 2015 -0400
----------------------------------------------------------------------
test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/951257ac/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java b/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
index d124ce9..9a84512 100644
--- a/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
+++ b/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
@@ -125,7 +125,7 @@ public abstract class SimpleProxyBase extends SharedMiniClusterIT {
private ByteBuffer creds = null;
private void waitForAccumulo(Connector c) throws Exception {
- Iterators.cycle(c.createScanner(MetadataTable.NAME, Authorizations.EMPTY));
+ Iterators.size(c.createScanner(MetadataTable.NAME, Authorizations.EMPTY).iterator());
}
@Before
[2/4] accumulo git commit: Merge branch '1.7'
Posted by ec...@apache.org.
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f442676c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f442676c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f442676c
Branch: refs/heads/master
Commit: f442676ca341c650b109762208bf4ce7c0b7aaa3
Parents: 488f441 951257a
Author: Eric C. Newton <er...@gmail.com>
Authored: Mon Apr 27 13:46:14 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Mon Apr 27 13:46:14 2015 -0400
----------------------------------------------------------------------
test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f442676c/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
----------------------------------------------------------------------
[4/4] accumulo git commit: Merge branch '1.7'
Posted by ec...@apache.org.
Merge branch '1.7'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ead923a2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ead923a2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ead923a2
Branch: refs/heads/master
Commit: ead923a20e9a996fb7c43fa91ee331751010c70a
Parents: f442676 1aea14c
Author: Eric C. Newton <er...@gmail.com>
Authored: Mon Apr 27 13:46:41 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Mon Apr 27 13:46:41 2015 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/4] accumulo git commit: Merge branch '1.7' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.7
Posted by ec...@apache.org.
Merge branch '1.7' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.7
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1aea14c7
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1aea14c7
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1aea14c7
Branch: refs/heads/master
Commit: 1aea14c72e7bd820ce554b413d06f30c5ea5f71d
Parents: 951257a 18650ac
Author: Eric C. Newton <er...@gmail.com>
Authored: Mon Apr 27 13:46:33 2015 -0400
Committer: Eric C. Newton <er...@gmail.com>
Committed: Mon Apr 27 13:46:33 2015 -0400
----------------------------------------------------------------------
.../core/client/ClientConfiguration.java | 20 +-
.../core/client/MutationsRejectedException.java | 14 +-
.../client/impl/ReplicationOperationsImpl.java | 4 +-
.../org/apache/accumulo/core/conf/Property.java | 4 +-
.../system/SourceSwitchingIterator.java | 59 +-
.../accumulo/core/metadata/RootTable.java | 1 +
.../core/metadata/schema/MetadataSchema.java | 48 ++
.../core/tabletserver/log/LogEntry.java | 78 ++-
.../core/client/ClientConfigurationTest.java | 21 +-
.../core/metadata/MetadataTableSchemaTest.java | 47 ++
.../src/test/resources/multi-valued.client.conf | 2 +-
.../standalone/StandaloneClusterControl.java | 5 +-
.../minicluster/MiniAccumuloInstance.java | 2 +-
.../org/apache/accumulo/server/TabletLevel.java | 34 ++
.../apache/accumulo/server/fs/VolumeUtil.java | 22 +-
.../apache/accumulo/server/init/Initialize.java | 1 +
.../server/master/state/MetaDataStateStore.java | 47 +-
.../master/state/MetaDataTableScanner.java | 6 +-
.../master/state/TabletLocationState.java | 7 +
.../server/master/state/TabletStateStore.java | 16 +-
.../master/state/ZooTabletStateStore.java | 35 +-
.../accumulo/server/replication/StatusUtil.java | 13 +
.../accumulo/server/util/ListVolumesUsed.java | 18 +-
.../server/util/MasterMetadataUtil.java | 18 +-
.../accumulo/server/util/MetadataTableUtil.java | 239 +++++---
.../server/util/ReplicationTableUtil.java | 13 +-
.../server/util/ReplicationTableUtilTest.java | 2 +-
.../gc/GarbageCollectWriteAheadLogs.java | 499 +++++++---------
.../accumulo/gc/SimpleGarbageCollector.java | 1 -
.../CloseWriteAheadLogReferences.java | 23 +-
.../gc/GarbageCollectWriteAheadLogsTest.java | 567 -------------------
.../CloseWriteAheadLogReferencesTest.java | 152 +----
.../java/org/apache/accumulo/master/Master.java | 3 +
.../master/MasterClientServiceHandler.java | 3 +-
.../accumulo/master/TabletGroupWatcher.java | 37 +-
.../accumulo/master/replication/WorkMaker.java | 1 +
.../accumulo/master/state/MergeStats.java | 3 +-
.../master/ReplicationOperationsImplTest.java | 9 +-
.../apache/accumulo/master/TestMergeState.java | 2 +-
.../master/state/RootTabletStateStoreTest.java | 4 +-
.../src/main/findbugs/exclude-filter.xml | 2 +-
.../server/GarbageCollectionLogger.java | 3 +-
.../apache/accumulo/tserver/TabletServer.java | 182 +++---
.../compaction/MajorCompactionRequest.java | 15 +-
.../apache/accumulo/tserver/log/DfsLogger.java | 14 +-
.../accumulo/tserver/log/SortedLogRecovery.java | 8 +-
.../tserver/log/TabletServerLogger.java | 187 +++---
.../accumulo/tserver/tablet/CommitSession.java | 3 +-
.../tserver/tablet/DatafileManager.java | 4 +-
.../apache/accumulo/tserver/tablet/Tablet.java | 59 +-
.../tserver/tablet/TabletCommitter.java | 3 +-
.../accumulo/tserver/log/LogEntryTest.java | 56 ++
.../test/performance/thrift/NullTserver.java | 6 +-
.../accumulo/proxy/ProxyDurabilityIT.java | 9 +-
.../apache/accumulo/proxy/SimpleProxyBase.java | 30 +-
.../test/BadDeleteMarkersCreatedIT.java | 2 +-
.../org/apache/accumulo/test/BalanceIT.java | 20 +-
.../org/apache/accumulo/test/CleanWalIT.java | 1 +
.../accumulo/test/ConditionalWriterIT.java | 1 +
.../accumulo/test/GarbageCollectWALIT.java | 81 +++
.../MissingWalHeaderCompletesRecoveryIT.java | 14 +-
.../accumulo/test/NoMutationRecoveryIT.java | 178 ------
.../org/apache/accumulo/test/ShellServerIT.java | 2 +-
.../org/apache/accumulo/test/UnusedWALIT.java | 144 +++++
.../java/org/apache/accumulo/test/VolumeIT.java | 17 +
.../accumulo/test/functional/ReadWriteIT.java | 8 +
.../accumulo/test/functional/WALSunnyDayIT.java | 250 ++++++++
.../test/functional/WatchTheWatchCountIT.java | 2 +-
.../test/performance/RollWALPerformanceIT.java | 126 +++++
...bageCollectorCommunicatesWithTServersIT.java | 35 +-
.../replication/MultiInstanceReplicationIT.java | 2 +-
.../test/replication/ReplicationIT.java | 370 ++++--------
test/src/test/resources/TestCompactionStrat.jar | Bin 1681 -> 2530 bytes
73 files changed, 1974 insertions(+), 1940 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1aea14c7/test/src/test/java/org/apache/accumulo/proxy/SimpleProxyBase.java
----------------------------------------------------------------------