accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [10/15] git commit: ACCUMULO-652 merged changes from trunk
Date Mon, 22 Sep 2014 20:45:08 GMT
ACCUMULO-652 merged changes from trunk

git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/ACCUMULO-652@1357909 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7bfa823e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7bfa823e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7bfa823e

Branch: refs/heads/ACCUMULO-652
Commit: 7bfa823ef28aa5cb70b296d7f3bf29b4d2e98439
Parents: 665887f 368cabd
Author: Adam Fuchs <afuchs@apache.org>
Authored: Thu Jul 5 21:03:16 2012 +0000
Committer: Adam Fuchs <afuchs@apache.org>
Committed: Thu Jul 5 21:03:16 2012 +0000

----------------------------------------------------------------------
 bin/tool.sh                                     |  11 +-
 core/pom.xml                                    |   4 +
 .../org/apache/accumulo/core/Constants.java     |   2 +
 .../accumulo/core/client/ZooKeeperInstance.java |   2 +-
 .../client/admin/InstanceOperationsImpl.java    |   2 +-
 .../accumulo/core/client/impl/ServerClient.java |   2 +-
 .../accumulo/core/client/impl/Tables.java       |   2 +-
 .../core/client/mock/MockBatchScanner.java      |  20 +-
 .../core/conf/DefaultConfiguration.java         |   9 +
 .../org/apache/accumulo/core/conf/Property.java |   4 +-
 .../accumulo/core/data/ArrayByteSequence.java   |   6 +-
 .../accumulo/core/file/rfile/bcfile/BCFile.java |   2 +-
 .../accumulo/core/trace/DistributedTrace.java   |   2 +-
 .../accumulo/core/trace/ZooTraceClient.java     |   2 +-
 .../org/apache/accumulo/core/util/Merge.java    |  10 +-
 .../accumulo/core/util/SimpleThreadPool.java    |   5 +-
 .../apache/accumulo/core/util/shell/Shell.java  |   5 +-
 .../accumulo/core/zookeeper/IZooReader.java     |  41 --
 .../accumulo/core/zookeeper/ZooCache.java       | 310 -------------
 .../accumulo/core/zookeeper/ZooReader.java      |  83 ----
 .../accumulo/core/zookeeper/ZooSession.java     | 147 ------
 .../apache/accumulo/core/zookeeper/ZooUtil.java | 234 +---------
 .../core/iterators/FirstEntryInRowTest.java     |   1 +
 .../wikisearch/iterator/AndIterator.java        |  18 +-
 .../examples/wikisearch/query/Query.java        |   5 +-
 fate/pom.xml                                    |  59 +++
 .../org/apache/accumulo/fate/AdminUtil.java     | 172 +++++++
 .../java/org/apache/accumulo/fate/Fate.java     | 233 ++++++++++
 .../java/org/apache/accumulo/fate/Repo.java     |  36 ++
 .../accumulo/fate/StackOverflowException.java   |  27 ++
 .../java/org/apache/accumulo/fate/TStore.java   | 132 ++++++
 .../java/org/apache/accumulo/fate/ZooStore.java | 425 +++++++++++++++++
 .../org/apache/accumulo/fate/util/Daemon.java   |  60 +++
 .../accumulo/fate/util/LoggingRunnable.java     |  65 +++
 .../accumulo/fate/util/UtilWaitThread.java      |  31 ++
 .../zookeeper/DistributedReadWriteLock.java     | 254 ++++++++++
 .../accumulo/fate/zookeeper/IZooReader.java     |  41 ++
 .../fate/zookeeper/IZooReaderWriter.java        |  63 +++
 .../fate/zookeeper/TransactionWatcher.java      |  73 +++
 .../accumulo/fate/zookeeper/ZooCache.java       | 310 +++++++++++++
 .../apache/accumulo/fate/zookeeper/ZooLock.java | 460 +++++++++++++++++++
 .../accumulo/fate/zookeeper/ZooQueueLock.java   | 119 +++++
 .../accumulo/fate/zookeeper/ZooReader.java      |  78 ++++
 .../fate/zookeeper/ZooReaderWriter.java         | 204 ++++++++
 .../accumulo/fate/zookeeper/ZooReservation.java |  75 +++
 .../accumulo/fate/zookeeper/ZooSession.java     | 147 ++++++
 .../apache/accumulo/fate/zookeeper/ZooUtil.java | 256 +++++++++++
 .../zookeeper/DistributedReadWriteLockTest.java | 132 ++++++
 .../fate/zookeeper/TransactionWatcherTest.java  | 126 +++++
 pom.xml                                         |   6 +
 server/pom.xml                                  |   4 +
 .../accumulo/server/client/BulkImporter.java    |  42 +-
 .../accumulo/server/client/HdfsZooInstance.java |   2 +-
 .../server/conf/TableConfiguration.java         |   2 +-
 .../accumulo/server/conf/ZooConfiguration.java  |   2 +-
 .../org/apache/accumulo/server/fate/Admin.java  | 158 +------
 .../org/apache/accumulo/server/fate/Fate.java   | 234 ----------
 .../org/apache/accumulo/server/fate/Print.java  | 136 ------
 .../org/apache/accumulo/server/fate/Repo.java   |  36 --
 .../server/fate/StackOverflowException.java     |  27 --
 .../org/apache/accumulo/server/fate/TStore.java | 132 ------
 .../apache/accumulo/server/fate/ZooStore.java   | 425 -----------------
 .../server/gc/SimpleGarbageCollector.java       |   4 +-
 .../accumulo/server/master/LiveTServerSet.java  |   2 +-
 .../apache/accumulo/server/master/Master.java   |  32 +-
 .../server/master/TServerLockWatcher.java       |   4 +-
 .../server/master/recovery/RecoverLease.java    |   2 +-
 .../master/recovery/SubmitFileForRecovery.java  |  11 +-
 .../server/master/state/DeadServerList.java     |   6 +-
 .../server/master/state/SetGoalState.java       |   2 +-
 .../accumulo/server/master/state/ZooStore.java  |   6 +-
 .../master/state/tables/TableManager.java       |   8 +-
 .../server/master/tableOps/BulkImport.java      | 187 ++++++--
 .../master/tableOps/ChangeTableState.java       |   2 +-
 .../server/master/tableOps/CloneTable.java      |   4 +-
 .../server/master/tableOps/CompactRange.java    |   6 +-
 .../server/master/tableOps/CreateTable.java     |   4 +-
 .../server/master/tableOps/DeleteTable.java     |   2 +-
 .../server/master/tableOps/MasterRepo.java      |   2 +-
 .../server/master/tableOps/RenameTable.java     |   6 +-
 .../server/master/tableOps/TableRangeOp.java    |   2 +-
 .../server/master/tableOps/TraceRepo.java       |   2 +-
 .../accumulo/server/master/tableOps/Utils.java  |   8 +-
 .../master/tserverOps/ShutdownTServer.java      |   6 +-
 .../server/monitor/servlets/BasicServlet.java   |   6 +-
 .../server/monitor/servlets/DefaultServlet.java |  29 +-
 .../server/monitor/servlets/VisServlet.java     |  62 +--
 .../accumulo/server/problems/ProblemReport.java |   4 +-
 .../server/problems/ProblemReports.java         |   2 +-
 .../server/security/ZKAuthenticator.java        |   6 +-
 .../tabletserver/BulkFailedCopyProcessor.java   |  72 +++
 .../accumulo/server/tabletserver/Tablet.java    |   8 +-
 .../server/tabletserver/TabletServer.java       |  27 +-
 .../server/tabletserver/log/LogSorter.java      | 242 +++-------
 .../apache/accumulo/server/test/TestIngest.java |   4 +-
 .../accumulo/server/test/VerifyIngest.java      |   4 +-
 .../test/continuous/UndefinedAnalyzer.java      | 140 +++---
 .../server/test/functional/CacheTestClean.java  |   4 +-
 .../server/test/functional/CacheTestReader.java |   3 +-
 .../server/test/functional/CacheTestWriter.java |   7 +-
 .../test/functional/SplitRecoveryTest.java      |   8 +-
 .../server/test/functional/ZombieTServer.java   |   6 +-
 .../server/test/randomwalk/Framework.java       |   4 +-
 .../accumulo/server/test/randomwalk/State.java  |   3 +-
 .../randomwalk/security/SecurityHelper.java     |   4 -
 .../accumulo/server/test/scalability/Run.java   |   7 +-
 .../accumulo/server/trace/TraceServer.java      |   2 +-
 .../accumulo/server/util/ChangeSecret.java      |   8 +-
 .../accumulo/server/util/CleanZookeeper.java    |   4 +-
 .../accumulo/server/util/DeleteZooInstance.java |   4 +-
 .../accumulo/server/util/DumpZookeeper.java     |   2 +-
 .../accumulo/server/util/FileSystemMonitor.java |   7 +-
 .../apache/accumulo/server/util/Initialize.java |   6 +-
 .../accumulo/server/util/ListInstances.java     |   2 +-
 .../accumulo/server/util/MetadataTable.java     |   9 +-
 .../accumulo/server/util/RestoreZookeeper.java  |   2 +-
 .../accumulo/server/util/SystemPropUtil.java    |   4 +-
 .../accumulo/server/util/TablePropUtil.java     |   4 +-
 .../accumulo/server/util/TabletServerLocks.java |   2 +-
 .../org/apache/accumulo/server/util/ZooZap.java |   4 +-
 .../zookeeper/DistributedReadWriteLock.java     | 254 ----------
 .../server/zookeeper/DistributedWorkQueue.java  | 247 ++++++++++
 .../server/zookeeper/IZooReaderWriter.java      |  63 ---
 .../server/zookeeper/TransactionWatcher.java    |  66 +--
 .../accumulo/server/zookeeper/ZooCache.java     |   2 +-
 .../accumulo/server/zookeeper/ZooLock.java      | 432 +----------------
 .../accumulo/server/zookeeper/ZooQueueLock.java |  93 +---
 .../server/zookeeper/ZooReaderWriter.java       | 133 +-----
 .../server/zookeeper/ZooReservation.java        |  75 ---
 .../zookeeper/DistributedReadWriteLockTest.java | 133 ------
 .../zookeeper/TransactionWatcherTest.java       | 127 -----
 test/system/auto/simple/examples.py             |   4 +-
 test/system/auto/simple/mapreduce.py            |   3 +-
 test/system/auto/stress/logger.py               |  55 ---
 test/system/test4/bulk_import_test.sh           |  20 +-
 135 files changed, 4533 insertions(+), 3907 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7bfa823e/core/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7bfa823e/core/src/main/java/org/apache/accumulo/core/Constants.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7bfa823e/fate/pom.xml
----------------------------------------------------------------------
diff --cc fate/pom.xml
index 0000000,50c5a94..804bd6a
mode 000000,100644..100644
--- a/fate/pom.xml
+++ b/fate/pom.xml
@@@ -1,0 -1,59 +1,59 @@@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+ 
+       http://www.apache.org/licenses/LICENSE-2.0
+ 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+ -->
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ 
+   <parent>
+     <groupId>org.apache.accumulo</groupId>
+     <artifactId>accumulo</artifactId>
 -    <version>1.5.0-SNAPSHOT</version>
++    <version>ACCUMULO-652-SNAPSHOT</version>
+   </parent>
+ 
+   <modelVersion>4.0.0</modelVersion>
+   <artifactId>accumulo-fate</artifactId>
+   <name>accumulo-fate</name>
+   <build>
+     <pluginManagement>
+       <plugins>
+         <plugin>
+           <artifactId>maven-jar-plugin</artifactId>
+           <configuration>
+             <outputDirectory>../lib</outputDirectory>
+           </configuration>
+         </plugin>
+       </plugins>
+     </pluginManagement>
+   </build>
+ 
+   <dependencies>
+     <dependency>
+       <groupId>log4j</groupId>
+       <artifactId>log4j</artifactId>
+     </dependency>
+ 
+     <dependency>
+       <groupId>commons-lang</groupId>
+       <artifactId>commons-lang</artifactId>
+     </dependency>
+ 
+     <dependency>
+       <groupId>org.apache.hadoop</groupId>
+       <artifactId>zookeeper</artifactId>
+     </dependency>
+   </dependencies>
+ 
+ </project>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7bfa823e/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index d9e2950,9f03de0..a8fe066
--- a/pom.xml
+++ b/pom.xml
@@@ -528,8 -529,13 +529,13 @@@
        </dependency>
        <dependency>
          <groupId>org.apache.accumulo</groupId>
+         <artifactId>accumulo-fate</artifactId>
 -        <version>1.5.0-SNAPSHOT</version>
++        <version>ACCUMULO-652-SNAPSHOT</version>
+       </dependency>
+       <dependency>
+         <groupId>org.apache.accumulo</groupId>
          <artifactId>accumulo-start</artifactId>
 -        <version>1.5.0-SNAPSHOT</version>
 +        <version>ACCUMULO-652-SNAPSHOT</version>
        </dependency>
        <dependency>
          <groupId>org.apache.accumulo</groupId>

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7bfa823e/server/pom.xml
----------------------------------------------------------------------


Mime
View raw message