Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/hadoop into 
trunk


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

Branch: refs/heads/trunk
Commit: fdf72029929bd31f3cb996525621c8d2cdfd6326
Parents: f3fb94b b01514f
Author: Ming Ma <[email protected]>
Authored: Thu Jan 19 22:31:43 2017 -0800
Committer: Ming Ma <[email protected]>
Committed: Thu Jan 19 22:31:43 2017 -0800

----------------------------------------------------------------------
 hadoop-project/pom.xml                          |  13 +-
 .../server/resourcemanager/TestRMRestart.java   |   4 +
 .../TestResourceTrackerService.java             |   4 +
 .../pom.xml                                     |  12 +
 .../pom.xml                                     | 191 +++++
 .../reader/filter/TimelineFilterUtils.java      | 290 ++++++++
 .../reader/filter/package-info.java             |  28 +
 .../storage/HBaseTimelineReaderImpl.java        |  88 +++
 .../storage/HBaseTimelineWriterImpl.java        | 566 ++++++++++++++
 .../storage/TimelineSchemaCreator.java          | 250 +++++++
 .../storage/application/ApplicationColumn.java  | 156 ++++
 .../application/ApplicationColumnFamily.java    |  65 ++
 .../application/ApplicationColumnPrefix.java    | 288 ++++++++
 .../storage/application/ApplicationRowKey.java  | 206 ++++++
 .../application/ApplicationRowKeyPrefix.java    |  69 ++
 .../storage/application/ApplicationTable.java   | 161 ++++
 .../storage/application/package-info.java       |  28 +
 .../storage/apptoflow/AppToFlowColumn.java      | 148 ++++
 .../apptoflow/AppToFlowColumnFamily.java        |  51 ++
 .../storage/apptoflow/AppToFlowRowKey.java      | 143 ++++
 .../storage/apptoflow/AppToFlowTable.java       | 113 +++
 .../storage/apptoflow/package-info.java         |  28 +
 .../storage/common/AppIdKeyConverter.java       |  96 +++
 .../storage/common/BaseTable.java               | 140 ++++
 .../common/BufferedMutatorDelegator.java        |  73 ++
 .../timelineservice/storage/common/Column.java  |  80 ++
 .../storage/common/ColumnFamily.java            |  34 +
 .../storage/common/ColumnHelper.java            | 388 ++++++++++
 .../storage/common/ColumnPrefix.java            | 145 ++++
 .../storage/common/EventColumnName.java         |  63 ++
 .../common/EventColumnNameConverter.java        |  99 +++
 .../storage/common/GenericConverter.java        |  48 ++
 .../common/HBaseTimelineStorageUtils.java       | 243 +++++++
 .../storage/common/KeyConverter.java            |  41 ++
 .../storage/common/LongConverter.java           |  94 +++
 .../storage/common/LongKeyConverter.java        |  68 ++
 .../storage/common/NumericValueConverter.java   |  39 +
 .../timelineservice/storage/common/Range.java   |  62 ++
 .../storage/common/RowKeyPrefix.java            |  42 ++
 .../storage/common/Separator.java               | 575 +++++++++++++++
 .../storage/common/StringKeyConverter.java      |  54 ++
 .../common/TimelineHBaseSchemaConstants.java    |  71 ++
 .../storage/common/TimestampGenerator.java      | 116 +++
 .../storage/common/TypedBufferedMutator.java    |  28 +
 .../storage/common/ValueConverter.java          |  47 ++
 .../storage/common/package-info.java            |  28 +
 .../storage/entity/EntityColumn.java            | 160 ++++
 .../storage/entity/EntityColumnFamily.java      |  65 ++
 .../storage/entity/EntityColumnPrefix.java      | 300 ++++++++
 .../storage/entity/EntityRowKey.java            | 225 ++++++
 .../storage/entity/EntityRowKeyPrefix.java      |  74 ++
 .../storage/entity/EntityTable.java             | 161 ++++
 .../storage/entity/package-info.java            |  28 +
 .../flow/AggregationCompactionDimension.java    |  63 ++
 .../storage/flow/AggregationOperation.java      |  94 +++
 .../timelineservice/storage/flow/Attribute.java |  39 +
 .../storage/flow/FlowActivityColumnFamily.java  |  55 ++
 .../storage/flow/FlowActivityColumnPrefix.java  | 277 +++++++
 .../storage/flow/FlowActivityRowKey.java        | 196 +++++
 .../storage/flow/FlowActivityRowKeyPrefix.java  |  60 ++
 .../storage/flow/FlowActivityTable.java         | 108 +++
 .../storage/flow/FlowRunColumn.java             | 182 +++++
 .../storage/flow/FlowRunColumnFamily.java       |  54 ++
 .../storage/flow/FlowRunColumnPrefix.java       | 268 +++++++
 .../storage/flow/FlowRunCoprocessor.java        | 304 ++++++++
 .../storage/flow/FlowRunRowKey.java             | 190 +++++
 .../storage/flow/FlowRunRowKeyPrefix.java       |  54 ++
 .../storage/flow/FlowRunTable.java              | 141 ++++
 .../storage/flow/FlowScanner.java               | 728 +++++++++++++++++++
 .../storage/flow/FlowScannerOperation.java      |  46 ++
 .../storage/flow/package-info.java              |  29 +
 .../timelineservice/storage/package-info.java   |  28 +
 .../storage/reader/ApplicationEntityReader.java | 481 ++++++++++++
 .../reader/FlowActivityEntityReader.java        | 163 +++++
 .../storage/reader/FlowRunEntityReader.java     | 269 +++++++
 .../storage/reader/GenericEntityReader.java     | 648 +++++++++++++++++
 .../storage/reader/TimelineEntityReader.java    | 496 +++++++++++++
 .../reader/TimelineEntityReaderFactory.java     |  89 +++
 .../storage/reader/package-info.java            |  28 +
 .../storage/common/TestKeyConverters.java       | 130 ++++
 .../storage/common/TestRowKeys.java             | 246 +++++++
 .../storage/common/TestSeparator.java           | 215 ++++++
 .../hadoop-yarn-server-timelineservice/pom.xml  |  66 --
 .../reader/filter/TimelineFilterUtils.java      | 290 --------
 .../storage/HBaseTimelineReaderImpl.java        |  88 ---
 .../storage/HBaseTimelineWriterImpl.java        | 566 --------------
 .../storage/TimelineSchemaCreator.java          | 250 -------
 .../storage/application/ApplicationColumn.java  | 156 ----
 .../application/ApplicationColumnFamily.java    |  65 --
 .../application/ApplicationColumnPrefix.java    | 288 --------
 .../storage/application/ApplicationRowKey.java  | 206 ------
 .../application/ApplicationRowKeyPrefix.java    |  69 --
 .../storage/application/ApplicationTable.java   | 161 ----
 .../storage/application/package-info.java       |  28 -
 .../storage/apptoflow/AppToFlowColumn.java      | 148 ----
 .../apptoflow/AppToFlowColumnFamily.java        |  51 --
 .../storage/apptoflow/AppToFlowRowKey.java      | 143 ----
 .../storage/apptoflow/AppToFlowTable.java       | 113 ---
 .../storage/apptoflow/package-info.java         |  28 -
 .../storage/common/AppIdKeyConverter.java       |  96 ---
 .../storage/common/BaseTable.java               | 140 ----
 .../common/BufferedMutatorDelegator.java        |  73 --
 .../timelineservice/storage/common/Column.java  |  80 --
 .../storage/common/ColumnFamily.java            |  34 -
 .../storage/common/ColumnHelper.java            | 388 ----------
 .../storage/common/ColumnPrefix.java            | 145 ----
 .../storage/common/EventColumnName.java         |  63 --
 .../common/EventColumnNameConverter.java        |  99 ---
 .../storage/common/GenericConverter.java        |  48 --
 .../common/HBaseTimelineStorageUtils.java       | 243 -------
 .../storage/common/KeyConverter.java            |  41 --
 .../storage/common/LongConverter.java           |  94 ---
 .../storage/common/LongKeyConverter.java        |  68 --
 .../storage/common/NumericValueConverter.java   |  39 -
 .../timelineservice/storage/common/Range.java   |  62 --
 .../storage/common/RowKeyPrefix.java            |  42 --
 .../storage/common/Separator.java               | 575 ---------------
 .../storage/common/StringKeyConverter.java      |  54 --
 .../common/TimelineHBaseSchemaConstants.java    |  71 --
 .../storage/common/TimestampGenerator.java      | 116 ---
 .../storage/common/TypedBufferedMutator.java    |  28 -
 .../storage/common/ValueConverter.java          |  47 --
 .../storage/common/package-info.java            |  28 -
 .../storage/entity/EntityColumn.java            | 160 ----
 .../storage/entity/EntityColumnFamily.java      |  65 --
 .../storage/entity/EntityColumnPrefix.java      | 300 --------
 .../storage/entity/EntityRowKey.java            | 225 ------
 .../storage/entity/EntityRowKeyPrefix.java      |  74 --
 .../storage/entity/EntityTable.java             | 161 ----
 .../storage/entity/package-info.java            |  28 -
 .../flow/AggregationCompactionDimension.java    |  63 --
 .../storage/flow/AggregationOperation.java      |  94 ---
 .../timelineservice/storage/flow/Attribute.java |  39 -
 .../storage/flow/FlowActivityColumnFamily.java  |  55 --
 .../storage/flow/FlowActivityColumnPrefix.java  | 277 -------
 .../storage/flow/FlowActivityRowKey.java        | 196 -----
 .../storage/flow/FlowActivityRowKeyPrefix.java  |  60 --
 .../storage/flow/FlowActivityTable.java         | 108 ---
 .../storage/flow/FlowRunColumn.java             | 182 -----
 .../storage/flow/FlowRunColumnFamily.java       |  54 --
 .../storage/flow/FlowRunColumnPrefix.java       | 268 -------
 .../storage/flow/FlowRunCoprocessor.java        | 304 --------
 .../storage/flow/FlowRunRowKey.java             | 190 -----
 .../storage/flow/FlowRunRowKeyPrefix.java       |  54 --
 .../storage/flow/FlowRunTable.java              | 141 ----
 .../storage/flow/FlowScanner.java               | 728 -------------------
 .../storage/flow/FlowScannerOperation.java      |  46 --
 .../storage/flow/package-info.java              |  29 -
 .../storage/reader/ApplicationEntityReader.java | 481 ------------
 .../reader/FlowActivityEntityReader.java        | 163 -----
 .../storage/reader/FlowRunEntityReader.java     | 269 -------
 .../storage/reader/GenericEntityReader.java     | 648 -----------------
 .../storage/reader/TimelineEntityReader.java    | 496 -------------
 .../reader/TimelineEntityReaderFactory.java     |  89 ---
 .../storage/reader/package-info.java            |  28 -
 .../storage/common/TestKeyConverters.java       | 130 ----
 .../storage/common/TestRowKeys.java             | 246 -------
 .../storage/common/TestSeparator.java           | 215 ------
 .../hadoop-yarn/hadoop-yarn-server/pom.xml      |   1 +
 .../src/site/markdown/TimelineServiceV2.md      |   2 +-
 hadoop-yarn-project/pom.xml                     |   4 +
 161 files changed, 12269 insertions(+), 12064 deletions(-)
----------------------------------------------------------------------



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to