You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by bi...@apache.org on 2014/09/29 02:35:56 UTC
[50/50] [abbrv] git commit: Merge master in to 0.5 and make them in
sync. Keep theirs
Merge master in to 0.5 and make them in sync. Keep theirs
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/7511e45a
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/7511e45a
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/7511e45a
Branch: refs/heads/branch-0.5
Commit: 7511e45a68f96c208483155389722760861a6b8f
Parents: 5264844 14cf35b
Author: Bikas Saha <bi...@apache.org>
Authored: Sun Sep 28 17:06:02 2014 -0700
Committer: Bikas Saha <bi...@apache.org>
Committed: Sun Sep 28 17:06:02 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 51 +-
docs/src/site/markdown/index_0_5_0.md | 29 +
docs/src/site/markdown/install.md | 132 +--
docs/src/site/markdown/install_0_5_0.md | 117 ---
docs/src/site/markdown/install_pre_0_5_0.md | 109 +++
docs/src/site/markdown/talks.md | 8 +-
docs/src/site/site.xml | 1 +
.../java/org/apache/tez/client/TezClient.java | 2 +-
.../org/apache/tez/client/TezClientUtils.java | 59 +-
.../apache/tez/common/counters/DAGCounter.java | 1 +
.../apache/tez/common/security/ACLManager.java | 30 +-
.../main/java/org/apache/tez/dag/api/DAG.java | 136 +--
.../apache/tez/dag/api/DagTypeConverters.java | 29 +
.../apache/tez/dag/api/DataSinkDescriptor.java | 48 ++
.../tez/dag/api/DataSourceDescriptor.java | 44 +
.../java/org/apache/tez/dag/api/Vertex.java | 7 +-
.../apache/tez/dag/api/client/DAGStatus.java | 2 +-
.../tez/runtime/api/InputInitializer.java | 2 +-
.../runtime/api/InputInitializerContext.java | 2 +-
tez-api/src/main/proto/DAGApiRecords.proto | 1 +
.../org/apache/tez/client/TestTezClient.java | 6 +-
.../apache/tez/client/TestTezClientUtils.java | 4 +-
.../tez/common/security/TestACLManager.java | 417 ++++-----
.../org/apache/tez/dag/api/TestDAGPlan.java | 8 +-
.../org/apache/tez/dag/api/TestDAGVerify.java | 79 +-
.../java/org/apache/tez/client/LocalClient.java | 15 +-
...DAGClientAMProtocolBlockingPBServerImpl.java | 40 +-
.../org/apache/tez/dag/app/DAGAppMaster.java | 15 +-
.../org/apache/tez/dag/app/RecoveryParser.java | 15 +-
.../java/org/apache/tez/dag/app/dag/DAG.java | 2 +
.../apache/tez/dag/app/dag/impl/DAGImpl.java | 62 +-
.../tez/dag/app/dag/impl/TaskAttemptImpl.java | 56 +-
.../apache/tez/dag/app/dag/impl/TaskImpl.java | 12 +-
.../TezRootInputInitializerContextImpl.java | 2 +-
.../apache/tez/dag/app/dag/impl/VertexImpl.java | 311 +++----
.../tez/dag/app/dag/impl/VertexManager.java | 28 +-
.../dag/app/rm/LocalTaskSchedulerService.java | 23 +-
.../app/rm/container/AMContainerHelpers.java | 9 +-
.../dag/app/rm/container/AMContainerImpl.java | 8 +-
.../dag/history/events/TaskFinishedEvent.java | 10 +-
.../dag/history/events/VertexFinishedEvent.java | 8 -
.../dag/history/recovery/RecoveryService.java | 39 +
tez-dag/src/main/proto/HistoryEvents.proto | 4 +-
.../apache/tez/dag/app/MockDAGAppMaster.java | 259 ++++++
.../org/apache/tez/dag/app/MockLocalClient.java | 48 ++
.../org/apache/tez/dag/app/MockTezClient.java | 48 ++
.../tez/dag/app/TestMockDAGAppMaster.java | 138 +++
.../org/apache/tez/dag/app/TestPreemption.java | 203 +++++
.../tez/dag/app/dag/impl/TestDAGImpl.java | 8 +-
.../tez/dag/app/dag/impl/TestDAGRecovery.java | 514 +++++++++++
.../tez/dag/app/dag/impl/TestTaskAttempt.java | 16 +
.../app/dag/impl/TestTaskAttemptRecovery.java | 224 +++++
.../tez/dag/app/dag/impl/TestTaskRecovery.java | 629 +++++++++++---
.../tez/dag/app/dag/impl/TestVertexImpl.java | 110 ++-
.../tez/dag/app/dag/impl/TestVertexManager.java | 76 ++
.../dag/app/dag/impl/TestVertexRecovery.java | 860 +++++++++++++++++++
.../app/rm/TestLocalTaskSchedulerService.java | 68 ++
.../TestHistoryEventsProtoConversion.java | 6 -
.../tez/dag/history/utils/TestDAGUtils.java | 2 +-
.../org/apache/tez/examples/ExampleDriver.java | 6 +-
.../apache/tez/examples/HashJoinExample.java | 403 +++++++++
.../org/apache/tez/examples/JoinDataGen.java | 1 -
.../org/apache/tez/examples/JoinExample.java | 364 --------
.../org/apache/tez/examples/JoinValidate.java | 4 +-
.../tez/examples/SortMergeJoinExample.java | 374 ++++++++
.../org/apache/tez/mapreduce/input/MRInput.java | 30 +-
.../apache/tez/mapreduce/output/MROutput.java | 16 +-
.../common/TestMRInputSplitDistributor.java | 2 +-
.../vertexmanager/ShuffleVertexManager.java | 15 +-
.../library/api/TezRuntimeConfiguration.java | 12 +
.../library/common/InputAttemptIdentifier.java | 26 +-
.../common/comparator/HashComparator.java | 29 -
.../common/comparator/ProxyComparator.java | 46 +
.../common/comparator/TezBytesComparator.java | 23 +-
.../library/common/shuffle/impl/Fetcher.java | 5 +-
.../common/sort/impl/PipelinedSorter.java | 10 +-
.../input/ConcatenatedMergedKeyValueInput.java | 2 +
.../input/ConcatenatedMergedKeyValuesInput.java | 2 +
.../library/input/OrderedGroupedKVInput.java | 2 +
.../input/OrderedGroupedMergedKVInput.java | 2 +
.../runtime/library/input/UnorderedKVInput.java | 2 +
.../output/OrderedPartitionedKVOutput.java | 2 +
.../library/output/UnorderedKVOutput.java | 2 +
.../output/UnorderedPartitionedKVOutput.java | 2 +
.../shuffle/common/DiskFetchedInput.java | 7 +
.../library/shuffle/common/FetchedInput.java | 3 +-
.../shuffle/common/FetchedInputAllocator.java | 3 +
.../runtime/library/shuffle/common/Fetcher.java | 318 ++++++-
.../library/shuffle/common/HttpConnection.java | 8 +-
.../impl/ShuffleInputEventHandlerImpl.java | 18 +-
.../shuffle/common/impl/ShuffleManager.java | 46 +-
.../impl/SimpleFetchedInputAllocator.java | 17 +
.../src/main/proto/ShufflePayloads.proto | 5 +-
.../vertexmanager/TestShuffleVertexManager.java | 4 +-
.../common/comparator/TestProxyComparator.java | 81 ++
.../tez/mapreduce/examples/ExampleDriver.java | 9 -
.../examples/GroupByOrderByMRRTest.java | 283 ++++--
.../tez/mapreduce/examples/MRRSleepJob.java | 33 +-
.../examples/TestOrderedWordCount.java | 70 +-
.../mapreduce/examples/terasort/GenSort.java | 251 ------
.../mapreduce/examples/terasort/Random16.java | 374 --------
.../examples/terasort/TeraChecksum.java | 103 ---
.../mapreduce/examples/terasort/TeraGen.java | 311 -------
.../examples/terasort/TeraInputFormat.java | 353 --------
.../examples/terasort/TeraOutputFormat.java | 112 ---
.../examples/terasort/TeraScheduler.java | 253 ------
.../mapreduce/examples/terasort/TeraSort.java | 335 --------
.../examples/terasort/TeraValidate.java | 188 ----
.../mapreduce/examples/terasort/Unsigned16.java | 297 -------
.../examples/terasort/TestTeraSort.java | 94 --
.../org/apache/tez/test/TestAMRecovery.java | 708 +++++++++++++++
.../org/apache/tez/test/TestDAGRecovery.java | 68 +-
.../tez/test/TestExceptionPropagation.java | 510 +++++++++++
.../java/org/apache/tez/test/TestTezJobs.java | 144 +++-
.../apache/tez/test/dag/MultiAttemptDAG.java | 35 +-
115 files changed, 7377 insertions(+), 4238 deletions(-)
----------------------------------------------------------------------