Apache-Phoenix | 4.x-HBase-1.1 | Build Successful
4.x-HBase-1.1 branch build status Successful Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/4.x-HBase-1.1 Compiled Artifacts https://builds.apache.org/job/Phoenix-4.x-HBase-1.1/lastSuccessfulBuild/artifact/ Test Report https://builds.apache.org/job/Phoenix-4.x-HBase-1.1/lastCompletedBuild/testReport/ Changes [tdsilva] PHOENIX-2085 Include joda-time in phoenix server jar [tdsilva] PHOENIX-2075 MR integration uses single mapper unless table is salted [tdsilva] PHOENIX-2059 MR index build does not handle table with a schema name correctly Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout
phoenix git commit: PHOENIX-2074 StackOverflowError for hash join with round robin
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-0.98 517cbb78f - 446b4c08f
PHOENIX-2074 StackOverflowError for hash join with round robin
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/446b4c08
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/446b4c08
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/446b4c08
Branch: refs/heads/4.x-HBase-0.98
Commit: 446b4c08fa7c728c9c5cf0f555c1b94fd8e0c721
Parents: 517cbb7
Author: maryannxue wei@intel.com
Authored: Tue Jul 7 13:52:58 2015 -0400
Committer: maryannxue wei@intel.com
Committed: Tue Jul 7 13:52:58 2015 -0400
--
.../iterate/RoundRobinResultIteratorIT.java | 80
.../iterate/RoundRobinResultIterator.java | 2 +-
2 files changed, 81 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/446b4c08/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
--
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
index 6a9b3d4..224ed95 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
@@ -17,6 +17,7 @@
*/
package org.apache.phoenix.iterate;
+import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
@@ -30,6 +31,7 @@ import java.sql.Statement;
import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
+import java.util.Properties;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -43,6 +45,7 @@ import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixResultSet;
import org.apache.phoenix.query.ConnectionQueryServices;
import org.apache.phoenix.query.QueryServices;
+import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -301,6 +304,83 @@ public class RoundRobinResultIteratorIT extends
BaseHBaseManagedTimeIT {
assertEquals(Number of rows retrieved didnt match for tableB,
insertedRowsB, rowsB);
assertEquals(Number of rows retrieved didn't match for tableC,
insertedRowsC, rowsC);
}
+
+@Test
+public void testBug2074() throws Exception {
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+Connection conn = DriverManager.getConnection(getUrl(), props);
+try {
+conn.createStatement().execute(CREATE TABLE EVENTS
++(id VARCHAR(10) PRIMARY KEY,
++ article VARCHAR(10),
++ misc VARCHAR(10)));
+
+PreparedStatement upsertStmt = conn.prepareStatement(
+upsert into EVENTS(id, article, misc) + values (?, ?,
?));
+upsertStmt.setString(1, 001);
+upsertStmt.setString(2, A);
+upsertStmt.setString(3, W);
+upsertStmt.execute();
+upsertStmt.setString(1, 002);
+upsertStmt.setString(2, B);
+upsertStmt.setString(3, X);
+upsertStmt.execute();
+upsertStmt.setString(1, 003);
+upsertStmt.setString(2, C);
+upsertStmt.setString(3, Y);
+upsertStmt.execute();
+upsertStmt.setString(1, 004);
+upsertStmt.setString(2, D);
+upsertStmt.setString(3, Z);
+upsertStmt.execute();
+conn.commit();
+
+conn.createStatement().execute(CREATE TABLE MAPPING
++(id VARCHAR(10) PRIMARY KEY,
++ article VARCHAR(10),
++ category VARCHAR(10)));
+
+upsertStmt = conn.prepareStatement(
+upsert into MAPPING(id, article, category) + values
(?, ?, ?));
+upsertStmt.setString(1, 002);
+upsertStmt.setString(2, A);
+upsertStmt.setString(3, X);
+upsertStmt.execute();
+upsertStmt.setString(1, 003);
+upsertStmt.setString(2, B);
+upsertStmt.setString(3, Y);
+upsertStmt.execute();
+upsertStmt.setString(1, 004);
+upsertStmt.setString(2, C);
+upsertStmt.setString(3, Z);
+upsertStmt.execute();
+upsertStmt.setString(1, 005);
+
Apache-Phoenix | 4.x-HBase-1.1 | Build Successful
4.x-HBase-1.1 branch build status Successful Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/4.x-HBase-1.1 Compiled Artifacts https://builds.apache.org/job/Phoenix-4.x-HBase-1.1/lastSuccessfulBuild/artifact/ Test Report https://builds.apache.org/job/Phoenix-4.x-HBase-1.1/lastCompletedBuild/testReport/ Changes [elilevine] PHOENIX-978: allow views to extend parent's PK [enis] PHOENIX-2042 Windows need hadoop native libraries to run tests (Alicia Ying Shu) [ramkrishna] PHOENIX-1981 : PhoenixHBase Load and Store Funcs should handle all Pig data types [ramkrishna] PHOENIX-1981 : PhoenixHBase Load and Store Funcs should handle all Pig data types [ramkrishna] PHOENIX-1981 : PhoenixHBase Load and Store Funcs should handle all Pig data types [ramkrishna] minor changes based on jesses feedback [ramkrishna] PHOENIX-1875 implement ARRAY_PREPEND built in function (Dumindu) [tdsilva] PHOENIX-2085 Include joda-time in phoenix server jar [tdsilva] PHOENIX-2075 MR integration uses single mapper unless table is salted [tdsilva] PHOENIX-2059 MR index build does not handle table with a schema name correctly Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout
Apache-Phoenix | 4.x-HBase-1.1 | Build Successful
4.x-HBase-1.1 branch build status Successful Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/4.x-HBase-1.1 Compiled Artifacts https://builds.apache.org/job/Phoenix-4.x-HBase-1.1/lastSuccessfulBuild/artifact/ Test Report https://builds.apache.org/job/Phoenix-4.x-HBase-1.1/lastCompletedBuild/testReport/ Changes Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout
Build failed in Jenkins: Phoenix | Master #815
See https://builds.apache.org/job/Phoenix-master/815/changes Changes: [maryannxue] PHOENIX-2074 StackOverflowError for hash join with round robin -- [...truncated 119853 lines...] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 37.256 sec - in org.apache.phoenix.end2end.UpsertSelectAutoCommitIT Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 19.948 sec - in org.apache.phoenix.end2end.NthValueFunctionIT Running org.apache.phoenix.end2end.SqrtFunctionEnd2EndIT Running org.apache.phoenix.end2end.index.SaltedIndexIT Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 16.814 sec - in org.apache.phoenix.end2end.SqrtFunctionEnd2EndIT Running org.apache.phoenix.end2end.index.DropViewIT Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.971 sec - in org.apache.phoenix.end2end.index.DropViewIT Running org.apache.phoenix.end2end.index.ImmutableIndexIT Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 41.453 sec - in org.apache.phoenix.end2end.PhoenixRuntimeIT Running org.apache.phoenix.end2end.index.GlobalMutableIndexIT Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 122.923 sec - in org.apache.phoenix.iterate.RoundRobinResultIteratorIT Running org.apache.phoenix.end2end.index.IndexExpressionIT Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 56.673 sec - in org.apache.phoenix.end2end.index.SaltedIndexIT Running org.apache.phoenix.end2end.index.LocalIndexIT Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 150.946 sec - in org.apache.phoenix.end2end.SubqueryUsingSortMergeJoinIT Running org.apache.phoenix.end2end.index.LocalMutableIndexIT Tests run: 13, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 69.147 sec - in org.apache.phoenix.end2end.index.ImmutableIndexIT Running org.apache.phoenix.end2end.index.GlobalIndexOptimizationIT Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 125.819 sec - in org.apache.phoenix.end2end.index.GlobalIndexOptimizationIT Running org.apache.phoenix.end2end.index.IndexMetadataIT Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 264.623 sec - in org.apache.phoenix.end2end.index.GlobalMutableIndexIT Running org.apache.phoenix.end2end.index.ViewIndexIT Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 19.514 sec - in org.apache.phoenix.end2end.index.ViewIndexIT Running org.apache.phoenix.end2end.ArrayFillFunctionIT Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 119.515 sec - in org.apache.phoenix.end2end.index.IndexMetadataIT Running org.apache.phoenix.end2end.ArrayPrependFunctionIT Tests run: 26, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 34.625 sec - in org.apache.phoenix.end2end.ArrayFillFunctionIT Running org.apache.phoenix.end2end.UpsertBigValuesIT Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 265.389 sec - in org.apache.phoenix.end2end.index.LocalMutableIndexIT Running org.apache.phoenix.end2end.AutoCommitIT Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.934 sec - in org.apache.phoenix.end2end.AutoCommitIT Running org.apache.phoenix.end2end.StddevIT Tests run: 58, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 325.916 sec - in org.apache.phoenix.end2end.index.IndexExpressionIT Running org.apache.phoenix.end2end.DeleteIT Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.004 sec - in org.apache.phoenix.end2end.StddevIT Running org.apache.phoenix.end2end.FirstValueFunctionIT Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 32.894 sec - in org.apache.phoenix.end2end.UpsertBigValuesIT Running org.apache.phoenix.end2end.RegexpSubstrFunctionIT Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 11.743 sec - in org.apache.phoenix.end2end.RegexpSubstrFunctionIT Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.549 sec - in org.apache.phoenix.end2end.FirstValueFunctionIT Running org.apache.phoenix.end2end.BinaryRowKeyIT Running org.apache.phoenix.end2end.ModulusExpressionIT Tests run: 34, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 60.471 sec - in org.apache.phoenix.end2end.ArrayPrependFunctionIT Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.028 sec - in org.apache.phoenix.end2end.BinaryRowKeyIT Running org.apache.phoenix.end2end.SkipScanQueryIT Running org.apache.phoenix.end2end.SpooledSortMergeJoinIT Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 16.049 sec - in org.apache.phoenix.end2end.ModulusExpressionIT Running org.apache.phoenix.end2end.HashJoinIT Tests run: 20, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 84.65 sec - in org.apache.phoenix.end2end.DeleteIT Running org.apache.phoenix.end2end.ReadOnlyIT Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 59.366 sec - in org.apache.phoenix.end2end.SkipScanQueryIT Running org.apache.phoenix.end2end.MD5FunctionIT Tests run:
phoenix git commit: PHOENIX-2102 phoenix-pherf: Wrong parent pom in version 4.4-HBase-0.98
Repository: phoenix Updated Branches: refs/heads/4.4-HBase-0.98 47e68a71c - 055465138 PHOENIX-2102 phoenix-pherf: Wrong parent pom in version 4.4-HBase-0.98 Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/05546513 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/05546513 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/05546513 Branch: refs/heads/4.4-HBase-0.98 Commit: 0554651384899926e19fcfd9c047dac00e3bdb45 Parents: 47e68a7 Author: Josh Mahonin jmaho...@interset.com Authored: Tue Jul 7 15:44:57 2015 -0400 Committer: Josh Mahonin jmaho...@interset.com Committed: Tue Jul 7 15:51:15 2015 -0400 -- phoenix-pherf/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/05546513/phoenix-pherf/pom.xml -- diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml index 0facbde..9319a7d 100644 --- a/phoenix-pherf/pom.xml +++ b/phoenix-pherf/pom.xml @@ -23,7 +23,7 @@ parent groupIdorg.apache.phoenix/groupId artifactIdphoenix/artifactId -version4.5.0-SNAPSHOT/version +version4.4.1-HBase-0.98-SNAPSHOT/version /parent artifactIdphoenix-pherf/artifactId
phoenix git commit: PHOENIX-2074 StackOverflowError for hash join with round robin
Repository: phoenix
Updated Branches:
refs/heads/4.4-HBase-1.1 27838c48b - 93dc3d5b6
PHOENIX-2074 StackOverflowError for hash join with round robin
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/93dc3d5b
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/93dc3d5b
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/93dc3d5b
Branch: refs/heads/4.4-HBase-1.1
Commit: 93dc3d5b622aa663528a78bbac8a7cb91ac8edf6
Parents: 27838c4
Author: maryannxue wei@intel.com
Authored: Tue Jul 7 14:02:08 2015 -0400
Committer: maryannxue wei@intel.com
Committed: Tue Jul 7 14:02:08 2015 -0400
--
.../iterate/RoundRobinResultIteratorIT.java | 80
.../iterate/RoundRobinResultIterator.java | 2 +-
2 files changed, 81 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/93dc3d5b/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
--
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
index 6a9b3d4..224ed95 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
@@ -17,6 +17,7 @@
*/
package org.apache.phoenix.iterate;
+import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
@@ -30,6 +31,7 @@ import java.sql.Statement;
import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
+import java.util.Properties;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -43,6 +45,7 @@ import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixResultSet;
import org.apache.phoenix.query.ConnectionQueryServices;
import org.apache.phoenix.query.QueryServices;
+import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -301,6 +304,83 @@ public class RoundRobinResultIteratorIT extends
BaseHBaseManagedTimeIT {
assertEquals(Number of rows retrieved didnt match for tableB,
insertedRowsB, rowsB);
assertEquals(Number of rows retrieved didn't match for tableC,
insertedRowsC, rowsC);
}
+
+@Test
+public void testBug2074() throws Exception {
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+Connection conn = DriverManager.getConnection(getUrl(), props);
+try {
+conn.createStatement().execute(CREATE TABLE EVENTS
++(id VARCHAR(10) PRIMARY KEY,
++ article VARCHAR(10),
++ misc VARCHAR(10)));
+
+PreparedStatement upsertStmt = conn.prepareStatement(
+upsert into EVENTS(id, article, misc) + values (?, ?,
?));
+upsertStmt.setString(1, 001);
+upsertStmt.setString(2, A);
+upsertStmt.setString(3, W);
+upsertStmt.execute();
+upsertStmt.setString(1, 002);
+upsertStmt.setString(2, B);
+upsertStmt.setString(3, X);
+upsertStmt.execute();
+upsertStmt.setString(1, 003);
+upsertStmt.setString(2, C);
+upsertStmt.setString(3, Y);
+upsertStmt.execute();
+upsertStmt.setString(1, 004);
+upsertStmt.setString(2, D);
+upsertStmt.setString(3, Z);
+upsertStmt.execute();
+conn.commit();
+
+conn.createStatement().execute(CREATE TABLE MAPPING
++(id VARCHAR(10) PRIMARY KEY,
++ article VARCHAR(10),
++ category VARCHAR(10)));
+
+upsertStmt = conn.prepareStatement(
+upsert into MAPPING(id, article, category) + values
(?, ?, ?));
+upsertStmt.setString(1, 002);
+upsertStmt.setString(2, A);
+upsertStmt.setString(3, X);
+upsertStmt.execute();
+upsertStmt.setString(1, 003);
+upsertStmt.setString(2, B);
+upsertStmt.setString(3, Y);
+upsertStmt.execute();
+upsertStmt.setString(1, 004);
+upsertStmt.setString(2, C);
+upsertStmt.setString(3, Z);
+upsertStmt.execute();
+upsertStmt.setString(1, 005);
+
phoenix git commit: PHOENIX-2074 StackOverflowError for hash join with round robin
Repository: phoenix
Updated Branches:
refs/heads/4.4-HBase-1.0 a7333c8a6 - 8133f89d1
PHOENIX-2074 StackOverflowError for hash join with round robin
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/8133f89d
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/8133f89d
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/8133f89d
Branch: refs/heads/4.4-HBase-1.0
Commit: 8133f89d16541fa61ec9d0b8c0ced72ad2ffe851
Parents: a7333c8
Author: maryannxue wei@intel.com
Authored: Tue Jul 7 14:10:45 2015 -0400
Committer: maryannxue wei@intel.com
Committed: Tue Jul 7 14:10:45 2015 -0400
--
.../iterate/RoundRobinResultIteratorIT.java | 80
.../iterate/RoundRobinResultIterator.java | 2 +-
2 files changed, 81 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/8133f89d/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
--
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
index 6a9b3d4..224ed95 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
@@ -17,6 +17,7 @@
*/
package org.apache.phoenix.iterate;
+import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
@@ -30,6 +31,7 @@ import java.sql.Statement;
import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
+import java.util.Properties;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -43,6 +45,7 @@ import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixResultSet;
import org.apache.phoenix.query.ConnectionQueryServices;
import org.apache.phoenix.query.QueryServices;
+import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -301,6 +304,83 @@ public class RoundRobinResultIteratorIT extends
BaseHBaseManagedTimeIT {
assertEquals(Number of rows retrieved didnt match for tableB,
insertedRowsB, rowsB);
assertEquals(Number of rows retrieved didn't match for tableC,
insertedRowsC, rowsC);
}
+
+@Test
+public void testBug2074() throws Exception {
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+Connection conn = DriverManager.getConnection(getUrl(), props);
+try {
+conn.createStatement().execute(CREATE TABLE EVENTS
++(id VARCHAR(10) PRIMARY KEY,
++ article VARCHAR(10),
++ misc VARCHAR(10)));
+
+PreparedStatement upsertStmt = conn.prepareStatement(
+upsert into EVENTS(id, article, misc) + values (?, ?,
?));
+upsertStmt.setString(1, 001);
+upsertStmt.setString(2, A);
+upsertStmt.setString(3, W);
+upsertStmt.execute();
+upsertStmt.setString(1, 002);
+upsertStmt.setString(2, B);
+upsertStmt.setString(3, X);
+upsertStmt.execute();
+upsertStmt.setString(1, 003);
+upsertStmt.setString(2, C);
+upsertStmt.setString(3, Y);
+upsertStmt.execute();
+upsertStmt.setString(1, 004);
+upsertStmt.setString(2, D);
+upsertStmt.setString(3, Z);
+upsertStmt.execute();
+conn.commit();
+
+conn.createStatement().execute(CREATE TABLE MAPPING
++(id VARCHAR(10) PRIMARY KEY,
++ article VARCHAR(10),
++ category VARCHAR(10)));
+
+upsertStmt = conn.prepareStatement(
+upsert into MAPPING(id, article, category) + values
(?, ?, ?));
+upsertStmt.setString(1, 002);
+upsertStmt.setString(2, A);
+upsertStmt.setString(3, X);
+upsertStmt.execute();
+upsertStmt.setString(1, 003);
+upsertStmt.setString(2, B);
+upsertStmt.setString(3, Y);
+upsertStmt.execute();
+upsertStmt.setString(1, 004);
+upsertStmt.setString(2, C);
+upsertStmt.setString(3, Z);
+upsertStmt.execute();
+upsertStmt.setString(1, 005);
+
phoenix git commit: PHOENIX-2074 StackOverflowError for hash join with round robin
Repository: phoenix
Updated Branches:
refs/heads/master 39c982f92 - d0c8f9dbd
PHOENIX-2074 StackOverflowError for hash join with round robin
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d0c8f9db
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d0c8f9db
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d0c8f9db
Branch: refs/heads/master
Commit: d0c8f9dbd15460c023d50c8b8fd9334fb18c05dc
Parents: 39c982f
Author: maryannxue wei@intel.com
Authored: Tue Jul 7 13:27:49 2015 -0400
Committer: maryannxue wei@intel.com
Committed: Tue Jul 7 13:27:49 2015 -0400
--
.../iterate/RoundRobinResultIteratorIT.java | 80
.../iterate/RoundRobinResultIterator.java | 2 +-
2 files changed, 81 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/d0c8f9db/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
--
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
index 6a9b3d4..224ed95 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
@@ -17,6 +17,7 @@
*/
package org.apache.phoenix.iterate;
+import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
@@ -30,6 +31,7 @@ import java.sql.Statement;
import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
+import java.util.Properties;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -43,6 +45,7 @@ import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixResultSet;
import org.apache.phoenix.query.ConnectionQueryServices;
import org.apache.phoenix.query.QueryServices;
+import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -301,6 +304,83 @@ public class RoundRobinResultIteratorIT extends
BaseHBaseManagedTimeIT {
assertEquals(Number of rows retrieved didnt match for tableB,
insertedRowsB, rowsB);
assertEquals(Number of rows retrieved didn't match for tableC,
insertedRowsC, rowsC);
}
+
+@Test
+public void testBug2074() throws Exception {
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+Connection conn = DriverManager.getConnection(getUrl(), props);
+try {
+conn.createStatement().execute(CREATE TABLE EVENTS
++(id VARCHAR(10) PRIMARY KEY,
++ article VARCHAR(10),
++ misc VARCHAR(10)));
+
+PreparedStatement upsertStmt = conn.prepareStatement(
+upsert into EVENTS(id, article, misc) + values (?, ?,
?));
+upsertStmt.setString(1, 001);
+upsertStmt.setString(2, A);
+upsertStmt.setString(3, W);
+upsertStmt.execute();
+upsertStmt.setString(1, 002);
+upsertStmt.setString(2, B);
+upsertStmt.setString(3, X);
+upsertStmt.execute();
+upsertStmt.setString(1, 003);
+upsertStmt.setString(2, C);
+upsertStmt.setString(3, Y);
+upsertStmt.execute();
+upsertStmt.setString(1, 004);
+upsertStmt.setString(2, D);
+upsertStmt.setString(3, Z);
+upsertStmt.execute();
+conn.commit();
+
+conn.createStatement().execute(CREATE TABLE MAPPING
++(id VARCHAR(10) PRIMARY KEY,
++ article VARCHAR(10),
++ category VARCHAR(10)));
+
+upsertStmt = conn.prepareStatement(
+upsert into MAPPING(id, article, category) + values
(?, ?, ?));
+upsertStmt.setString(1, 002);
+upsertStmt.setString(2, A);
+upsertStmt.setString(3, X);
+upsertStmt.execute();
+upsertStmt.setString(1, 003);
+upsertStmt.setString(2, B);
+upsertStmt.setString(3, Y);
+upsertStmt.execute();
+upsertStmt.setString(1, 004);
+upsertStmt.setString(2, C);
+upsertStmt.setString(3, Z);
+upsertStmt.execute();
+upsertStmt.setString(1, 005);
+
phoenix git commit: PHOENIX-2074 StackOverflowError for hash join with round robin
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-1.0 b5cb4141c - 193fd92ec
PHOENIX-2074 StackOverflowError for hash join with round robin
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/193fd92e
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/193fd92e
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/193fd92e
Branch: refs/heads/4.x-HBase-1.0
Commit: 193fd92ec0892b08f24823da2d62395fb647ffb0
Parents: b5cb414
Author: maryannxue wei@intel.com
Authored: Tue Jul 7 13:34:45 2015 -0400
Committer: maryannxue wei@intel.com
Committed: Tue Jul 7 13:34:45 2015 -0400
--
.../iterate/RoundRobinResultIteratorIT.java | 80
.../iterate/RoundRobinResultIterator.java | 2 +-
2 files changed, 81 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/193fd92e/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
--
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
index 6a9b3d4..224ed95 100644
---
a/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
+++
b/phoenix-core/src/it/java/org/apache/phoenix/iterate/RoundRobinResultIteratorIT.java
@@ -17,6 +17,7 @@
*/
package org.apache.phoenix.iterate;
+import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
@@ -30,6 +31,7 @@ import java.sql.Statement;
import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
+import java.util.Properties;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -43,6 +45,7 @@ import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.jdbc.PhoenixResultSet;
import org.apache.phoenix.query.ConnectionQueryServices;
import org.apache.phoenix.query.QueryServices;
+import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -301,6 +304,83 @@ public class RoundRobinResultIteratorIT extends
BaseHBaseManagedTimeIT {
assertEquals(Number of rows retrieved didnt match for tableB,
insertedRowsB, rowsB);
assertEquals(Number of rows retrieved didn't match for tableC,
insertedRowsC, rowsC);
}
+
+@Test
+public void testBug2074() throws Exception {
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+Connection conn = DriverManager.getConnection(getUrl(), props);
+try {
+conn.createStatement().execute(CREATE TABLE EVENTS
++(id VARCHAR(10) PRIMARY KEY,
++ article VARCHAR(10),
++ misc VARCHAR(10)));
+
+PreparedStatement upsertStmt = conn.prepareStatement(
+upsert into EVENTS(id, article, misc) + values (?, ?,
?));
+upsertStmt.setString(1, 001);
+upsertStmt.setString(2, A);
+upsertStmt.setString(3, W);
+upsertStmt.execute();
+upsertStmt.setString(1, 002);
+upsertStmt.setString(2, B);
+upsertStmt.setString(3, X);
+upsertStmt.execute();
+upsertStmt.setString(1, 003);
+upsertStmt.setString(2, C);
+upsertStmt.setString(3, Y);
+upsertStmt.execute();
+upsertStmt.setString(1, 004);
+upsertStmt.setString(2, D);
+upsertStmt.setString(3, Z);
+upsertStmt.execute();
+conn.commit();
+
+conn.createStatement().execute(CREATE TABLE MAPPING
++(id VARCHAR(10) PRIMARY KEY,
++ article VARCHAR(10),
++ category VARCHAR(10)));
+
+upsertStmt = conn.prepareStatement(
+upsert into MAPPING(id, article, category) + values
(?, ?, ?));
+upsertStmt.setString(1, 002);
+upsertStmt.setString(2, A);
+upsertStmt.setString(3, X);
+upsertStmt.execute();
+upsertStmt.setString(1, 003);
+upsertStmt.setString(2, B);
+upsertStmt.setString(3, Y);
+upsertStmt.execute();
+upsertStmt.setString(1, 004);
+upsertStmt.setString(2, C);
+upsertStmt.setString(3, Z);
+upsertStmt.execute();
+upsertStmt.setString(1, 005);
+
phoenix git commit: PHOENIX-2025 Phoenix-core's hbase-default.xml prevents HBaseTestingUtility from starting up in client apps (Mujtaba Chohan)
Repository: phoenix
Updated Branches:
refs/heads/4.4-HBase-1.0 8133f89d1 - cac6d5767
PHOENIX-2025 Phoenix-core's hbase-default.xml prevents HBaseTestingUtility from
starting up in client apps (Mujtaba Chohan)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/cac6d576
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/cac6d576
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/cac6d576
Branch: refs/heads/4.4-HBase-1.0
Commit: cac6d576758a6cb0eb010d04ed8fa70f272d1cf0
Parents: 8133f89
Author: Thomas D'Silva tdsi...@salesforce.com
Authored: Tue Jul 7 13:40:18 2015 -0700
Committer: Thomas D'Silva tdsi...@salesforce.com
Committed: Tue Jul 7 13:42:59 2015 -0700
--
.../apache/phoenix/mapreduce/util/ConnectionUtil.java | 9 +
.../mapreduce/util/PhoenixConfigurationUtil.java| 12
2 files changed, 17 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/cac6d576/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
index 294d4e9..000ce59 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
@@ -54,7 +54,7 @@ public class ConnectionUtil {
*/
public static Connection getInputConnection(final Configuration conf ,
final Properties props) throws SQLException {
Preconditions.checkNotNull(conf);
-return getConnection(PhoenixConfigurationUtil.getInputCluster(conf),
+return getConnection(PhoenixConfigurationUtil.getInputCluster(conf),
PhoenixConfigurationUtil.getClientPort(conf),
PropertiesUtil.extractProperties(props, conf));
}
@@ -77,7 +77,7 @@ public class ConnectionUtil {
*/
public static Connection getOutputConnection(final Configuration conf,
Properties props) throws SQLException {
Preconditions.checkNotNull(conf);
-return getConnection(PhoenixConfigurationUtil.getOutputCluster(conf),
+return getConnection(PhoenixConfigurationUtil.getOutputCluster(conf),
PhoenixConfigurationUtil.getClientPort(conf),
PropertiesUtil.extractProperties(props, conf));
}
@@ -85,11 +85,12 @@ public class ConnectionUtil {
* Returns the {@link Connection} from a ZooKeeper cluster string.
*
* @param quorum a ZooKeeper quorum connection string
+ * @param clientPort a ZooKeeper client port
* @return a Phoenix connection to the given connection string
*/
-private static Connection getConnection(final String quorum, Properties
props) throws SQLException {
+private static Connection getConnection(final String quorum, final int
clientPort, Properties props) throws SQLException {
Preconditions.checkNotNull(quorum);
-return DriverManager.getConnection(QueryUtil.getUrl(quorum), props);
+return DriverManager.getConnection(QueryUtil.getUrl(quorum,
clientPort), props);
}
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/cac6d576/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
index 6e0e5e4..bba96ac 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
@@ -94,6 +94,8 @@ public final class PhoenixConfigurationUtil {
public static final String MAPREDUCE_INPUT_CLUSTER_QUORUM =
phoenix.mapreduce.input.cluster.quorum;
public static final String MAPREDUCE_OUTPUT_CLUSTER_QUORUM =
phoneix.mapreduce.output.cluster.quorum;
+
+public static final String HBASE_ZOOKEEPER_CLIENT_PORT =
hbase.zookeeper.property.clientPort;
public enum SchemaType {
TABLE,
@@ -363,6 +365,16 @@ public final class PhoenixConfigurationUtil {
}
return quorum;
}
+
+/**
+ * Returns the HBase Client Port
+ * @param configuration
+ * @return
+ */
+public static int getClientPort(final Configuration configuration) {
+Preconditions.checkNotNull(configuration);
+return
Integer.parseInt(configuration.get(HBASE_ZOOKEEPER_CLIENT_PORT));
+}
Build failed in Jenkins: Phoenix | Master #816
See https://builds.apache.org/job/Phoenix-master/816/changes Changes: [tdsilva] PHOENIX-2025 Phoenix-core's hbase-default.xml prevents HBaseTestingUtility from starting up in client apps (Mujtaba Chohan) -- [...truncated 119567 lines...] Running org.apache.phoenix.expression.PowerFunctionTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.349 sec - in org.apache.phoenix.compile.ViewCompilerTest Running org.apache.phoenix.compile.WhereCompilerTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.019 sec - in org.apache.phoenix.expression.PowerFunctionTest Running org.apache.phoenix.expression.DeterminismTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0 sec - in org.apache.phoenix.expression.DeterminismTest Running org.apache.phoenix.expression.RoundFloorCeilExpressionsTest Tests run: 37, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.771 sec - in org.apache.phoenix.compile.QueryOptimizerTest Running org.apache.phoenix.compile.ScanRangesTest Tests run: 34, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.02 sec - in org.apache.phoenix.compile.ScanRangesTest Running org.apache.phoenix.compile.HavingCompilerTest Tests run: 43, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.465 sec - in org.apache.phoenix.compile.WhereCompilerTest Running org.apache.phoenix.compile.QueryCompilerTest Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.097 sec - in org.apache.phoenix.compile.HavingCompilerTest Running org.apache.phoenix.index.IndexMaintainerTest Tests run: 21, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.498 sec - in org.apache.phoenix.expression.RoundFloorCeilExpressionsTest Running org.apache.phoenix.expression.CbrtFunctionTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.006 sec - in org.apache.phoenix.expression.CbrtFunctionTest Running org.apache.phoenix.expression.SqrtFunctionTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.007 sec - in org.apache.phoenix.expression.SqrtFunctionTest Running org.apache.phoenix.expression.RegexpReplaceFunctionTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.116 sec - in org.apache.phoenix.expression.RegexpReplaceFunctionTest Running org.apache.phoenix.expression.function.ExternalSqlTypeIdFunctionTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 sec - in org.apache.phoenix.expression.function.ExternalSqlTypeIdFunctionTest Running org.apache.phoenix.expression.SortOrderExpressionTest Tests run: 24, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.038 sec - in org.apache.phoenix.expression.SortOrderExpressionTest Running org.apache.phoenix.jdbc.PhoenixResultSetMetadataTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.099 sec - in org.apache.phoenix.jdbc.PhoenixResultSetMetadataTest Running org.apache.phoenix.iterate.MergeSortResultIteratorTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.005 sec - in org.apache.phoenix.iterate.MergeSortResultIteratorTest Running org.apache.phoenix.query.KeyRangeCoalesceTest Tests run: 13, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.019 sec - in org.apache.phoenix.query.KeyRangeCoalesceTest Running org.apache.phoenix.query.QueryPlanTest Tests run: 23, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.395 sec - in org.apache.phoenix.index.IndexMaintainerTest Running org.apache.phoenix.hbase.index.covered.TestLocalTableState Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.316 sec - in org.apache.phoenix.query.QueryPlanTest Running org.apache.phoenix.query.HBaseFactoryProviderTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.002 sec - in org.apache.phoenix.query.HBaseFactoryProviderTest Running org.apache.phoenix.mapreduce.CsvBulkImportUtilTest Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.051 sec - in org.apache.phoenix.mapreduce.CsvBulkImportUtilTest Running org.apache.phoenix.filter.SkipScanBigFilterTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.309 sec - in org.apache.phoenix.hbase.index.covered.TestLocalTableState Running org.apache.phoenix.hbase.index.covered.example.TestColumnTracker Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 sec - in org.apache.phoenix.hbase.index.covered.example.TestColumnTracker Running org.apache.phoenix.hbase.index.covered.TestCoveredColumns Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0 sec - in org.apache.phoenix.hbase.index.covered.TestCoveredColumns Running org.apache.phoenix.hbase.index.covered.filter.TestApplyAndFilterDeletesFilter Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.002 sec - in org.apache.phoenix.hbase.index.covered.filter.TestApplyAndFilterDeletesFilter Running org.apache.phoenix.hbase.index.write.recovery.TestPerRegionIndexWriteCache Tests run: 106,
phoenix git commit: PHOENIX-2025 Phoenix-core's hbase-default.xml prevents HBaseTestingUtility from starting up in client apps (Mujtaba Chohan)
Repository: phoenix
Updated Branches:
refs/heads/4.4-HBase-1.1 93dc3d5b6 - 5a6b9967b
PHOENIX-2025 Phoenix-core's hbase-default.xml prevents HBaseTestingUtility from
starting up in client apps (Mujtaba Chohan)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/5a6b9967
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/5a6b9967
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/5a6b9967
Branch: refs/heads/4.4-HBase-1.1
Commit: 5a6b9967b06bc71ab8805796f218a989c203f047
Parents: 93dc3d5
Author: Thomas D'Silva tdsi...@salesforce.com
Authored: Tue Jul 7 13:40:18 2015 -0700
Committer: Thomas D'Silva tdsi...@salesforce.com
Committed: Tue Jul 7 13:44:03 2015 -0700
--
.../apache/phoenix/mapreduce/util/ConnectionUtil.java | 9 +
.../mapreduce/util/PhoenixConfigurationUtil.java| 12
2 files changed, 17 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/5a6b9967/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
index 294d4e9..000ce59 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
@@ -54,7 +54,7 @@ public class ConnectionUtil {
*/
public static Connection getInputConnection(final Configuration conf ,
final Properties props) throws SQLException {
Preconditions.checkNotNull(conf);
-return getConnection(PhoenixConfigurationUtil.getInputCluster(conf),
+return getConnection(PhoenixConfigurationUtil.getInputCluster(conf),
PhoenixConfigurationUtil.getClientPort(conf),
PropertiesUtil.extractProperties(props, conf));
}
@@ -77,7 +77,7 @@ public class ConnectionUtil {
*/
public static Connection getOutputConnection(final Configuration conf,
Properties props) throws SQLException {
Preconditions.checkNotNull(conf);
-return getConnection(PhoenixConfigurationUtil.getOutputCluster(conf),
+return getConnection(PhoenixConfigurationUtil.getOutputCluster(conf),
PhoenixConfigurationUtil.getClientPort(conf),
PropertiesUtil.extractProperties(props, conf));
}
@@ -85,11 +85,12 @@ public class ConnectionUtil {
* Returns the {@link Connection} from a ZooKeeper cluster string.
*
* @param quorum a ZooKeeper quorum connection string
+ * @param clientPort a ZooKeeper client port
* @return a Phoenix connection to the given connection string
*/
-private static Connection getConnection(final String quorum, Properties
props) throws SQLException {
+private static Connection getConnection(final String quorum, final int
clientPort, Properties props) throws SQLException {
Preconditions.checkNotNull(quorum);
-return DriverManager.getConnection(QueryUtil.getUrl(quorum), props);
+return DriverManager.getConnection(QueryUtil.getUrl(quorum,
clientPort), props);
}
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/5a6b9967/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
index 6e0e5e4..bba96ac 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
@@ -94,6 +94,8 @@ public final class PhoenixConfigurationUtil {
public static final String MAPREDUCE_INPUT_CLUSTER_QUORUM =
phoenix.mapreduce.input.cluster.quorum;
public static final String MAPREDUCE_OUTPUT_CLUSTER_QUORUM =
phoneix.mapreduce.output.cluster.quorum;
+
+public static final String HBASE_ZOOKEEPER_CLIENT_PORT =
hbase.zookeeper.property.clientPort;
public enum SchemaType {
TABLE,
@@ -363,6 +365,16 @@ public final class PhoenixConfigurationUtil {
}
return quorum;
}
+
+/**
+ * Returns the HBase Client Port
+ * @param configuration
+ * @return
+ */
+public static int getClientPort(final Configuration configuration) {
+Preconditions.checkNotNull(configuration);
+return
Integer.parseInt(configuration.get(HBASE_ZOOKEEPER_CLIENT_PORT));
+}
phoenix git commit: PHOENIX-2025 Phoenix-core's hbase-default.xml prevents HBaseTestingUtility from starting up in client apps (Mujtaba Chohan)
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-1.0 193fd92ec - f17e26775
PHOENIX-2025 Phoenix-core's hbase-default.xml prevents HBaseTestingUtility from
starting up in client apps (Mujtaba Chohan)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/f17e2677
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/f17e2677
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/f17e2677
Branch: refs/heads/4.x-HBase-1.0
Commit: f17e26775ccf47d6d8aa4b9df4fa96a85d68b9e3
Parents: 193fd92
Author: Thomas D'Silva tdsi...@salesforce.com
Authored: Tue Jul 7 13:40:18 2015 -0700
Committer: Thomas D'Silva tdsi...@salesforce.com
Committed: Tue Jul 7 13:46:47 2015 -0700
--
.../apache/phoenix/mapreduce/util/ConnectionUtil.java | 9 +
.../mapreduce/util/PhoenixConfigurationUtil.java| 12
2 files changed, 17 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/f17e2677/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
index 294d4e9..000ce59 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
@@ -54,7 +54,7 @@ public class ConnectionUtil {
*/
public static Connection getInputConnection(final Configuration conf ,
final Properties props) throws SQLException {
Preconditions.checkNotNull(conf);
-return getConnection(PhoenixConfigurationUtil.getInputCluster(conf),
+return getConnection(PhoenixConfigurationUtil.getInputCluster(conf),
PhoenixConfigurationUtil.getClientPort(conf),
PropertiesUtil.extractProperties(props, conf));
}
@@ -77,7 +77,7 @@ public class ConnectionUtil {
*/
public static Connection getOutputConnection(final Configuration conf,
Properties props) throws SQLException {
Preconditions.checkNotNull(conf);
-return getConnection(PhoenixConfigurationUtil.getOutputCluster(conf),
+return getConnection(PhoenixConfigurationUtil.getOutputCluster(conf),
PhoenixConfigurationUtil.getClientPort(conf),
PropertiesUtil.extractProperties(props, conf));
}
@@ -85,11 +85,12 @@ public class ConnectionUtil {
* Returns the {@link Connection} from a ZooKeeper cluster string.
*
* @param quorum a ZooKeeper quorum connection string
+ * @param clientPort a ZooKeeper client port
* @return a Phoenix connection to the given connection string
*/
-private static Connection getConnection(final String quorum, Properties
props) throws SQLException {
+private static Connection getConnection(final String quorum, final int
clientPort, Properties props) throws SQLException {
Preconditions.checkNotNull(quorum);
-return DriverManager.getConnection(QueryUtil.getUrl(quorum), props);
+return DriverManager.getConnection(QueryUtil.getUrl(quorum,
clientPort), props);
}
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/f17e2677/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
index 6e0e5e4..bba96ac 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
@@ -94,6 +94,8 @@ public final class PhoenixConfigurationUtil {
public static final String MAPREDUCE_INPUT_CLUSTER_QUORUM =
phoenix.mapreduce.input.cluster.quorum;
public static final String MAPREDUCE_OUTPUT_CLUSTER_QUORUM =
phoneix.mapreduce.output.cluster.quorum;
+
+public static final String HBASE_ZOOKEEPER_CLIENT_PORT =
hbase.zookeeper.property.clientPort;
public enum SchemaType {
TABLE,
@@ -363,6 +365,16 @@ public final class PhoenixConfigurationUtil {
}
return quorum;
}
+
+/**
+ * Returns the HBase Client Port
+ * @param configuration
+ * @return
+ */
+public static int getClientPort(final Configuration configuration) {
+Preconditions.checkNotNull(configuration);
+return
Integer.parseInt(configuration.get(HBASE_ZOOKEEPER_CLIENT_PORT));
+}
phoenix git commit: PHOENIX-2025 Phoenix-core's hbase-default.xml prevents HBaseTestingUtility from starting up in client apps (Mujtaba Chohan)
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-0.98 446b4c08f - 69a2948ac
PHOENIX-2025 Phoenix-core's hbase-default.xml prevents HBaseTestingUtility from
starting up in client apps (Mujtaba Chohan)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/69a2948a
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/69a2948a
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/69a2948a
Branch: refs/heads/4.x-HBase-0.98
Commit: 69a2948acfd49cfd984bb824961f56bf15525905
Parents: 446b4c0
Author: Thomas D'Silva tdsi...@salesforce.com
Authored: Tue Jul 7 13:40:18 2015 -0700
Committer: Thomas D'Silva tdsi...@salesforce.com
Committed: Tue Jul 7 13:45:55 2015 -0700
--
.../apache/phoenix/mapreduce/util/ConnectionUtil.java | 9 +
.../mapreduce/util/PhoenixConfigurationUtil.java| 12
2 files changed, 17 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/69a2948a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
index 294d4e9..000ce59 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
@@ -54,7 +54,7 @@ public class ConnectionUtil {
*/
public static Connection getInputConnection(final Configuration conf ,
final Properties props) throws SQLException {
Preconditions.checkNotNull(conf);
-return getConnection(PhoenixConfigurationUtil.getInputCluster(conf),
+return getConnection(PhoenixConfigurationUtil.getInputCluster(conf),
PhoenixConfigurationUtil.getClientPort(conf),
PropertiesUtil.extractProperties(props, conf));
}
@@ -77,7 +77,7 @@ public class ConnectionUtil {
*/
public static Connection getOutputConnection(final Configuration conf,
Properties props) throws SQLException {
Preconditions.checkNotNull(conf);
-return getConnection(PhoenixConfigurationUtil.getOutputCluster(conf),
+return getConnection(PhoenixConfigurationUtil.getOutputCluster(conf),
PhoenixConfigurationUtil.getClientPort(conf),
PropertiesUtil.extractProperties(props, conf));
}
@@ -85,11 +85,12 @@ public class ConnectionUtil {
* Returns the {@link Connection} from a ZooKeeper cluster string.
*
* @param quorum a ZooKeeper quorum connection string
+ * @param clientPort a ZooKeeper client port
* @return a Phoenix connection to the given connection string
*/
-private static Connection getConnection(final String quorum, Properties
props) throws SQLException {
+private static Connection getConnection(final String quorum, final int
clientPort, Properties props) throws SQLException {
Preconditions.checkNotNull(quorum);
-return DriverManager.getConnection(QueryUtil.getUrl(quorum), props);
+return DriverManager.getConnection(QueryUtil.getUrl(quorum,
clientPort), props);
}
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/69a2948a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
index 6e0e5e4..bba96ac 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
@@ -94,6 +94,8 @@ public final class PhoenixConfigurationUtil {
public static final String MAPREDUCE_INPUT_CLUSTER_QUORUM =
phoenix.mapreduce.input.cluster.quorum;
public static final String MAPREDUCE_OUTPUT_CLUSTER_QUORUM =
phoneix.mapreduce.output.cluster.quorum;
+
+public static final String HBASE_ZOOKEEPER_CLIENT_PORT =
hbase.zookeeper.property.clientPort;
public enum SchemaType {
TABLE,
@@ -363,6 +365,16 @@ public final class PhoenixConfigurationUtil {
}
return quorum;
}
+
+/**
+ * Returns the HBase Client Port
+ * @param configuration
+ * @return
+ */
+public static int getClientPort(final Configuration configuration) {
+Preconditions.checkNotNull(configuration);
+return
Integer.parseInt(configuration.get(HBASE_ZOOKEEPER_CLIENT_PORT));
+}
Apache-Phoenix | 4.x-HBase-1.1 | Build Successful
4.x-HBase-1.1 branch build status Successful Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/4.x-HBase-1.1 Compiled Artifacts https://builds.apache.org/job/Phoenix-4.x-HBase-1.1/lastSuccessfulBuild/artifact/ Test Report https://builds.apache.org/job/Phoenix-4.x-HBase-1.1/lastCompletedBuild/testReport/ Changes Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout
Apache-Phoenix | 4.x-HBase-1.1 | Build Successful
4.x-HBase-1.1 branch build status Successful Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/4.x-HBase-1.1 Compiled Artifacts https://builds.apache.org/job/Phoenix-4.x-HBase-1.1/lastSuccessfulBuild/artifact/ Test Report https://builds.apache.org/job/Phoenix-4.x-HBase-1.1/lastCompletedBuild/testReport/ Changes [ndimiduk] PHOENIX-2012 RowKeyComparisonFilter logs unencoded data at DEBUG level [ramkrishna] PHOENIX-777 - Support null value for fixed length ARRAY (Dumindu Buddhika) [ramkrishna] PHOENIX-777 - Support null value for fixed length ARRAY - Addendum (Ram) [rajeshbabu] PHOENIX-1978 UDF ArgumentTypeMismatchException(Rajeshbabu) [rajeshbabu] PHOENIX-2027 Subqueries with no data are raising IllegalStateException(Alicia Ying Shu) [ravimagham] PHOENIX-1968: Should support saving arrays [ndimiduk] PHOENIX-2033 PQS log environment details on launch [ndimiduk] PHOENIX-2032 psql.py is broken after PHOENIX-2013 [ndimiduk] PHOENIX-2040 Mark spark/scala dependencies as 'provided' (Josh Mahonin) [tdsilva] PHOENIX-2029 Queries are making two rpc calls for getTable [ndimiduk] PHOENIX-1941 Phoenix tests are failing in linux env with missing class: StaticMapping (Alicia Ying Shu) [ndimiduk] PHOENIX-1935 org.apache.phoenix.end2end.ArithmeticQueryIT tests are failing (Alicia Ying Shu) [ndimiduk] PHOENIX-1975 Detect and use HBASE_HOME when set [tdsilva] PHOENIX-2073 Two bytes character in LIKE _expression_ is not allowed (Yuhao Bi) [gabrielr] LP-1277 Support nulls in CHAR fields in CSV loader [jmahonin] PHOENIX-1659 PhoenixDatabaseMetaData.getColumns does not return REMARKS column [jmahonin] PHOENIX-1659 PhoenixDatabaseMetaData.getColumns does not return REMARKS column [elilevine] PHOENIX-978: allow views to extend parent's PK [enis] PHOENIX-2042 Windows need hadoop native libraries to run tests (Alicia Ying Shu) Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout
Apache-Phoenix | 4.x-HBase-1.1 | Build Successful
4.x-HBase-1.1 branch build status Successful Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/4.x-HBase-1.1 Compiled Artifacts https://builds.apache.org/job/Phoenix-4.x-HBase-1.1/lastSuccessfulBuild/artifact/ Test Report https://builds.apache.org/job/Phoenix-4.x-HBase-1.1/lastCompletedBuild/testReport/ Changes [ramkrishna] PHOENIX-1981 : PhoenixHBase Load and Store Funcs should handle all Pig data types [ramkrishna] PHOENIX-1981 : PhoenixHBase Load and Store Funcs should handle all Pig data types [ramkrishna] PHOENIX-1981 : PhoenixHBase Load and Store Funcs should handle all Pig data types [ramkrishna] minor changes based on jesses feedback [ramkrishna] PHOENIX-1875 implement ARRAY_PREPEND built in function (Dumindu) [tdsilva] PHOENIX-2085 Include joda-time in phoenix server jar [tdsilva] PHOENIX-2075 MR integration uses single mapper unless table is salted [tdsilva] PHOENIX-2059 MR index build does not handle table with a schema name correctly Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout
Apache-Phoenix | 4.x-HBase-1.1 | Build Successful
4.x-HBase-1.1 branch build status Successful Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/4.x-HBase-1.1 Compiled Artifacts https://builds.apache.org/job/Phoenix-4.x-HBase-1.1/lastSuccessfulBuild/artifact/ Test Report https://builds.apache.org/job/Phoenix-4.x-HBase-1.1/lastCompletedBuild/testReport/ Changes Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout
Apache-Phoenix | 4.x-HBase-1.1 | Build Successful
4.x-HBase-1.1 branch build status Successful Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/4.x-HBase-1.1 Compiled Artifacts https://builds.apache.org/job/Phoenix-4.x-HBase-1.1/lastSuccessfulBuild/artifact/ Test Report https://builds.apache.org/job/Phoenix-4.x-HBase-1.1/lastCompletedBuild/testReport/ Changes Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout
[4/6] phoenix git commit: PHOENIX-2025 - Phoenix-core's hbase-default.xml prevents HBaseTestingUtility from starting up in client apps - (Thomas D'Silva)
PHOENIX-2025 - Phoenix-core's hbase-default.xml prevents HBaseTestingUtility
from starting up in client apps - (Thomas D'Silva)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/3c6b6ac3
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/3c6b6ac3
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/3c6b6ac3
Branch: refs/heads/4.4-HBase-1.1
Commit: 3c6b6ac36af759320baee20fe833e19feff67b25
Parents: 5a6b996
Author: ravimagham ravimag...@apache.org
Authored: Tue Jul 7 22:13:42 2015 -0700
Committer: ravimagham ravimag...@apache.org
Committed: Tue Jul 7 22:13:42 2015 -0700
--
.../java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java | 4 ++--
.../phoenix/mapreduce/util/PhoenixConfigurationUtil.java | 6 --
2 files changed, 6 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/3c6b6ac3/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
index 000ce59..b4724d8 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
@@ -88,9 +88,9 @@ public class ConnectionUtil {
* @param clientPort a ZooKeeper client port
* @return a Phoenix connection to the given connection string
*/
-private static Connection getConnection(final String quorum, final int
clientPort, Properties props) throws SQLException {
+private static Connection getConnection(final String quorum, final Integer
clientPort, Properties props) throws SQLException {
Preconditions.checkNotNull(quorum);
-return DriverManager.getConnection(QueryUtil.getUrl(quorum,
clientPort), props);
+return DriverManager.getConnection(clientPort!=null?
QueryUtil.getUrl(quorum, clientPort) : QueryUtil.getUrl(quorum), props);
}
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/3c6b6ac3/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
index bba96ac..e26f988 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
@@ -27,6 +27,7 @@ import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
@@ -371,9 +372,10 @@ public final class PhoenixConfigurationUtil {
* @param configuration
* @return
*/
-public static int getClientPort(final Configuration configuration) {
+public static Integer getClientPort(final Configuration configuration) {
Preconditions.checkNotNull(configuration);
-return
Integer.parseInt(configuration.get(HBASE_ZOOKEEPER_CLIENT_PORT));
+String clientPortString =
configuration.get(HBASE_ZOOKEEPER_CLIENT_PORT);
+return clientPortString==null ? null :
Integer.parseInt(clientPortString);
}
public static void loadHBaseConfiguration(Job job) throws IOException {
[5/6] phoenix git commit: PHOENIX-2025 - Phoenix-core's hbase-default.xml prevents HBaseTestingUtility from starting up in client apps - (Thomas D'Silva)
PHOENIX-2025 - Phoenix-core's hbase-default.xml prevents HBaseTestingUtility
from starting up in client apps - (Thomas D'Silva)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/b82c5cbc
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/b82c5cbc
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/b82c5cbc
Branch: refs/heads/4.x-HBase-0.98
Commit: b82c5cbccdf4eb944238e69a514841be361bfb6d
Parents: 69a2948
Author: ravimagham ravimag...@apache.org
Authored: Tue Jul 7 22:15:07 2015 -0700
Committer: ravimagham ravimag...@apache.org
Committed: Tue Jul 7 22:15:07 2015 -0700
--
.../java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java | 4 ++--
.../phoenix/mapreduce/util/PhoenixConfigurationUtil.java | 6 --
2 files changed, 6 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b82c5cbc/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
index 000ce59..b4724d8 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
@@ -88,9 +88,9 @@ public class ConnectionUtil {
* @param clientPort a ZooKeeper client port
* @return a Phoenix connection to the given connection string
*/
-private static Connection getConnection(final String quorum, final int
clientPort, Properties props) throws SQLException {
+private static Connection getConnection(final String quorum, final Integer
clientPort, Properties props) throws SQLException {
Preconditions.checkNotNull(quorum);
-return DriverManager.getConnection(QueryUtil.getUrl(quorum,
clientPort), props);
+return DriverManager.getConnection(clientPort!=null?
QueryUtil.getUrl(quorum, clientPort) : QueryUtil.getUrl(quorum), props);
}
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b82c5cbc/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
index bba96ac..e26f988 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
@@ -27,6 +27,7 @@ import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
@@ -371,9 +372,10 @@ public final class PhoenixConfigurationUtil {
* @param configuration
* @return
*/
-public static int getClientPort(final Configuration configuration) {
+public static Integer getClientPort(final Configuration configuration) {
Preconditions.checkNotNull(configuration);
-return
Integer.parseInt(configuration.get(HBASE_ZOOKEEPER_CLIENT_PORT));
+String clientPortString =
configuration.get(HBASE_ZOOKEEPER_CLIENT_PORT);
+return clientPortString==null ? null :
Integer.parseInt(clientPortString);
}
public static void loadHBaseConfiguration(Job job) throws IOException {
[6/6] phoenix git commit: PHOENIX-2025 - Phoenix-core's hbase-default.xml prevents HBaseTestingUtility from starting up in client apps - (Thomas D'Silva)
PHOENIX-2025 - Phoenix-core's hbase-default.xml prevents HBaseTestingUtility
from starting up in client apps - (Thomas D'Silva)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/926b3160
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/926b3160
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/926b3160
Branch: refs/heads/4.x-HBase-1.0
Commit: 926b31605af7d7c628f6f32b1959a370f3ec
Parents: f17e267
Author: ravimagham ravimag...@apache.org
Authored: Tue Jul 7 22:15:40 2015 -0700
Committer: ravimagham ravimag...@apache.org
Committed: Tue Jul 7 22:15:40 2015 -0700
--
.../java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java | 4 ++--
.../phoenix/mapreduce/util/PhoenixConfigurationUtil.java | 6 --
2 files changed, 6 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/926b3160/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
index 000ce59..b4724d8 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
@@ -88,9 +88,9 @@ public class ConnectionUtil {
* @param clientPort a ZooKeeper client port
* @return a Phoenix connection to the given connection string
*/
-private static Connection getConnection(final String quorum, final int
clientPort, Properties props) throws SQLException {
+private static Connection getConnection(final String quorum, final Integer
clientPort, Properties props) throws SQLException {
Preconditions.checkNotNull(quorum);
-return DriverManager.getConnection(QueryUtil.getUrl(quorum,
clientPort), props);
+return DriverManager.getConnection(clientPort!=null?
QueryUtil.getUrl(quorum, clientPort) : QueryUtil.getUrl(quorum), props);
}
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/926b3160/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
index bba96ac..e26f988 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
@@ -27,6 +27,7 @@ import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
@@ -371,9 +372,10 @@ public final class PhoenixConfigurationUtil {
* @param configuration
* @return
*/
-public static int getClientPort(final Configuration configuration) {
+public static Integer getClientPort(final Configuration configuration) {
Preconditions.checkNotNull(configuration);
-return
Integer.parseInt(configuration.get(HBASE_ZOOKEEPER_CLIENT_PORT));
+String clientPortString =
configuration.get(HBASE_ZOOKEEPER_CLIENT_PORT);
+return clientPortString==null ? null :
Integer.parseInt(clientPortString);
}
public static void loadHBaseConfiguration(Job job) throws IOException {
[3/6] phoenix git commit: PHOENIX-2025 - Phoenix-core's hbase-default.xml prevents HBaseTestingUtility from starting up in client apps - (Thomas D'Silva)
PHOENIX-2025 - Phoenix-core's hbase-default.xml prevents HBaseTestingUtility
from starting up in client apps - (Thomas D'Silva)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/b3d1f12f
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/b3d1f12f
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/b3d1f12f
Branch: refs/heads/4.4-HBase-1.0
Commit: b3d1f12ff7da66815e32ce6533d003320f916ac5
Parents: cac6d57
Author: ravimagham ravimag...@apache.org
Authored: Tue Jul 7 22:12:58 2015 -0700
Committer: ravimagham ravimag...@apache.org
Committed: Tue Jul 7 22:12:58 2015 -0700
--
.../java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java | 4 ++--
.../phoenix/mapreduce/util/PhoenixConfigurationUtil.java | 6 --
2 files changed, 6 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b3d1f12f/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
index 000ce59..b4724d8 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/ConnectionUtil.java
@@ -88,9 +88,9 @@ public class ConnectionUtil {
* @param clientPort a ZooKeeper client port
* @return a Phoenix connection to the given connection string
*/
-private static Connection getConnection(final String quorum, final int
clientPort, Properties props) throws SQLException {
+private static Connection getConnection(final String quorum, final Integer
clientPort, Properties props) throws SQLException {
Preconditions.checkNotNull(quorum);
-return DriverManager.getConnection(QueryUtil.getUrl(quorum,
clientPort), props);
+return DriverManager.getConnection(clientPort!=null?
QueryUtil.getUrl(quorum, clientPort) : QueryUtil.getUrl(quorum), props);
}
}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b3d1f12f/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
index bba96ac..e26f988 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/mapreduce/util/PhoenixConfigurationUtil.java
@@ -27,6 +27,7 @@ import com.google.common.base.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
@@ -371,9 +372,10 @@ public final class PhoenixConfigurationUtil {
* @param configuration
* @return
*/
-public static int getClientPort(final Configuration configuration) {
+public static Integer getClientPort(final Configuration configuration) {
Preconditions.checkNotNull(configuration);
-return
Integer.parseInt(configuration.get(HBASE_ZOOKEEPER_CLIENT_PORT));
+String clientPortString =
configuration.get(HBASE_ZOOKEEPER_CLIENT_PORT);
+return clientPortString==null ? null :
Integer.parseInt(clientPortString);
}
public static void loadHBaseConfiguration(Job job) throws IOException {
