accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [16/16] git commit: Merging up to trunk
Date Mon, 22 Sep 2014 20:48:16 GMT
Merging up to trunk




git-svn-id: https://svn.apache.org/repos/asf/accumulo/branches/ACCUMULO-CURATOR@1499116 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/12b51af1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/12b51af1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/12b51af1

Branch: refs/heads/ACCUMULO-CURATOR
Commit: 12b51af116230199fc5051ad68c547c1f2838a6e
Parents: a951e78 aea4313
Author: John Vines <vines@apache.org>
Authored: Tue Jul 2 21:25:56 2013 +0000
Committer: John Vines <vines@apache.org>
Committed: Tue Jul 2 21:25:56 2013 +0000

----------------------------------------------------------------------
 .../client/impl/TabletServerBatchReader.java    |   4 +-
 .../accumulo/core/conf/SiteConfiguration.java   |   2 +-
 .../examples/simple/dirlist/QueryUtil.java      |   2 +-
 .../examples/simple/helloworld/ReadData.java    |   9 +-
 .../examples/simple/mapreduce/RowHash.java      |   4 +-
 .../examples/simple/mapreduce/TableToFile.java  |   6 +-
 .../simple/mapreduce/TeraSortIngest.java        |   3 +-
 .../examples/simple/mapreduce/WordCount.java    |   3 +-
 .../simple/mapreduce/bulk/VerifyIngest.java     |   2 -
 .../accumulo/examples/simple/shard/Index.java   |   3 +-
 .../accumulo/examples/simple/shard/Query.java   |  36 +-
 .../minicluster/MiniAccumuloCluster.java        |  60 ++-
 .../minicluster/MiniAccumuloConfig.java         |  18 +-
 .../org/apache/accumulo/proxy/SimpleTest.java   |   2 +-
 .../server/master/recovery/HadoopLogCloser.java |   5 +-
 .../server/util/CheckForMetadataProblems.java   |   2 +-
 test/pom.xml                                    |  15 +
 .../accumulo/test/GCLotsOfCandidatesTest.java   |  53 --
 .../apache/accumulo/test/TestBinaryRows.java    | 246 +++++----
 .../org/apache/accumulo/test/TestIngest.java    | 278 +++++-----
 .../accumulo/test/TestMultiTableIngest.java     |   9 +-
 .../org/apache/accumulo/test/VerifyIngest.java  | 282 +++++------
 .../test/continuous/ContinuousBatchWalker.java  |   1 +
 .../accumulo/test/functional/AddSplitTest.java  | 148 ------
 .../test/functional/BadIteratorMincTest.java    | 121 -----
 .../test/functional/BatchScanSplitTest.java     | 127 -----
 .../test/functional/BatchWriterFlushTest.java   | 189 -------
 .../test/functional/BloomFilterTest.java        | 229 ---------
 .../accumulo/test/functional/BulkFileTest.java  | 119 -----
 .../functional/BulkSplitOptimizationTest.java   |  96 ----
 .../test/functional/ConcurrencyTest.java        | 143 ------
 .../test/functional/ConstraintTest.java         | 322 ------------
 .../test/functional/CreateAndUseTest.java       | 141 ------
 .../test/functional/DeleteEverythingTest.java   | 101 ----
 .../test/functional/DeleteRowsSplitTest.java    | 160 ------
 .../test/functional/DeleteRowsTest.java         | 157 ------
 .../test/functional/FateStarvationTest.java     |  77 ---
 .../accumulo/test/functional/LargeRowTest.java  | 185 -------
 .../test/functional/LogicalTimeTest.java        | 112 -----
 .../accumulo/test/functional/MaxOpenTest.java   | 127 -----
 .../accumulo/test/functional/MergeTest.java     | 142 ------
 .../test/functional/PermissionsTest.java        | 504 -------------------
 .../accumulo/test/functional/RowDeleteTest.java | 113 -----
 .../test/functional/ScanIteratorTest.java       | 136 -----
 .../accumulo/test/functional/ScanRangeTest.java | 250 ---------
 .../test/functional/ScanSessionTimeOutTest.java | 112 -----
 .../test/functional/ServerSideErrorTest.java    | 134 -----
 .../accumulo/test/functional/SlowIterator.java  |   9 +-
 .../test/functional/SparseColumnFamilyTest.java | 116 -----
 .../accumulo/test/functional/TimeoutTest.java   | 132 -----
 .../metadata/MetadataBatchScanTest.java         |   1 +
 .../apache/accumulo/test/AuditMessageTest.java  |  51 +-
 .../org/apache/accumulo/test/MetaSplitTest.java |   6 +-
 .../apache/accumulo/test/ShellServerTest.java   |  16 +-
 .../apache/accumulo/test/TableOperationsIT.java |   5 +-
 .../test/TestAccumuloSplitRecovery.java         |   5 +-
 .../accumulo/test/functional/AddSplitIT.java    | 134 +++++
 .../test/functional/BadIteratorMincIT.java      | 109 ++++
 .../test/functional/BatchScanSplitIT.java       | 117 +++++
 .../test/functional/BatchWriterFlushIT.java     | 171 +++++++
 .../accumulo/test/functional/BinaryIT.java      |  77 +++
 .../accumulo/test/functional/BloomFilterIT.java | 218 ++++++++
 .../accumulo/test/functional/BulkFileIT.java    | 113 +++++
 .../apache/accumulo/test/functional/BulkIT.java |  73 +++
 .../functional/BulkSplitOptimizationIT.java     |  92 ++++
 .../accumulo/test/functional/ClassLoaderIT.java |  81 +++
 .../accumulo/test/functional/CombinerIT.java    |  74 +++
 .../accumulo/test/functional/CompactionIT.java  | 111 ++++
 .../accumulo/test/functional/ConcurrencyIT.java | 136 +++++
 .../accumulo/test/functional/ConstraintIT.java  | 313 ++++++++++++
 .../test/functional/CreateAndUseIT.java         | 124 +++++
 .../test/functional/DeleteEverythingIT.java     |  93 ++++
 .../accumulo/test/functional/DeleteIT.java      |  53 ++
 .../accumulo/test/functional/DeleteRowsIT.java  | 130 +++++
 .../test/functional/DeleteRowsSplitIT.java      | 143 ++++++
 .../test/functional/DynamicThreadPoolsIT.java   |  86 ++++
 .../accumulo/test/functional/ExamplesIT.java    | 377 ++++++++++++++
 .../test/functional/FateStarvationIT.java       |  64 +++
 .../test/functional/FunctionalTestUtils.java    | 164 ++++++
 .../test/functional/GarbageCollectorIT.java     | 122 +++++
 .../accumulo/test/functional/LargeRowIT.java    | 168 +++++++
 .../accumulo/test/functional/LogicalTimeIT.java |  99 ++++
 .../accumulo/test/functional/MacTest.java       |  57 +++
 .../accumulo/test/functional/MapReduceIT.java   |  80 +++
 .../accumulo/test/functional/MaxOpenIT.java     | 132 +++++
 .../accumulo/test/functional/MergeIT.java       | 182 +++++++
 .../accumulo/test/functional/MergeMetaIT.java   |  61 +++
 .../accumulo/test/functional/PermissionsIT.java | 475 +++++++++++++++++
 .../accumulo/test/functional/ReadWriteIT.java   | 284 +++++++++++
 .../accumulo/test/functional/RenameIT.java      |  45 ++
 .../accumulo/test/functional/RowDeleteIT.java   | 116 +++++
 .../test/functional/ScanIteratorIT.java         | 125 +++++
 .../accumulo/test/functional/ScanRangeIT.java   | 233 +++++++++
 .../test/functional/ScanSessionTimeOutIT.java   | 104 ++++
 .../test/functional/ServerSideErrorIT.java      | 119 +++++
 .../accumulo/test/functional/ShutdownIT.java    | 104 ++++
 .../functional/SimpleBalancerFairnessIT.java    |  90 ++++
 .../test/functional/SparseColumnFamilyIT.java   | 102 ++++
 .../accumulo/test/functional/SplitIT.java       | 103 ++++
 .../accumulo/test/functional/StartIT.java       |  33 ++
 .../accumulo/test/functional/TableIT.java       |  75 +++
 .../accumulo/test/functional/TabletIT.java      |  47 ++
 .../accumulo/test/functional/TimeoutIT.java     | 115 +++++
 test/system/auto/simple/addSplit.py             |  30 --
 test/system/auto/simple/aggregation.py          |  65 ---
 test/system/auto/simple/baditerminc.py          |  30 --
 test/system/auto/simple/batchScanSplit.py       |  30 --
 test/system/auto/simple/batchWriterFlush.py     |  30 --
 test/system/auto/simple/binary.py               |  68 ---
 test/system/auto/simple/bloom.py                |  31 --
 test/system/auto/simple/bulk.py                 |  98 ----
 test/system/auto/simple/bulkFile.py             |  30 --
 .../system/auto/simple/bulkSplitOptimization.py |  31 --
 test/system/auto/simple/combiner.py             | 127 -----
 test/system/auto/simple/compaction.py           |  88 ----
 test/system/auto/simple/concurrency.py          |  30 --
 test/system/auto/simple/constraint.py           |  30 --
 test/system/auto/simple/createAndUse.py         |  30 --
 test/system/auto/simple/delete.py               |  71 ---
 test/system/auto/simple/deleteEverything.py     |  30 --
 test/system/auto/simple/deleterows.py           |  37 --
 test/system/auto/simple/dynamic.py              | 115 -----
 test/system/auto/simple/dynamicThreadPools.py   |  76 ---
 test/system/auto/simple/examples.py             | 348 -------------
 test/system/auto/simple/fateStartvation.py      |  30 --
 test/system/auto/simple/gc.py                   | 120 -----
 test/system/auto/simple/largeRow.py             |  30 --
 test/system/auto/simple/logicalTime.py          |  30 --
 test/system/auto/simple/mapreduce.py            | 142 ------
 test/system/auto/simple/maxOpen.py              |  30 --
 test/system/auto/simple/merge.py                | 107 ----
 test/system/auto/simple/mergeMetadata.py        |  73 ---
 test/system/auto/simple/range.py                |  29 --
 test/system/auto/simple/readwrite.py            | 276 ----------
 test/system/auto/simple/rename.py               |  57 ---
 test/system/auto/simple/rowDelete.py            |  30 --
 test/system/auto/simple/scanIter.py             |  30 --
 test/system/auto/simple/scanSessionTimeout.py   |  30 --
 test/system/auto/simple/security.py             |  39 --
 test/system/auto/simple/serverSideError.py      |  30 --
 test/system/auto/simple/shutdown.py             | 108 ----
 test/system/auto/simple/simpleBalancer.py       | 116 -----
 test/system/auto/simple/sparseColumnFamily.py   |  30 --
 test/system/auto/simple/split.py                | 135 -----
 test/system/auto/simple/start.py                |  40 --
 test/system/auto/simple/table.py                | 120 -----
 test/system/auto/simple/tablets.py              |  55 --
 test/system/auto/simple/timeout.py              |  29 --
 148 files changed, 6694 insertions(+), 7902 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/12b51af1/server/src/main/java/org/apache/accumulo/server/master/recovery/HadoopLogCloser.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/12b51af1/test/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/12b51af1/test/src/main/java/org/apache/accumulo/test/TestIngest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/12b51af1/test/src/main/java/org/apache/accumulo/test/VerifyIngest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/accumulo/blob/12b51af1/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
----------------------------------------------------------------------
diff --cc test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
index cb08566,4a9c3f5..f90c610
--- a/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/MetaSplitTest.java
@@@ -66,10 -63,8 +63,9 @@@ public class MetaSplitTest 
    
    @Test(timeout = 60000)
    public void testMetaSplit() throws Exception {
-     Instance instance = new ZooKeeperInstance(cluster.getConfig().getInstanceName(), cluster.getConfig().getZooKeepers());
-     Connector connector = instance.getConnector("root", new PasswordToken(secret));
+     Connector connector = cluster.getConnector("root", secret);
      TableOperations opts = connector.tableOperations();
 +    
      for (int i = 1; i <= 10; i++) {
        opts.create("" + i);
      }


Mime
View raw message