You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2017/07/24 17:10:04 UTC
[11/19] storm git commit: STORM-1280 port
backtype.storm.daemon.logviewer to java
STORM-1280 port backtype.storm.daemon.logviewer to java
* also fixed failing tests
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/7f846915
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/7f846915
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/7f846915
Branch: refs/heads/master
Commit: 7f84691516dbbea28a780acb05bc5bae449f67cd
Parents: bb5c247
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Jul 14 14:24:20 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Jul 14 14:24:20 2017 +0900
----------------------------------------------------------------------
.../logviewer/handler/LogviewerLogSearchHandler.java | 10 ++++------
.../logviewer/handler/LogviewerLogSearchHandlerTest.java | 11 ++---------
2 files changed, 6 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/7f846915/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandler.java
----------------------------------------------------------------------
diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandler.java b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandler.java
index 7d800e7..304c2d6 100644
--- a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandler.java
+++ b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandler.java
@@ -490,10 +490,7 @@ public class LogviewerLogSearchHandler {
String afterString;
if (haystackOffset >= GREP_CONTEXT_SIZE) {
- StringBuilder sb = new StringBuilder();
- sb.append(new String(haystackBytes, (haystackOffset - GREP_CONTEXT_SIZE), GREP_CONTEXT_SIZE, "UTF-8"));
- sb.append(new String(haystackBytes, 0, haystackOffset, "UTF-8"));
- beforeString = sb.toString();
+ beforeString = new String(haystackBytes, (haystackOffset - GREP_CONTEXT_SIZE), GREP_CONTEXT_SIZE, "UTF-8");
} else {
int numDesired = Math.max(0, GREP_CONTEXT_SIZE - haystackOffset);
int beforeSize = beforeBytes != null ? beforeBytes.length : 0;
@@ -501,7 +498,7 @@ public class LogviewerLogSearchHandler {
if (numExpected > 0) {
StringBuilder sb = new StringBuilder();
- sb.append(new String(beforeBytes, numExpected - beforeSize, numExpected, "UTF-8"));
+ sb.append(new String(beforeBytes, beforeSize - numExpected, numExpected, "UTF-8"));
sb.append(new String(haystackBytes, 0, haystackOffset, "UTF-8"));
beforeString = sb.toString();
} else {
@@ -632,7 +629,8 @@ public class LogviewerLogSearchHandler {
return URLBuilder.build(String.format("http://%s:%d/api/v1/log", host, port), parameters);
}
- private String urlToMatchCenteredInLogPageDaemonFile(byte[] needle, String fname, int offset, Integer port) throws UnknownHostException {
+ @VisibleForTesting
+ String urlToMatchCenteredInLogPageDaemonFile(byte[] needle, String fname, int offset, Integer port) throws UnknownHostException {
String host = Utils.hostname();
String splittedFileName = String.join(Utils.FILE_PATH_SEPARATOR,
takeLast(Arrays.asList(fname.split(Utils.FILE_PATH_SEPARATOR)), 1));
http://git-wip-us.apache.org/repos/asf/storm/blob/7f846915/storm-webapp/src/test/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandlerTest.java
----------------------------------------------------------------------
diff --git a/storm-webapp/src/test/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandlerTest.java b/storm-webapp/src/test/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandlerTest.java
index 29dff1b..9e36b5a 100644
--- a/storm-webapp/src/test/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandlerTest.java
+++ b/storm-webapp/src/test/java/org/apache/storm/daemon/logviewer/handler/LogviewerLogSearchHandlerTest.java
@@ -117,7 +117,7 @@ public class LogviewerLogSearchHandlerTest {
when(mockedUtil.hostname()).thenReturn(expectedHost);
- String actualUrl = handler.urlToMatchCenteredInLogPage(new byte[42], expectedFname, 27526, 8888);
+ String actualUrl = handler.urlToMatchCenteredInLogPageDaemonFile(new byte[42], expectedFname, 27526, 8888);
assertEquals("http://" + expectedHost + ":" + expectedPort + "/api/v1/daemonlog?file=" + expectedFname +
"&start=1947&length=" + LogviewerConstant.DEFAULT_BYTES_PER_PAGE, actualUrl);
@@ -167,7 +167,6 @@ public class LogviewerLogSearchHandlerTest {
"/api/v1/log?file=test%2Fresources%2F" + file.getName() + "&start=0&length=51200"
));
- // FIXME: currently fail on this...
matches.add(buildMatchData(134,
" needle000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000needle ",
"\n",
@@ -255,7 +254,6 @@ public class LogviewerLogSearchHandlerTest {
}
}
- // FIXME: failing now
@Test
public void testNoOffsetReturnedWhenFileEndsOnBufferOffset() throws InvalidRequestException, UnknownHostException {
Utils prevUtils = null;
@@ -339,7 +337,6 @@ public class LogviewerLogSearchHandlerTest {
expected.put("startByteOffset", 0);
expected.put("nextByteOffset", 6252);
- // FIXME: currently failing on below...
List<Map<String, Object>> matches = new ArrayList<>();
matches.add(buildMatchData(5,
@@ -399,7 +396,6 @@ public class LogviewerLogSearchHandlerTest {
}
}
- // FIXME: this is failing...
@Test
public void testCorrectMatchOffsetIsReturnedWhenSkippingBytes() throws InvalidRequestException, UnknownHostException {
Utils prevUtils = null;
@@ -440,8 +436,6 @@ public class LogviewerLogSearchHandlerTest {
}
}
- // FIXME: this is failing...
- // java.lang.StringIndexOutOfBoundsException: String index out of range: -39
@Test
public void testAnotherPatterns1() throws UnknownHostException, InvalidRequestException {
Utils prevUtils = null;
@@ -481,7 +475,7 @@ public class LogviewerLogSearchHandlerTest {
"/api/v1/log?file=test%2Fresources%2F" + file.getName() + "&start=0&length=51200"
));
- expected.put("matches", Collections.emptyList());
+ expected.put("matches", matches);
assertEquals(expected, searchResult);
} finally {
@@ -489,7 +483,6 @@ public class LogviewerLogSearchHandlerTest {
}
}
- // FIXME: this is failing...
@Test
public void testAnotherPatterns2() throws UnknownHostException, InvalidRequestException {
Utils prevUtils = null;