This is an automated email from the ASF dual-hosted git repository. kturner pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/fluo.git
commit 99a8438900c6e49635bd8321331a18b4d14189a2 Merge: 52f2079 ce4751b Author: Keith Turner <[email protected]> AuthorDate: Wed Oct 17 15:29:40 2018 -0400 Merge pull request #1053 from keith-turner/accumulo-2.0 Get Fluo building against Accumulo 2.0 and Hadoop 3.0 and uses some new APIs. Work still needs to be done to make the Fluo tar ball work with Accumulo 2. .travis.yml | 1 - modules/accumulo/pom.xml | 2 +- .../iterators/TimestampSkippingIterator.java | 106 +-------------------- .../apache/fluo/accumulo/util/AccumuloProps.java | 6 +- modules/cluster/pom.xml | 13 +-- .../org/apache/fluo/cluster/runner/AppRunner.java | 2 +- modules/command/pom.xml | 4 + .../java/org/apache/fluo/command/FluoWait.java | 4 +- modules/core/pom.xml | 6 +- .../org/apache/fluo/core/client/FluoAdminImpl.java | 87 +++++++---------- .../fluo/core/client/LoaderExecutorAsyncImpl.java | 6 +- .../org/apache/fluo/core/impl/Environment.java | 52 +++++++--- .../org/apache/fluo/core/impl/LockResolver.java | 3 +- .../fluo/core/impl/ParallelSnapshotScanner.java | 3 +- .../org/apache/fluo/core/impl/SharedResources.java | 15 +-- .../org/apache/fluo/core/impl/SnapshotScanner.java | 2 +- .../org/apache/fluo/core/impl/TransactionImpl.java | 3 +- .../org/apache/fluo/core/util/AccumuloUtil.java | 34 +++---- .../java/org/apache/fluo/core/util/ColumnUtil.java | 2 +- .../java/org/apache/fluo/core/util/ScanUtil.java | 10 +- .../fluo/core/worker/finder/hash/ScanTask.java | 3 +- .../core/worker/finder/hash/SerializedSplits.java | 2 +- modules/distribution/src/main/lib/ahz/pom.xml | 2 +- modules/integration-tests/pom.xml | 6 +- .../java/org/apache/fluo/integration/ITBase.java | 15 ++- .../org/apache/fluo/integration/ITBaseImpl.java | 12 +-- .../org/apache/fluo/integration/ITBaseMini.java | 10 +- .../apache/fluo/integration/TestTransaction.java | 2 +- .../accumulo/Skip100StampsIterator.java | 23 +---- .../fluo/integration/accumulo/TimeskippingIT.java | 26 +++-- .../fluo/integration/client/FluoAdminImplIT.java | 15 +-- .../apache/fluo/integration/impl/CollisionIT.java | 4 +- .../apache/fluo/integration/impl/FailureIT.java | 8 +- .../apache/fluo/integration/impl/FaultyConfig.java | 10 +- .../org/apache/fluo/integration/impl/FluoIT.java | 2 +- .../impl/GarbageCollectionIteratorIT.java | 20 ++-- .../fluo/integration/impl/NotificationGcIT.java | 8 +- .../fluo/integration/impl/ReadLockFailureIT.java | 2 +- .../apache/fluo/integration/impl/ReadLockIT.java | 4 +- .../fluo/integration/impl/StochasticBankIT.java | 25 ++--- .../impl/WeakNotificationOverlapIT.java | 2 +- modules/mapreduce/pom.xml | 6 +- .../fluo/mapreduce/FluoEntryInputFormat.java | 12 +-- .../apache/fluo/mapreduce/FluoRowInputFormat.java | 12 +-- .../fluo/mapreduce/it/FluoFileOutputFormatIT.java | 2 +- .../fluo/mapreduce/it/MutationBuilderIT.java | 2 +- .../java/org/apache/fluo/mini/MiniFluoImpl.java | 3 +- pom.xml | 69 ++++++++++---- 48 files changed, 294 insertions(+), 374 deletions(-)
