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 2018/12/19 06:53:29 UTC
[accumulo] 01/01: Merge pull request #804 from
milleruntime/mr-compatibility
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 8062d7dff76a8f5cb24ee64c0cebebb968c0ebde
Merge: 826f9f2 38f382c
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Wed Dec 19 01:53:23 2018 -0500
Merge pull request #804 from milleruntime/mr-compatibility
Make old MR more backwards compatible & deprecate
.../core/client/mapred/AbstractInputFormat.java | 632 +++++++++++----------
.../client/mapred/AccumuloFileOutputFormat.java | 44 +-
.../core/client/mapred/AccumuloInputFormat.java | 11 +-
.../mapred/AccumuloMultiTableInputFormat.java | 27 +-
.../core/client/mapred/AccumuloOutputFormat.java | 159 +++---
.../core/client/mapred/AccumuloRowInputFormat.java | 8 +-
.../core/client/mapred/InputFormatBase.java | 100 ++--
.../core/client/mapred/RangeInputSplit.java | 4 +
.../core/client/mapreduce/AbstractInputFormat.java | 471 ++++++++-------
.../client/mapreduce/AccumuloFileOutputFormat.java | 42 +-
.../core/client/mapreduce/AccumuloInputFormat.java | 8 +-
.../mapreduce/AccumuloMultiTableInputFormat.java | 12 +-
.../client/mapreduce/AccumuloOutputFormat.java | 159 +++---
.../client/mapreduce/AccumuloRowInputFormat.java | 8 +-
.../core/client/mapreduce/InputFormatBase.java | 98 ++--
.../core/client/mapreduce/InputTableConfig.java | 63 +-
.../core/client/mapreduce/RangeInputSplit.java | 230 ++++++--
.../lib/partition/KeyRangePartitioner.java | 4 +
.../mapreduce/lib/partition/RangePartitioner.java | 11 +-
.../core/clientImpl/mapred/BatchInputSplit.java | 3 +
.../core/clientImpl/mapreduce/BatchInputSplit.java | 6 +-
.../clientImpl/mapreduce/DelegationTokenStub.java | 3 +
.../core/clientImpl/mapreduce/SplitUtils.java | 11 +-
.../clientImpl/mapreduce/lib/ConfiguratorBase.java | 124 ++--
.../mapreduce/lib/DistributedCacheHelper.java | 3 +-
.../mapreduce/lib/FileOutputConfigurator.java | 2 +
.../mapreduce/lib/InputConfigurator.java | 268 ++++-----
.../lib/MapReduceClientOnDefaultTable.java | 50 --
.../lib/MapReduceClientOnRequiredTable.java | 43 --
.../mapreduce/lib/MapReduceClientOpts.java | 90 ---
.../mapreduce/lib/OutputConfigurator.java | 2 +
.../clientImpl/mapreduce/lib/package-info.java | 39 --
.../core/singletons/SingletonReservation.java | 8 +-
.../mapred/AccumuloFileOutputFormatTest.java | 30 +-
.../client/mapred/AccumuloInputFormatTest.java | 4 +
.../mapred/AccumuloMultiTableInputFormatTest.java | 14 +-
.../client/mapred/AccumuloOutputFormatTest.java | 4 +
.../core/client/mapred/RangeInputSplitTest.java | 8 +-
.../mapreduce/AccumuloFileOutputFormatTest.java | 32 +-
.../client/mapreduce/AccumuloInputFormatTest.java | 4 +
.../AccumuloMultiTableInputFormatTest.java | 4 +
.../client/mapreduce/AccumuloOutputFormatTest.java | 4 +
.../client/mapreduce/InputTableConfigTest.java | 13 +-
.../core/client/mapreduce/RangeInputSplitTest.java | 8 +-
.../lib/partition/RangePartitionerTest.java | 4 +
.../clientImpl/mapreduce/BatchInputSplitTest.java | 4 +
.../mapreduce/lib/ConfiguratorBaseTest.java | 28 +-
.../its/mapred/AccumuloFileOutputFormatIT.java | 6 +-
pom.xml | 2 +-
.../org/apache/accumulo/server/ServerContext.java | 2 +-
.../accumulo/test/functional/CredentialsIT.java | 2 +-
.../org/apache/accumulo/test/functional/SslIT.java | 5 +-
.../accumulo/test/functional/ZooCacheIT.java | 3 +-
.../test/mapred/AccumuloFileOutputFormatIT.java | 35 +-
.../test/mapred/AccumuloInputFormatIT.java | 46 +-
.../mapred/AccumuloMultiTableInputFormatIT.java | 30 +-
.../test/mapred/AccumuloOutputFormatIT.java | 43 +-
.../test/mapred/AccumuloRowInputFormatIT.java | 16 +-
.../apache/accumulo/test/mapred/TokenFileIT.java | 29 +-
.../test/mapreduce/AccumuloFileOutputFormatIT.java | 26 +-
.../test/mapreduce/AccumuloInputFormatIT.java | 124 ++--
.../mapreduce/AccumuloMultiTableInputFormatIT.java | 29 +-
.../test/mapreduce/AccumuloOutputFormatIT.java | 30 +-
.../test/mapreduce/AccumuloRowInputFormatIT.java | 19 +-
.../{functional => mapreduce}/MapReduceIT.java | 15 +-
.../apache/accumulo/test/mapreduce/RowHash.java | 99 +++-
.../accumulo/test/mapreduce/TokenFileIT.java | 31 +-
67 files changed, 1883 insertions(+), 1613 deletions(-)