Repository: tajo Updated Branches: refs/heads/index_support 5893d2c98 -> 94faf6ec8
TAJO-1252: PathValidator should allow hdfs paths which contain IP addresses. (jihoon) Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/e025e3cb Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/e025e3cb Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/e025e3cb Branch: refs/heads/index_support Commit: e025e3cbe80ab39ca963333a7d4d71edea22ce0b Parents: 82dfb17 Author: Jihoon Son <[email protected]> Authored: Wed Dec 17 16:17:25 2014 +0900 Committer: Jihoon Son <[email protected]> Committed: Wed Dec 17 16:17:25 2014 +0900 ---------------------------------------------------------------------- CHANGES | 3 +++ .../java/org/apache/tajo/validation/PathValidator.java | 2 +- .../java/org/apache/tajo/validation/TestValidators.java | 12 ++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/e025e3cb/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 98c533b..65492d2 100644 --- a/CHANGES +++ b/CHANGES @@ -109,6 +109,9 @@ Release 0.9.1 - unreleased BUG FIXES + TAJO-1252: PathValidator should allow hdfs paths which contain IP addresses. + (jihoon) + TAJO-1246: HBase info port conflict occasionally causes unit test failures in Jenkins CI. (hyunsik) http://git-wip-us.apache.org/repos/asf/tajo/blob/e025e3cb/tajo-common/src/main/java/org/apache/tajo/validation/PathValidator.java ---------------------------------------------------------------------- diff --git a/tajo-common/src/main/java/org/apache/tajo/validation/PathValidator.java b/tajo-common/src/main/java/org/apache/tajo/validation/PathValidator.java index 9548e80..34b5262 100644 --- a/tajo-common/src/main/java/org/apache/tajo/validation/PathValidator.java +++ b/tajo-common/src/main/java/org/apache/tajo/validation/PathValidator.java @@ -20,7 +20,7 @@ package org.apache.tajo.validation; public class PathValidator extends PatternValidator { static final String PATH_REGEXP_PATTERN = - "^(?:[a-zA-Z][a-zA-Z0-9+-.]+:[/]{1,2}[a-zA-Z-.]*[:0-9]*)?(?:/?[a-zA-Z]:)?[/a-zA-Z0-9-_\\\\.\\\\$\\\\{\\\\}]*$"; + "^(?:[a-zA-Z][a-zA-Z0-9+-.]+:[/]{1,2}[a-zA-Z0-9-.]*[:0-9]*)?(?:/?[a-zA-Z]:)?[/a-zA-Z0-9-_\\\\.\\\\$\\\\{\\\\}]*$"; public PathValidator() { super(PATH_REGEXP_PATTERN); http://git-wip-us.apache.org/repos/asf/tajo/blob/e025e3cb/tajo-common/src/test/java/org/apache/tajo/validation/TestValidators.java ---------------------------------------------------------------------- diff --git a/tajo-common/src/test/java/org/apache/tajo/validation/TestValidators.java b/tajo-common/src/test/java/org/apache/tajo/validation/TestValidators.java index c539a51..92e016a 100644 --- a/tajo-common/src/test/java/org/apache/tajo/validation/TestValidators.java +++ b/tajo-common/src/test/java/org/apache/tajo/validation/TestValidators.java @@ -384,6 +384,18 @@ public class TestValidators { validUrl = "/tmp/tajo-root/"; assertThat(new PathValidator().validateInternal(validUrl), is(true)); assertThat(new PathValidator().validate(validUrl).size(), is(0)); + + validUrl = "hdfs://localhost:7020/tajo-root"; + assertThat(new PathValidator().validateInternal(validUrl), is(true)); + assertThat(new PathValidator().validate(validUrl).size(), is(0)); + + validUrl = "hdfs://127.0.0.1:7020/tajo-root"; + assertThat(new PathValidator().validateInternal(validUrl), is(true)); + assertThat(new PathValidator().validate(validUrl).size(), is(0)); + + validUrl = "hdfs://192.168.0.1:7020/tajo-root"; + assertThat(new PathValidator().validateInternal(validUrl), is(true)); + assertThat(new PathValidator().validate(validUrl).size(), is(0)); String invalidUrl = "t!ef:///tmp/tajo-root"; assertThat(new PathValidator().validateInternal(invalidUrl), is(false));
