date:20140814

git commit: PHOENIX-1047 Auto cast - add/sub decimal constant and integer

2014-08-14 Thread jamestaylor

Repository: phoenix
Updated Branches:
  refs/heads/master c85d4c6ad -> acd35f0eb


PHOENIX-1047 Auto cast - add/sub decimal constant and integer


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/acd35f0e
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/acd35f0e
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/acd35f0e

Branch: refs/heads/master
Commit: acd35f0ebbb3cf3151741832dc3f3e08a585318c
Parents: c85d4c6
Author: James Taylor 
Authored: Thu Aug 14 23:50:13 2014 -0700
Committer: James Taylor 
Committed: Thu Aug 14 23:56:03 2014 -0700

--
 .../phoenix/end2end/ArithmeticQueryIT.java  | 29 
 .../org/apache/phoenix/schema/PDataType.java| 11 +---
 .../arithmetic/ArithmeticOperationTest.java |  5 ++--
 3 files changed, 33 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/acd35f0e/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java
index ddc3f79..52c76a9 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java
@@ -829,4 +829,33 @@ public class ArithmeticQueryIT extends 
BaseHBaseManagedTimeIT {
 assertEquals(0, rs.getLong(1));
 assertFalse(rs.next());
 }
+
+@Test
+public void testCastingOnConstantAddInArithmeticEvaluation() throws 
Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String ddl = "CREATE TABLE IF NOT EXISTS test_table (k1 INTEGER NOT 
NULL, v1 INTEGER CONSTRAINT pk PRIMARY KEY (k1))";
+conn.createStatement().execute(ddl);
+String dml = "UPSERT INTO test_table (k1, v1) VALUES (2, 2)";
+conn.createStatement().execute(dml);
+conn.commit();
+
+ResultSet rs = conn.createStatement().executeQuery("SELECT k1 / (v1 + 
0.5) FROM test_table");
+assertTrue(rs.next());
+double d = rs.getDouble(1);
+assertEquals(0.8, d, 0.01);
+}
+
+@Test
+public void testCastingOnConstantSubInArithmeticEvaluation() throws 
Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String ddl = "CREATE TABLE IF NOT EXISTS test_table (k1 INTEGER NOT 
NULL, v1 INTEGER CONSTRAINT pk PRIMARY KEY (k1))";
+conn.createStatement().execute(ddl);
+String dml = "UPSERT INTO test_table (k1, v1) VALUES (2, 2)";
+conn.createStatement().execute(dml);
+conn.commit();
+
+ResultSet rs = conn.createStatement().executeQuery("SELECT k1 / (v1 - 
0.5) FROM test_table");
+assertTrue(rs.next());
+assertEquals(1.3, rs.getDouble(1), 0.001);
+}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/phoenix/blob/acd35f0e/phoenix-core/src/main/java/org/apache/phoenix/schema/PDataType.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/PDataType.java 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/PDataType.java
index a915b2f..714028c 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/PDataType.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/PDataType.java
@@ -1333,16 +1333,7 @@ public enum PDataType {
 
 @Override
 public Integer getScale(Object o) {
-if (o == null) {
-return null;
-}
-BigDecimal v = (BigDecimal) o;
-int scale = v.scale();
-if (scale == 0) {
-return null;
-}
-// If we have 5.0, we still want scale to be null
-return v.remainder(BigDecimal.ONE).compareTo(BigDecimal.ZERO) == 0 
? null : scale;
+return null;
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/phoenix/blob/acd35f0e/phoenix-core/src/test/java/org/apache/phoenix/arithmetic/ArithmeticOperationTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/arithmetic/ArithmeticOperationTest.java
 
b/phoenix-core/src/test/java/org/apache/phoenix/arithmetic/ArithmeticOperationTest.java
index 97cf665..d90c6b6 100644
--- 
a/phoenix-core/src/test/java/org/apache/phoenix/arithmetic/ArithmeticOperationTest.java
+++ 
b/phoenix-core/src/test/java/org/apache/phoenix/arithmetic/ArithmeticOperationTest.java
@@ -18,6 +18,7 @@
 package org.apache.phoenix.arithmetic;
 
 import static org.junit.Assert.asse

git commit: PHOENIX-1047 Auto cast - add/sub decimal constant and integer

2014-08-14 Thread jamestaylor

Repository: phoenix
Updated Branches:
  refs/heads/4.0 b07658e87 -> fcdcd697c


PHOENIX-1047 Auto cast - add/sub decimal constant and integer


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/fcdcd697
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/fcdcd697
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/fcdcd697

Branch: refs/heads/4.0
Commit: fcdcd697ccf13cd377980a186c32fb8b4121d1a1
Parents: b07658e
Author: James Taylor 
Authored: Thu Aug 14 23:50:13 2014 -0700
Committer: James Taylor 
Committed: Thu Aug 14 23:51:59 2014 -0700

--
 .../phoenix/end2end/ArithmeticQueryIT.java  | 29 
 .../org/apache/phoenix/schema/PDataType.java| 11 +---
 .../arithmetic/ArithmeticOperationTest.java |  5 ++--
 3 files changed, 33 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/fcdcd697/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java
index ddc3f79..52c76a9 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java
@@ -829,4 +829,33 @@ public class ArithmeticQueryIT extends 
BaseHBaseManagedTimeIT {
 assertEquals(0, rs.getLong(1));
 assertFalse(rs.next());
 }
+
+@Test
+public void testCastingOnConstantAddInArithmeticEvaluation() throws 
Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String ddl = "CREATE TABLE IF NOT EXISTS test_table (k1 INTEGER NOT 
NULL, v1 INTEGER CONSTRAINT pk PRIMARY KEY (k1))";
+conn.createStatement().execute(ddl);
+String dml = "UPSERT INTO test_table (k1, v1) VALUES (2, 2)";
+conn.createStatement().execute(dml);
+conn.commit();
+
+ResultSet rs = conn.createStatement().executeQuery("SELECT k1 / (v1 + 
0.5) FROM test_table");
+assertTrue(rs.next());
+double d = rs.getDouble(1);
+assertEquals(0.8, d, 0.01);
+}
+
+@Test
+public void testCastingOnConstantSubInArithmeticEvaluation() throws 
Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String ddl = "CREATE TABLE IF NOT EXISTS test_table (k1 INTEGER NOT 
NULL, v1 INTEGER CONSTRAINT pk PRIMARY KEY (k1))";
+conn.createStatement().execute(ddl);
+String dml = "UPSERT INTO test_table (k1, v1) VALUES (2, 2)";
+conn.createStatement().execute(dml);
+conn.commit();
+
+ResultSet rs = conn.createStatement().executeQuery("SELECT k1 / (v1 - 
0.5) FROM test_table");
+assertTrue(rs.next());
+assertEquals(1.3, rs.getDouble(1), 0.001);
+}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/phoenix/blob/fcdcd697/phoenix-core/src/main/java/org/apache/phoenix/schema/PDataType.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/PDataType.java 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/PDataType.java
index a915b2f..714028c 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/PDataType.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/PDataType.java
@@ -1333,16 +1333,7 @@ public enum PDataType {
 
 @Override
 public Integer getScale(Object o) {
-if (o == null) {
-return null;
-}
-BigDecimal v = (BigDecimal) o;
-int scale = v.scale();
-if (scale == 0) {
-return null;
-}
-// If we have 5.0, we still want scale to be null
-return v.remainder(BigDecimal.ONE).compareTo(BigDecimal.ZERO) == 0 
? null : scale;
+return null;
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/phoenix/blob/fcdcd697/phoenix-core/src/test/java/org/apache/phoenix/arithmetic/ArithmeticOperationTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/arithmetic/ArithmeticOperationTest.java
 
b/phoenix-core/src/test/java/org/apache/phoenix/arithmetic/ArithmeticOperationTest.java
index 97cf665..d90c6b6 100644
--- 
a/phoenix-core/src/test/java/org/apache/phoenix/arithmetic/ArithmeticOperationTest.java
+++ 
b/phoenix-core/src/test/java/org/apache/phoenix/arithmetic/ArithmeticOperationTest.java
@@ -18,6 +18,7 @@
 package org.apache.phoenix.arithmetic;
 
 import static org.junit.Assert.assertEqua

git commit: PHOENIX-1047 Auto cast - add/sub decimal constant and integer

2014-08-14 Thread jamestaylor

Repository: phoenix
Updated Branches:
  refs/heads/3.0 3a6a9ddd8 -> 19dc23aa5


PHOENIX-1047 Auto cast - add/sub decimal constant and integer


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/19dc23aa
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/19dc23aa
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/19dc23aa

Branch: refs/heads/3.0
Commit: 19dc23aa511b31106b1ed791524ebc16ff3170c6
Parents: 3a6a9dd
Author: James Taylor 
Authored: Thu Aug 14 23:50:13 2014 -0700
Committer: James Taylor 
Committed: Thu Aug 14 23:50:13 2014 -0700

--
 .../phoenix/end2end/ArithmeticQueryIT.java  | 29 
 .../org/apache/phoenix/schema/PDataType.java| 11 +---
 .../arithmetic/ArithmeticOperationTest.java |  5 ++--
 3 files changed, 33 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/19dc23aa/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java
index ddc3f79..52c76a9 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ArithmeticQueryIT.java
@@ -829,4 +829,33 @@ public class ArithmeticQueryIT extends 
BaseHBaseManagedTimeIT {
 assertEquals(0, rs.getLong(1));
 assertFalse(rs.next());
 }
+
+@Test
+public void testCastingOnConstantAddInArithmeticEvaluation() throws 
Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String ddl = "CREATE TABLE IF NOT EXISTS test_table (k1 INTEGER NOT 
NULL, v1 INTEGER CONSTRAINT pk PRIMARY KEY (k1))";
+conn.createStatement().execute(ddl);
+String dml = "UPSERT INTO test_table (k1, v1) VALUES (2, 2)";
+conn.createStatement().execute(dml);
+conn.commit();
+
+ResultSet rs = conn.createStatement().executeQuery("SELECT k1 / (v1 + 
0.5) FROM test_table");
+assertTrue(rs.next());
+double d = rs.getDouble(1);
+assertEquals(0.8, d, 0.01);
+}
+
+@Test
+public void testCastingOnConstantSubInArithmeticEvaluation() throws 
Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String ddl = "CREATE TABLE IF NOT EXISTS test_table (k1 INTEGER NOT 
NULL, v1 INTEGER CONSTRAINT pk PRIMARY KEY (k1))";
+conn.createStatement().execute(ddl);
+String dml = "UPSERT INTO test_table (k1, v1) VALUES (2, 2)";
+conn.createStatement().execute(dml);
+conn.commit();
+
+ResultSet rs = conn.createStatement().executeQuery("SELECT k1 / (v1 - 
0.5) FROM test_table");
+assertTrue(rs.next());
+assertEquals(1.3, rs.getDouble(1), 0.001);
+}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/phoenix/blob/19dc23aa/phoenix-core/src/main/java/org/apache/phoenix/schema/PDataType.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/PDataType.java 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/PDataType.java
index a915b2f..714028c 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/PDataType.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/PDataType.java
@@ -1333,16 +1333,7 @@ public enum PDataType {
 
 @Override
 public Integer getScale(Object o) {
-if (o == null) {
-return null;
-}
-BigDecimal v = (BigDecimal) o;
-int scale = v.scale();
-if (scale == 0) {
-return null;
-}
-// If we have 5.0, we still want scale to be null
-return v.remainder(BigDecimal.ONE).compareTo(BigDecimal.ZERO) == 0 
? null : scale;
+return null;
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/phoenix/blob/19dc23aa/phoenix-core/src/test/java/org/apache/phoenix/arithmetic/ArithmeticOperationTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/arithmetic/ArithmeticOperationTest.java
 
b/phoenix-core/src/test/java/org/apache/phoenix/arithmetic/ArithmeticOperationTest.java
index 97cf665..d90c6b6 100644
--- 
a/phoenix-core/src/test/java/org/apache/phoenix/arithmetic/ArithmeticOperationTest.java
+++ 
b/phoenix-core/src/test/java/org/apache/phoenix/arithmetic/ArithmeticOperationTest.java
@@ -18,6 +18,7 @@
 package org.apache.phoenix.arithmetic;
 
 import static org.junit.Assert.assertEqua

Jenkins build is back to stable : Phoenix | Master | Hadoop1 #330

2014-08-14 Thread Apache Jenkins Server

See

Jenkins build is back to stable : Phoenix | 4.0 | Hadoop1 #276

2014-08-14 Thread Apache Jenkins Server

See

Build failed in Jenkins: Phoenix | 3.0 | Hadoop1 #185

2014-08-14 Thread Apache Jenkins Server

See 

Changes:

[jtaylor] PHOENIX-1171 Dropping the index is not verifying the associated table

--
[...truncated 391 lines...]
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.558 sec - in 
org.apache.phoenix.end2end.MD5FunctionIT
Running org.apache.phoenix.end2end.ExecuteStatementsIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.964 sec - in 
org.apache.phoenix.end2end.UpsertSelectAutoCommitIT
Running org.apache.phoenix.end2end.HashJoinIT
Tests run: 14, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 91.899 sec - 
in org.apache.phoenix.end2end.index.MutableIndexIT
Running org.apache.phoenix.end2end.TenantSpecificViewIndexIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.708 sec - in 
org.apache.phoenix.end2end.ExecuteStatementsIT
Running org.apache.phoenix.end2end.TimezoneOffsetFunctionIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.922 sec - in 
org.apache.phoenix.end2end.TimezoneOffsetFunctionIT
Running org.apache.phoenix.end2end.ArithmeticQueryIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.42 sec - in 
org.apache.phoenix.end2end.TenantSpecificViewIndexIT
Running org.apache.phoenix.end2end.ReverseFunctionIT
Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.874 sec - in 
org.apache.phoenix.end2end.ReverseFunctionIT
Running org.apache.phoenix.end2end.SaltedViewIT
Tests run: 25, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 75.733 sec - 
in org.apache.phoenix.end2end.InListIT
Running org.apache.phoenix.end2end.FirstValueFunctionIT
Tests run: 18, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 18.086 sec - 
in org.apache.phoenix.end2end.ArithmeticQueryIT
Running org.apache.phoenix.end2end.QueryPlanIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.118 sec - in 
org.apache.phoenix.end2end.FirstValueFunctionIT
Running org.apache.phoenix.end2end.QueryExecWithoutSCNIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.179 sec - in 
org.apache.phoenix.end2end.SaltedViewIT
Running org.apache.phoenix.end2end.ConvertTimezoneFunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.47 sec - in 
org.apache.phoenix.end2end.QueryExecWithoutSCNIT
Running org.apache.phoenix.end2end.StatementHintsIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.988 sec - in 
org.apache.phoenix.end2end.ConvertTimezoneFunctionIT
Running org.apache.phoenix.end2end.UpsertBigValuesIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.444 sec - in 
org.apache.phoenix.end2end.StatementHintsIT
Running org.apache.phoenix.end2end.salted.SaltedTableUpsertSelectIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.115 sec - in 
org.apache.phoenix.end2end.QueryPlanIT
Running org.apache.phoenix.end2end.SortOrderFIT
Tests run: 30, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.918 sec - in 
org.apache.phoenix.end2end.SortOrderFIT
Running org.apache.phoenix.end2end.QueryMoreIT
Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.307 sec - in 
org.apache.phoenix.end2end.salted.SaltedTableUpsertSelectIT
Running org.apache.phoenix.end2end.ServerExceptionIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.315 sec - in 
org.apache.phoenix.end2end.UpsertBigValuesIT
Running org.apache.phoenix.end2end.AutoCommitIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.412 sec - in 
org.apache.phoenix.end2end.ServerExceptionIT
Running org.apache.phoenix.end2end.LastValueFunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.343 sec - in 
org.apache.phoenix.end2end.AutoCommitIT
Running org.apache.phoenix.end2end.RoundFloorCeilFunctionsEnd2EndIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.68 sec - in 
org.apache.phoenix.end2end.LastValueFunctionIT
Running org.apache.phoenix.end2end.LpadFunctionIT
Tests run: 30, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.974 sec - in 
org.apache.phoenix.end2end.RoundFloorCeilFunctionsEnd2EndIT
Tests run: 10, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.62 sec - in 
org.apache.phoenix.end2end.LpadFunctionIT
Tests run: 62, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 67.335 sec - 
in org.apache.phoenix.end2end.HashJoinIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 38.226 sec - in 
org.apache.phoenix.end2end.QueryMoreIT

Results :

Tests run: 371, Failures: 0, Errors: 0, Skipped: 0

[INFO] 
[INFO] --- maven-failsafe-plugin:2.17:integration-test (ClientManagedTimeTests) 
@ phoenix-core ---
[INFO] Failsafe report directory: 

[INFO] parallel='none', perCoreThreadCount=true, threadCount=0, 
useUnlimitedThreads=false, threadCountSuites=0, threadCountClasses=0, 
threadCountMethods=0, parallelOp

git commit: PHOENIX-1171 Dropping the index is not verifying the associated table

2014-08-14 Thread jamestaylor

Repository: phoenix
Updated Branches:
  refs/heads/master ca39e2d1b -> c85d4c6ad


PHOENIX-1171 Dropping the index is not verifying the associated table

Conflicts:

phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/c85d4c6a
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/c85d4c6a
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/c85d4c6a

Branch: refs/heads/master
Commit: c85d4c6ad145babcd5eca2fde1dc632071105b77
Parents: ca39e2d
Author: James Taylor 
Authored: Thu Aug 14 12:58:12 2014 -0700
Committer: James Taylor 
Committed: Thu Aug 14 20:38:52 2014 -0700

--
 .../java/org/apache/phoenix/end2end/ViewIT.java | 37 
 .../phoenix/end2end/index/IndexMetadataIT.java  | 12 ++-
 .../coprocessor/MetaDataEndpointImpl.java   | 22 ++--
 .../org/apache/phoenix/util/MetaDataUtil.java   |  4 ++-
 .../phoenix/compile/ViewCompilerTest.java   | 12 +++
 5 files changed, 69 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c85d4c6a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
index 1d022e5..d79535a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
@@ -29,6 +29,7 @@ import java.sql.SQLException;
 
 import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.schema.ReadOnlyTableException;
+import org.apache.phoenix.schema.TableNotFoundException;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -233,4 +234,40 @@ public class ViewIT extends BaseViewIT {
 }
 assertEquals(4, count);
 }
+
+@Test
+public void testViewAndTableInDifferentSchemas() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String ddl = "CREATE TABLE s1.t (k INTEGER NOT NULL PRIMARY KEY, v1 
DATE)";
+conn.createStatement().execute(ddl);
+ddl = "CREATE VIEW s2.v1 (v2 VARCHAR) AS SELECT * FROM s1.t WHERE k > 
5";
+conn.createStatement().execute(ddl);
+ddl = "CREATE VIEW v2 (v2 VARCHAR) AS SELECT * FROM s1.t WHERE k > 5";
+conn.createStatement().execute(ddl);
+ddl = "DROP VIEW v1";
+try {
+conn.createStatement().execute(ddl);
+fail();
+} catch (TableNotFoundException ignore) {
+}
+ddl = "DROP VIEW s2.v1";
+conn.createStatement().execute(ddl);
+ddl = "DROP VIEW s2.v2";
+try {
+conn.createStatement().execute(ddl);
+fail();
+} catch (TableNotFoundException ignore) {
+}
+ddl = "DROP TABLE s1.t";
+try {
+conn.createStatement().execute(ddl);
+fail();
+} catch (SQLException e) {
+assertEquals(SQLExceptionCode.CANNOT_MUTATE_TABLE.getErrorCode(), 
e.getErrorCode());
+}
+ddl = "DROP VIEW v2";
+conn.createStatement().execute(ddl);
+ddl = "DROP TABLE s1.t";
+conn.createStatement().execute(ddl);
+}
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c85d4c6a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
index 35232b5..2547844 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
@@ -45,6 +45,7 @@ import org.apache.phoenix.schema.AmbiguousColumnException;
 import org.apache.phoenix.schema.PIndexState;
 import org.apache.phoenix.schema.PTableKey;
 import org.apache.phoenix.schema.PTableType;
+import org.apache.phoenix.schema.TableNotFoundException;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.SchemaUtil;
 import org.apache.phoenix.util.StringUtil;
@@ -115,7 +116,7 @@ public class IndexMetadataIT extends BaseHBaseManagedTimeIT 
{
 }
 
 @Test
-public void testIndexCreation() throws Exception {
+public void testIndexCreateDrop() throws Exception {
 Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 Connection conn = DriverManager.getConnection(getUrl(), props);
 conn.setAutoCommi

git commit: PHOENIX-1171 Dropping the index is not verifying the associated table

2014-08-14 Thread jamestaylor

Repository: phoenix
Updated Branches:
  refs/heads/4.0 2bcc1d148 -> b07658e87


PHOENIX-1171 Dropping the index is not verifying the associated table

Conflicts:

phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/b07658e8
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/b07658e8
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/b07658e8

Branch: refs/heads/4.0
Commit: b07658e8791cebf59ec45beeac56ec7ca5252a4d
Parents: 2bcc1d1
Author: James Taylor 
Authored: Thu Aug 14 12:58:12 2014 -0700
Committer: James Taylor 
Committed: Thu Aug 14 20:37:46 2014 -0700

--
 .../java/org/apache/phoenix/end2end/ViewIT.java | 37 
 .../phoenix/end2end/index/IndexMetadataIT.java  | 12 ++-
 .../coprocessor/MetaDataEndpointImpl.java   | 22 ++--
 .../org/apache/phoenix/util/MetaDataUtil.java   |  4 ++-
 .../phoenix/compile/ViewCompilerTest.java   | 12 +++
 5 files changed, 69 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/b07658e8/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
index 1d022e5..d79535a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
@@ -29,6 +29,7 @@ import java.sql.SQLException;
 
 import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.schema.ReadOnlyTableException;
+import org.apache.phoenix.schema.TableNotFoundException;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -233,4 +234,40 @@ public class ViewIT extends BaseViewIT {
 }
 assertEquals(4, count);
 }
+
+@Test
+public void testViewAndTableInDifferentSchemas() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String ddl = "CREATE TABLE s1.t (k INTEGER NOT NULL PRIMARY KEY, v1 
DATE)";
+conn.createStatement().execute(ddl);
+ddl = "CREATE VIEW s2.v1 (v2 VARCHAR) AS SELECT * FROM s1.t WHERE k > 
5";
+conn.createStatement().execute(ddl);
+ddl = "CREATE VIEW v2 (v2 VARCHAR) AS SELECT * FROM s1.t WHERE k > 5";
+conn.createStatement().execute(ddl);
+ddl = "DROP VIEW v1";
+try {
+conn.createStatement().execute(ddl);
+fail();
+} catch (TableNotFoundException ignore) {
+}
+ddl = "DROP VIEW s2.v1";
+conn.createStatement().execute(ddl);
+ddl = "DROP VIEW s2.v2";
+try {
+conn.createStatement().execute(ddl);
+fail();
+} catch (TableNotFoundException ignore) {
+}
+ddl = "DROP TABLE s1.t";
+try {
+conn.createStatement().execute(ddl);
+fail();
+} catch (SQLException e) {
+assertEquals(SQLExceptionCode.CANNOT_MUTATE_TABLE.getErrorCode(), 
e.getErrorCode());
+}
+ddl = "DROP VIEW v2";
+conn.createStatement().execute(ddl);
+ddl = "DROP TABLE s1.t";
+conn.createStatement().execute(ddl);
+}
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/b07658e8/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
index 35232b5..2547844 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
@@ -45,6 +45,7 @@ import org.apache.phoenix.schema.AmbiguousColumnException;
 import org.apache.phoenix.schema.PIndexState;
 import org.apache.phoenix.schema.PTableKey;
 import org.apache.phoenix.schema.PTableType;
+import org.apache.phoenix.schema.TableNotFoundException;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.SchemaUtil;
 import org.apache.phoenix.util.StringUtil;
@@ -115,7 +116,7 @@ public class IndexMetadataIT extends BaseHBaseManagedTimeIT 
{
 }
 
 @Test
-public void testIndexCreation() throws Exception {
+public void testIndexCreateDrop() throws Exception {
 Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 Connection conn = DriverManager.getConnection(getUrl(), props);
 conn.setAutoCommit(fals

git commit: PHOENIX-1171 Dropping the index is not verifying the associated table

2014-08-14 Thread jamestaylor

Repository: phoenix
Updated Branches:
  refs/heads/3.0 9173fa2e8 -> 3a6a9ddd8


PHOENIX-1171 Dropping the index is not verifying the associated table


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/3a6a9ddd
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/3a6a9ddd
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/3a6a9ddd

Branch: refs/heads/3.0
Commit: 3a6a9ddd80d7e97a55e6bd453dab078624e934d5
Parents: 9173fa2
Author: James Taylor 
Authored: Thu Aug 14 12:58:12 2014 -0700
Committer: James Taylor 
Committed: Thu Aug 14 16:40:48 2014 -0700

--
 .../java/org/apache/phoenix/end2end/ViewIT.java | 37 
 .../phoenix/end2end/index/IndexMetadataIT.java  | 12 ++-
 .../coprocessor/MetaDataEndpointImpl.java   | 14 +---
 .../org/apache/phoenix/util/MetaDataUtil.java   |  4 ++-
 .../phoenix/compile/ViewCompilerTest.java   | 12 +++
 5 files changed, 66 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/3a6a9ddd/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
index b75bb30..394fa04 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java
@@ -29,6 +29,7 @@ import java.sql.SQLException;
 
 import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.schema.ReadOnlyTableException;
+import org.apache.phoenix.schema.TableNotFoundException;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -233,4 +234,40 @@ public class ViewIT extends BaseViewIT {
 }
 assertEquals(4, count);
 }
+
+@Test
+public void testViewAndTableInDifferentSchemas() throws Exception {
+Connection conn = DriverManager.getConnection(getUrl());
+String ddl = "CREATE TABLE s1.t (k INTEGER NOT NULL PRIMARY KEY, v1 
DATE)";
+conn.createStatement().execute(ddl);
+ddl = "CREATE VIEW s2.v1 (v2 VARCHAR) AS SELECT * FROM s1.t WHERE k > 
5";
+conn.createStatement().execute(ddl);
+ddl = "CREATE VIEW v2 (v2 VARCHAR) AS SELECT * FROM s1.t WHERE k > 5";
+conn.createStatement().execute(ddl);
+ddl = "DROP VIEW v1";
+try {
+conn.createStatement().execute(ddl);
+fail();
+} catch (TableNotFoundException ignore) {
+}
+ddl = "DROP VIEW s2.v1";
+conn.createStatement().execute(ddl);
+ddl = "DROP VIEW s2.v2";
+try {
+conn.createStatement().execute(ddl);
+fail();
+} catch (TableNotFoundException ignore) {
+}
+ddl = "DROP TABLE s1.t";
+try {
+conn.createStatement().execute(ddl);
+fail();
+} catch (SQLException e) {
+assertEquals(SQLExceptionCode.CANNOT_MUTATE_TABLE.getErrorCode(), 
e.getErrorCode());
+}
+ddl = "DROP VIEW v2";
+conn.createStatement().execute(ddl);
+ddl = "DROP TABLE s1.t";
+conn.createStatement().execute(ddl);
+}
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/3a6a9ddd/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
index 35232b5..2547844 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
@@ -45,6 +45,7 @@ import org.apache.phoenix.schema.AmbiguousColumnException;
 import org.apache.phoenix.schema.PIndexState;
 import org.apache.phoenix.schema.PTableKey;
 import org.apache.phoenix.schema.PTableType;
+import org.apache.phoenix.schema.TableNotFoundException;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.SchemaUtil;
 import org.apache.phoenix.util.StringUtil;
@@ -115,7 +116,7 @@ public class IndexMetadataIT extends BaseHBaseManagedTimeIT 
{
 }
 
 @Test
-public void testIndexCreation() throws Exception {
+public void testIndexCreateDrop() throws Exception {
 Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 Connection conn = DriverManager.getConnection(getUrl(), props);
 conn.setAutoCommit(false);
@@ -259,6 +260,15 @@ public class IndexMetadataIT extends 
BaseHBaseManagedTimeIT {
 assertIn

Jenkins build became unstable: Phoenix | 4.0 | Hadoop1 #275

2014-08-14 Thread Apache Jenkins Server

See

svn commit: r1618075 [1/2] - in /phoenix: phoenix-docs/src/main/org/h2/ phoenix-docs/src/main/org/h2/jdbc/ phoenix-docs/src/main/org/h2/jdbcx/ phoenix-docs/src/main/org/h2/tools/ site/publish/ site/pu

2014-08-14 Thread jyates

Author: jyates
Date: Thu Aug 14 22:21:43 2014
New Revision: 1618075

URL: http://svn.apache.org/r1618075
Log:
Adding docs for tracing

Added:
phoenix/site/publish/tracing.html
phoenix/site/source/src/site/markdown/tracing.md
Modified:
phoenix/phoenix-docs/src/main/org/h2/Driver.java
phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcCallableStatement.java
phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcConnection.java
phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java
phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcResultSet.java
phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcStatement.java
phoenix/phoenix-docs/src/main/org/h2/jdbcx/JdbcConnectionPool.java
phoenix/phoenix-docs/src/main/org/h2/jdbcx/JdbcDataSource.java
phoenix/phoenix-docs/src/main/org/h2/tools/SimpleResultSet.java
phoenix/site/publish/Phoenix-in-15-minutes-or-less.html
phoenix/site/publish/array_type.html
phoenix/site/publish/building.html
phoenix/site/publish/building_website.html
phoenix/site/publish/bulk_dataload.html
phoenix/site/publish/contributing.html
phoenix/site/publish/download.html
phoenix/site/publish/dynamic_columns.html
phoenix/site/publish/faq.html
phoenix/site/publish/flume.html
phoenix/site/publish/index.html
phoenix/site/publish/issues.html
phoenix/site/publish/joins.html
phoenix/site/publish/language/datatypes.html
phoenix/site/publish/language/functions.html
phoenix/site/publish/language/index.html
phoenix/site/publish/mailing_list.html
phoenix/site/publish/multi-tenancy.html
phoenix/site/publish/paged.html
phoenix/site/publish/performance.html
phoenix/site/publish/phoenix_on_emr.html
phoenix/site/publish/pig_integration.html
phoenix/site/publish/recent.html
phoenix/site/publish/resources.html
phoenix/site/publish/roadmap.html
phoenix/site/publish/salted.html
phoenix/site/publish/secondary_indexing.html
phoenix/site/publish/sequences.html
phoenix/site/publish/skip_scan.html
phoenix/site/publish/source.html
phoenix/site/publish/team.html
phoenix/site/publish/tuning.html
phoenix/site/publish/upgrade_from_2_2.html
phoenix/site/publish/views.html
phoenix/site/source/src/site/site.xml

Modified: phoenix/phoenix-docs/src/main/org/h2/Driver.java
URL: 
http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/main/org/h2/Driver.java?rev=1618075&r1=1618074&r2=1618075&view=diff
==
--- phoenix/phoenix-docs/src/main/org/h2/Driver.java (original)
+++ phoenix/phoenix-docs/src/main/org/h2/Driver.java Thu Aug 14 22:21:43 2014
@@ -17,7 +17,7 @@ import org.h2.message.DbException;
 import org.h2.message.TraceSystem;
 import org.h2.upgrade.DbUpgrade;
 
-/*## Java 1.7 ##
+//## Java 1.7 ##
 import java.util.logging.Logger;
 //*/
 
@@ -138,7 +138,7 @@ public class Driver implements java.sql.
 /**
  * [Not supported]
  */
-/*## Java 1.7 ##
+//## Java 1.7 ##
 public Logger getParentLogger() {
 return null;
 }

Modified: phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcCallableStatement.java
URL: 
http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcCallableStatement.java?rev=1618075&r1=1618074&r2=1618075&view=diff
==
--- phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcCallableStatement.java 
(original)
+++ phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcCallableStatement.java Thu 
Aug 14 22:21:43 2014
@@ -1440,7 +1440,7 @@ public class JdbcCallableStatement exten
  * @param parameterIndex the parameter index (1, 2, ...)
  * @param type the class of the returned value
  */
-/*## Java 1.7 ##
+//## Java 1.7 ##
 public  T getObject(int parameterIndex, Class type) {
 return null;
 }
@@ -1452,7 +1452,7 @@ public class JdbcCallableStatement exten
  * @param parameterName the parameter name
  * @param type the class of the returned value
  */
-/*## Java 1.7 ##
+//## Java 1.7 ##
 public  T getObject(String parameterName, Class type) {
 return null;
 }

Modified: phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcConnection.java
URL: 
http://svn.apache.org/viewvc/phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcConnection.java?rev=1618075&r1=1618074&r2=1618075&view=diff
==
--- phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcConnection.java (original)
+++ phoenix/phoenix-docs/src/main/org/h2/jdbc/JdbcConnection.java Thu Aug 14 
22:21:43 2014
@@ -49,7 +49,7 @@ import java.sql.SQLXML;
 import java.sql.SQLClientInfoException;
 //*/
 
-/*## Java 1.7 ##
+//## Java 1.7 ##
 import java.util.concurrent.Executor;
 //*/
 
@@ -1678,7 +1678,7 @@ public class JdbcConnection extends Trac
  *
  * @param schema the schema
  */
-/*## Java 1.7 ##
+//## Java 1.7 ##

svn commit: r1618075 [2/2] - in /phoenix: phoenix-docs/src/main/org/h2/ phoenix-docs/src/main/org/h2/jdbc/ phoenix-docs/src/main/org/h2/jdbcx/ phoenix-docs/src/main/org/h2/tools/ site/publish/ site/pu

2014-08-14 Thread jyates

Modified: phoenix/site/publish/roadmap.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/roadmap.html?rev=1618075&r1=1618074&r2=1618075&view=diff
==
--- phoenix/site/publish/roadmap.html (original)
+++ phoenix/site/publish/roadmap.html Thu Aug 14 22:21:43 2014
@@ -1,7 +1,7 @@
 
 
 
 
@@ -88,6 +88,7 @@
Dynamic Columns
Skip Scan
Bulk Loading
+   Request Tracing

Amazon EMR 
Support
Apache Flume Plugin
@@ -280,6 +281,9 @@
Bulk Loading


+   Request Tracing
+   
+   




Modified: phoenix/site/publish/salted.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/salted.html?rev=1618075&r1=1618074&r2=1618075&view=diff
==
--- phoenix/site/publish/salted.html (original)
+++ phoenix/site/publish/salted.html Thu Aug 14 22:21:43 2014
@@ -1,7 +1,7 @@
 
 
 
 
@@ -88,6 +88,7 @@
Dynamic Columns
Skip Scan
Bulk Loading
+   Request Tracing

Amazon EMR 
Support
Apache Flume Plugin
@@ -267,6 +268,9 @@
Bulk Loading


+   Request Tracing
+   
+   




Modified: phoenix/site/publish/secondary_indexing.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/secondary_indexing.html?rev=1618075&r1=1618074&r2=1618075&view=diff
==
--- phoenix/site/publish/secondary_indexing.html (original)
+++ phoenix/site/publish/secondary_indexing.html Thu Aug 14 22:21:43 2014
@@ -1,7 +1,7 @@
 
 
 
 
@@ -88,6 +88,7 @@
Dynamic Columns
Skip Scan
Bulk Loading
+   Request Tracing

Amazon EMR 
Support
Apache Flume Plugin
@@ -454,6 +455,9 @@
Bulk Loading


+   Request Tracing
+   
+   




Modified: phoenix/site/publish/sequences.html
URL: 
http://svn.apache.org/viewvc/phoenix/site/publish/sequences.html?rev=1618075&r1=1618074&r2=1618075&view=diff
==
--- phoenix/site/publish/sequences.html (original)
+++ phoenix/site/publish/sequences.html Thu Aug 14 22:21:43 2014
@@ -1,7 +1,7 @@
 
 
 
 
@@ -88,6 +88,7 @@

Apache-Phoenix | 4.0 | Hadoop1 | Build Successful

2014-08-14 Thread Apache Jenkins Server

4.0 branch build status Successful

Source repository https://git-wip-us.apache.org/repos/asf/incubator-phoenix.git

Compiled Artifacts https://builds.apache.org/job/Phoenix-4.0-hadoop1/lastSuccessfulBuild/artifact/

Test Report https://builds.apache.org/job/Phoenix-4.0-hadoop1/lastCompletedBuild/testReport/

Changes
[jtaylor] PHOENIX-965 Cannot aggregate on index with NULL values

Jenkins build became unstable: Phoenix | Master | Hadoop1 #329

2014-08-14 Thread Apache Jenkins Server

See

Apache-Phoenix | 3.0 | Hadoop1 | Build Successful

2014-08-14 Thread Apache Jenkins Server

3.0 branch build status Successful
Source repository https://git-wip-us.apache.org/repos/asf/phoenix.git

Last Successful Compiled Artifacts https://builds.apache.org/job/Phoenix-3.0-hadoop1/lastSuccessfulBuild/artifact/

Last Complete Test Report https://builds.apache.org/job/Phoenix-3.0-hadoop1/lastCompletedBuild/testReport/

Changes
[jtaylor] PHOENIX-965 Cannot aggregate on index with NULL values

git commit: PHOENIX-965 Cannot aggregate on index with NULL values

2014-08-14 Thread jamestaylor

Repository: phoenix
Updated Branches:
  refs/heads/master 481a9ae07 -> ca39e2d1b


PHOENIX-965 Cannot aggregate on index with NULL values


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/ca39e2d1
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/ca39e2d1
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/ca39e2d1

Branch: refs/heads/master
Commit: ca39e2d1b1c314b9b5758054cea84f201cc499b5
Parents: 481a9ae
Author: James Taylor 
Authored: Wed Aug 13 21:17:46 2014 -0700
Committer: James Taylor 
Committed: Thu Aug 14 11:29:24 2014 -0700

--
 .../org/apache/phoenix/end2end/QueryIT.java | 37 
 .../aggregator/ServerAggregators.java   |  3 +-
 2 files changed, 38 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/ca39e2d1/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java
index 35140f4..c9ec25e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java
@@ -792,4 +792,41 @@ public class QueryIT extends BaseQueryIT {
 conn.close();
 }
 }
+
+@Test
+public void testSumOverNullIntegerColumn() throws Exception {
+String query = "SELECT sum(a_integer) FROM aTable a";
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+conn.setAutoCommit(true);
+conn.createStatement().execute("UPSERT INTO 
atable(organization_id,entity_id,a_integer) VALUES('" + getOrganizationId() + 
"','" + ROW3 + "',NULL)");
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 5));
+conn = DriverManager.getConnection(getUrl(), props);
+try {
+PreparedStatement statement = conn.prepareStatement(query);
+ResultSet rs = statement.executeQuery();
+assertTrue (rs.next());
+assertEquals(42, rs.getInt(1));
+assertFalse(rs.next());
+} finally {
+conn.close();
+}
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 7));
+conn = DriverManager.getConnection(getUrl(), props);
+conn.setAutoCommit(true);
+conn.createStatement().execute("UPSERT INTO 
atable(organization_id,entity_id,a_integer) SELECT organization_id, entity_id, 
null FROM atable");
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 9));
+conn = DriverManager.getConnection(getUrl(), props);
+try {
+PreparedStatement statement = conn.prepareStatement(query);
+ResultSet rs = statement.executeQuery();
+assertTrue (rs.next());
+assertEquals(0, rs.getInt(1));
+assertTrue(rs.wasNull());
+assertFalse(rs.next());
+} finally {
+conn.close();
+}
+}
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/ca39e2d1/phoenix-core/src/main/java/org/apache/phoenix/expression/aggregator/ServerAggregators.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/expression/aggregator/ServerAggregators.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/expression/aggregator/ServerAggregators.java
index 1ddda5d..8792c91 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/expression/aggregator/ServerAggregators.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/expression/aggregator/ServerAggregators.java
@@ -27,7 +27,6 @@ import java.util.List;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.WritableUtils;
-
 import org.apache.phoenix.expression.Expression;
 import org.apache.phoenix.expression.ExpressionType;
 import org.apache.phoenix.expression.function.SingleAggregateFunction;
@@ -57,7 +56,7 @@ public class ServerAggregators extends Aggregators {
 @Override
 public void aggregate(Aggregator[] aggregators, Tuple result) {
 for (int i = 0; i < expressions.length; i++) {
-if (expressions[i].evaluate(result, ptr)) {
+if (expressions[i].evaluate(result, ptr) && ptr.getLength() != 0) {
 aggregators[i].aggregate(result, ptr);
 }
 }

git commit: PHOENIX-965 Cannot aggregate on index with NULL values

2014-08-14 Thread jamestaylor

Repository: phoenix
Updated Branches:
  refs/heads/4.0 d27353ad2 -> 2bcc1d148


PHOENIX-965 Cannot aggregate on index with NULL values


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/2bcc1d14
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/2bcc1d14
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/2bcc1d14

Branch: refs/heads/4.0
Commit: 2bcc1d14889685ecc6187fb33684aece74de51c3
Parents: d27353a
Author: James Taylor 
Authored: Wed Aug 13 21:17:46 2014 -0700
Committer: James Taylor 
Committed: Thu Aug 14 11:28:39 2014 -0700

--
 .../org/apache/phoenix/end2end/QueryIT.java | 37 
 .../aggregator/ServerAggregators.java   |  3 +-
 2 files changed, 38 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/2bcc1d14/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java
index 35140f4..c9ec25e 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java
@@ -792,4 +792,41 @@ public class QueryIT extends BaseQueryIT {
 conn.close();
 }
 }
+
+@Test
+public void testSumOverNullIntegerColumn() throws Exception {
+String query = "SELECT sum(a_integer) FROM aTable a";
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+conn.setAutoCommit(true);
+conn.createStatement().execute("UPSERT INTO 
atable(organization_id,entity_id,a_integer) VALUES('" + getOrganizationId() + 
"','" + ROW3 + "',NULL)");
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 5));
+conn = DriverManager.getConnection(getUrl(), props);
+try {
+PreparedStatement statement = conn.prepareStatement(query);
+ResultSet rs = statement.executeQuery();
+assertTrue (rs.next());
+assertEquals(42, rs.getInt(1));
+assertFalse(rs.next());
+} finally {
+conn.close();
+}
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 7));
+conn = DriverManager.getConnection(getUrl(), props);
+conn.setAutoCommit(true);
+conn.createStatement().execute("UPSERT INTO 
atable(organization_id,entity_id,a_integer) SELECT organization_id, entity_id, 
null FROM atable");
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 9));
+conn = DriverManager.getConnection(getUrl(), props);
+try {
+PreparedStatement statement = conn.prepareStatement(query);
+ResultSet rs = statement.executeQuery();
+assertTrue (rs.next());
+assertEquals(0, rs.getInt(1));
+assertTrue(rs.wasNull());
+assertFalse(rs.next());
+} finally {
+conn.close();
+}
+}
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/2bcc1d14/phoenix-core/src/main/java/org/apache/phoenix/expression/aggregator/ServerAggregators.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/expression/aggregator/ServerAggregators.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/expression/aggregator/ServerAggregators.java
index 1ddda5d..8792c91 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/expression/aggregator/ServerAggregators.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/expression/aggregator/ServerAggregators.java
@@ -27,7 +27,6 @@ import java.util.List;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.WritableUtils;
-
 import org.apache.phoenix.expression.Expression;
 import org.apache.phoenix.expression.ExpressionType;
 import org.apache.phoenix.expression.function.SingleAggregateFunction;
@@ -57,7 +56,7 @@ public class ServerAggregators extends Aggregators {
 @Override
 public void aggregate(Aggregator[] aggregators, Tuple result) {
 for (int i = 0; i < expressions.length; i++) {
-if (expressions[i].evaluate(result, ptr)) {
+if (expressions[i].evaluate(result, ptr) && ptr.getLength() != 0) {
 aggregators[i].aggregate(result, ptr);
 }
 }

git commit: PHOENIX-965 Cannot aggregate on index with NULL values

2014-08-14 Thread jamestaylor

Repository: phoenix
Updated Branches:
  refs/heads/3.0 702881c3e -> 9173fa2e8


PHOENIX-965 Cannot aggregate on index with NULL values


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/9173fa2e
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/9173fa2e
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/9173fa2e

Branch: refs/heads/3.0
Commit: 9173fa2e8f612c30ef44f63bcc5935dc739763f1
Parents: 702881c
Author: James Taylor 
Authored: Wed Aug 13 21:17:46 2014 -0700
Committer: James Taylor 
Committed: Wed Aug 13 21:17:46 2014 -0700

--
 .../org/apache/phoenix/end2end/QueryIT.java | 37 
 .../aggregator/ServerAggregators.java   |  3 +-
 2 files changed, 38 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/9173fa2e/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java
index dcbe59e..553f615 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryIT.java
@@ -790,4 +790,41 @@ public class QueryIT extends BaseQueryIT {
 conn.close();
 }
 }
+
+@Test
+public void testSumOverNullIntegerColumn() throws Exception {
+String query = "SELECT sum(a_integer) FROM aTable a";
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+conn.setAutoCommit(true);
+conn.createStatement().execute("UPSERT INTO 
atable(organization_id,entity_id,a_integer) VALUES('" + getOrganizationId() + 
"','" + ROW3 + "',NULL)");
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 5));
+conn = DriverManager.getConnection(getUrl(), props);
+try {
+PreparedStatement statement = conn.prepareStatement(query);
+ResultSet rs = statement.executeQuery();
+assertTrue (rs.next());
+assertEquals(42, rs.getInt(1));
+assertFalse(rs.next());
+} finally {
+conn.close();
+}
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 7));
+conn = DriverManager.getConnection(getUrl(), props);
+conn.setAutoCommit(true);
+conn.createStatement().execute("UPSERT INTO 
atable(organization_id,entity_id,a_integer) SELECT organization_id, entity_id, 
null FROM atable");
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 9));
+conn = DriverManager.getConnection(getUrl(), props);
+try {
+PreparedStatement statement = conn.prepareStatement(query);
+ResultSet rs = statement.executeQuery();
+assertTrue (rs.next());
+assertEquals(0, rs.getInt(1));
+assertTrue(rs.wasNull());
+assertFalse(rs.next());
+} finally {
+conn.close();
+}
+}
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/9173fa2e/phoenix-core/src/main/java/org/apache/phoenix/expression/aggregator/ServerAggregators.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/expression/aggregator/ServerAggregators.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/expression/aggregator/ServerAggregators.java
index 1ddda5d..8792c91 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/expression/aggregator/ServerAggregators.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/expression/aggregator/ServerAggregators.java
@@ -27,7 +27,6 @@ import java.util.List;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.io.WritableUtils;
-
 import org.apache.phoenix.expression.Expression;
 import org.apache.phoenix.expression.ExpressionType;
 import org.apache.phoenix.expression.function.SingleAggregateFunction;
@@ -57,7 +56,7 @@ public class ServerAggregators extends Aggregators {
 @Override
 public void aggregate(Aggregator[] aggregators, Tuple result) {
 for (int i = 0; i < expressions.length; i++) {
-if (expressions[i].evaluate(result, ptr)) {
+if (expressions[i].evaluate(result, ptr) && ptr.getLength() != 0) {
 aggregators[i].aggregate(result, ptr);
 }
 }

git commit: PHOENIX-1047 Auto cast - add/sub decimal constant and integer

git commit: PHOENIX-1047 Auto cast - add/sub decimal constant and integer

git commit: PHOENIX-1047 Auto cast - add/sub decimal constant and integer

Jenkins build is back to stable : Phoenix | Master | Hadoop1 #330

Jenkins build is back to stable : Phoenix | 4.0 | Hadoop1 #276

Build failed in Jenkins: Phoenix | 3.0 | Hadoop1 #185

git commit: PHOENIX-1171 Dropping the index is not verifying the associated table

git commit: PHOENIX-1171 Dropping the index is not verifying the associated table

git commit: PHOENIX-1171 Dropping the index is not verifying the associated table

Jenkins build became unstable: Phoenix | 4.0 | Hadoop1 #275

svn commit: r1618075 [1/2] - in /phoenix: phoenix-docs/src/main/org/h2/ phoenix-docs/src/main/org/h2/jdbc/ phoenix-docs/src/main/org/h2/jdbcx/ phoenix-docs/src/main/org/h2/tools/ site/publish/ site/pu

svn commit: r1618075 [2/2] - in /phoenix: phoenix-docs/src/main/org/h2/ phoenix-docs/src/main/org/h2/jdbc/ phoenix-docs/src/main/org/h2/jdbcx/ phoenix-docs/src/main/org/h2/tools/ site/publish/ site/pu

Apache-Phoenix | 4.0 | Hadoop1 | Build Successful

Jenkins build became unstable: Phoenix | Master | Hadoop1 #329

Apache-Phoenix | 3.0 | Hadoop1 | Build Successful

git commit: PHOENIX-965 Cannot aggregate on index with NULL values

git commit: PHOENIX-965 Cannot aggregate on index with NULL values

git commit: PHOENIX-965 Cannot aggregate on index with NULL values

18 matches

Site Navigation

Mail list logo

Footer information