http://git-wip-us.apache.org/repos/asf/hadoop/blob/6cf6ab7b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestFileSystemTimelineWriterImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestFileSystemTimelineWriterImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestFileSystemTimelineWriterImpl.java index 2f79daa..15be494 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestFileSystemTimelineWriterImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/TestFileSystemTimelineWriterImpl.java @@ -41,7 +41,8 @@ import org.junit.Test; public class TestFileSystemTimelineWriterImpl { /** - * Unit test for PoC YARN 3264 + * Unit test for PoC YARN 3264. + * * @throws Exception */ @Test @@ -84,8 +85,8 @@ public class TestFileSystemTimelineWriterImpl { "app_id", te); String fileName = fsi.getOutputRoot() + - "/entities/cluster_id/user_id/flow_name/flow_version/12345678/app_id/" + - type + "/" + id + + "/entities/cluster_id/user_id/flow_name/flow_version/12345678/" + + "app_id/" + type + "/" + id + FileSystemTimelineWriterImpl.TIMELINE_SERVICE_STORAGE_EXTENSION; Path path = Paths.get(fileName); File f = new File(fileName);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6cf6ab7b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/common/TestRowKeys.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/common/TestRowKeys.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/common/TestRowKeys.java index 77370b7..368b060 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/common/TestRowKeys.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/common/TestRowKeys.java @@ -60,7 +60,8 @@ public class TestRowKeys { if (sepByteLen <= byteArr.length) { for (int i = 0; i < sepByteLen; i++) { byteArr[byteArr.length - sepByteLen + i] = - (byte) (longMaxByteArr[byteArr.length - sepByteLen + i] - QUALIFIER_SEP_BYTES[i]); + (byte) (longMaxByteArr[byteArr.length - sepByteLen + i] - + QUALIFIER_SEP_BYTES[i]); } } clusterTs = Bytes.toLong(byteArr); @@ -73,7 +74,8 @@ public class TestRowKeys { for (int i = 0; i < sepLen; i++) { assertTrue( "Row key prefix not encoded properly.", - byteRowKeyPrefix[byteRowKeyPrefix.length - sepLen + i] == QUALIFIER_SEP_BYTES[i]); + byteRowKeyPrefix[byteRowKeyPrefix.length - sepLen + i] == + QUALIFIER_SEP_BYTES[i]); } } @@ -94,9 +96,9 @@ public class TestRowKeys { .getRowKeyPrefix(); byte[][] splits = Separator.QUALIFIERS.split(byteRowKeyPrefix, - new int[] { Separator.VARIABLE_SIZE, Separator.VARIABLE_SIZE, + new int[] {Separator.VARIABLE_SIZE, Separator.VARIABLE_SIZE, Separator.VARIABLE_SIZE, Bytes.SIZEOF_LONG, - Separator.VARIABLE_SIZE }); + Separator.VARIABLE_SIZE}); assertEquals(5, splits.length); assertEquals(0, splits[4].length); assertEquals(FLOW_NAME, @@ -153,10 +155,10 @@ public class TestRowKeys { byte[][] splits = Separator.QUALIFIERS.split( byteRowKeyPrefix, - new int[] { Separator.VARIABLE_SIZE, Separator.VARIABLE_SIZE, + new int[] {Separator.VARIABLE_SIZE, Separator.VARIABLE_SIZE, Separator.VARIABLE_SIZE, Bytes.SIZEOF_LONG, AppIdKeyConverter.getKeySize(), Separator.VARIABLE_SIZE, - Separator.VARIABLE_SIZE }); + Separator.VARIABLE_SIZE}); assertEquals(7, splits.length); assertEquals(0, splits[6].length); assertEquals(APPLICATION_ID, new AppIdKeyConverter().decode(splits[4])); @@ -170,9 +172,9 @@ public class TestRowKeys { splits = Separator.QUALIFIERS.split( byteRowKeyPrefix, - new int[] { Separator.VARIABLE_SIZE, Separator.VARIABLE_SIZE, + new int[] {Separator.VARIABLE_SIZE, Separator.VARIABLE_SIZE, Separator.VARIABLE_SIZE, Bytes.SIZEOF_LONG, - AppIdKeyConverter.getKeySize(), Separator.VARIABLE_SIZE }); + AppIdKeyConverter.getKeySize(), Separator.VARIABLE_SIZE}); assertEquals(6, splits.length); assertEquals(0, splits[5].length); AppIdKeyConverter appIdKeyConverter = new AppIdKeyConverter(); @@ -207,8 +209,8 @@ public class TestRowKeys { new FlowActivityRowKeyPrefix(CLUSTER, ts).getRowKeyPrefix(); splits = Separator.QUALIFIERS.split(byteRowKeyPrefix, - new int[] { Separator.VARIABLE_SIZE, Bytes.SIZEOF_LONG, - Separator.VARIABLE_SIZE }); + new int[] {Separator.VARIABLE_SIZE, Bytes.SIZEOF_LONG, + Separator.VARIABLE_SIZE}); assertEquals(3, splits.length); assertEquals(0, splits[2].length); assertEquals(CLUSTER, http://git-wip-us.apache.org/repos/asf/hadoop/blob/6cf6ab7b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/common/TestSeparator.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/common/TestSeparator.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/common/TestSeparator.java index 27750f3..7d37206 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/common/TestSeparator.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timelineservice/src/test/java/org/apache/hadoop/yarn/server/timelineservice/storage/common/TestSeparator.java @@ -86,7 +86,7 @@ public class TestSeparator { testEncodeDecode("Double-escape %2$ and %9$ or %%2$ or %%3$, nor %%%2$" + "= no problem!", Separator.QUALIFIERS, Separator.VALUES, Separator.SPACE, Separator.TAB); - } + } @Test public void testSplits() { @@ -101,10 +101,10 @@ public class TestSeparator { byte[] intVal1Arr = Bytes.add(sepByteArr, Bytes.copy(maxIntBytes, sepByteArr.length, Bytes.SIZEOF_INT - sepByteArr.length)); byte[] arr = separator.join( - Bytes.toBytes(separator.encode(str1)),longVal1Arr, + Bytes.toBytes(separator.encode(str1)), longVal1Arr, Bytes.toBytes(separator.encode(str2)), intVal1Arr); - int[] sizes = { Separator.VARIABLE_SIZE, Bytes.SIZEOF_LONG, - Separator.VARIABLE_SIZE, Bytes.SIZEOF_INT }; + int[] sizes = {Separator.VARIABLE_SIZE, Bytes.SIZEOF_LONG, + Separator.VARIABLE_SIZE, Bytes.SIZEOF_INT}; byte[][] splits = separator.split(arr, sizes); assertEquals(4, splits.length); assertEquals(str1, separator.decode(Bytes.toString(splits[0]))); @@ -116,7 +116,7 @@ public class TestSeparator { sepByteArr.length), sepByteArr); intVal1Arr = Bytes.add(Bytes.copy(maxIntBytes, 0, Bytes.SIZEOF_INT - sepByteArr.length), sepByteArr); - arr = separator.join(Bytes.toBytes(separator.encode(str1)),longVal1Arr, + arr = separator.join(Bytes.toBytes(separator.encode(str1)), longVal1Arr, Bytes.toBytes(separator.encode(str2)), intVal1Arr); splits = separator.split(arr, sizes); assertEquals(4, splits.length); @@ -129,7 +129,7 @@ public class TestSeparator { sepByteArr.length, 4 - sepByteArr.length), sepByteArr); longVal1Arr = Bytes.add(longVal1Arr, Bytes.copy(maxLongBytes, 4, 3 - sepByteArr.length), sepByteArr); - arr = separator.join(Bytes.toBytes(separator.encode(str1)),longVal1Arr, + arr = separator.join(Bytes.toBytes(separator.encode(str1)), longVal1Arr, Bytes.toBytes(separator.encode(str2)), intVal1Arr); splits = separator.split(arr, sizes); assertEquals(4, splits.length); @@ -140,8 +140,8 @@ public class TestSeparator { arr = separator.join(Bytes.toBytes(separator.encode(str1)), Bytes.toBytes(separator.encode(str2)), intVal1Arr, longVal1Arr); - int[] sizes1 = { Separator.VARIABLE_SIZE, Separator.VARIABLE_SIZE, - Bytes.SIZEOF_INT, Bytes.SIZEOF_LONG }; + int[] sizes1 = {Separator.VARIABLE_SIZE, Separator.VARIABLE_SIZE, + Bytes.SIZEOF_INT, Bytes.SIZEOF_LONG}; splits = separator.split(arr, sizes1); assertEquals(4, splits.length); assertEquals(str1, separator.decode(Bytes.toString(splits[0]))); @@ -150,15 +150,15 @@ public class TestSeparator { assertEquals(Bytes.toLong(longVal1Arr), Bytes.toLong(splits[3])); try { - int[] sizes2 = { Separator.VARIABLE_SIZE, Separator.VARIABLE_SIZE, - Bytes.SIZEOF_INT, 7 }; + int[] sizes2 = {Separator.VARIABLE_SIZE, Separator.VARIABLE_SIZE, + Bytes.SIZEOF_INT, 7}; splits = separator.split(arr, sizes2); fail("Exception should have been thrown."); } catch (IllegalArgumentException e) {} try { - int[] sizes2 = { Separator.VARIABLE_SIZE, Separator.VARIABLE_SIZE, 2, - Bytes.SIZEOF_LONG }; + int[] sizes2 = {Separator.VARIABLE_SIZE, Separator.VARIABLE_SIZE, 2, + Bytes.SIZEOF_LONG}; splits = separator.split(arr, sizes2); fail("Exception should have been thrown."); } catch (IllegalArgumentException e) {} @@ -196,12 +196,12 @@ public class TestSeparator { split = Separator.VALUES.splitEncoded(joined); assertTrue(Iterables.elementsEqual(stringList, split)); - String[] stringArray1 = { "else" }; + String[] stringArray1 = {"else"}; joined = Separator.VALUES.joinEncoded(stringArray1); split = Separator.VALUES.splitEncoded(joined); assertTrue(Iterables.elementsEqual(Arrays.asList(stringArray1), split)); - String[] stringArray2 = { "d", "e?", "f" }; + String[] stringArray2 = {"d", "e?", "f"}; joined = Separator.VALUES.joinEncoded(stringArray2); split = Separator.VALUES.splitEncoded(joined); assertTrue(Iterables.elementsEqual(Arrays.asList(stringArray2), split)); http://git-wip-us.apache.org/repos/asf/hadoop/blob/6cf6ab7b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md index d1ef46b..b6a0da4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServiceV2.md @@ -1197,4 +1197,3 @@ container ID. Similarly, application attempt can be queried by specifying entity 1. If any problem occurs in parsing request, HTTP 400 (Bad Request) is returned. 1. If flow context information cannot be retrieved or entity for the given entity id cannot be found, HTTP 404 (Not Found) is returned. 1. For non-recoverable errors while retrieving data, HTTP 500 (Internal Server Error) is returned. - --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
