Build failed in Jenkins: Phoenix | Master #830
See https://builds.apache.org/job/Phoenix-master/830/changes Changes: [mujtaba] PHOENIX-2113 Include log4j.properties in Pherf so runtime logging is displayed on console by default -- [...truncated 119857 lines...] [ERROR] KeyValueSkipListSet.java[106] (indentation) Indentation: method def modifier at indentation level 2 not at correct indentation, 4 [ERROR] KeyValueSkipListSet.java[108] (indentation) Indentation: method def child at indentation level 4 not at correct indentation, 8 [ERROR] KeyValueSkipListSet.java[109] (indentation) Indentation: method def rcurly at indentation level 2 not at correct indentation, 4 [ERROR] KeyValueSkipListSet.java[111] (indentation) Indentation: method def modifier at indentation level 2 not at correct indentation, 4 [ERROR] KeyValueSkipListSet.java[112] (indentation) Indentation: method def child at indentation level 4 not at correct indentation, 8 [ERROR] KeyValueSkipListSet.java[113] (indentation) Indentation: method def rcurly at indentation level 2 not at correct indentation, 4 [ERROR] KeyValueSkipListSet.java[115] (indentation) Indentation: method def modifier at indentation level 2 not at correct indentation, 4 [ERROR] KeyValueSkipListSet.java[116] (indentation) Indentation: method def child at indentation level 4 not at correct indentation, 8 [ERROR] KeyValueSkipListSet.java[117] (indentation) Indentation: method def rcurly at indentation level 2 not at correct indentation, 4 [ERROR] KeyValueSkipListSet.java[119] (indentation) Indentation: method def modifier at indentation level 2 not at correct indentation, 4 [ERROR] KeyValueSkipListSet.java[120] (indentation) Indentation: method def child at indentation level 4 not at correct indentation, 8 [ERROR] KeyValueSkipListSet.java[121] (indentation) Indentation: method def rcurly at indentation level 2 not at correct indentation, 4 [ERROR] KeyValueSkipListSet.java[123] (indentation) Indentation: method def modifier at indentation level 2 not at correct indentation, 4 [ERROR] KeyValueSkipListSet.java[124] (indentation) Indentation: method def child at indentation level 4 not at correct indentation, 8 [ERROR] KeyValueSkipListSet.java[125] (indentation) Indentation: method def rcurly at indentation level 2 not at correct indentation, 4 [ERROR] KeyValueSkipListSet.java[127] (indentation) Indentation: method def modifier at indentation level 2 not at correct indentation, 4 [ERROR] KeyValueSkipListSet.java[128] (indentation) Indentation: method def child at indentation level 4 not at correct indentation, 8 [ERROR] KeyValueSkipListSet.java[129] (indentation) Indentation: method def rcurly at indentation level 2 not at correct indentation, 4 [ERROR] KeyValueSkipListSet.java[131] (indentation) Indentation: method def modifier at indentation level 2 not at correct indentation, 4 [ERROR] KeyValueSkipListSet.java[132] (indentation) Indentation: method def child at indentation level 4 not at correct indentation, 8 [ERROR] KeyValueSkipListSet.java[133] (indentation) Indentation: method def rcurly at indentation level 2 not at correct indentation, 4 [ERROR] KeyValueSkipListSet.java[135] (indentation) Indentation: method def modifier at indentation level 2 not at correct indentation, 4 [ERROR] KeyValueSkipListSet.java[136] (indentation) Indentation: method def child at indentation level 4 not at correct indentation, 8 [ERROR] KeyValueSkipListSet.java[137] (indentation) Indentation: method def rcurly at indentation level 2 not at correct indentation, 4 [ERROR] KeyValueSkipListSet.java[139] (indentation) Indentation: method def modifier at indentation level 2 not at correct indentation, 4 [ERROR] KeyValueSkipListSet.java[140] (indentation) Indentation: method call child at indentation level 4 not at correct indentation, 8 [ERROR] KeyValueSkipListSet.java[140] (indentation) Indentation: method def child at indentation level 4 not at correct indentation, 8 [ERROR] KeyValueSkipListSet.java[141] (indentation) Indentation: method def rcurly at indentation level 2 not at correct indentation, 4 [ERROR] KeyValueSkipListSet.java[143] (indentation) Indentation: method def modifier at indentation level 2 not at correct indentation, 4 [ERROR] KeyValueSkipListSet.java[145] (indentation) Indentation: method def child at indentation level 4 not at correct indentation, 8 [ERROR] KeyValueSkipListSet.java[146] (indentation) Indentation: method def rcurly at indentation level 2 not at correct indentation, 4 [ERROR] KeyValueSkipListSet.java[148] (indentation) Indentation: method def modifier at indentation level 2 not at correct indentation, 4 [ERROR] KeyValueSkipListSet.java[149] (indentation) Indentation: method def child at indentation level 4 not at correct indentation, 8 [ERROR] KeyValueSkipListSet.java[150] (indentation) Indentation: method def rcurly at indentation level 2 not at correct indentation, 4 [ERROR] KeyValueSkipListSet.java[152] (indentation) Indentation:
phoenix git commit: PHOENIX-2113 Include log4j.properties in Pherf so runtime logging is displayed on console by default
Repository: phoenix
Updated Branches:
refs/heads/master 300de02c0 - 052836c72
PHOENIX-2113 Include log4j.properties in Pherf so runtime logging is displayed
on console by default
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/052836c7
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/052836c7
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/052836c7
Branch: refs/heads/master
Commit: 052836c72c97de6580dda22fb485b7e3fa6d277d
Parents: 300de02
Author: Mujtaba mujt...@apache.org
Authored: Mon Jul 13 11:50:47 2015 -0700
Committer: Mujtaba mujt...@apache.org
Committed: Mon Jul 13 11:50:47 2015 -0700
--
phoenix-pherf/config/log4j.properties | 58 ++
1 file changed, 58 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/052836c7/phoenix-pherf/config/log4j.properties
--
diff --git a/phoenix-pherf/config/log4j.properties
b/phoenix-pherf/config/log4j.properties
new file mode 100644
index 000..a6673c4
--- /dev/null
+++ b/phoenix-pherf/config/log4j.properties
@@ -0,0 +1,58 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# License); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+
+log4j.rootLogger=INFO,console
+log4j.threshold=INFO
+log4j.appender.DRFA=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.DRFA.File=pherf.log
+
+# Rollver at midnight
+log4j.appender.DRFA.DatePattern=.-MM-dd
+
+# 30-day backup
+#log4j.appender.DRFA.MaxBackupIndex=30
+log4j.appender.DRFA.layout=org.apache.log4j.PatternLayout
+
+# Pattern format: Date LogLevel LoggerName LogMessage
+log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n
+
+# Debugging Pattern format
+#log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %-5p %c{2}
(%F:%M(%L)) - %m%n
+
+#
+# Null Appender
+#
+log4j.appender.NullAppender=org.apache.log4j.varia.NullAppender
+
+#
+# console
+# Add console to rootlogger above if you want to use this
+#
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.target=System.err
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p
%c{2}: %m%n
+
+# Custom Logging levels
+log4j.logger.org.apache.zookeeper=ERROR
+log4j.logger.org.apache.hadoop.hbase.zookeeper.RecoverableZooKeeper=ERROR
+log4j.logger.org.apache.hadoop.hbase.zookeeper.ZKUtil=ERROR
+log4j.logger.org.apache.hadoop.hbase.HBaseConfiguration=ERROR
phoenix git commit: PHOENIX-2113 Include log4j.properties in Pherf so runtime logging is displayed on console by default
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-1.0 be9cc51e8 - ee3882394
PHOENIX-2113 Include log4j.properties in Pherf so runtime logging is displayed
on console by default
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/ee388239
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/ee388239
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/ee388239
Branch: refs/heads/4.x-HBase-1.0
Commit: ee3882394b10657572d953ea10d42195a63c08fc
Parents: be9cc51
Author: Mujtaba mujt...@apache.org
Authored: Mon Jul 13 11:49:40 2015 -0700
Committer: Mujtaba mujt...@apache.org
Committed: Mon Jul 13 11:49:40 2015 -0700
--
phoenix-pherf/config/log4j.properties | 58 ++
1 file changed, 58 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ee388239/phoenix-pherf/config/log4j.properties
--
diff --git a/phoenix-pherf/config/log4j.properties
b/phoenix-pherf/config/log4j.properties
new file mode 100644
index 000..a6673c4
--- /dev/null
+++ b/phoenix-pherf/config/log4j.properties
@@ -0,0 +1,58 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# License); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+
+log4j.rootLogger=INFO,console
+log4j.threshold=INFO
+log4j.appender.DRFA=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.DRFA.File=pherf.log
+
+# Rollver at midnight
+log4j.appender.DRFA.DatePattern=.-MM-dd
+
+# 30-day backup
+#log4j.appender.DRFA.MaxBackupIndex=30
+log4j.appender.DRFA.layout=org.apache.log4j.PatternLayout
+
+# Pattern format: Date LogLevel LoggerName LogMessage
+log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %p %c: %m%n
+
+# Debugging Pattern format
+#log4j.appender.DRFA.layout.ConversionPattern=%d{ISO8601} %-5p %c{2}
(%F:%M(%L)) - %m%n
+
+#
+# Null Appender
+#
+log4j.appender.NullAppender=org.apache.log4j.varia.NullAppender
+
+#
+# console
+# Add console to rootlogger above if you want to use this
+#
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.target=System.err
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss} %p
%c{2}: %m%n
+
+# Custom Logging levels
+log4j.logger.org.apache.zookeeper=ERROR
+log4j.logger.org.apache.hadoop.hbase.zookeeper.RecoverableZooKeeper=ERROR
+log4j.logger.org.apache.hadoop.hbase.zookeeper.ZKUtil=ERROR
+log4j.logger.org.apache.hadoop.hbase.HBaseConfiguration=ERROR
phoenix git commit: PHOENIX-2112 Phoenix-Spark need to support UTF8String for spark 1.4.0 (Yi Tian)
Repository: phoenix
Updated Branches:
refs/heads/master 052836c72 - 70c542d8e
PHOENIX-2112 Phoenix-Spark need to support UTF8String for spark 1.4.0 (Yi Tian)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/70c542d8
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/70c542d8
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/70c542d8
Branch: refs/heads/master
Commit: 70c542d8e7b8bdcea58e2ef8cbf76143ec5ae66c
Parents: 052836c
Author: Josh Mahonin jmaho...@interset.com
Authored: Mon Jul 13 16:15:42 2015 -0400
Committer: Josh Mahonin jmaho...@interset.com
Committed: Mon Jul 13 16:15:42 2015 -0400
--
phoenix-spark/pom.xml | 2 +-
.../main/scala/org/apache/phoenix/spark/PhoenixRelation.scala | 7 ---
2 files changed, 5 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/70c542d8/phoenix-spark/pom.xml
--
diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml
index 289801a..ef4d2c4 100644
--- a/phoenix-spark/pom.xml
+++ b/phoenix-spark/pom.xml
@@ -34,7 +34,7 @@
namePhoenix - Spark/name
properties
-spark.version1.3.0/spark.version
+spark.version1.4.0/spark.version
scala.version2.10.4/scala.version
scala.binary.version2.10/scala.binary.version
top.dir${project.basedir}/../top.dir
http://git-wip-us.apache.org/repos/asf/phoenix/blob/70c542d8/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala
--
diff --git
a/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala
b/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala
index 8804f3b..f20ad61 100644
---
a/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala
+++
b/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala
@@ -19,10 +19,10 @@ package org.apache.phoenix.spark
import org.apache.hadoop.conf.Configuration
import org.apache.spark.rdd.RDD
-import org.apache.spark.sql.types.StructType
+import org.apache.spark.sql.types.{UTF8String, StructType}
import org.apache.spark.sql.{Row, SQLContext}
import org.apache.spark.sql.sources._
-import org.apache.commons.lang.StringEscapeUtils.escapeSql
+import org.apache.phoenix.util.StringUtil.escapeStringConstant
case class PhoenixRelation(tableName: String, zkUrl: String)(@transient val
sqlContext: SQLContext)
extends BaseRelation with PrunedFilteredScan {
@@ -91,7 +91,8 @@ case class PhoenixRelation(tableName: String, zkUrl:
String)(@transient val sqlC
// Helper function to escape string values in SQL queries
private def compileValue(value: Any): Any = value match {
-case stringValue: String = s'${escapeSql(stringValue)}'
+case stringValue: String = s'${escapeStringConstant(stringValue)}'
+case stringValue: UTF8String =
s'${escapeStringConstant(stringValue.toString)}'
case _ = value
}
}
phoenix git commit: PHOENIX-2112 Phoenix-Spark need to support UTF8String for spark 1.4.0 (Yi Tian)
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-0.98 262c905b9 - 54e98aa4a
PHOENIX-2112 Phoenix-Spark need to support UTF8String for spark 1.4.0 (Yi Tian)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/54e98aa4
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/54e98aa4
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/54e98aa4
Branch: refs/heads/4.x-HBase-0.98
Commit: 54e98aa4a616287ff1a301082d0933b4fb0f1c30
Parents: 262c905
Author: Josh Mahonin jmaho...@interset.com
Authored: Mon Jul 13 16:15:42 2015 -0400
Committer: Josh Mahonin jmaho...@interset.com
Committed: Mon Jul 13 17:04:29 2015 -0400
--
phoenix-spark/pom.xml | 2 +-
.../main/scala/org/apache/phoenix/spark/PhoenixRelation.scala | 7 ---
2 files changed, 5 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/54e98aa4/phoenix-spark/pom.xml
--
diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml
index a289869..0b1a815 100644
--- a/phoenix-spark/pom.xml
+++ b/phoenix-spark/pom.xml
@@ -34,7 +34,7 @@
namePhoenix - Spark/name
properties
-spark.version1.3.0/spark.version
+spark.version1.4.0/spark.version
scala.version2.10.4/scala.version
scala.binary.version2.10/scala.binary.version
top.dir${project.basedir}/../top.dir
http://git-wip-us.apache.org/repos/asf/phoenix/blob/54e98aa4/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala
--
diff --git
a/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala
b/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala
index 8804f3b..f20ad61 100644
---
a/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala
+++
b/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala
@@ -19,10 +19,10 @@ package org.apache.phoenix.spark
import org.apache.hadoop.conf.Configuration
import org.apache.spark.rdd.RDD
-import org.apache.spark.sql.types.StructType
+import org.apache.spark.sql.types.{UTF8String, StructType}
import org.apache.spark.sql.{Row, SQLContext}
import org.apache.spark.sql.sources._
-import org.apache.commons.lang.StringEscapeUtils.escapeSql
+import org.apache.phoenix.util.StringUtil.escapeStringConstant
case class PhoenixRelation(tableName: String, zkUrl: String)(@transient val
sqlContext: SQLContext)
extends BaseRelation with PrunedFilteredScan {
@@ -91,7 +91,8 @@ case class PhoenixRelation(tableName: String, zkUrl:
String)(@transient val sqlC
// Helper function to escape string values in SQL queries
private def compileValue(value: Any): Any = value match {
-case stringValue: String = s'${escapeSql(stringValue)}'
+case stringValue: String = s'${escapeStringConstant(stringValue)}'
+case stringValue: UTF8String =
s'${escapeStringConstant(stringValue.toString)}'
case _ = value
}
}
phoenix git commit: PHOENIX-2112 Phoenix-Spark need to support UTF8String for spark 1.4.0 (Yi Tian)
Repository: phoenix
Updated Branches:
refs/heads/4.4-HBase-1.0 4b7de8c1a - 4ffdcdeea
PHOENIX-2112 Phoenix-Spark need to support UTF8String for spark 1.4.0 (Yi Tian)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/4ffdcdee
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/4ffdcdee
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/4ffdcdee
Branch: refs/heads/4.4-HBase-1.0
Commit: 4ffdcdeeafcad0b0a460b6a71578e7d5532e565e
Parents: 4b7de8c
Author: Josh Mahonin jmaho...@interset.com
Authored: Mon Jul 13 16:15:42 2015 -0400
Committer: Josh Mahonin jmaho...@interset.com
Committed: Mon Jul 13 17:02:52 2015 -0400
--
phoenix-spark/pom.xml | 2 +-
.../main/scala/org/apache/phoenix/spark/PhoenixRelation.scala | 7 ---
2 files changed, 5 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/4ffdcdee/phoenix-spark/pom.xml
--
diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml
index 559ba12..e9331d7 100644
--- a/phoenix-spark/pom.xml
+++ b/phoenix-spark/pom.xml
@@ -34,7 +34,7 @@
namePhoenix - Spark/name
properties
-spark.version1.3.0/spark.version
+spark.version1.4.0/spark.version
scala.version2.10.4/scala.version
scala.binary.version2.10/scala.binary.version
/properties
http://git-wip-us.apache.org/repos/asf/phoenix/blob/4ffdcdee/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala
--
diff --git
a/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala
b/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala
index 8804f3b..f20ad61 100644
---
a/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala
+++
b/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala
@@ -19,10 +19,10 @@ package org.apache.phoenix.spark
import org.apache.hadoop.conf.Configuration
import org.apache.spark.rdd.RDD
-import org.apache.spark.sql.types.StructType
+import org.apache.spark.sql.types.{UTF8String, StructType}
import org.apache.spark.sql.{Row, SQLContext}
import org.apache.spark.sql.sources._
-import org.apache.commons.lang.StringEscapeUtils.escapeSql
+import org.apache.phoenix.util.StringUtil.escapeStringConstant
case class PhoenixRelation(tableName: String, zkUrl: String)(@transient val
sqlContext: SQLContext)
extends BaseRelation with PrunedFilteredScan {
@@ -91,7 +91,8 @@ case class PhoenixRelation(tableName: String, zkUrl:
String)(@transient val sqlC
// Helper function to escape string values in SQL queries
private def compileValue(value: Any): Any = value match {
-case stringValue: String = s'${escapeSql(stringValue)}'
+case stringValue: String = s'${escapeStringConstant(stringValue)}'
+case stringValue: UTF8String =
s'${escapeStringConstant(stringValue.toString)}'
case _ = value
}
}
phoenix git commit: PHOENIX-2112 Phoenix-Spark need to support UTF8String for spark 1.4.0 (Yi Tian)
Repository: phoenix
Updated Branches:
refs/heads/4.4-HBase-1.1 fef132d34 - 26e8cf244
PHOENIX-2112 Phoenix-Spark need to support UTF8String for spark 1.4.0 (Yi Tian)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/26e8cf24
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/26e8cf24
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/26e8cf24
Branch: refs/heads/4.4-HBase-1.1
Commit: 26e8cf2447b7163bcf8ab0ee3ff5dda879ece2af
Parents: fef132d
Author: Josh Mahonin jmaho...@interset.com
Authored: Mon Jul 13 16:15:42 2015 -0400
Committer: Josh Mahonin jmaho...@interset.com
Committed: Mon Jul 13 17:03:13 2015 -0400
--
phoenix-spark/pom.xml | 2 +-
.../main/scala/org/apache/phoenix/spark/PhoenixRelation.scala | 7 ---
2 files changed, 5 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/26e8cf24/phoenix-spark/pom.xml
--
diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml
index 10277ff..0146182 100644
--- a/phoenix-spark/pom.xml
+++ b/phoenix-spark/pom.xml
@@ -34,7 +34,7 @@
namePhoenix - Spark/name
properties
-spark.version1.3.0/spark.version
+spark.version1.4.0/spark.version
scala.version2.10.4/scala.version
scala.binary.version2.10/scala.binary.version
/properties
http://git-wip-us.apache.org/repos/asf/phoenix/blob/26e8cf24/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala
--
diff --git
a/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala
b/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala
index 8804f3b..f20ad61 100644
---
a/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala
+++
b/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala
@@ -19,10 +19,10 @@ package org.apache.phoenix.spark
import org.apache.hadoop.conf.Configuration
import org.apache.spark.rdd.RDD
-import org.apache.spark.sql.types.StructType
+import org.apache.spark.sql.types.{UTF8String, StructType}
import org.apache.spark.sql.{Row, SQLContext}
import org.apache.spark.sql.sources._
-import org.apache.commons.lang.StringEscapeUtils.escapeSql
+import org.apache.phoenix.util.StringUtil.escapeStringConstant
case class PhoenixRelation(tableName: String, zkUrl: String)(@transient val
sqlContext: SQLContext)
extends BaseRelation with PrunedFilteredScan {
@@ -91,7 +91,8 @@ case class PhoenixRelation(tableName: String, zkUrl:
String)(@transient val sqlC
// Helper function to escape string values in SQL queries
private def compileValue(value: Any): Any = value match {
-case stringValue: String = s'${escapeSql(stringValue)}'
+case stringValue: String = s'${escapeStringConstant(stringValue)}'
+case stringValue: UTF8String =
s'${escapeStringConstant(stringValue.toString)}'
case _ = value
}
}
phoenix git commit: PHOENIX-2112 Phoenix-Spark need to support UTF8String for spark 1.4.0 (Yi Tian)
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-1.0 ee3882394 - 35b7776e7
PHOENIX-2112 Phoenix-Spark need to support UTF8String for spark 1.4.0 (Yi Tian)
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/35b7776e
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/35b7776e
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/35b7776e
Branch: refs/heads/4.x-HBase-1.0
Commit: 35b7776e799d9ceadd4420fe03dcf4d858c9b49a
Parents: ee38823
Author: Josh Mahonin jmaho...@interset.com
Authored: Mon Jul 13 16:15:42 2015 -0400
Committer: Josh Mahonin jmaho...@interset.com
Committed: Mon Jul 13 17:05:03 2015 -0400
--
phoenix-spark/pom.xml | 2 +-
.../main/scala/org/apache/phoenix/spark/PhoenixRelation.scala | 7 ---
2 files changed, 5 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/35b7776e/phoenix-spark/pom.xml
--
diff --git a/phoenix-spark/pom.xml b/phoenix-spark/pom.xml
index 99a7b63..78194f4 100644
--- a/phoenix-spark/pom.xml
+++ b/phoenix-spark/pom.xml
@@ -34,7 +34,7 @@
namePhoenix - Spark/name
properties
-spark.version1.3.0/spark.version
+spark.version1.4.0/spark.version
scala.version2.10.4/scala.version
scala.binary.version2.10/scala.binary.version
top.dir${project.basedir}/../top.dir
http://git-wip-us.apache.org/repos/asf/phoenix/blob/35b7776e/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala
--
diff --git
a/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala
b/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala
index 8804f3b..f20ad61 100644
---
a/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala
+++
b/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRelation.scala
@@ -19,10 +19,10 @@ package org.apache.phoenix.spark
import org.apache.hadoop.conf.Configuration
import org.apache.spark.rdd.RDD
-import org.apache.spark.sql.types.StructType
+import org.apache.spark.sql.types.{UTF8String, StructType}
import org.apache.spark.sql.{Row, SQLContext}
import org.apache.spark.sql.sources._
-import org.apache.commons.lang.StringEscapeUtils.escapeSql
+import org.apache.phoenix.util.StringUtil.escapeStringConstant
case class PhoenixRelation(tableName: String, zkUrl: String)(@transient val
sqlContext: SQLContext)
extends BaseRelation with PrunedFilteredScan {
@@ -91,7 +91,8 @@ case class PhoenixRelation(tableName: String, zkUrl:
String)(@transient val sqlC
// Helper function to escape string values in SQL queries
private def compileValue(value: Any): Any = value match {
-case stringValue: String = s'${escapeSql(stringValue)}'
+case stringValue: String = s'${escapeStringConstant(stringValue)}'
+case stringValue: UTF8String =
s'${escapeStringConstant(stringValue.toString)}'
case _ = value
}
}
Build failed in Jenkins: Phoenix | Master #832
See https://builds.apache.org/job/Phoenix-master/832/changes
Changes:
[cody.marcel] PHOENIX-2109 - Joda time version conflict between phoenix and
pherf
--
[...truncated 123982 lines...]
[ERROR] WriteWorkload.java[229:17] (coding) MultipleVariableDeclarations: Each
variable declaration must be in its own statement.
[ERROR] WriteWorkload.java[237:70] (whitespace) OperatorWrap: '?' should be on
a new line.
[ERROR] WriteWorkload.java[238:52] (whitespace) OperatorWrap: ':' should be on
a new line.
[ERROR] WriteWorkload.java[385] (javadoc) JavadocType: Missing a Javadoc
comment.
[ERROR] MultithreadedDiffer.java[0] (misc) NewlineAtEndOfFile: File does not
end with a newline.
[ERROR] MultithreadedDiffer.java[2] (header) Header: Line does not match
expected header line of ' * Licensed to the Apache Software Foundation (ASF)
under one or more'.
[ERROR] MultithreadedDiffer.java[31] (javadoc) JavadocType: Missing a Javadoc
comment.
[ERROR] MultithreadedDiffer.java[32:33] (naming) ConstantName: Name 'logger'
must match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'.
[ERROR] MultithreadedDiffer.java[56:38] (coding) SimplifyBooleanExpression:
Expression can be simplified.
[ERROR] MultithreadedDiffer.java[85:43] (coding) UnnecessaryParentheses:
Unnecessary parentheses around expression.
[ERROR] Workload.java[1] (header) Header: Missing a header - not enough lines
in file.
[ERROR] Workload.java[3] (javadoc) JavadocType: Missing a Javadoc comment.
[ERROR] Workload.java[4:5] (modifier) RedundantModifier: Redundant 'public'
modifier.
[ERROR] Workload.java[9:5] (modifier) RedundantModifier: Redundant 'public'
modifier.
[ERROR] WorkloadExecutor.java[0] (misc) NewlineAtEndOfFile: File does not end
with a newline.
[ERROR] WorkloadExecutor.java[2] (header) Header: Line does not match expected
header line of ' * Licensed to the Apache Software Foundation (ASF) under one
or more'.
[ERROR] WorkloadExecutor.java[25] (imports) ImportOrder: Wrong order for
'java.util.ArrayList' import.
[ERROR] WorkloadExecutor.java[29] (imports) AvoidStarImport: Using the '.*'
form of import should be avoided - java.util.concurrent.*.
[ERROR] WorkloadExecutor.java[31] (javadoc) JavadocType: Missing a Javadoc
comment.
[ERROR] WorkloadExecutor.java[32:33] (naming) ConstantName: Name 'logger' must
match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'.
[ERROR] WorkloadExecutor.java[50:78] (whitespace) OperatorWrap: '?' should be
on a new line.
[ERROR] WorkloadExecutor.java[51:65] (whitespace) OperatorWrap: ':' should be
on a new line.
[ERROR] QueryVerifier.java[2] (header) Header: Line does not match expected
header line of ' * Licensed to the Apache Software Foundation (ASF) under one
or more'.
[ERROR] QueryVerifier.java[38] (imports) ImportOrder: Wrong order for
'org.apache.phoenix.pherf.PherfConstants' import.
[ERROR] QueryVerifier.java[45] (javadoc) JavadocType: Missing a Javadoc comment.
[ERROR] QueryVerifier.java[47:33] (naming) ConstantName: Name 'logger' must
match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'.
[ERROR] QueryVerifier.java[91] (blocks) NeedBraces: 'if' construct must use
'{}'s.
[ERROR] QueryVerifier.java[92] (blocks) NeedBraces: 'if' construct must use
'{}'s.
[ERROR] QueryVerifier.java[93] (blocks) NeedBraces: 'if' construct must use
'{}'s.
[ERROR] QueryVerifier.java[166] (blocks) NeedBraces: 'if' construct must use
'{}'s.
[ERROR] QueryVerifier.java[167] (blocks) NeedBraces: 'if' construct must use
'{}'s.
[ERROR] QueryVerifier.java[168] (blocks) NeedBraces: 'if' construct must use
'{}'s.
[ERROR] QueryExecutor.java[0] (misc) NewlineAtEndOfFile: File does not end with
a newline.
[ERROR] QueryExecutor.java[2] (header) Header: Line does not match expected
header line of ' * Licensed to the Apache Software Foundation (ASF) under one
or more'.
[ERROR] QueryExecutor.java[24] (imports) AvoidStarImport: Using the '.*' form
of import should be avoided - org.apache.phoenix.pherf.configuration.*.
[ERROR] QueryExecutor.java[25] (imports) AvoidStarImport: Using the '.*' form
of import should be avoided - org.apache.phoenix.pherf.result.*.
[ERROR] QueryExecutor.java[30] (imports) ImportOrder: Wrong order for
'java.util.ArrayList' import.
[ERROR] QueryExecutor.java[37] (javadoc) JavadocType: Missing a Javadoc comment.
[ERROR] QueryExecutor.java[38:33] (naming) ConstantName: Name 'logger' must
match pattern '^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$'.
[ERROR] Pherf.java[0] (misc) NewlineAtEndOfFile: File does not end with a
newline.
[ERROR] Pherf.java[0] (javadoc) JavadocPackage: Missing package-info.java file.
[ERROR] Pherf.java[2] (header) Header: Line does not match expected header line
of ' * Licensed to the Apache Software Foundation (ASF) under one or more'.
[ERROR] Pherf.java[21] (imports) AvoidStarImport: Using the '.*' form of import
should be avoided - org.apache.commons.cli.*.
[ERROR] Pherf.java[34] (imports) ImportOrder: Wrong order for
'java.nio.file.Path' import.
[ERROR]
Build failed in Jenkins: Phoenix | Master #831
See https://builds.apache.org/job/Phoenix-master/831/changes Changes: [jmahonin] PHOENIX-2112 Phoenix-Spark need to support UTF8String for spark 1.4.0 (Yi Tian) -- [...truncated 143959 lines...] at org.apache.maven.surefire.junitcore.JUnitCoreWrapper.execute(JUnitCoreWrapper.java:57) at org.apache.maven.surefire.junitcore.JUnitCoreProvider.invoke(JUnitCoreProvider.java:144) at org.apache.maven.surefire.booter.ForkedBooter.invokeProviderInSameClassLoader(ForkedBooter.java:203) at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:155) at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:103) Caused by: java.io.IOException: Shutting down at org.apache.hadoop.hbase.MiniHBaseCluster.init(MiniHBaseCluster.java:232) at org.apache.hadoop.hbase.MiniHBaseCluster.init(MiniHBaseCluster.java:94) at org.apache.hadoop.hbase.HBaseTestingUtility.startMiniHBaseCluster(HBaseTestingUtility.java:995) at org.apache.hadoop.hbase.HBaseTestingUtility.startMiniCluster(HBaseTestingUtility.java:955) at org.apache.hadoop.hbase.HBaseTestingUtility.startMiniCluster(HBaseTestingUtility.java:829) at org.apache.hadoop.hbase.HBaseTestingUtility.startMiniCluster(HBaseTestingUtility.java:811) at org.apache.hadoop.hbase.HBaseTestingUtility.startMiniCluster(HBaseTestingUtility.java:798) at org.apache.phoenix.query.BaseTest.initMiniCluster(BaseTest.java:571) at org.apache.phoenix.query.BaseTest.setUpTestCluster(BaseTest.java:501) at org.apache.phoenix.query.BaseTest.checkClusterInitialized(BaseTest.java:488) at org.apache.phoenix.query.BaseTest.setUpTestDriver(BaseTest.java:545) at org.apache.phoenix.query.BaseTest.setUpTestDriver(BaseTest.java:541) at org.apache.phoenix.end2end.BaseViewIT.doSetup(BaseViewIT.java:49) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:50) at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12) at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:47) at org.junit.internal.runners.statements.RunBefores.evaluate(RunBefores.java:24) at org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:27) at org.junit.runners.ParentRunner.run(ParentRunner.java:363) at org.junit.runners.Suite.runChild(Suite.java:128) at org.junit.runners.Suite.runChild(Suite.java:27) at org.junit.runners.ParentRunner$3.run(ParentRunner.java:290) at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:71) at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:288) at org.junit.runners.ParentRunner.access$000(ParentRunner.java:58) at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:268) at org.junit.runners.ParentRunner.run(ParentRunner.java:363) at org.junit.runner.JUnitCore.run(JUnitCore.java:137) at org.junit.runner.JUnitCore.run(JUnitCore.java:115) at org.apache.maven.surefire.junitcore.JUnitCoreWrapper.createRequestAndRun(JUnitCoreWrapper.java:107) at org.apache.maven.surefire.junitcore.JUnitCoreWrapper.executeLazy(JUnitCoreWrapper.java:88) at org.apache.maven.surefire.junitcore.JUnitCoreWrapper.execute(JUnitCoreWrapper.java:57) at org.apache.maven.surefire.junitcore.JUnitCoreProvider.invoke(JUnitCoreProvider.java:144) at org.apache.maven.surefire.booter.ForkedBooter.invokeProviderInSameClassLoader(ForkedBooter.java:203) at org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:155) at org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:103) Caused by: java.lang.RuntimeException: Master not initialized after 20ms seconds at org.apache.hadoop.hbase.util.JVMClusterUtil.startup(JVMClusterUtil.java:225) at org.apache.hadoop.hbase.LocalHBaseCluster.startup(LocalHBaseCluster.java:445) at org.apache.hadoop.hbase.MiniHBaseCluster.init(MiniHBaseCluster.java:225) at org.apache.hadoop.hbase.MiniHBaseCluster.init(MiniHBaseCluster.java:94) at org.apache.hadoop.hbase.HBaseTestingUtility.startMiniHBaseCluster(HBaseTestingUtility.java:995) at org.apache.hadoop.hbase.HBaseTestingUtility.startMiniCluster(HBaseTestingUtility.java:955) at org.apache.hadoop.hbase.HBaseTestingUtility.startMiniCluster(HBaseTestingUtility.java:829) at
phoenix git commit: PHOENIX-2109 - Joda time version conflict between phoenix and pherf
Repository: phoenix
Updated Branches:
refs/heads/master 70c542d8e - a772a4a0c
PHOENIX-2109 - Joda time version conflict between phoenix and pherf
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/a772a4a0
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/a772a4a0
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/a772a4a0
Branch: refs/heads/master
Commit: a772a4a0ca3c9ac98335ce2148eb2b34d3ce1369
Parents: 70c542d
Author: Cody Marcel cody.mar...@gmail.com
Authored: Mon Jul 13 14:23:53 2015 -0700
Committer: Cody Marcel cody.mar...@gmail.com
Committed: Mon Jul 13 14:23:53 2015 -0700
--
phoenix-pherf/pom.xml| 2 +-
.../src/it/java/org/apache/phoenix/pherf/DataIngestIT.java | 8
2 files changed, 9 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/a772a4a0/phoenix-pherf/pom.xml
--
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index 0facbde..4d27305 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -219,7 +219,7 @@
dependency
groupIdjoda-time/groupId
artifactIdjoda-time/artifactId
-version1.6.2/version
+version${jodatime.version}/version
/dependency
dependency
groupIdcom.googlecode.java-diff-utils/groupId
http://git-wip-us.apache.org/repos/asf/phoenix/blob/a772a4a0/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
--
diff --git
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
index 828ac38..8a340b3 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
@@ -27,6 +27,7 @@ import org.apache.phoenix.pherf.configuration.Scenario;
import org.apache.phoenix.pherf.rules.DataValue;
import org.apache.phoenix.pherf.rules.RulesApplier;
import org.apache.phoenix.pherf.workload.QueryExecutor;
+import org.apache.phoenix.pherf.workload.Workload;
import org.apache.phoenix.pherf.workload.WorkloadExecutor;
import org.apache.phoenix.pherf.workload.WriteWorkload;
import org.junit.Before;
@@ -68,6 +69,7 @@ public class DataIngestIT extends ResultBaseTestIT {
WriteWorkload loader = new WriteWorkload(util, parser, scenario);
WorkloadExecutor executor = new WorkloadExecutor();
executor.add(loader);
+executor.get();
RulesApplier rulesApplier = loader.getRulesApplier();
ListMap modelList = rulesApplier.getModelList();
@@ -90,6 +92,12 @@ public class DataIngestIT extends ResultBaseTestIT {
data.getDistribution() == Integer.MIN_VALUE);
}
}
+
+// Run some queries
+Workload query = new QueryExecutor(parser, util,
executor.getPool());
+executor.add(query);
+executor.get();
+
} catch (Exception e) {
fail(We had an exception: + e.getMessage());
}
phoenix git commit: PHOENIX-2109 - Joda time version conflict between phoenix and pherf
Repository: phoenix
Updated Branches:
refs/heads/4.4-HBase-1.0 4ffdcdeea - d226c6a63
PHOENIX-2109 - Joda time version conflict between phoenix and pherf
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d226c6a6
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d226c6a6
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d226c6a6
Branch: refs/heads/4.4-HBase-1.0
Commit: d226c6a63d118da109299aa8d9f82001c4d8d61f
Parents: 4ffdcde
Author: Cody Marcel cody.mar...@gmail.com
Authored: Mon Jul 13 14:27:09 2015 -0700
Committer: Cody Marcel cody.mar...@gmail.com
Committed: Mon Jul 13 14:27:09 2015 -0700
--
phoenix-pherf/pom.xml| 2 +-
.../src/it/java/org/apache/phoenix/pherf/DataIngestIT.java | 8
2 files changed, 9 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/d226c6a6/phoenix-pherf/pom.xml
--
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index dc03af4..f987a8c 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -219,7 +219,7 @@
dependency
groupIdjoda-time/groupId
artifactIdjoda-time/artifactId
-version1.6.2/version
+version${jodatime.version}/version
/dependency
dependency
groupIdcom.googlecode.java-diff-utils/groupId
http://git-wip-us.apache.org/repos/asf/phoenix/blob/d226c6a6/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
--
diff --git
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
index 828ac38..8a340b3 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
@@ -27,6 +27,7 @@ import org.apache.phoenix.pherf.configuration.Scenario;
import org.apache.phoenix.pherf.rules.DataValue;
import org.apache.phoenix.pherf.rules.RulesApplier;
import org.apache.phoenix.pherf.workload.QueryExecutor;
+import org.apache.phoenix.pherf.workload.Workload;
import org.apache.phoenix.pherf.workload.WorkloadExecutor;
import org.apache.phoenix.pherf.workload.WriteWorkload;
import org.junit.Before;
@@ -68,6 +69,7 @@ public class DataIngestIT extends ResultBaseTestIT {
WriteWorkload loader = new WriteWorkload(util, parser, scenario);
WorkloadExecutor executor = new WorkloadExecutor();
executor.add(loader);
+executor.get();
RulesApplier rulesApplier = loader.getRulesApplier();
ListMap modelList = rulesApplier.getModelList();
@@ -90,6 +92,12 @@ public class DataIngestIT extends ResultBaseTestIT {
data.getDistribution() == Integer.MIN_VALUE);
}
}
+
+// Run some queries
+Workload query = new QueryExecutor(parser, util,
executor.getPool());
+executor.add(query);
+executor.get();
+
} catch (Exception e) {
fail(We had an exception: + e.getMessage());
}
phoenix git commit: PHOENIX-2109 - Joda time version conflict between phoenix and pherf
Repository: phoenix
Updated Branches:
refs/heads/4.4-HBase-1.1 26e8cf244 - eeefd6d12
PHOENIX-2109 - Joda time version conflict between phoenix and pherf
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/eeefd6d1
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/eeefd6d1
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/eeefd6d1
Branch: refs/heads/4.4-HBase-1.1
Commit: eeefd6d12fd3a6ffc58e1674ddacec6986307c38
Parents: 26e8cf2
Author: Cody Marcel cody.mar...@gmail.com
Authored: Mon Jul 13 14:28:14 2015 -0700
Committer: Cody Marcel cody.mar...@gmail.com
Committed: Mon Jul 13 14:28:14 2015 -0700
--
phoenix-pherf/pom.xml| 2 +-
.../src/it/java/org/apache/phoenix/pherf/DataIngestIT.java | 8
2 files changed, 9 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/eeefd6d1/phoenix-pherf/pom.xml
--
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index a852a85..b6b9130 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -219,7 +219,7 @@
dependency
groupIdjoda-time/groupId
artifactIdjoda-time/artifactId
-version1.6.2/version
+version${jodatime.version}/version
/dependency
dependency
groupIdcom.googlecode.java-diff-utils/groupId
http://git-wip-us.apache.org/repos/asf/phoenix/blob/eeefd6d1/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
--
diff --git
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
index 828ac38..8a340b3 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
@@ -27,6 +27,7 @@ import org.apache.phoenix.pherf.configuration.Scenario;
import org.apache.phoenix.pherf.rules.DataValue;
import org.apache.phoenix.pherf.rules.RulesApplier;
import org.apache.phoenix.pherf.workload.QueryExecutor;
+import org.apache.phoenix.pherf.workload.Workload;
import org.apache.phoenix.pherf.workload.WorkloadExecutor;
import org.apache.phoenix.pherf.workload.WriteWorkload;
import org.junit.Before;
@@ -68,6 +69,7 @@ public class DataIngestIT extends ResultBaseTestIT {
WriteWorkload loader = new WriteWorkload(util, parser, scenario);
WorkloadExecutor executor = new WorkloadExecutor();
executor.add(loader);
+executor.get();
RulesApplier rulesApplier = loader.getRulesApplier();
ListMap modelList = rulesApplier.getModelList();
@@ -90,6 +92,12 @@ public class DataIngestIT extends ResultBaseTestIT {
data.getDistribution() == Integer.MIN_VALUE);
}
}
+
+// Run some queries
+Workload query = new QueryExecutor(parser, util,
executor.getPool());
+executor.add(query);
+executor.get();
+
} catch (Exception e) {
fail(We had an exception: + e.getMessage());
}
phoenix git commit: PHOENIX-2109 - Joda time version conflict between phoenix and pherf
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-0.98 54e98aa4a - fae7ee04a
PHOENIX-2109 - Joda time version conflict between phoenix and pherf
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/fae7ee04
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/fae7ee04
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/fae7ee04
Branch: refs/heads/4.x-HBase-0.98
Commit: fae7ee04a50460c8b2255f26340510f3120f26c9
Parents: 54e98aa
Author: Cody Marcel cody.mar...@gmail.com
Authored: Mon Jul 13 14:31:07 2015 -0700
Committer: Cody Marcel cody.mar...@gmail.com
Committed: Mon Jul 13 14:31:07 2015 -0700
--
phoenix-pherf/pom.xml| 2 +-
.../src/it/java/org/apache/phoenix/pherf/DataIngestIT.java | 8
2 files changed, 9 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/fae7ee04/phoenix-pherf/pom.xml
--
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index bc4a07a..9bdd583 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -218,7 +218,7 @@
dependency
groupIdjoda-time/groupId
artifactIdjoda-time/artifactId
-version1.6.2/version
+version${jodatime.version}/version
/dependency
dependency
groupIdcom.googlecode.java-diff-utils/groupId
http://git-wip-us.apache.org/repos/asf/phoenix/blob/fae7ee04/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
--
diff --git
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
index 828ac38..8a340b3 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
@@ -27,6 +27,7 @@ import org.apache.phoenix.pherf.configuration.Scenario;
import org.apache.phoenix.pherf.rules.DataValue;
import org.apache.phoenix.pherf.rules.RulesApplier;
import org.apache.phoenix.pherf.workload.QueryExecutor;
+import org.apache.phoenix.pherf.workload.Workload;
import org.apache.phoenix.pherf.workload.WorkloadExecutor;
import org.apache.phoenix.pherf.workload.WriteWorkload;
import org.junit.Before;
@@ -68,6 +69,7 @@ public class DataIngestIT extends ResultBaseTestIT {
WriteWorkload loader = new WriteWorkload(util, parser, scenario);
WorkloadExecutor executor = new WorkloadExecutor();
executor.add(loader);
+executor.get();
RulesApplier rulesApplier = loader.getRulesApplier();
ListMap modelList = rulesApplier.getModelList();
@@ -90,6 +92,12 @@ public class DataIngestIT extends ResultBaseTestIT {
data.getDistribution() == Integer.MIN_VALUE);
}
}
+
+// Run some queries
+Workload query = new QueryExecutor(parser, util,
executor.getPool());
+executor.add(query);
+executor.get();
+
} catch (Exception e) {
fail(We had an exception: + e.getMessage());
}
phoenix git commit: PHOENIX-2109 - Joda time version conflict between phoenix and pherf
Repository: phoenix
Updated Branches:
refs/heads/4.4-HBase-0.98 7fa989ad2 - 421f851dc
PHOENIX-2109 - Joda time version conflict between phoenix and pherf
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/421f851d
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/421f851d
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/421f851d
Branch: refs/heads/4.4-HBase-0.98
Commit: 421f851dc4b5352527cae0413f207ca13c28cd25
Parents: 7fa989a
Author: Cody Marcel cody.mar...@gmail.com
Authored: Mon Jul 13 14:25:58 2015 -0700
Committer: Cody Marcel cody.mar...@gmail.com
Committed: Mon Jul 13 14:25:58 2015 -0700
--
phoenix-pherf/pom.xml| 2 +-
.../src/it/java/org/apache/phoenix/pherf/DataIngestIT.java | 8
2 files changed, 9 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/421f851d/phoenix-pherf/pom.xml
--
diff --git a/phoenix-pherf/pom.xml b/phoenix-pherf/pom.xml
index 9319a7d..1b3f0a1 100644
--- a/phoenix-pherf/pom.xml
+++ b/phoenix-pherf/pom.xml
@@ -219,7 +219,7 @@
dependency
groupIdjoda-time/groupId
artifactIdjoda-time/artifactId
-version1.6.2/version
+version${jodatime.version}/version
/dependency
dependency
groupIdcom.googlecode.java-diff-utils/groupId
http://git-wip-us.apache.org/repos/asf/phoenix/blob/421f851d/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
--
diff --git
a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
index 828ac38..8a340b3 100644
--- a/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
+++ b/phoenix-pherf/src/it/java/org/apache/phoenix/pherf/DataIngestIT.java
@@ -27,6 +27,7 @@ import org.apache.phoenix.pherf.configuration.Scenario;
import org.apache.phoenix.pherf.rules.DataValue;
import org.apache.phoenix.pherf.rules.RulesApplier;
import org.apache.phoenix.pherf.workload.QueryExecutor;
+import org.apache.phoenix.pherf.workload.Workload;
import org.apache.phoenix.pherf.workload.WorkloadExecutor;
import org.apache.phoenix.pherf.workload.WriteWorkload;
import org.junit.Before;
@@ -68,6 +69,7 @@ public class DataIngestIT extends ResultBaseTestIT {
WriteWorkload loader = new WriteWorkload(util, parser, scenario);
WorkloadExecutor executor = new WorkloadExecutor();
executor.add(loader);
+executor.get();
RulesApplier rulesApplier = loader.getRulesApplier();
ListMap modelList = rulesApplier.getModelList();
@@ -90,6 +92,12 @@ public class DataIngestIT extends ResultBaseTestIT {
data.getDistribution() == Integer.MIN_VALUE);
}
}
+
+// Run some queries
+Workload query = new QueryExecutor(parser, util,
executor.getPool());
+executor.add(query);
+executor.get();
+
} catch (Exception e) {
fail(We had an exception: + e.getMessage());
}
Apache-Phoenix | 4.4-HBase-0.98 | Build Successful
4.4-HBase-0.98 branch build status Successful Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/4.4-HBase-0.98 Compiled Artifacts https://builds.apache.org/job/Phoenix-4.4-HBase-0.98/lastSuccessfulBuild/artifact/ Test Report https://builds.apache.org/job/Phoenix-4.4-HBase-0.98/lastCompletedBuild/testReport/ Changes [cody.marcel] PHOENIX-2109 - Joda time version conflict between phoenix and pherf Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout
[2/2] phoenix git commit: PHOENIX-2058 Check for existence and compatibility of columns being added in view
PHOENIX-2058 Check for existence and compatibility of columns being added in
view
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/01b4f605
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/01b4f605
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/01b4f605
Branch: refs/heads/master
Commit: 01b4f6055911aa5036aa1e3a79340f80eb08396a
Parents: 66705d5
Author: Thomas D'Silva tdsi...@salesforce.com
Authored: Fri Jul 10 11:55:55 2015 -0700
Committer: Thomas D'Silva tdsi...@salesforce.com
Committed: Mon Jul 13 17:37:58 2015 -0700
--
.../apache/phoenix/end2end/AlterTableIT.java| 311 ---
.../java/org/apache/phoenix/end2end/ViewIT.java | 6 +
.../coprocessor/MetaDataEndpointImpl.java | 64 ++--
.../apache/phoenix/schema/MetaDataClient.java | 9 +-
4 files changed, 310 insertions(+), 80 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/01b4f605/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
--
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
index 0425933..607f52a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
@@ -2009,7 +2009,7 @@ public class AlterTableIT extends
BaseOwnClusterHBaseManagedTimeIT {
}
@Test
-public void testAddNewColumnToBaseTableWithViews() throws Exception {
+public void testAddNewColumnsToBaseTableWithViews() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
try {
conn.createStatement().execute(CREATE TABLE IF NOT EXISTS
TABLEWITHVIEW (
@@ -2018,13 +2018,15 @@ public class AlterTableIT extends
BaseOwnClusterHBaseManagedTimeIT {
+ COL2 bigint NOT NULL,
+ CONSTRAINT NAME_PK PRIMARY KEY (ID, COL1, COL2)
+ ));
-assertTableDefinition(conn, TABLEWITHVIEW, PTableType.TABLE,
null, 0, 3, -1, ID, COL1, COL2);
+assertTableDefinition(conn, TABLEWITHVIEW, PTableType.TABLE,
null, 0, 3, QueryConstants.BASE_TABLE_BASE_COLUMN_COUNT, ID, COL1, COL2);
conn.createStatement().execute(CREATE VIEW VIEWOFTABLE (
VIEW_COL1 DECIMAL(10,2), VIEW_COL2 VARCHAR ) AS SELECT * FROM TABLEWITHVIEW);
assertTableDefinition(conn, VIEWOFTABLE, PTableType.VIEW,
TABLEWITHVIEW, 0, 5, 3, ID, COL1, COL2, VIEW_COL1, VIEW_COL2);
-conn.createStatement().execute(ALTER TABLE TABLEWITHVIEW ADD COL3
char(10));
-assertTableDefinition(conn, VIEWOFTABLE, PTableType.VIEW,
TABLEWITHVIEW, 1, 6, 4, ID, COL1, COL2, COL3, VIEW_COL1,
VIEW_COL2);
+// adding a new pk column and a new regular column
+conn.createStatement().execute(ALTER TABLE TABLEWITHVIEW ADD COL3
varchar(10) PRIMARY KEY, COL4 integer);
+assertTableDefinition(conn, TABLEWITHVIEW, PTableType.TABLE,
null, 1, 5, QueryConstants.BASE_TABLE_BASE_COLUMN_COUNT, ID, COL1, COL2,
COL3, COL4);
+assertTableDefinition(conn, VIEWOFTABLE, PTableType.VIEW,
TABLEWITHVIEW, 1, 7, 5, ID, COL1, COL2, COL3, COL4, VIEW_COL1,
VIEW_COL2);
} finally {
conn.close();
}
@@ -2040,13 +2042,13 @@ public class AlterTableIT extends
BaseOwnClusterHBaseManagedTimeIT {
+ COL2 bigint NOT NULL,
+ CONSTRAINT NAME_PK PRIMARY KEY (ID, COL1, COL2)
+ ));
-assertTableDefinition(conn, TABLEWITHVIEW, PTableType.TABLE,
null, 0, 3, -1, ID, COL1, COL2);
+assertTableDefinition(conn, TABLEWITHVIEW, PTableType.TABLE,
null, 0, 3, QueryConstants.BASE_TABLE_BASE_COLUMN_COUNT, ID, COL1, COL2);
-conn.createStatement().execute(CREATE VIEW VIEWOFTABLE (
VIEW_COL1 DECIMAL(10,2), VIEW_COL2 VARCHAR(256), VIEW_COL3 VARCHAR, VIEW_COL4
DECIMAL ) AS SELECT * FROM TABLEWITHVIEW);
-assertTableDefinition(conn, VIEWOFTABLE, PTableType.VIEW,
TABLEWITHVIEW, 0, 7, 3, ID, COL1, COL2, VIEW_COL1, VIEW_COL2,
VIEW_COL3, VIEW_COL4);
+conn.createStatement().execute(CREATE VIEW VIEWOFTABLE (
VIEW_COL1 DECIMAL(10,2), VIEW_COL2 VARCHAR(256), VIEW_COL3 VARCHAR, VIEW_COL4
DECIMAL, VIEW_COL5 DECIMAL(10,2), VIEW_COL6 VARCHAR, CONSTRAINT pk PRIMARY KEY
(VIEW_COL5, VIEW_COL6) ) AS SELECT * FROM TABLEWITHVIEW);
+assertTableDefinition(conn, VIEWOFTABLE, PTableType.VIEW,
TABLEWITHVIEW, 0, 9, 3, ID, COL1, COL2, VIEW_COL1, VIEW_COL2,
VIEW_COL3, VIEW_COL4, VIEW_COL5, VIEW_COL6);
[2/2] phoenix git commit: PHOENIX-978: Allow views to extend parent's PK only if parent's last PK column is fixed length
PHOENIX-978: Allow views to extend parent's PK only if parent's last PK column
is fixed length
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/f542971a
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/f542971a
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/f542971a
Branch: refs/heads/4.x-HBase-1.0
Commit: f542971ab29a2237c578a463cdb7e48f6665a32e
Parents: 8d003ad
Author: Eli Levine elilev...@apache.org
Authored: Wed Jul 8 18:46:43 2015 -0700
Committer: Thomas D'Silva tdsi...@salesforce.com
Committed: Mon Jul 13 17:32:23 2015 -0700
--
.../apache/phoenix/end2end/AlterTableIT.java| 9 ++
.../java/org/apache/phoenix/end2end/ViewIT.java | 17 ++
.../phoenix/exception/SQLExceptionCode.java | 1 +
.../apache/phoenix/schema/MetaDataClient.java | 33
4 files changed, 54 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/f542971a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
--
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
index fbaded0..0425933 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
@@ -64,7 +64,6 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import com.google.common.base.Objects;
@@ -2132,15 +2131,13 @@ public class AlterTableIT extends
BaseOwnClusterHBaseManagedTimeIT {
}
@Test
-@Ignore
-// enable this test after
https://issues.apache.org/jira/browse/PHOENIX-978 is fixed
public void testAddExistingViewPkColumnToBaseTableWithViews() throws
Exception {
Connection conn = DriverManager.getConnection(getUrl());
try {
conn.createStatement().execute(CREATE TABLE IF NOT EXISTS
TABLEWITHVIEW (
+ ID char(10) NOT NULL,
+ COL1 integer NOT NULL,
-+ COL2 bigint NOT NULL,
++ COL2 integer NOT NULL,
+ CONSTRAINT NAME_PK PRIMARY KEY (ID, COL1, COL2)
+ ));
assertTableDefinition(conn, TABLEWITHVIEW, PTableType.TABLE,
null, 0, 3, -1, ID, COL1, COL2);
@@ -2169,7 +2166,7 @@ public class AlterTableIT extends
BaseOwnClusterHBaseManagedTimeIT {
}
// add the pk column of the view to the base table
-conn.createStatement().execute(ALTER TABLE TABLEWITHVIEW ADD
VIEW_COL1 DECIMAL PRIMARY KEY);
+conn.createStatement().execute(ALTER TABLE TABLEWITHVIEW ADD
VIEW_COL1 DECIMAL(10,2) PRIMARY KEY);
assertTableDefinition(conn, TABLEWITHVIEW, PTableType.TABLE,
null, 1, 4, -1, ID, COL1, COL2, VIEW_COL1);
assertTableDefinition(conn, VIEWOFTABLE, PTableType.VIEW,
TABLEWITHVIEW, 1, 5, 4, ID, COL1, COL2, VIEW_COL1, VIEW_COL2);
@@ -2179,7 +2176,7 @@ public class AlterTableIT extends
BaseOwnClusterHBaseManagedTimeIT {
assertEquals(rs.getString(1), view1);
assertEquals(rs.getInt(2), 12);
assertEquals(rs.getInt(3), 13);
-assertEquals(rs.getInt(4), 14);
+assertEquals(rs.getBigDecimal(4).intValue(), 14);
assertFalse(rs.next());
// query view
http://git-wip-us.apache.org/repos/asf/phoenix/blob/f542971a/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 db38ab3..1d8af35 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
@@ -18,6 +18,7 @@
package org.apache.phoenix.end2end;
import static com.google.common.collect.Lists.newArrayListWithExpectedSize;
+import static
org.apache.phoenix.exception.SQLExceptionCode.CANNOT_MODIFY_VIEW_PK;
import static
org.apache.phoenix.exception.SQLExceptionCode.NOT_NULLABLE_COLUMN_IN_ROW_KEY;
import static org.apache.phoenix.util.TestUtil.analyzeTable;
import static org.apache.phoenix.util.TestUtil.getAllSplits;
@@ -522,6 +523,22 @@ public class ViewIT extends BaseViewIT {
assertPKs(rs, new String[] {K1, K2, K3, K4});
}
+@Test
+public void
[1/2] phoenix git commit: PHOENIX-2058 Check for existence and compatibility of columns being added in view
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-0.98 fae7ee04a - 9d244e0d7
PHOENIX-2058 Check for existence and compatibility of columns being added in
view
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/9d244e0d
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/9d244e0d
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/9d244e0d
Branch: refs/heads/4.x-HBase-0.98
Commit: 9d244e0d797aea44cf4ac9d25d1112b7acfc16ce
Parents: 9b8f361
Author: Thomas D'Silva tdsi...@salesforce.com
Authored: Fri Jul 10 11:55:55 2015 -0700
Committer: Thomas D'Silva tdsi...@salesforce.com
Committed: Mon Jul 13 17:31:25 2015 -0700
--
.../apache/phoenix/end2end/AlterTableIT.java| 311 ---
.../java/org/apache/phoenix/end2end/ViewIT.java | 6 +
.../coprocessor/MetaDataEndpointImpl.java | 65 ++--
.../apache/phoenix/schema/MetaDataClient.java | 9 +-
4 files changed, 311 insertions(+), 80 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/9d244e0d/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
--
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
index 0425933..607f52a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
@@ -2009,7 +2009,7 @@ public class AlterTableIT extends
BaseOwnClusterHBaseManagedTimeIT {
}
@Test
-public void testAddNewColumnToBaseTableWithViews() throws Exception {
+public void testAddNewColumnsToBaseTableWithViews() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
try {
conn.createStatement().execute(CREATE TABLE IF NOT EXISTS
TABLEWITHVIEW (
@@ -2018,13 +2018,15 @@ public class AlterTableIT extends
BaseOwnClusterHBaseManagedTimeIT {
+ COL2 bigint NOT NULL,
+ CONSTRAINT NAME_PK PRIMARY KEY (ID, COL1, COL2)
+ ));
-assertTableDefinition(conn, TABLEWITHVIEW, PTableType.TABLE,
null, 0, 3, -1, ID, COL1, COL2);
+assertTableDefinition(conn, TABLEWITHVIEW, PTableType.TABLE,
null, 0, 3, QueryConstants.BASE_TABLE_BASE_COLUMN_COUNT, ID, COL1, COL2);
conn.createStatement().execute(CREATE VIEW VIEWOFTABLE (
VIEW_COL1 DECIMAL(10,2), VIEW_COL2 VARCHAR ) AS SELECT * FROM TABLEWITHVIEW);
assertTableDefinition(conn, VIEWOFTABLE, PTableType.VIEW,
TABLEWITHVIEW, 0, 5, 3, ID, COL1, COL2, VIEW_COL1, VIEW_COL2);
-conn.createStatement().execute(ALTER TABLE TABLEWITHVIEW ADD COL3
char(10));
-assertTableDefinition(conn, VIEWOFTABLE, PTableType.VIEW,
TABLEWITHVIEW, 1, 6, 4, ID, COL1, COL2, COL3, VIEW_COL1,
VIEW_COL2);
+// adding a new pk column and a new regular column
+conn.createStatement().execute(ALTER TABLE TABLEWITHVIEW ADD COL3
varchar(10) PRIMARY KEY, COL4 integer);
+assertTableDefinition(conn, TABLEWITHVIEW, PTableType.TABLE,
null, 1, 5, QueryConstants.BASE_TABLE_BASE_COLUMN_COUNT, ID, COL1, COL2,
COL3, COL4);
+assertTableDefinition(conn, VIEWOFTABLE, PTableType.VIEW,
TABLEWITHVIEW, 1, 7, 5, ID, COL1, COL2, COL3, COL4, VIEW_COL1,
VIEW_COL2);
} finally {
conn.close();
}
@@ -2040,13 +2042,13 @@ public class AlterTableIT extends
BaseOwnClusterHBaseManagedTimeIT {
+ COL2 bigint NOT NULL,
+ CONSTRAINT NAME_PK PRIMARY KEY (ID, COL1, COL2)
+ ));
-assertTableDefinition(conn, TABLEWITHVIEW, PTableType.TABLE,
null, 0, 3, -1, ID, COL1, COL2);
+assertTableDefinition(conn, TABLEWITHVIEW, PTableType.TABLE,
null, 0, 3, QueryConstants.BASE_TABLE_BASE_COLUMN_COUNT, ID, COL1, COL2);
-conn.createStatement().execute(CREATE VIEW VIEWOFTABLE (
VIEW_COL1 DECIMAL(10,2), VIEW_COL2 VARCHAR(256), VIEW_COL3 VARCHAR, VIEW_COL4
DECIMAL ) AS SELECT * FROM TABLEWITHVIEW);
-assertTableDefinition(conn, VIEWOFTABLE, PTableType.VIEW,
TABLEWITHVIEW, 0, 7, 3, ID, COL1, COL2, VIEW_COL1, VIEW_COL2,
VIEW_COL3, VIEW_COL4);
+conn.createStatement().execute(CREATE VIEW VIEWOFTABLE (
VIEW_COL1 DECIMAL(10,2), VIEW_COL2 VARCHAR(256), VIEW_COL3 VARCHAR, VIEW_COL4
DECIMAL, VIEW_COL5 DECIMAL(10,2), VIEW_COL6 VARCHAR, CONSTRAINT pk PRIMARY KEY
(VIEW_COL5, VIEW_COL6) ) AS SELECT * FROM TABLEWITHVIEW);
+assertTableDefinition(conn, VIEWOFTABLE, PTableType.VIEW,
TABLEWITHVIEW, 0, 9, 3, ID,
[1/2] phoenix git commit: PHOENIX-2058 Check for existence and compatibility of columns being added in view
Repository: phoenix
Updated Branches:
refs/heads/4.x-HBase-1.0 8d003ad64 - 27d78b653
PHOENIX-2058 Check for existence and compatibility of columns being added in
view
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/27d78b65
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/27d78b65
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/27d78b65
Branch: refs/heads/4.x-HBase-1.0
Commit: 27d78b65381d22bea1cf76069fa39650e5eb6b2b
Parents: f542971
Author: Thomas D'Silva tdsi...@salesforce.com
Authored: Fri Jul 10 11:55:55 2015 -0700
Committer: Thomas D'Silva tdsi...@salesforce.com
Committed: Mon Jul 13 17:32:23 2015 -0700
--
.../apache/phoenix/end2end/AlterTableIT.java| 311 ---
.../java/org/apache/phoenix/end2end/ViewIT.java | 6 +
.../coprocessor/MetaDataEndpointImpl.java | 65 ++--
.../apache/phoenix/schema/MetaDataClient.java | 9 +-
4 files changed, 311 insertions(+), 80 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/27d78b65/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
--
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
index 0425933..607f52a 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
@@ -2009,7 +2009,7 @@ public class AlterTableIT extends
BaseOwnClusterHBaseManagedTimeIT {
}
@Test
-public void testAddNewColumnToBaseTableWithViews() throws Exception {
+public void testAddNewColumnsToBaseTableWithViews() throws Exception {
Connection conn = DriverManager.getConnection(getUrl());
try {
conn.createStatement().execute(CREATE TABLE IF NOT EXISTS
TABLEWITHVIEW (
@@ -2018,13 +2018,15 @@ public class AlterTableIT extends
BaseOwnClusterHBaseManagedTimeIT {
+ COL2 bigint NOT NULL,
+ CONSTRAINT NAME_PK PRIMARY KEY (ID, COL1, COL2)
+ ));
-assertTableDefinition(conn, TABLEWITHVIEW, PTableType.TABLE,
null, 0, 3, -1, ID, COL1, COL2);
+assertTableDefinition(conn, TABLEWITHVIEW, PTableType.TABLE,
null, 0, 3, QueryConstants.BASE_TABLE_BASE_COLUMN_COUNT, ID, COL1, COL2);
conn.createStatement().execute(CREATE VIEW VIEWOFTABLE (
VIEW_COL1 DECIMAL(10,2), VIEW_COL2 VARCHAR ) AS SELECT * FROM TABLEWITHVIEW);
assertTableDefinition(conn, VIEWOFTABLE, PTableType.VIEW,
TABLEWITHVIEW, 0, 5, 3, ID, COL1, COL2, VIEW_COL1, VIEW_COL2);
-conn.createStatement().execute(ALTER TABLE TABLEWITHVIEW ADD COL3
char(10));
-assertTableDefinition(conn, VIEWOFTABLE, PTableType.VIEW,
TABLEWITHVIEW, 1, 6, 4, ID, COL1, COL2, COL3, VIEW_COL1,
VIEW_COL2);
+// adding a new pk column and a new regular column
+conn.createStatement().execute(ALTER TABLE TABLEWITHVIEW ADD COL3
varchar(10) PRIMARY KEY, COL4 integer);
+assertTableDefinition(conn, TABLEWITHVIEW, PTableType.TABLE,
null, 1, 5, QueryConstants.BASE_TABLE_BASE_COLUMN_COUNT, ID, COL1, COL2,
COL3, COL4);
+assertTableDefinition(conn, VIEWOFTABLE, PTableType.VIEW,
TABLEWITHVIEW, 1, 7, 5, ID, COL1, COL2, COL3, COL4, VIEW_COL1,
VIEW_COL2);
} finally {
conn.close();
}
@@ -2040,13 +2042,13 @@ public class AlterTableIT extends
BaseOwnClusterHBaseManagedTimeIT {
+ COL2 bigint NOT NULL,
+ CONSTRAINT NAME_PK PRIMARY KEY (ID, COL1, COL2)
+ ));
-assertTableDefinition(conn, TABLEWITHVIEW, PTableType.TABLE,
null, 0, 3, -1, ID, COL1, COL2);
+assertTableDefinition(conn, TABLEWITHVIEW, PTableType.TABLE,
null, 0, 3, QueryConstants.BASE_TABLE_BASE_COLUMN_COUNT, ID, COL1, COL2);
-conn.createStatement().execute(CREATE VIEW VIEWOFTABLE (
VIEW_COL1 DECIMAL(10,2), VIEW_COL2 VARCHAR(256), VIEW_COL3 VARCHAR, VIEW_COL4
DECIMAL ) AS SELECT * FROM TABLEWITHVIEW);
-assertTableDefinition(conn, VIEWOFTABLE, PTableType.VIEW,
TABLEWITHVIEW, 0, 7, 3, ID, COL1, COL2, VIEW_COL1, VIEW_COL2,
VIEW_COL3, VIEW_COL4);
+conn.createStatement().execute(CREATE VIEW VIEWOFTABLE (
VIEW_COL1 DECIMAL(10,2), VIEW_COL2 VARCHAR(256), VIEW_COL3 VARCHAR, VIEW_COL4
DECIMAL, VIEW_COL5 DECIMAL(10,2), VIEW_COL6 VARCHAR, CONSTRAINT pk PRIMARY KEY
(VIEW_COL5, VIEW_COL6) ) AS SELECT * FROM TABLEWITHVIEW);
+assertTableDefinition(conn, VIEWOFTABLE, PTableType.VIEW,
TABLEWITHVIEW, 0, 9, 3, ID,
[2/2] phoenix git commit: PHOENIX-978: Allow views to extend parent's PK only if parent's last PK column is fixed length
PHOENIX-978: Allow views to extend parent's PK only if parent's last PK column
is fixed length
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/9b8f3615
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/9b8f3615
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/9b8f3615
Branch: refs/heads/4.x-HBase-0.98
Commit: 9b8f3615e719198a1af80a9b8a920bfd0fba97f0
Parents: fae7ee0
Author: Eli Levine elilev...@apache.org
Authored: Wed Jul 8 18:46:43 2015 -0700
Committer: Thomas D'Silva tdsi...@salesforce.com
Committed: Mon Jul 13 17:31:25 2015 -0700
--
.../apache/phoenix/end2end/AlterTableIT.java| 9 ++
.../java/org/apache/phoenix/end2end/ViewIT.java | 17 ++
.../phoenix/exception/SQLExceptionCode.java | 1 +
.../apache/phoenix/schema/MetaDataClient.java | 33
4 files changed, 54 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/9b8f3615/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
--
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
index fbaded0..0425933 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AlterTableIT.java
@@ -64,7 +64,6 @@ import org.apache.phoenix.util.PropertiesUtil;
import org.apache.phoenix.util.ReadOnlyProps;
import org.apache.phoenix.util.SchemaUtil;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Test;
import com.google.common.base.Objects;
@@ -2132,15 +2131,13 @@ public class AlterTableIT extends
BaseOwnClusterHBaseManagedTimeIT {
}
@Test
-@Ignore
-// enable this test after
https://issues.apache.org/jira/browse/PHOENIX-978 is fixed
public void testAddExistingViewPkColumnToBaseTableWithViews() throws
Exception {
Connection conn = DriverManager.getConnection(getUrl());
try {
conn.createStatement().execute(CREATE TABLE IF NOT EXISTS
TABLEWITHVIEW (
+ ID char(10) NOT NULL,
+ COL1 integer NOT NULL,
-+ COL2 bigint NOT NULL,
++ COL2 integer NOT NULL,
+ CONSTRAINT NAME_PK PRIMARY KEY (ID, COL1, COL2)
+ ));
assertTableDefinition(conn, TABLEWITHVIEW, PTableType.TABLE,
null, 0, 3, -1, ID, COL1, COL2);
@@ -2169,7 +2166,7 @@ public class AlterTableIT extends
BaseOwnClusterHBaseManagedTimeIT {
}
// add the pk column of the view to the base table
-conn.createStatement().execute(ALTER TABLE TABLEWITHVIEW ADD
VIEW_COL1 DECIMAL PRIMARY KEY);
+conn.createStatement().execute(ALTER TABLE TABLEWITHVIEW ADD
VIEW_COL1 DECIMAL(10,2) PRIMARY KEY);
assertTableDefinition(conn, TABLEWITHVIEW, PTableType.TABLE,
null, 1, 4, -1, ID, COL1, COL2, VIEW_COL1);
assertTableDefinition(conn, VIEWOFTABLE, PTableType.VIEW,
TABLEWITHVIEW, 1, 5, 4, ID, COL1, COL2, VIEW_COL1, VIEW_COL2);
@@ -2179,7 +2176,7 @@ public class AlterTableIT extends
BaseOwnClusterHBaseManagedTimeIT {
assertEquals(rs.getString(1), view1);
assertEquals(rs.getInt(2), 12);
assertEquals(rs.getInt(3), 13);
-assertEquals(rs.getInt(4), 14);
+assertEquals(rs.getBigDecimal(4).intValue(), 14);
assertFalse(rs.next());
// query view
http://git-wip-us.apache.org/repos/asf/phoenix/blob/9b8f3615/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 db38ab3..1d8af35 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
@@ -18,6 +18,7 @@
package org.apache.phoenix.end2end;
import static com.google.common.collect.Lists.newArrayListWithExpectedSize;
+import static
org.apache.phoenix.exception.SQLExceptionCode.CANNOT_MODIFY_VIEW_PK;
import static
org.apache.phoenix.exception.SQLExceptionCode.NOT_NULLABLE_COLUMN_IN_ROW_KEY;
import static org.apache.phoenix.util.TestUtil.analyzeTable;
import static org.apache.phoenix.util.TestUtil.getAllSplits;
@@ -522,6 +523,22 @@ public class ViewIT extends BaseViewIT {
assertPKs(rs, new String[] {K1, K2, K3, K4});
}
+@Test
+public void
