You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by ji...@apache.org on 2015/01/13 09:14:04 UTC
[1/3] tajo git commit: TAJO-1293: Tajo have to accept hostname
beginning with digits.
Repository: tajo
Updated Branches:
refs/heads/index_support 35453bbda -> a69f7b0bb
TAJO-1293: Tajo have to accept hostname beginning with digits.
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/d1a46c6b
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/d1a46c6b
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/d1a46c6b
Branch: refs/heads/index_support
Commit: d1a46c6b6e3d4f6c74519cffab1c0562640fb0e5
Parents: bc478ba
Author: Jihun Kang <ji...@apache.org>
Authored: Mon Jan 12 17:53:16 2015 +0900
Committer: Jihun Kang <ji...@apache.org>
Committed: Mon Jan 12 17:53:16 2015 +0900
----------------------------------------------------------------------
CHANGES | 3 +++
.../java/org/apache/tajo/validation/NetworkAddressValidator.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/d1a46c6b/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 5ff3143..54d72e1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -27,6 +27,9 @@ Release 0.9.1 - unreleased
IMPROVEMENT
+ TAJO-1293: Tajo have to accept hostname beginning with digits.
+ (Jinhang Choi via jihun)
+
TAJO-1281: Remove hadoop-common dependency from tajo-rpc. (hyunsik)
TAJO-1291: Rename TajoMasterProtocol to QueryCoordinatorProtocol.
http://git-wip-us.apache.org/repos/asf/tajo/blob/d1a46c6b/tajo-common/src/main/java/org/apache/tajo/validation/NetworkAddressValidator.java
----------------------------------------------------------------------
diff --git a/tajo-common/src/main/java/org/apache/tajo/validation/NetworkAddressValidator.java b/tajo-common/src/main/java/org/apache/tajo/validation/NetworkAddressValidator.java
index 7477c4c..d16d33a 100644
--- a/tajo-common/src/main/java/org/apache/tajo/validation/NetworkAddressValidator.java
+++ b/tajo-common/src/main/java/org/apache/tajo/validation/NetworkAddressValidator.java
@@ -31,7 +31,7 @@ public class NetworkAddressValidator extends AbstractValidator {
public NetworkAddressValidator() {
hostnamePattern = Pattern.compile(
- "^[a-zA-Z][-a-zA-Z0-9\\\\._]+$");
+ "^\\w[\\w-]*(\\.\\w[\\w-]*)*\\.[a-zA-Z][\\w-]*.?$|[a-zA-Z][\\w-]*.?$");
portNumberPattern = Pattern.compile("^[1-6]?[0-9]{1,4}$");
}
[2/3] tajo git commit: TAJO-1299: TB and PB representations in
StorageUnit are overflow
Posted by ji...@apache.org.
TAJO-1299: TB and PB representations in StorageUnit are overflow
Closes #348
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/9553edc9
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/9553edc9
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/9553edc9
Branch: refs/heads/index_support
Commit: 9553edc9ba0d6a0d4ff6e75b6be5d06aef91eddb
Parents: d1a46c6
Author: Jihun Kang <ji...@apache.org>
Authored: Tue Jan 13 14:02:14 2015 +0900
Committer: Jihun Kang <ji...@apache.org>
Committed: Tue Jan 13 14:02:14 2015 +0900
----------------------------------------------------------------------
CHANGES | 3 +++
.../src/main/java/org/apache/tajo/unit/StorageUnit.java | 9 +++++----
2 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/9553edc9/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 54d72e1..52ae50c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -164,6 +164,9 @@ Release 0.9.1 - unreleased
BUG FIXES
+ TAJO-1299: TB and PB representations in StorageUnit are overflow.
+ (jihun)
+
TAJO-1297: Tajo Web UI does not work after TAJO-1291. (jihoon)
TAJO-1251: Query is hanging occasionally by shuffle report. (jinho)
http://git-wip-us.apache.org/repos/asf/tajo/blob/9553edc9/tajo-common/src/main/java/org/apache/tajo/unit/StorageUnit.java
----------------------------------------------------------------------
diff --git a/tajo-common/src/main/java/org/apache/tajo/unit/StorageUnit.java b/tajo-common/src/main/java/org/apache/tajo/unit/StorageUnit.java
index dd345c1..6af84e9 100644
--- a/tajo-common/src/main/java/org/apache/tajo/unit/StorageUnit.java
+++ b/tajo-common/src/main/java/org/apache/tajo/unit/StorageUnit.java
@@ -22,8 +22,9 @@ public class StorageUnit {
public static final int B = 8;
public static final int KB = 1024;
- public static final int MB = KB * 1024;
- public static final int GB = MB * 1024;
- public static final int TB = GB * 1024;
- public static final int PB = TB * 1024;
+ public static final int MB = KB * KB;
+ public static final int GB = MB * KB;
+ // To prevent a overflow in a integer variable, this variable size increased to 64bit size.
+ public static final long TB = (long)GB * KB;
+ public static final long PB = TB * KB;
}
[3/3] tajo git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/tajo into index_support
Posted by ji...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tajo into index_support
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/a69f7b0b
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/a69f7b0b
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/a69f7b0b
Branch: refs/heads/index_support
Commit: a69f7b0bbbc77e64c5bebfae47723f6fbc705e08
Parents: 35453bb 9553edc
Author: Jihoon Son <ji...@apache.org>
Authored: Tue Jan 13 17:13:47 2015 +0900
Committer: Jihoon Son <ji...@apache.org>
Committed: Tue Jan 13 17:13:47 2015 +0900
----------------------------------------------------------------------
CHANGES | 6 ++++++
.../src/main/java/org/apache/tajo/unit/StorageUnit.java | 9 +++++----
.../org/apache/tajo/validation/NetworkAddressValidator.java | 2 +-
3 files changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------