phoenix git commit: PHOENIX-3540 Fix Time data type in Phoenix Spark integration

[ankit]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 f11d501b2 -> 5706f5144


PHOENIX-3540 Fix Time data type in Phoenix Spark integration


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 5706f514416079e9afda7c59474492a74c704473
Parents: f11d501
Author: Ankit Singhal 
Authored: Thu Dec 22 13:18:35 2016 +0530
Committer: Ankit Singhal 
Committed: Thu Dec 22 13:18:35 2016 +0530

--
 phoenix-spark/src/it/resources/globalSetup.sql   |  2 ++
 .../org/apache/phoenix/spark/PhoenixSparkIT.scala| 12 
 .../scala/org/apache/phoenix/spark/PhoenixRDD.scala  | 15 ---
 3 files changed, 22 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/5706f514/phoenix-spark/src/it/resources/globalSetup.sql
--
diff --git a/phoenix-spark/src/it/resources/globalSetup.sql 
b/phoenix-spark/src/it/resources/globalSetup.sql
index 852687e..72f8620 100644
--- a/phoenix-spark/src/it/resources/globalSetup.sql
+++ b/phoenix-spark/src/it/resources/globalSetup.sql
@@ -48,6 +48,8 @@ CREATE TABLE TEST_SMALL_TINY (ID BIGINT NOT NULL PRIMARY KEY, 
COL1 SMALLINT, COL
 UPSERT INTO TEST_SMALL_TINY VALUES (1, 32767, 127)
 CREATE TABLE DATE_TEST(ID BIGINT NOT NULL PRIMARY KEY, COL1 DATE)
 UPSERT INTO DATE_TEST VALUES(1, CURRENT_DATE())
+CREATE TABLE TIME_TEST(ID BIGINT NOT NULL PRIMARY KEY, COL1 TIME)
+UPSERT INTO TIME_TEST VALUES(1, CURRENT_TIME())
 CREATE TABLE "space" ("key" VARCHAR PRIMARY KEY, "first name" VARCHAR)
 UPSERT INTO "space" VALUES ('key1', 'xyz')
 CREATE TABLE "small" ("key" VARCHAR PRIMARY KEY, "first name" VARCHAR, 
"salary" INTEGER )

http://git-wip-us.apache.org/repos/asf/phoenix/blob/5706f514/phoenix-spark/src/it/scala/org/apache/phoenix/spark/PhoenixSparkIT.scala
--
diff --git 
a/phoenix-spark/src/it/scala/org/apache/phoenix/spark/PhoenixSparkIT.scala 
b/phoenix-spark/src/it/scala/org/apache/phoenix/spark/PhoenixSparkIT.scala
index 90822d4..fc8483d 100644
--- a/phoenix-spark/src/it/scala/org/apache/phoenix/spark/PhoenixSparkIT.scala
+++ b/phoenix-spark/src/it/scala/org/apache/phoenix/spark/PhoenixSparkIT.scala
@@ -620,4 +620,16 @@ class PhoenixSparkIT extends AbstractPhoenixSparkIT {
 
 assert(Math.abs(epoch - ts) < 30)
   }
+
+  test("Can load Phoenix Time columns through DataFrame API") {
+val sqlContext = new SQLContext(sc)
+val df = sqlContext.read
+  .format("org.apache.phoenix.spark")
+  .options(Map("table" -> "TIME_TEST", "zkUrl" -> quorumAddress))
+  .load
+val time = df.select("COL1").first().getTimestamp(0).getTime
+val epoch = new Date().getTime
+assert(Math.abs(epoch - time) < 8640)
+  }
+
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/5706f514/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRDD.scala
--
diff --git 
a/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRDD.scala 
b/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRDD.scala
index 505de1b..204a7ef 100644
--- a/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRDD.scala
+++ b/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRDD.scala
@@ -130,13 +130,14 @@ class PhoenixRDD(sc: SparkContext, table: String, 
columns: Seq[String],
   val rowSeq = columns.map { case (name, sqlType) =>
 val res = pr.resultMap(name)
 
-// Special handling for data types
-if(dateAsTimestamp && sqlType == 91) { // 91 is the defined type for 
Date
-  new java.sql.Timestamp(res.asInstanceOf[java.sql.Date].getTime)
-}
-else {
-  res
-}
+  // Special handling for data types
+  if (dateAsTimestamp && sqlType == 91) { // 91 is the defined type 
for Date
+new java.sql.Timestamp(res.asInstanceOf[java.sql.Date].getTime)
+  } else if (sqlType == 92) { // 92 is the defined type for Time
+new java.sql.Timestamp(res.asInstanceOf[java.sql.Time].getTime)
+  } else {
+res
+  }
   }
 
   // Create a Spark Row from the sequence

phoenix git commit: PHOENIX-3540 Fix Time data type in Phoenix Spark integration

[ankit]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 5286236f9 -> 3378ee857


PHOENIX-3540 Fix Time data type in Phoenix Spark integration


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

Branch: refs/heads/4.x-HBase-1.1
Commit: 3378ee857136eee1d7e7c2f09e3a1e42e340dcf4
Parents: 5286236
Author: Ankit Singhal 
Authored: Thu Dec 22 13:18:05 2016 +0530
Committer: Ankit Singhal 
Committed: Thu Dec 22 13:18:05 2016 +0530

--
 phoenix-spark/src/it/resources/globalSetup.sql   |  2 ++
 .../org/apache/phoenix/spark/PhoenixSparkIT.scala| 12 
 .../scala/org/apache/phoenix/spark/PhoenixRDD.scala  | 15 ---
 3 files changed, 22 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/3378ee85/phoenix-spark/src/it/resources/globalSetup.sql
--
diff --git a/phoenix-spark/src/it/resources/globalSetup.sql 
b/phoenix-spark/src/it/resources/globalSetup.sql
index 30605d3..1a2d162 100644
--- a/phoenix-spark/src/it/resources/globalSetup.sql
+++ b/phoenix-spark/src/it/resources/globalSetup.sql
@@ -48,6 +48,8 @@ CREATE TABLE TEST_SMALL_TINY (ID BIGINT NOT NULL PRIMARY KEY, 
COL1 SMALLINT, COL
 UPSERT INTO TEST_SMALL_TINY VALUES (1, 32767, 127)
 CREATE TABLE DATE_TEST(ID BIGINT NOT NULL PRIMARY KEY, COL1 DATE)
 UPSERT INTO DATE_TEST VALUES(1, CURRENT_DATE())
+CREATE TABLE TIME_TEST(ID BIGINT NOT NULL PRIMARY KEY, COL1 TIME)
+UPSERT INTO TIME_TEST VALUES(1, CURRENT_TIME())
 CREATE TABLE "space" ("key" VARCHAR PRIMARY KEY, "first name" VARCHAR)
 UPSERT INTO "space" VALUES ('key1', 'xyz')
 CREATE TABLE "small" ("key" VARCHAR PRIMARY KEY, "first name" VARCHAR, 
"salary" INTEGER )

http://git-wip-us.apache.org/repos/asf/phoenix/blob/3378ee85/phoenix-spark/src/it/scala/org/apache/phoenix/spark/PhoenixSparkIT.scala
--
diff --git 
a/phoenix-spark/src/it/scala/org/apache/phoenix/spark/PhoenixSparkIT.scala 
b/phoenix-spark/src/it/scala/org/apache/phoenix/spark/PhoenixSparkIT.scala
index b4ee538..bbab4e0 100644
--- a/phoenix-spark/src/it/scala/org/apache/phoenix/spark/PhoenixSparkIT.scala
+++ b/phoenix-spark/src/it/scala/org/apache/phoenix/spark/PhoenixSparkIT.scala
@@ -572,4 +572,16 @@ class PhoenixSparkIT extends AbstractPhoenixSparkIT {
 
 assert(Math.abs(epoch - ts) < 30)
   }
+
+  test("Can load Phoenix Time columns through DataFrame API") {
+val sqlContext = new SQLContext(sc)
+val df = sqlContext.read
+  .format("org.apache.phoenix.spark")
+  .options(Map("table" -> "TIME_TEST", "zkUrl" -> quorumAddress))
+  .load
+val time = df.select("COL1").first().getTimestamp(0).getTime
+val epoch = new Date().getTime
+assert(Math.abs(epoch - time) < 8640)
+  }
+
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/3378ee85/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRDD.scala
--
diff --git 
a/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRDD.scala 
b/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRDD.scala
index 505de1b..204a7ef 100644
--- a/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRDD.scala
+++ b/phoenix-spark/src/main/scala/org/apache/phoenix/spark/PhoenixRDD.scala
@@ -130,13 +130,14 @@ class PhoenixRDD(sc: SparkContext, table: String, 
columns: Seq[String],
   val rowSeq = columns.map { case (name, sqlType) =>
 val res = pr.resultMap(name)
 
-// Special handling for data types
-if(dateAsTimestamp && sqlType == 91) { // 91 is the defined type for 
Date
-  new java.sql.Timestamp(res.asInstanceOf[java.sql.Date].getTime)
-}
-else {
-  res
-}
+  // Special handling for data types
+  if (dateAsTimestamp && sqlType == 91) { // 91 is the defined type 
for Date
+new java.sql.Timestamp(res.asInstanceOf[java.sql.Date].getTime)
+  } else if (sqlType == 92) { // 92 is the defined type for Time
+new java.sql.Timestamp(res.asInstanceOf[java.sql.Time].getTime)
+  } else {
+res
+  }
   }
 
   // Create a Spark Row from the sequence

Build failed in Jenkins: Phoenix-Calcite #50

[Apache Jenkins Server]

See 

--
[...truncated 40167 lines...]
"=" "VAR_SAMP" ...
"=" "CURRENT_CATALOG" ...
"=" "CURRENT_DEFAULT_TRANSFORM_GROUP" ...
"=" "CURRENT_PATH" ...
"=" "CURRENT_ROLE" ...
"=" "CURRENT_SCHEMA" ...
"=" "CURRENT_USER" ...
"=" "SESSION_USER" ...
"=" "SYSTEM_USER" ...
"=" "USER" ...
"=" "NEW" ...
"=" "CASE" ...
"=" "NEXT" ...
"=" "CURRENT" ...
"=" "CURSOR" ...
"=" "ROW" ...
"=" "(" ...
"[" ...
"IS" ...
 ...
"UESCAPE" ...

at 
org.apache.phoenix.end2end.StringToArrayFunctionIT.testStringToArrayFunctionInWhere3(StringToArrayFunctionIT.java:469)

testStringToArrayFunction1(org.apache.phoenix.end2end.StringToArrayFunctionIT)  
Time elapsed: 1.299 sec  <<< ERROR!
java.sql.SQLException: Error while executing SQL "SELECT 
STRING_TO_ARRAY(string1, delimiter1) FROM T000397 WHERE region_name = 'SF Bay 
Area'": From line 1, column 8 to line 1, column 43: No match found for function 
signature STRING_TO_ARRAY(, )
at 
org.apache.phoenix.end2end.StringToArrayFunctionIT.testStringToArrayFunction1(StringToArrayFunctionIT.java:66)
Caused by: org.apache.calcite.runtime.CalciteContextException: From line 1, 
column 8 to line 1, column 43: No match found for function signature 
STRING_TO_ARRAY(, )
at 
org.apache.phoenix.end2end.StringToArrayFunctionIT.testStringToArrayFunction1(StringToArrayFunctionIT.java:66)
Caused by: org.apache.calcite.sql.validate.SqlValidatorException: No match 
found for function signature STRING_TO_ARRAY(, )
at 
org.apache.phoenix.end2end.StringToArrayFunctionIT.testStringToArrayFunction1(StringToArrayFunctionIT.java:66)

testStringToArrayFunction2(org.apache.phoenix.end2end.StringToArrayFunctionIT)  
Time elapsed: 1.303 sec  <<< ERROR!
java.sql.SQLException: Error while executing SQL "SELECT 
STRING_TO_ARRAY(string1, delimiter1, nullstring1) FROM T000398 WHERE 
region_name = 'SF Bay Area'": From line 1, column 8 to line 1, column 56: No 
match found for function signature STRING_TO_ARRAY(, , 
)
at 
org.apache.phoenix.end2end.StringToArrayFunctionIT.testStringToArrayFunction2(StringToArrayFunctionIT.java:82)
Caused by: org.apache.calcite.runtime.CalciteContextException: From line 1, 
column 8 to line 1, column 56: No match found for function signature 
STRING_TO_ARRAY(, , )
at 
org.apache.phoenix.end2end.StringToArrayFunctionIT.testStringToArrayFunction2(StringToArrayFunctionIT.java:82)
Caused by: org.apache.calcite.sql.validate.SqlValidatorException: No match 
found for function signature STRING_TO_ARRAY(, , 
)
at 
org.apache.phoenix.end2end.StringToArrayFunctionIT.testStringToArrayFunction2(StringToArrayFunctionIT.java:82)

testStringToArrayFunction3(org.apache.phoenix.end2end.StringToArrayFunctionIT)  
Time elapsed: 1.324 sec  <<< ERROR!
java.sql.SQLException: Error while executing SQL "SELECT 
STRING_TO_ARRAY(string1, delimiter1, 'a') FROM T000399 WHERE region_name = 'SF 
Bay Area'": From line 1, column 8 to line 1, column 48: No match found for 
function signature STRING_TO_ARRAY(, , )
at 
org.apache.phoenix.end2end.StringToArrayFunctionIT.testStringToArrayFunction3(StringToArrayFunctionIT.java:98)
Caused by: org.apache.calcite.runtime.CalciteContextException: From line 1, 
column 8 to line 1, column 48: No match found for function signature 
STRING_TO_ARRAY(, , )
at 
org.apache.phoenix.end2end.StringToArrayFunctionIT.testStringToArrayFunction3(StringToArrayFunctionIT.java:98)
Caused by: org.apache.calcite.sql.validate.SqlValidatorException: No match 
found for function signature STRING_TO_ARRAY(, , 
)
at 
org.apache.phoenix.end2end.StringToArrayFunctionIT.testStringToArrayFunction3(StringToArrayFunctionIT.java:98)

testStringToArrayFunction4(org.apache.phoenix.end2end.StringToArrayFunctionIT)  
Time elapsed: 1.357 sec  <<< ERROR!
java.sql.SQLException: Error while executing SQL "SELECT 
STRING_TO_ARRAY(string1, delimiter1, 'd') FROM T000400 WHERE region_name = 'SF 
Bay Area'": From line 1, column 8 to line 1, column 48: No match found for 
function signature STRING_TO_ARRAY(, , )
at 
org.apache.phoenix.end2end.StringToArrayFunctionIT.testStringToArrayFunction4(StringToArrayFunctionIT.java:114)
Caused by: org.apache.calcite.runtime.CalciteContextException: From line 1, 
column 8 to line 1, column 48: No match found for function signature 
STRING_TO_ARRAY(, , )
at 
org.apache.phoenix.end2end.StringToArrayFunctionIT.testStringToArrayFunction4(StringToArrayFunctionIT.java:114)
Caused by: org.apache.calcite.sql.validate.SqlValidatorException: No match 
found for function signature STRING_TO_ARRAY(, , 
)
at 
org.apache.phoenix.end2end.StringToArrayFunctionIT.testStringToArrayFunction4(StringToArrayFunctionIT.java:114)

testStringToArrayFunction5(org.apache.phoenix.end2end.StringToArrayFunctionIT)  
Time elapsed: 2.397 sec  <<< 

Apache-Phoenix | origin/4.9-HBase-1.2 | Build Fixed

[Apache Jenkins Server]

origin/4.9-HBase-1.2 branch build status Fixed

Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/origin/4.9-HBase-1.2

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

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

Changes
No changes


Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout

Apache Phoenix - Timeout crawler - Build https://builds.apache.org/job/Phoenix-calcite/49/

[Apache Jenkins Server]

[...truncated 48 lines...]
Looking at the log, list of test(s) that timed-out:

Build:
https://builds.apache.org/job/Phoenix-calcite/49/


Affected test class(es):
Set(['org.apache.phoenix.end2end.HashJoinIT', 
'org.apache.phoenix.end2end.QueryWithOffsetIT', 
'org.apache.phoenix.end2end.InListIT', 
'org.apache.phoenix.end2end.QueryMoreIT', 
'org.apache.phoenix.end2end.OnDuplicateKeyIT', 
'org.apache.phoenix.end2end.RegexpSplitFunctionIT'])


Build step 'Execute shell' marked build as failure
Email was triggered for: Failure - Any
Sending email for trigger: Failure - Any

Build failed in Jenkins: Phoenix-Calcite #49

[Apache Jenkins Server]

See 

--
[...truncated 31870 lines...]
"COLLECT" ...
"COVAR_POP" ...
"COVAR_SAMP" ...
"CUME_DIST" ...
"COUNT" ...
"CURRENT_DATE" ...
"CURRENT_TIME" ...
"CURRENT_TIMESTAMP" ...
"DENSE_RANK" ...
"ELEMENT" ...
"EXP" ...
"FIRST_VALUE" ...
"FUSION" ...
"GROUPING" ...
"LAST_VALUE" ...
"LN" ...
"LOCALTIME" ...
"LOCALTIMESTAMP" ...
"LOWER" ...
"MAX" ...
"MIN" ...
"MOD" ...
"NULLIF" ...
"OCTET_LENGTH" ...
"PERCENT_RANK" ...
"POWER" ...
"RANK" ...
"REGR_SXX" ...
"REGR_SYY" ...
"ROW_NUMBER" ...
"SQRT" ...
"STDDEV_POP" ...
"STDDEV_SAMP" ...
"SUM" ...
"UPPER" ...
"VAR_POP" ...
"VAR_SAMP" ...
"CURRENT_CATALOG" ...
"CURRENT_DEFAULT_TRANSFORM_GROUP" ...
"CURRENT_PATH" ...
"CURRENT_ROLE" ...
"CURRENT_SCHEMA" ...
"CURRENT_USER" ...
"SESSION_USER" ...
"SYSTEM_USER" ...
"USER" ...
"NEW" ...
"CASE" ...
"NEXT" ...
"CURRENT" ...
"CURSOR" ...
"ROW" ...
"(" ...

at 
org.apache.phoenix.end2end.PercentileIT.testPercentileDiscAsc(PercentileIT.java:181)

Running org.apache.phoenix.end2end.QueryExecWithoutSCNIT
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 4.867 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.PowerFunctionEnd2EndIT
test(org.apache.phoenix.end2end.PowerFunctionEnd2EndIT)  Time elapsed: 4.867 
sec  <<< ERROR!
java.sql.SQLException: ERROR 201 (22000): Illegal data.
at 
org.apache.phoenix.end2end.PowerFunctionEnd2EndIT.testNumberSpec(PowerFunctionEnd2EndIT.java:95)
at 
org.apache.phoenix.end2end.PowerFunctionEnd2EndIT.test(PowerFunctionEnd2EndIT.java:145)
Caused by: org.apache.hadoop.hbase.ipc.RemoteWithExtrasException: 
org.apache.hadoop.hbase.DoNotRetryIOException: 
T000174,,1482386178907.baf50b50cb1e79825536386581bddc68.: 
java.sql.SQLException: ERROR 201 (22000): Illegal data.
at 
org.apache.phoenix.util.ServerUtil.createIOException(ServerUtil.java:87)
at 
org.apache.phoenix.util.ServerUtil.throwIOException(ServerUtil.java:53)
at 
org.apache.phoenix.coprocessor.BaseScannerRegionObserver$1.nextRaw(BaseScannerRegionObserver.java:489)
at 
org.apache.phoenix.coprocessor.DelegateRegionScanner.nextRaw(DelegateRegionScanner.java:77)
at 
org.apache.phoenix.coprocessor.DelegateRegionScanner.nextRaw(DelegateRegionScanner.java:77)
at 
org.apache.phoenix.coprocessor.BaseScannerRegionObserver$RegionScannerHolder.nextRaw(BaseScannerRegionObserver.java:261)
at 
org.apache.hadoop.hbase.regionserver.RSRpcServices.scan(RSRpcServices.java:2555)
at 
org.apache.hadoop.hbase.protobuf.generated.ClientProtos$ClientService$2.callBlockingMethod(ClientProtos.java:33648)
at org.apache.hadoop.hbase.ipc.RpcServer.call(RpcServer.java:2170)
at org.apache.hadoop.hbase.ipc.CallRunner.run(CallRunner.java:109)
at 
org.apache.hadoop.hbase.ipc.RpcExecutor.consumerLoop(RpcExecutor.java:133)
at org.apache.hadoop.hbase.ipc.RpcExecutor$1.run(RpcExecutor.java:108)
at java.lang.Thread.run(Thread.java:745)
Caused by: org.apache.phoenix.schema.IllegalDataException: 
java.sql.SQLException: ERROR 201 (22000): Illegal data.
at 
org.apache.phoenix.schema.types.PDataType.newIllegalDataException(PDataType.java:297)
at 
org.apache.phoenix.schema.types.PUnsignedDouble$UnsignedDoubleCodec.decodeDouble(PUnsignedDouble.java:155)
at 
org.apache.phoenix.schema.types.PDataType$BaseCodec.decodeDouble(PDataType.java:414)
at 
org.apache.phoenix.expression.function.JavaMathOneArgumentFunction.getArg(JavaMathOneArgumentFunction.java:46)
at 
org.apache.phoenix.expression.function.JavaMathTwoArgumentFunction.evaluate(JavaMathTwoArgumentFunction.java:48)
at 
org.apache.phoenix.schema.KeyValueSchema.toBytes(KeyValueSchema.java:112)
at 
org.apache.phoenix.execute.TupleProjector.projectResults(TupleProjector.java:253)
at 
org.apache.phoenix.coprocessor.BaseScannerRegionObserver$1.nextRaw(BaseScannerRegionObserver.java:480)
... 10 more
Caused by: java.sql.SQLException: ERROR 201 (22000): Illegal data.
at 
org.apache.phoenix.exception.SQLExceptionCode$Factory$1.newException(SQLExceptionCode.java:464)
at 
org.apache.phoenix.exception.SQLExceptionInfo.buildException(SQLExceptionInfo.java:150)
... 18 more


Running org.apache.phoenix.end2end.QueryMoreIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.497 sec - in 
org.apache.phoenix.end2end.QueryExecWithoutSCNIT
Running org.apache.phoenix.end2end.QueryWithOffsetIT
Tests run: 9, Failures: 0, Errors: 9, Skipped: 0, Time elapsed: 15.376 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.PrimitiveTypeIT
testCompareLongGTDecimal2(org.apache.phoenix.end2end.PrimitiveTypeIT)  Time 
elapsed: 

Apache-Phoenix | origin/4.9-HBase-1.1 | Build Successful

[Apache Jenkins Server]

origin/4.9-HBase-1.1 branch build status Successful

Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/origin/4.9-HBase-1.1

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

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

Changes
[samarth] PHOENIX-3535 Addendum to fix test failures



Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout

Build failed in Jenkins: Phoenix-4.x-HBase-1.1 #297

[Apache Jenkins Server]

See 

Changes:

[samarth] PHOENIX-3535 Addendum to fix test failures

--
[...truncated 899 lines...]
Tests run: 12, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.493 sec - in 
org.apache.phoenix.execute.PartialCommitIT
Running 
org.apache.phoenix.hbase.index.covered.EndToEndCoveredColumnsIndexBuilderIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 20.344 sec - in 
org.apache.phoenix.hbase.index.FailForUnsupportedHBaseVersionsIT
Tests run: 26, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 263.586 sec - 
in org.apache.phoenix.end2end.index.LocalIndexIT
Running org.apache.phoenix.hbase.index.covered.example.EndToEndCoveredIndexingIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 27.463 sec - in 
org.apache.phoenix.hbase.index.covered.EndToEndCoveredColumnsIndexBuilderIT
Running org.apache.phoenix.hbase.index.covered.example.FailWithoutRetriesIT
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 68.06 sec - in 
org.apache.phoenix.end2end.index.txn.TxWriteFailureIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.004 sec - in 
org.apache.phoenix.hbase.index.covered.example.FailWithoutRetriesIT
Running 
org.apache.phoenix.hbase.index.covered.example.EndtoEndIndexingWithCompressionIT
Tests run: 8, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 216.38 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.index.MutableIndexFailureIT
testWriteFailureDisablesIndex[MutableIndexFailureIT_transactional=false,localIndex=true,isNamespaceMapped=true](org.apache.phoenix.end2end.index.MutableIndexFailureIT)
  Time elapsed: 18.808 sec  <<< ERROR!
org.apache.phoenix.execute.CommitException: 
org.apache.hadoop.hbase.client.RetriesExhaustedWithDetailsException: Failed 1 
action: org.apache.hadoop.hbase.DoNotRetryIOException: Failed 2 actions: 
org.apache.hadoop.hbase.DoNotRetryIOException
at 
org.apache.phoenix.end2end.index.MutableIndexFailureIT$FailingRegionObserver.preBatchMutate(MutableIndexFailureIT.java:393)
at 
org.apache.hadoop.hbase.regionserver.RegionCoprocessorHost$35.call(RegionCoprocessorHost.java:1024)
at 
org.apache.hadoop.hbase.regionserver.RegionCoprocessorHost$RegionOperation.call(RegionCoprocessorHost.java:1708)
at 
org.apache.hadoop.hbase.regionserver.RegionCoprocessorHost.execOperation(RegionCoprocessorHost.java:1783)
at 
org.apache.hadoop.hbase.regionserver.RegionCoprocessorHost.execOperation(RegionCoprocessorHost.java:1740)
at 
org.apache.hadoop.hbase.regionserver.RegionCoprocessorHost.preBatchMutate(RegionCoprocessorHost.java:1020)
at 
org.apache.hadoop.hbase.regionserver.HRegion.doMiniBatchMutation(HRegion.java:3078)
at 
org.apache.hadoop.hbase.regionserver.HRegion.batchMutate(HRegion.java:2853)
at 
org.apache.hadoop.hbase.regionserver.HRegion.batchMutate(HRegion.java:2795)
at 
org.apache.hadoop.hbase.regionserver.RSRpcServices.doBatchOp(RSRpcServices.java:700)
at 
org.apache.hadoop.hbase.regionserver.RSRpcServices.doNonAtomicRegionMutation(RSRpcServices.java:662)
at 
org.apache.hadoop.hbase.regionserver.RSRpcServices.multi(RSRpcServices.java:2046)
at 
org.apache.hadoop.hbase.client.MultiServerCallable.call(MultiServerCallable.java:129)
at 
org.apache.hadoop.hbase.client.MultiServerCallable.call(MultiServerCallable.java:54)
at 
org.apache.hadoop.hbase.client.RpcRetryingCaller.callWithoutRetries(RpcRetryingCaller.java:200)
at 
org.apache.hadoop.hbase.client.AsyncProcess$AsyncRequestFutureImpl$SingleServerRequestRunnable.run(AsyncProcess.java:708)
at 
java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at 
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at 
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:745)
: 2 times, 
at 
org.apache.phoenix.util.ServerUtil.createIOException(ServerUtil.java:73)
at 
org.apache.phoenix.index.PhoenixIndexFailurePolicy.handleFailure(PhoenixIndexFailurePolicy.java:114)
at 
org.apache.phoenix.hbase.index.write.IndexWriter.writeAndKillYourselfOnFailure(IndexWriter.java:151)
at 
org.apache.phoenix.hbase.index.write.IndexWriter.writeAndKillYourselfOnFailure(IndexWriter.java:135)
at 
org.apache.phoenix.hbase.index.Indexer.doPostWithExceptions(Indexer.java:465)
at org.apache.phoenix.hbase.index.Indexer.doPost(Indexer.java:401)
at org.apache.phoenix.hbase.index.Indexer.postPut(Indexer.java:371)
at 
org.apache.hadoop.hbase.regionserver.RegionCoprocessorHost$32.call(RegionCoprocessorHost.java:973)
at 

Jenkins build is back to normal : Phoenix | 4.x-HBase-0.98 #1407

[Apache Jenkins Server]

See 

Apache-Phoenix | 4.x-HBase-0.98 | Build Successful

[Apache Jenkins Server]

4.x-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.x-HBase-0.98

Compiled Artifacts https://builds.apache.org/job/Phoenix-4.x-HBase-0.98/lastSuccessfulBuild/artifact/

Test Report https://builds.apache.org/job/Phoenix-4.x-HBase-0.98/lastCompletedBuild/testReport/

Changes
[samarth] PHOENIX-3535 Addendum to fix test failures



Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout

Apache-Phoenix | Master | Build Successful

[Apache Jenkins Server]

Master branch build status Successful
Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/master

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

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

Changes
[samarth] PHOENIX-3535 Addendum to fix test failures



Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout

Jenkins build is back to normal : Phoenix | Master #1520

[Apache Jenkins Server]

See 

Apache-Phoenix | origin/4.9-HBase-0.98 | Build Fixed

[Apache Jenkins Server]

origin/4.9-HBase-0.98 branch build status Fixed

Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/origin/4.9-HBase-0.98

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

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

Changes
[samarth] PHOENIX-3535 Addendum to fix test failures



Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout

Apache-Phoenix | origin/4.9-HBase-1.2 | Build Still Failing

[Apache Jenkins Server]

<<< text/html; charset=UTF-8: Unrecognized >>>

Apache Phoenix - Timeout crawler - Build https://builds.apache.org/job/Phoenix-4.x-HBase-0.98/1406/

[Apache Jenkins Server]

[...truncated 21 lines...]
Looking at the log, list of test(s) that timed-out:

Build:
https://builds.apache.org/job/Phoenix-4.x-HBase-0.98/1406/


Affected test class(es):
Set(['org.apache.phoenix.tx.TxCheckpointIT', 
'org.apache.phoenix.end2end.index.MutableIndexIT', 
'org.apache.phoenix.end2end.index.IndexIT'])


Build step 'Execute shell' marked build as failure
Email was triggered for: Failure - Any
Sending email for trigger: Failure - Any

Apache Phoenix - Timeout crawler - Build https://builds.apache.org/job/Phoenix-master/1519/

[Apache Jenkins Server]

[...truncated 21 lines...]
Looking at the log, list of test(s) that timed-out:

Build:
https://builds.apache.org/job/Phoenix-master/1519/


Affected test class(es):
Set(['org.apache.phoenix.end2end.SortMergeJoinIT', 
'org.apache.phoenix.end2end.index.IndexIT'])


Build step 'Execute shell' marked build as failure
Email was triggered for: Failure - Any
Sending email for trigger: Failure - Any

phoenix git commit: PHOENIX-3535 Addendum to fix test failures

[samarth]

Repository: phoenix
Updated Branches:
  refs/heads/4.9-HBase-1.2 a107c0eed -> bd227a7b4


PHOENIX-3535 Addendum to fix test failures


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

Branch: refs/heads/4.9-HBase-1.2
Commit: bd227a7b4d95d6aec1527b664b723d42e2ee7ecc
Parents: a107c0e
Author: Samarth 
Authored: Wed Dec 21 17:47:10 2016 -0800
Committer: Samarth 
Committed: Wed Dec 21 17:47:10 2016 -0800

--
 .../java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/bd227a7b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index 721f232..a2b32a8 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -2375,7 +2375,6 @@ public class ConnectionQueryServicesImpl extends 
DelegateQueryServices implement
 hConnectionEstablished = true;
 boolean isDoNotUpgradePropSet = 
UpgradeUtil.isNoUpgradeSet(props);
 try (HBaseAdmin admin = getAdmin()) {
-createSysMutexTable(admin);
 boolean mappedSystemCatalogExists = admin
 
.tableExists(SchemaUtil.getPhysicalTableName(SYSTEM_CATALOG_NAME_BYTES, true));
 if 
(SchemaUtil.isNamespaceMappingEnabled(PTableType.SYSTEM,
@@ -2393,6 +2392,7 @@ public class ConnectionQueryServicesImpl extends 
DelegateQueryServices implement
 + " is found but client does 
not have "
 + IS_NAMESPACE_MAPPING_ENABLED 
+ " enabled")
 .build().buildException(); }
+createSysMutexTable(admin);
 }
 Properties scnProps = 
PropertiesUtil.deepCopy(props);
 
scnProps.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,

phoenix git commit: PHOENIX-3535 Addendum to fix test failures

[samarth]

Repository: phoenix
Updated Branches:
  refs/heads/4.9-HBase-0.98 a2d074304 -> f3117248f


PHOENIX-3535 Addendum to fix test failures


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

Branch: refs/heads/4.9-HBase-0.98
Commit: f3117248ff7141c6f67f5bd5aa1ad45d7126d011
Parents: a2d0743
Author: Samarth 
Authored: Wed Dec 21 17:45:55 2016 -0800
Committer: Samarth 
Committed: Wed Dec 21 17:45:55 2016 -0800

--
 .../java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/f3117248/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index 97836c1..fc0925d 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -2372,7 +2372,6 @@ public class ConnectionQueryServicesImpl extends 
DelegateQueryServices implement
 hConnectionEstablished = true;
 boolean isDoNotUpgradePropSet = 
UpgradeUtil.isNoUpgradeSet(props);
 try (HBaseAdmin admin = getAdmin()) {
-createSysMutexTable(admin);
 boolean mappedSystemCatalogExists = admin
 
.tableExists(SchemaUtil.getPhysicalTableName(SYSTEM_CATALOG_NAME_BYTES, true));
 if 
(SchemaUtil.isNamespaceMappingEnabled(PTableType.SYSTEM,
@@ -2390,6 +2389,7 @@ public class ConnectionQueryServicesImpl extends 
DelegateQueryServices implement
 + " is found but client does 
not have "
 + IS_NAMESPACE_MAPPING_ENABLED 
+ " enabled")
 .build().buildException(); }
+createSysMutexTable(admin);
 }
 Properties scnProps = 
PropertiesUtil.deepCopy(props);
 
scnProps.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,

phoenix git commit: PHOENIX-3535 Addendum to fix test failures

[samarth]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 3760be37c -> 5286236f9


PHOENIX-3535 Addendum to fix test failures


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

Branch: refs/heads/4.x-HBase-1.1
Commit: 5286236f9d4c799447ac6ab864bce71230ea3152
Parents: 3760be3
Author: Samarth 
Authored: Wed Dec 21 17:45:15 2016 -0800
Committer: Samarth 
Committed: Wed Dec 21 17:45:15 2016 -0800

--
 .../java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/5286236f/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index 7c1a41d..16350e5 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -2355,7 +2355,6 @@ public class ConnectionQueryServicesImpl extends 
DelegateQueryServices implement
 hConnectionEstablished = true;
 boolean isDoNotUpgradePropSet = 
UpgradeUtil.isNoUpgradeSet(props);
 try (HBaseAdmin admin = getAdmin()) {
-createSysMutexTable(admin);
 boolean mappedSystemCatalogExists = admin
 
.tableExists(SchemaUtil.getPhysicalTableName(SYSTEM_CATALOG_NAME_BYTES, true));
 if 
(SchemaUtil.isNamespaceMappingEnabled(PTableType.SYSTEM,
@@ -2373,6 +2372,7 @@ public class ConnectionQueryServicesImpl extends 
DelegateQueryServices implement
 + " is found but client does 
not have "
 + IS_NAMESPACE_MAPPING_ENABLED 
+ " enabled")
 .build().buildException(); }
+createSysMutexTable(admin);
 }
 Properties scnProps = 
PropertiesUtil.deepCopy(props);
 
scnProps.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,

phoenix git commit: PHOENIX-3535 Addendum to fix test failures

[samarth]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 90d27be5b -> f11d501b2


PHOENIX-3535 Addendum to fix test failures


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

Branch: refs/heads/4.x-HBase-0.98
Commit: f11d501b29483a3e543768f3f5e267bf2dd413b5
Parents: 90d27be
Author: Samarth 
Authored: Wed Dec 21 17:44:49 2016 -0800
Committer: Samarth 
Committed: Wed Dec 21 17:44:49 2016 -0800

--
 .../java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/f11d501b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index 9d7a3d2..f1de0bd 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -2352,7 +2352,6 @@ public class ConnectionQueryServicesImpl extends 
DelegateQueryServices implement
 hConnectionEstablished = true;
 boolean isDoNotUpgradePropSet = 
UpgradeUtil.isNoUpgradeSet(props);
 try (HBaseAdmin admin = getAdmin()) {
-createSysMutexTable(admin);
 boolean mappedSystemCatalogExists = admin
 
.tableExists(SchemaUtil.getPhysicalTableName(SYSTEM_CATALOG_NAME_BYTES, true));
 if 
(SchemaUtil.isNamespaceMappingEnabled(PTableType.SYSTEM,
@@ -2370,6 +2369,7 @@ public class ConnectionQueryServicesImpl extends 
DelegateQueryServices implement
 + " is found but client does 
not have "
 + IS_NAMESPACE_MAPPING_ENABLED 
+ " enabled")
 .build().buildException(); }
+createSysMutexTable(admin);
 }
 Properties scnProps = 
PropertiesUtil.deepCopy(props);
 
scnProps.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,

phoenix git commit: PHOENIX-3535 Addendum to fix test failures

[samarth]

Repository: phoenix
Updated Branches:
  refs/heads/master 31f3a4635 -> 108b78dee


PHOENIX-3535 Addendum to fix test failures


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

Branch: refs/heads/master
Commit: 108b78deed29b42b9a37470abb8e832108182361
Parents: 31f3a46
Author: Samarth 
Authored: Wed Dec 21 17:44:20 2016 -0800
Committer: Samarth 
Committed: Wed Dec 21 17:44:20 2016 -0800

--
 .../java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/108b78de/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index 2227c70..f66b358 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -2355,7 +2355,6 @@ public class ConnectionQueryServicesImpl extends 
DelegateQueryServices implement
 hConnectionEstablished = true;
 boolean isDoNotUpgradePropSet = 
UpgradeUtil.isNoUpgradeSet(props);
 try (HBaseAdmin admin = getAdmin()) {
-createSysMutexTable(admin);
 boolean mappedSystemCatalogExists = admin
 
.tableExists(SchemaUtil.getPhysicalTableName(SYSTEM_CATALOG_NAME_BYTES, true));
 if 
(SchemaUtil.isNamespaceMappingEnabled(PTableType.SYSTEM,
@@ -2373,6 +2372,7 @@ public class ConnectionQueryServicesImpl extends 
DelegateQueryServices implement
 + " is found but client does 
not have "
 + IS_NAMESPACE_MAPPING_ENABLED 
+ " enabled")
 .build().buildException(); }
+createSysMutexTable(admin);
 }
 Properties scnProps = 
PropertiesUtil.deepCopy(props);
 
scnProps.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB,

phoenix git commit: PHOENIX-3355 Register Phoenix built-in functions as Calcite functions

[maryannxue]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 18cb85e69 -> 90d27be5b


PHOENIX-3355 Register Phoenix built-in functions as Calcite functions


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 90d27be5b469f66e346539f5c273623a39f1c6c0
Parents: 18cb85e
Author: Eric Lomore 
Authored: Wed Dec 21 17:23:02 2016 -0800
Committer: maryannxue 
Committed: Wed Dec 21 17:23:02 2016 -0800

--
 .../org/apache/phoenix/end2end/DateTimeIT.java  | 48 ++--
 .../phoenix/end2end/DefaultColumnValueIT.java   |  6 +--
 .../phoenix/end2end/ToDateFunctionIT.java   |  2 +-
 .../phoenix/end2end/index/LocalIndexIT.java |  6 +--
 .../ByteBasedRegexpReplaceFunction.java | 11 +
 .../function/ByteBasedRegexpSplitFunction.java  | 10 
 .../function/ByteBasedRegexpSubstrFunction.java | 16 +++
 .../expression/function/CeilDateExpression.java | 14 ++
 .../function/CeilDecimalExpression.java | 13 ++
 .../expression/function/CeilFunction.java   | 10 +++-
 .../function/CeilTimestampExpression.java   | 13 ++
 .../function/CurrentDateFunction.java   |  9 
 .../function/CurrentTimeFunction.java   |  9 
 .../expression/function/FirstValueFunction.java |  4 ++
 .../function/FloorDateExpression.java   | 13 ++
 .../function/FloorDecimalExpression.java| 13 ++
 .../expression/function/FloorFunction.java  |  5 +-
 .../expression/function/LastValueFunction.java  |  4 ++
 .../function/MaxAggregateFunction.java  |  4 ++
 .../function/MinAggregateFunction.java  |  4 ++
 .../expression/function/NowFunction.java|  5 +-
 .../expression/function/NthValueFunction.java   |  4 ++
 .../function/RegexpReplaceFunction.java |  5 +-
 .../function/RegexpSplitFunction.java   |  4 +-
 .../function/RegexpSubstrFunction.java  |  5 +-
 .../function/RoundDateExpression.java   | 12 +
 .../function/RoundDecimalExpression.java| 12 +
 .../expression/function/RoundFunction.java  |  5 +-
 .../function/RoundTimestampExpression.java  | 14 +-
 .../StringBasedRegexpReplaceFunction.java   | 12 +
 .../StringBasedRegexpSplitFunction.java | 10 
 .../StringBasedRegexpSubstrFunction.java| 12 +
 .../expression/function/ToCharFunction.java | 34 ++
 .../expression/function/ToDateFunction.java | 14 ++
 .../expression/function/ToNumberFunction.java   | 34 ++
 .../expression/function/ToTimeFunction.java |  6 +++
 .../function/ToTimestampFunction.java   |  5 ++
 .../expression/function/TruncFunction.java  |  5 +-
 .../apache/phoenix/parse/FunctionParseNode.java | 31 +
 .../apache/phoenix/parse/ParseNodeFactory.java  | 38 +++-
 40 files changed, 429 insertions(+), 52 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/90d27be5/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java
index ffcb472..74cc068 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java
@@ -411,45 +411,45 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
 @Test
 public void testYearFunctionDate() throws SQLException {
 
-assertEquals(2008, callYearFunction("YEAR(TO_DATE('2008-01-01', 
'-MM-dd', 'local'))"));
+assertEquals(2008, callYearFunction("\"YEAR\"(TO_DATE('2008-01-01', 
'-MM-dd', 'local'))"));
 
 assertEquals(2004,
-callYearFunction("YEAR(TO_DATE('2004-12-13 10:13:18', '-MM-dd 
hh:mm:ss'))"));
+callYearFunction("\"YEAR\"(TO_DATE('2004-12-13 10:13:18', 
'-MM-dd hh:mm:ss'))"));
 
-assertEquals(2015, 
callYearFunction("YEAR(TO_DATE('2015-01-27T16:17:57+00:00'))"));
+assertEquals(2015, 
callYearFunction("\"YEAR\"(TO_DATE('2015-01-27T16:17:57+00:00'))"));
 
-assertEquals(2005, callYearFunction("YEAR(TO_DATE('2005-12-13 
10:13:18'))"));
+assertEquals(2005, callYearFunction("\"YEAR\"(TO_DATE('2005-12-13 
10:13:18'))"));
 
-assertEquals(2006, callYearFunction("YEAR(TO_DATE('2006-12-13'))"));
+assertEquals(2006, 
callYearFunction("\"YEAR\"(TO_DATE('2006-12-13'))"));
 
-assertEquals(2015, 

phoenix git commit: PHOENIX-3355 Register Phoenix built-in functions as Calcite functions

[maryannxue]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 5998f2aeb -> 3760be37c


PHOENIX-3355 Register Phoenix built-in functions as Calcite functions


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

Branch: refs/heads/4.x-HBase-1.1
Commit: 3760be37c354534f8538e0ba31a410136f32a82d
Parents: 5998f2a
Author: Eric Lomore 
Authored: Wed Dec 21 17:19:53 2016 -0800
Committer: maryannxue 
Committed: Wed Dec 21 17:19:53 2016 -0800

--
 .../org/apache/phoenix/end2end/DateTimeIT.java  | 48 ++--
 .../phoenix/end2end/DefaultColumnValueIT.java   |  6 +--
 .../phoenix/end2end/ToDateFunctionIT.java   |  2 +-
 .../phoenix/end2end/index/LocalIndexIT.java |  6 +--
 .../ByteBasedRegexpReplaceFunction.java | 11 +
 .../function/ByteBasedRegexpSplitFunction.java  | 10 
 .../function/ByteBasedRegexpSubstrFunction.java | 16 +++
 .../expression/function/CeilDateExpression.java | 14 ++
 .../function/CeilDecimalExpression.java | 13 ++
 .../expression/function/CeilFunction.java   | 10 +++-
 .../function/CeilTimestampExpression.java   | 13 ++
 .../function/CurrentDateFunction.java   |  9 
 .../function/CurrentTimeFunction.java   |  9 
 .../expression/function/FirstValueFunction.java |  4 ++
 .../function/FloorDateExpression.java   | 13 ++
 .../function/FloorDecimalExpression.java| 13 ++
 .../expression/function/FloorFunction.java  |  5 +-
 .../expression/function/LastValueFunction.java  |  4 ++
 .../function/MaxAggregateFunction.java  |  4 ++
 .../function/MinAggregateFunction.java  |  4 ++
 .../expression/function/NowFunction.java|  5 +-
 .../expression/function/NthValueFunction.java   |  4 ++
 .../function/RegexpReplaceFunction.java |  5 +-
 .../function/RegexpSplitFunction.java   |  4 +-
 .../function/RegexpSubstrFunction.java  |  5 +-
 .../function/RoundDateExpression.java   | 12 +
 .../function/RoundDecimalExpression.java| 12 +
 .../expression/function/RoundFunction.java  |  5 +-
 .../function/RoundTimestampExpression.java  | 14 +-
 .../StringBasedRegexpReplaceFunction.java   | 12 +
 .../StringBasedRegexpSplitFunction.java | 10 
 .../StringBasedRegexpSubstrFunction.java| 12 +
 .../expression/function/ToCharFunction.java | 34 ++
 .../expression/function/ToDateFunction.java | 14 ++
 .../expression/function/ToNumberFunction.java   | 34 ++
 .../expression/function/ToTimeFunction.java |  6 +++
 .../function/ToTimestampFunction.java   |  5 ++
 .../expression/function/TruncFunction.java  |  5 +-
 .../apache/phoenix/parse/FunctionParseNode.java | 31 +
 .../apache/phoenix/parse/ParseNodeFactory.java  | 38 +++-
 40 files changed, 429 insertions(+), 52 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/3760be37/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java
index ffcb472..74cc068 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java
@@ -411,45 +411,45 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
 @Test
 public void testYearFunctionDate() throws SQLException {
 
-assertEquals(2008, callYearFunction("YEAR(TO_DATE('2008-01-01', 
'-MM-dd', 'local'))"));
+assertEquals(2008, callYearFunction("\"YEAR\"(TO_DATE('2008-01-01', 
'-MM-dd', 'local'))"));
 
 assertEquals(2004,
-callYearFunction("YEAR(TO_DATE('2004-12-13 10:13:18', '-MM-dd 
hh:mm:ss'))"));
+callYearFunction("\"YEAR\"(TO_DATE('2004-12-13 10:13:18', 
'-MM-dd hh:mm:ss'))"));
 
-assertEquals(2015, 
callYearFunction("YEAR(TO_DATE('2015-01-27T16:17:57+00:00'))"));
+assertEquals(2015, 
callYearFunction("\"YEAR\"(TO_DATE('2015-01-27T16:17:57+00:00'))"));
 
-assertEquals(2005, callYearFunction("YEAR(TO_DATE('2005-12-13 
10:13:18'))"));
+assertEquals(2005, callYearFunction("\"YEAR\"(TO_DATE('2005-12-13 
10:13:18'))"));
 
-assertEquals(2006, callYearFunction("YEAR(TO_DATE('2006-12-13'))"));
+assertEquals(2006, 
callYearFunction("\"YEAR\"(TO_DATE('2006-12-13'))"));
 
-assertEquals(2015, 

phoenix git commit: PHOENIX-3355 Register Phoenix built-in functions as Calcite functions

[maryannxue]

Repository: phoenix
Updated Branches:
  refs/heads/master b5ab53d96 -> 31f3a4635


PHOENIX-3355 Register Phoenix built-in functions as Calcite functions


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

Branch: refs/heads/master
Commit: 31f3a46352f5ad6eb165ffd903968014ae6ff253
Parents: b5ab53d
Author: Eric Lomore 
Authored: Wed Dec 21 17:16:54 2016 -0800
Committer: maryannxue 
Committed: Wed Dec 21 17:16:54 2016 -0800

--
 .../org/apache/phoenix/end2end/DateTimeIT.java  | 48 ++--
 .../phoenix/end2end/DefaultColumnValueIT.java   |  6 +--
 .../phoenix/end2end/ToDateFunctionIT.java   |  2 +-
 .../phoenix/end2end/index/LocalIndexIT.java |  6 +--
 .../ByteBasedRegexpReplaceFunction.java | 11 +
 .../function/ByteBasedRegexpSplitFunction.java  | 10 
 .../function/ByteBasedRegexpSubstrFunction.java | 16 +++
 .../expression/function/CeilDateExpression.java | 14 ++
 .../function/CeilDecimalExpression.java | 13 ++
 .../expression/function/CeilFunction.java   | 10 +++-
 .../function/CeilTimestampExpression.java   | 13 ++
 .../function/CurrentDateFunction.java   |  9 
 .../function/CurrentTimeFunction.java   |  9 
 .../expression/function/FirstValueFunction.java |  4 ++
 .../function/FloorDateExpression.java   | 13 ++
 .../function/FloorDecimalExpression.java| 13 ++
 .../expression/function/FloorFunction.java  |  5 +-
 .../expression/function/LastValueFunction.java  |  4 ++
 .../function/MaxAggregateFunction.java  |  4 ++
 .../function/MinAggregateFunction.java  |  4 ++
 .../expression/function/NowFunction.java|  5 +-
 .../expression/function/NthValueFunction.java   |  4 ++
 .../function/RegexpReplaceFunction.java |  5 +-
 .../function/RegexpSplitFunction.java   |  4 +-
 .../function/RegexpSubstrFunction.java  |  5 +-
 .../function/RoundDateExpression.java   | 12 +
 .../function/RoundDecimalExpression.java| 12 +
 .../expression/function/RoundFunction.java  |  5 +-
 .../function/RoundTimestampExpression.java  | 14 +-
 .../StringBasedRegexpReplaceFunction.java   | 12 +
 .../StringBasedRegexpSplitFunction.java | 10 
 .../StringBasedRegexpSubstrFunction.java| 12 +
 .../expression/function/ToCharFunction.java | 34 ++
 .../expression/function/ToDateFunction.java | 14 ++
 .../expression/function/ToNumberFunction.java   | 34 ++
 .../expression/function/ToTimeFunction.java |  6 +++
 .../function/ToTimestampFunction.java   |  5 ++
 .../expression/function/TruncFunction.java  |  5 +-
 .../apache/phoenix/parse/FunctionParseNode.java | 31 +
 .../apache/phoenix/parse/ParseNodeFactory.java  | 38 +++-
 40 files changed, 429 insertions(+), 52 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/31f3a463/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java
index ffcb472..74cc068 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DateTimeIT.java
@@ -411,45 +411,45 @@ public class DateTimeIT extends ParallelStatsDisabledIT {
 @Test
 public void testYearFunctionDate() throws SQLException {
 
-assertEquals(2008, callYearFunction("YEAR(TO_DATE('2008-01-01', 
'-MM-dd', 'local'))"));
+assertEquals(2008, callYearFunction("\"YEAR\"(TO_DATE('2008-01-01', 
'-MM-dd', 'local'))"));
 
 assertEquals(2004,
-callYearFunction("YEAR(TO_DATE('2004-12-13 10:13:18', '-MM-dd 
hh:mm:ss'))"));
+callYearFunction("\"YEAR\"(TO_DATE('2004-12-13 10:13:18', 
'-MM-dd hh:mm:ss'))"));
 
-assertEquals(2015, 
callYearFunction("YEAR(TO_DATE('2015-01-27T16:17:57+00:00'))"));
+assertEquals(2015, 
callYearFunction("\"YEAR\"(TO_DATE('2015-01-27T16:17:57+00:00'))"));
 
-assertEquals(2005, callYearFunction("YEAR(TO_DATE('2005-12-13 
10:13:18'))"));
+assertEquals(2005, callYearFunction("\"YEAR\"(TO_DATE('2005-12-13 
10:13:18'))"));
 
-assertEquals(2006, callYearFunction("YEAR(TO_DATE('2006-12-13'))"));
+assertEquals(2006, 
callYearFunction("\"YEAR\"(TO_DATE('2006-12-13'))"));
 
-assertEquals(2015, 

Apache-Phoenix | origin/4.9-HBase-1.1 | Build Still Failing

[Apache Jenkins Server]

<<< text/html; charset=UTF-8: Unrecognized >>>

Build failed in Jenkins: Phoenix | Master #1518

[Apache Jenkins Server]

See 

Changes:

[samarth] PHOENIX-3535 Fix race condition in

--
[...truncated 777 lines...]
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.911 sec - in 
org.apache.phoenix.tx.FlappingTransactionIT
Running org.apache.phoenix.tx.TransactionIT
Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 50.598 sec - in 
org.apache.phoenix.iterate.RoundRobinResultIteratorIT
Running org.apache.phoenix.tx.TxCheckpointIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 89.425 sec - in 
org.apache.phoenix.trace.PhoenixTracingEndToEndIT
Tests run: 19, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 102.6 sec - in 
org.apache.phoenix.tx.TransactionIT
Tests run: 20, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 145.947 sec - 
in org.apache.phoenix.tx.TxCheckpointIT
Tests run: 66, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 452.524 sec - 
in org.apache.phoenix.end2end.index.IndexExpressionIT
Tests run: 99, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1,056.296 sec 
- in org.apache.phoenix.end2end.HashJoinIT
Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 546.827 sec - 
in org.apache.phoenix.end2end.index.MutableIndexIT
Tests run: 102, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1,109.647 sec 
- in org.apache.phoenix.end2end.SortMergeJoinIT
Tests run: 152, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1,018.507 sec 
- in org.apache.phoenix.end2end.index.IndexIT

Results :

Tests run: 1648, Failures: 0, Errors: 0, Skipped: 1

[INFO] 
[INFO] --- maven-failsafe-plugin:2.19.1:integration-test 
(ClientManagedTimeTests) @ phoenix-core ---

---
 T E S T S
---
Running org.apache.phoenix.end2end.CreateTableIT
Running org.apache.phoenix.end2end.ColumnProjectionOptimizationIT
Running org.apache.phoenix.end2end.CreateSchemaIT
Running org.apache.phoenix.end2end.AggregateQueryIT
Running org.apache.phoenix.end2end.ClientTimeArithmeticQueryIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.478 sec - in 
org.apache.phoenix.end2end.CreateSchemaIT
Running org.apache.phoenix.end2end.CastAndCoerceIT
Running org.apache.phoenix.end2end.ArrayIT
Running org.apache.phoenix.end2end.CaseStatementIT
Running org.apache.phoenix.end2end.CustomEntityDataIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.184 sec - in 
org.apache.phoenix.end2end.CustomEntityDataIT
Running org.apache.phoenix.end2end.DerivedTableIT
Tests run: 18, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 19.173 sec - 
in org.apache.phoenix.end2end.DerivedTableIT
Running org.apache.phoenix.end2end.DistinctCountIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 33.709 sec - in 
org.apache.phoenix.end2end.ColumnProjectionOptimizationIT
Running org.apache.phoenix.end2end.DropSchemaIT
Tests run: 49, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 43.156 sec - 
in org.apache.phoenix.end2end.CastAndCoerceIT
Running org.apache.phoenix.end2end.ExtendedQueryExecIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.069 sec - in 
org.apache.phoenix.end2end.DropSchemaIT
Running org.apache.phoenix.end2end.FunkyNamesIT
Tests run: 63, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 47.211 sec - 
in org.apache.phoenix.end2end.CaseStatementIT
Running org.apache.phoenix.end2end.GroupByIT
Tests run: 10, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 20.172 sec - 
in org.apache.phoenix.end2end.DistinctCountIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.756 sec - in 
org.apache.phoenix.end2end.ExtendedQueryExecIT
Running org.apache.phoenix.end2end.NotQueryIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.467 sec - in 
org.apache.phoenix.end2end.FunkyNamesIT
Running org.apache.phoenix.end2end.PointInTimeQueryIT
Tests run: 49, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 58.518 sec - 
in org.apache.phoenix.end2end.AggregateQueryIT
Running org.apache.phoenix.end2end.ProductMetricsIT
Running org.apache.phoenix.end2end.NativeHBaseTypesIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.035 sec - in 
org.apache.phoenix.end2end.NativeHBaseTypesIT
Running org.apache.phoenix.end2end.QueryDatabaseMetaDataIT
Tests run: 14, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 25.473 sec - 
in org.apache.phoenix.end2end.PointInTimeQueryIT
Running org.apache.phoenix.end2end.QueryIT
Tests run: 61, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 27.961 sec - 
in org.apache.phoenix.end2end.ProductMetricsIT
Tests run: 79, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 88.484 sec - 
in org.apache.phoenix.end2end.ArrayIT
Running org.apache.phoenix.end2end.ReadIsolationLevelIT
Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 94.908 sec - 
in org.apache.phoenix.end2end.CreateTableIT
Running 

Apache-Phoenix | origin/4.9-HBase-0.98 | Build Failure

[Apache Jenkins Server]

<<< text/html; charset=UTF-8: Unrecognized >>>

phoenix git commit: PHOENIX-3535 Fix race condition in ConnectionQueryServicesImpl#acquireUpgradeMutex

[samarth]

Repository: phoenix
Updated Branches:
  refs/heads/master 436bab01d -> b5ab53d96


PHOENIX-3535 Fix race condition in 
ConnectionQueryServicesImpl#acquireUpgradeMutex


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

Branch: refs/heads/master
Commit: b5ab53d9650910c2ff3a08f30c2c6f182693a004
Parents: 436bab0
Author: Samarth 
Authored: Wed Dec 21 15:12:30 2016 -0800
Committer: Samarth 
Committed: Wed Dec 21 15:12:30 2016 -0800

--
 .../org/apache/phoenix/end2end/UpgradeIT.java   | 43 --
 .../query/ConnectionQueryServicesImpl.java  | 46 +++-
 2 files changed, 44 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/b5ab53d9/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
index 733dab0..49fdba6 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
@@ -19,6 +19,9 @@ package org.apache.phoenix.end2end;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
+import static 
org.apache.phoenix.query.ConnectionQueryServicesImpl.UPGRADE_MUTEX;
+import static 
org.apache.phoenix.query.ConnectionQueryServicesImpl.UPGRADE_MUTEX_LOCKED;
+import static 
org.apache.phoenix.query.ConnectionQueryServicesImpl.UPGRADE_MUTEX_UNLOCKED;
 import static 
org.apache.phoenix.query.QueryConstants.BASE_TABLE_BASE_COLUMN_COUNT;
 import static 
org.apache.phoenix.query.QueryConstants.DIVERGED_VIEW_BASE_COLUMN_COUNT;
 import static 
org.apache.phoenix.util.UpgradeUtil.SELECT_BASE_COLUMN_COUNT_FROM_HEADER_ROW;
@@ -694,17 +697,30 @@ public class UpgradeIT extends ParallelStatsDisabledIT {
 }
 }
 
+private void putUnlockKVInSysMutex(byte[] row) throws Exception {
+try (Connection conn = getConnection(false, null)) {
+ConnectionQueryServices services = 
conn.unwrap(PhoenixConnection.class).getQueryServices();
+try (HTableInterface sysMutexTable = 
services.getTable(PhoenixDatabaseMetaData.SYSTEM_MUTEX_NAME_BYTES)) {
+byte[] family = 
PhoenixDatabaseMetaData.SYSTEM_MUTEX_FAMILY_NAME_BYTES;
+byte[] qualifier = UPGRADE_MUTEX;
+Put put = new Put(row);
+put.add(family, qualifier, UPGRADE_MUTEX_UNLOCKED);
+sysMutexTable.put(put);
+sysMutexTable.flushCommits();
+}
+}
+}
+
 @Test
 public void testAcquiringAndReleasingUpgradeMutex() throws Exception {
 ConnectionQueryServices services = null;
 byte[] mutexRowKey = SchemaUtil.getTableKey(null, 
PhoenixDatabaseMetaData.SYSTEM_CATALOG_SCHEMA,
 generateUniqueName());
-boolean dropSysMutexTable = false;
 try (Connection conn = getConnection(false, null)) {
 services = conn.unwrap(PhoenixConnection.class).getQueryServices();
+putUnlockKVInSysMutex(mutexRowKey);
 assertTrue(((ConnectionQueryServicesImpl)services)
 
.acquireUpgradeMutex(MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_4_7_0, 
mutexRowKey));
-dropSysMutexTable = true;
 try {
 ((ConnectionQueryServicesImpl)services)
 
.acquireUpgradeMutex(MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_4_7_0, 
mutexRowKey);
@@ -714,16 +730,6 @@ public class UpgradeIT extends ParallelStatsDisabledIT {
 }
 
assertTrue(((ConnectionQueryServicesImpl)services).releaseUpgradeMutex(mutexRowKey));
 
assertFalse(((ConnectionQueryServicesImpl)services).releaseUpgradeMutex(mutexRowKey));
-} finally {
-// We need to drop the SYSTEM.MUTEX table else other tests calling 
acquireUpgradeMutex will unexpectedly fail because they
-// won't see the UNLOCKED cell present for their key. This cell is 
inserted into the table the first time we create the 
-// SYSTEM.MUTEX table.
-if (services != null && dropSysMutexTable) {
-try (HBaseAdmin admin = services.getAdmin()) {
-
admin.disableTable(PhoenixDatabaseMetaData.SYSTEM_MUTEX_NAME_BYTES);
-
admin.deleteTable(PhoenixDatabaseMetaData.SYSTEM_MUTEX_NAME_BYTES);
-   

phoenix git commit: PHOENIX-3535 Fix race condition in ConnectionQueryServicesImpl#acquireUpgradeMutex

[samarth]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 0eecc471a -> 5998f2aeb


PHOENIX-3535 Fix race condition in 
ConnectionQueryServicesImpl#acquireUpgradeMutex


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

Branch: refs/heads/4.x-HBase-1.1
Commit: 5998f2aebd26744a4e90d0237ad8a494192e310a
Parents: 0eecc47
Author: Samarth 
Authored: Wed Dec 21 15:11:05 2016 -0800
Committer: Samarth 
Committed: Wed Dec 21 15:11:05 2016 -0800

--
 .../org/apache/phoenix/end2end/UpgradeIT.java   | 43 --
 .../query/ConnectionQueryServicesImpl.java  | 46 +++-
 2 files changed, 44 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/5998f2ae/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
index 733dab0..49fdba6 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
@@ -19,6 +19,9 @@ package org.apache.phoenix.end2end;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
+import static 
org.apache.phoenix.query.ConnectionQueryServicesImpl.UPGRADE_MUTEX;
+import static 
org.apache.phoenix.query.ConnectionQueryServicesImpl.UPGRADE_MUTEX_LOCKED;
+import static 
org.apache.phoenix.query.ConnectionQueryServicesImpl.UPGRADE_MUTEX_UNLOCKED;
 import static 
org.apache.phoenix.query.QueryConstants.BASE_TABLE_BASE_COLUMN_COUNT;
 import static 
org.apache.phoenix.query.QueryConstants.DIVERGED_VIEW_BASE_COLUMN_COUNT;
 import static 
org.apache.phoenix.util.UpgradeUtil.SELECT_BASE_COLUMN_COUNT_FROM_HEADER_ROW;
@@ -694,17 +697,30 @@ public class UpgradeIT extends ParallelStatsDisabledIT {
 }
 }
 
+private void putUnlockKVInSysMutex(byte[] row) throws Exception {
+try (Connection conn = getConnection(false, null)) {
+ConnectionQueryServices services = 
conn.unwrap(PhoenixConnection.class).getQueryServices();
+try (HTableInterface sysMutexTable = 
services.getTable(PhoenixDatabaseMetaData.SYSTEM_MUTEX_NAME_BYTES)) {
+byte[] family = 
PhoenixDatabaseMetaData.SYSTEM_MUTEX_FAMILY_NAME_BYTES;
+byte[] qualifier = UPGRADE_MUTEX;
+Put put = new Put(row);
+put.add(family, qualifier, UPGRADE_MUTEX_UNLOCKED);
+sysMutexTable.put(put);
+sysMutexTable.flushCommits();
+}
+}
+}
+
 @Test
 public void testAcquiringAndReleasingUpgradeMutex() throws Exception {
 ConnectionQueryServices services = null;
 byte[] mutexRowKey = SchemaUtil.getTableKey(null, 
PhoenixDatabaseMetaData.SYSTEM_CATALOG_SCHEMA,
 generateUniqueName());
-boolean dropSysMutexTable = false;
 try (Connection conn = getConnection(false, null)) {
 services = conn.unwrap(PhoenixConnection.class).getQueryServices();
+putUnlockKVInSysMutex(mutexRowKey);
 assertTrue(((ConnectionQueryServicesImpl)services)
 
.acquireUpgradeMutex(MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_4_7_0, 
mutexRowKey));
-dropSysMutexTable = true;
 try {
 ((ConnectionQueryServicesImpl)services)
 
.acquireUpgradeMutex(MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_4_7_0, 
mutexRowKey);
@@ -714,16 +730,6 @@ public class UpgradeIT extends ParallelStatsDisabledIT {
 }
 
assertTrue(((ConnectionQueryServicesImpl)services).releaseUpgradeMutex(mutexRowKey));
 
assertFalse(((ConnectionQueryServicesImpl)services).releaseUpgradeMutex(mutexRowKey));
-} finally {
-// We need to drop the SYSTEM.MUTEX table else other tests calling 
acquireUpgradeMutex will unexpectedly fail because they
-// won't see the UNLOCKED cell present for their key. This cell is 
inserted into the table the first time we create the 
-// SYSTEM.MUTEX table.
-if (services != null && dropSysMutexTable) {
-try (HBaseAdmin admin = services.getAdmin()) {
-
admin.disableTable(PhoenixDatabaseMetaData.SYSTEM_MUTEX_NAME_BYTES);
-

phoenix git commit: PHOENIX-3535 Fix race condition in ConnectionQueryServicesImpl#acquireUpgradeMutex

[samarth]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 0ea97ce67 -> 18cb85e69


PHOENIX-3535 Fix race condition in 
ConnectionQueryServicesImpl#acquireUpgradeMutex


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 18cb85e69580ede3bdb391c2134c6f12effefabe
Parents: 0ea97ce
Author: Samarth 
Authored: Wed Dec 21 15:10:09 2016 -0800
Committer: Samarth 
Committed: Wed Dec 21 15:10:09 2016 -0800

--
 .../org/apache/phoenix/end2end/UpgradeIT.java   | 43 --
 .../query/ConnectionQueryServicesImpl.java  | 46 +++-
 2 files changed, 44 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/18cb85e6/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
index 733dab0..49fdba6 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
@@ -19,6 +19,9 @@ package org.apache.phoenix.end2end;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
+import static 
org.apache.phoenix.query.ConnectionQueryServicesImpl.UPGRADE_MUTEX;
+import static 
org.apache.phoenix.query.ConnectionQueryServicesImpl.UPGRADE_MUTEX_LOCKED;
+import static 
org.apache.phoenix.query.ConnectionQueryServicesImpl.UPGRADE_MUTEX_UNLOCKED;
 import static 
org.apache.phoenix.query.QueryConstants.BASE_TABLE_BASE_COLUMN_COUNT;
 import static 
org.apache.phoenix.query.QueryConstants.DIVERGED_VIEW_BASE_COLUMN_COUNT;
 import static 
org.apache.phoenix.util.UpgradeUtil.SELECT_BASE_COLUMN_COUNT_FROM_HEADER_ROW;
@@ -694,17 +697,30 @@ public class UpgradeIT extends ParallelStatsDisabledIT {
 }
 }
 
+private void putUnlockKVInSysMutex(byte[] row) throws Exception {
+try (Connection conn = getConnection(false, null)) {
+ConnectionQueryServices services = 
conn.unwrap(PhoenixConnection.class).getQueryServices();
+try (HTableInterface sysMutexTable = 
services.getTable(PhoenixDatabaseMetaData.SYSTEM_MUTEX_NAME_BYTES)) {
+byte[] family = 
PhoenixDatabaseMetaData.SYSTEM_MUTEX_FAMILY_NAME_BYTES;
+byte[] qualifier = UPGRADE_MUTEX;
+Put put = new Put(row);
+put.add(family, qualifier, UPGRADE_MUTEX_UNLOCKED);
+sysMutexTable.put(put);
+sysMutexTable.flushCommits();
+}
+}
+}
+
 @Test
 public void testAcquiringAndReleasingUpgradeMutex() throws Exception {
 ConnectionQueryServices services = null;
 byte[] mutexRowKey = SchemaUtil.getTableKey(null, 
PhoenixDatabaseMetaData.SYSTEM_CATALOG_SCHEMA,
 generateUniqueName());
-boolean dropSysMutexTable = false;
 try (Connection conn = getConnection(false, null)) {
 services = conn.unwrap(PhoenixConnection.class).getQueryServices();
+putUnlockKVInSysMutex(mutexRowKey);
 assertTrue(((ConnectionQueryServicesImpl)services)
 
.acquireUpgradeMutex(MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_4_7_0, 
mutexRowKey));
-dropSysMutexTable = true;
 try {
 ((ConnectionQueryServicesImpl)services)
 
.acquireUpgradeMutex(MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_4_7_0, 
mutexRowKey);
@@ -714,16 +730,6 @@ public class UpgradeIT extends ParallelStatsDisabledIT {
 }
 
assertTrue(((ConnectionQueryServicesImpl)services).releaseUpgradeMutex(mutexRowKey));
 
assertFalse(((ConnectionQueryServicesImpl)services).releaseUpgradeMutex(mutexRowKey));
-} finally {
-// We need to drop the SYSTEM.MUTEX table else other tests calling 
acquireUpgradeMutex will unexpectedly fail because they
-// won't see the UNLOCKED cell present for their key. This cell is 
inserted into the table the first time we create the 
-// SYSTEM.MUTEX table.
-if (services != null && dropSysMutexTable) {
-try (HBaseAdmin admin = services.getAdmin()) {
-
admin.disableTable(PhoenixDatabaseMetaData.SYSTEM_MUTEX_NAME_BYTES);
-

phoenix git commit: PHOENIX-3535 Fix race condition in ConnectionQueryServicesImpl#acquireUpgradeMutex

[samarth]

Repository: phoenix
Updated Branches:
  refs/heads/4.9-HBase-1.2 796808fe4 -> a107c0eed


PHOENIX-3535 Fix race condition in 
ConnectionQueryServicesImpl#acquireUpgradeMutex


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

Branch: refs/heads/4.9-HBase-1.2
Commit: a107c0eedd949cd188493f0c94fa11dee12d501b
Parents: 796808f
Author: Samarth 
Authored: Wed Dec 21 15:09:27 2016 -0800
Committer: Samarth 
Committed: Wed Dec 21 15:09:27 2016 -0800

--
 .../org/apache/phoenix/end2end/UpgradeIT.java   | 43 --
 .../query/ConnectionQueryServicesImpl.java  | 46 +++-
 2 files changed, 44 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/a107c0ee/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
index 733dab0..49fdba6 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
@@ -19,6 +19,9 @@ package org.apache.phoenix.end2end;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
+import static 
org.apache.phoenix.query.ConnectionQueryServicesImpl.UPGRADE_MUTEX;
+import static 
org.apache.phoenix.query.ConnectionQueryServicesImpl.UPGRADE_MUTEX_LOCKED;
+import static 
org.apache.phoenix.query.ConnectionQueryServicesImpl.UPGRADE_MUTEX_UNLOCKED;
 import static 
org.apache.phoenix.query.QueryConstants.BASE_TABLE_BASE_COLUMN_COUNT;
 import static 
org.apache.phoenix.query.QueryConstants.DIVERGED_VIEW_BASE_COLUMN_COUNT;
 import static 
org.apache.phoenix.util.UpgradeUtil.SELECT_BASE_COLUMN_COUNT_FROM_HEADER_ROW;
@@ -694,17 +697,30 @@ public class UpgradeIT extends ParallelStatsDisabledIT {
 }
 }
 
+private void putUnlockKVInSysMutex(byte[] row) throws Exception {
+try (Connection conn = getConnection(false, null)) {
+ConnectionQueryServices services = 
conn.unwrap(PhoenixConnection.class).getQueryServices();
+try (HTableInterface sysMutexTable = 
services.getTable(PhoenixDatabaseMetaData.SYSTEM_MUTEX_NAME_BYTES)) {
+byte[] family = 
PhoenixDatabaseMetaData.SYSTEM_MUTEX_FAMILY_NAME_BYTES;
+byte[] qualifier = UPGRADE_MUTEX;
+Put put = new Put(row);
+put.add(family, qualifier, UPGRADE_MUTEX_UNLOCKED);
+sysMutexTable.put(put);
+sysMutexTable.flushCommits();
+}
+}
+}
+
 @Test
 public void testAcquiringAndReleasingUpgradeMutex() throws Exception {
 ConnectionQueryServices services = null;
 byte[] mutexRowKey = SchemaUtil.getTableKey(null, 
PhoenixDatabaseMetaData.SYSTEM_CATALOG_SCHEMA,
 generateUniqueName());
-boolean dropSysMutexTable = false;
 try (Connection conn = getConnection(false, null)) {
 services = conn.unwrap(PhoenixConnection.class).getQueryServices();
+putUnlockKVInSysMutex(mutexRowKey);
 assertTrue(((ConnectionQueryServicesImpl)services)
 
.acquireUpgradeMutex(MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_4_7_0, 
mutexRowKey));
-dropSysMutexTable = true;
 try {
 ((ConnectionQueryServicesImpl)services)
 
.acquireUpgradeMutex(MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_4_7_0, 
mutexRowKey);
@@ -714,16 +730,6 @@ public class UpgradeIT extends ParallelStatsDisabledIT {
 }
 
assertTrue(((ConnectionQueryServicesImpl)services).releaseUpgradeMutex(mutexRowKey));
 
assertFalse(((ConnectionQueryServicesImpl)services).releaseUpgradeMutex(mutexRowKey));
-} finally {
-// We need to drop the SYSTEM.MUTEX table else other tests calling 
acquireUpgradeMutex will unexpectedly fail because they
-// won't see the UNLOCKED cell present for their key. This cell is 
inserted into the table the first time we create the 
-// SYSTEM.MUTEX table.
-if (services != null && dropSysMutexTable) {
-try (HBaseAdmin admin = services.getAdmin()) {
-
admin.disableTable(PhoenixDatabaseMetaData.SYSTEM_MUTEX_NAME_BYTES);
-

phoenix git commit: PHOENIX-3535 Fix race condition in ConnectionQueryServicesImpl#acquireUpgradeMutex

[samarth]

Repository: phoenix
Updated Branches:
  refs/heads/4.9-HBase-1.1 d879e9a3e -> 65e8183e9


PHOENIX-3535 Fix race condition in 
ConnectionQueryServicesImpl#acquireUpgradeMutex


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

Branch: refs/heads/4.9-HBase-1.1
Commit: 65e8183e91bd9eb0a809c2c0d0035915dcea2925
Parents: d879e9a
Author: Samarth 
Authored: Wed Dec 21 15:08:21 2016 -0800
Committer: Samarth 
Committed: Wed Dec 21 15:08:21 2016 -0800

--
 .../org/apache/phoenix/end2end/UpgradeIT.java   | 43 --
 .../query/ConnectionQueryServicesImpl.java  | 46 +++-
 2 files changed, 44 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/65e8183e/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
index 733dab0..49fdba6 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
@@ -19,6 +19,9 @@ package org.apache.phoenix.end2end;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
+import static 
org.apache.phoenix.query.ConnectionQueryServicesImpl.UPGRADE_MUTEX;
+import static 
org.apache.phoenix.query.ConnectionQueryServicesImpl.UPGRADE_MUTEX_LOCKED;
+import static 
org.apache.phoenix.query.ConnectionQueryServicesImpl.UPGRADE_MUTEX_UNLOCKED;
 import static 
org.apache.phoenix.query.QueryConstants.BASE_TABLE_BASE_COLUMN_COUNT;
 import static 
org.apache.phoenix.query.QueryConstants.DIVERGED_VIEW_BASE_COLUMN_COUNT;
 import static 
org.apache.phoenix.util.UpgradeUtil.SELECT_BASE_COLUMN_COUNT_FROM_HEADER_ROW;
@@ -694,17 +697,30 @@ public class UpgradeIT extends ParallelStatsDisabledIT {
 }
 }
 
+private void putUnlockKVInSysMutex(byte[] row) throws Exception {
+try (Connection conn = getConnection(false, null)) {
+ConnectionQueryServices services = 
conn.unwrap(PhoenixConnection.class).getQueryServices();
+try (HTableInterface sysMutexTable = 
services.getTable(PhoenixDatabaseMetaData.SYSTEM_MUTEX_NAME_BYTES)) {
+byte[] family = 
PhoenixDatabaseMetaData.SYSTEM_MUTEX_FAMILY_NAME_BYTES;
+byte[] qualifier = UPGRADE_MUTEX;
+Put put = new Put(row);
+put.add(family, qualifier, UPGRADE_MUTEX_UNLOCKED);
+sysMutexTable.put(put);
+sysMutexTable.flushCommits();
+}
+}
+}
+
 @Test
 public void testAcquiringAndReleasingUpgradeMutex() throws Exception {
 ConnectionQueryServices services = null;
 byte[] mutexRowKey = SchemaUtil.getTableKey(null, 
PhoenixDatabaseMetaData.SYSTEM_CATALOG_SCHEMA,
 generateUniqueName());
-boolean dropSysMutexTable = false;
 try (Connection conn = getConnection(false, null)) {
 services = conn.unwrap(PhoenixConnection.class).getQueryServices();
+putUnlockKVInSysMutex(mutexRowKey);
 assertTrue(((ConnectionQueryServicesImpl)services)
 
.acquireUpgradeMutex(MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_4_7_0, 
mutexRowKey));
-dropSysMutexTable = true;
 try {
 ((ConnectionQueryServicesImpl)services)
 
.acquireUpgradeMutex(MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_4_7_0, 
mutexRowKey);
@@ -714,16 +730,6 @@ public class UpgradeIT extends ParallelStatsDisabledIT {
 }
 
assertTrue(((ConnectionQueryServicesImpl)services).releaseUpgradeMutex(mutexRowKey));
 
assertFalse(((ConnectionQueryServicesImpl)services).releaseUpgradeMutex(mutexRowKey));
-} finally {
-// We need to drop the SYSTEM.MUTEX table else other tests calling 
acquireUpgradeMutex will unexpectedly fail because they
-// won't see the UNLOCKED cell present for their key. This cell is 
inserted into the table the first time we create the 
-// SYSTEM.MUTEX table.
-if (services != null && dropSysMutexTable) {
-try (HBaseAdmin admin = services.getAdmin()) {
-
admin.disableTable(PhoenixDatabaseMetaData.SYSTEM_MUTEX_NAME_BYTES);
-

phoenix git commit: PHOENIX-3535 Fix race condition in ConnectionQueryServicesImpl#acquireUpgradeMutex

[samarth]

Repository: phoenix
Updated Branches:
  refs/heads/4.9-HBase-0.98 d2fcc7a68 -> a2d074304


PHOENIX-3535 Fix race condition in 
ConnectionQueryServicesImpl#acquireUpgradeMutex


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

Branch: refs/heads/4.9-HBase-0.98
Commit: a2d07430459fdcf8b2604f0d50fa89a6c2963bcd
Parents: d2fcc7a
Author: Samarth 
Authored: Wed Dec 21 15:05:44 2016 -0800
Committer: Samarth 
Committed: Wed Dec 21 15:05:44 2016 -0800

--
 .../org/apache/phoenix/end2end/UpgradeIT.java   | 43 --
 .../query/ConnectionQueryServicesImpl.java  | 46 +++-
 2 files changed, 44 insertions(+), 45 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/a2d07430/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
index 733dab0..49fdba6 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UpgradeIT.java
@@ -19,6 +19,9 @@ package org.apache.phoenix.end2end;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
+import static 
org.apache.phoenix.query.ConnectionQueryServicesImpl.UPGRADE_MUTEX;
+import static 
org.apache.phoenix.query.ConnectionQueryServicesImpl.UPGRADE_MUTEX_LOCKED;
+import static 
org.apache.phoenix.query.ConnectionQueryServicesImpl.UPGRADE_MUTEX_UNLOCKED;
 import static 
org.apache.phoenix.query.QueryConstants.BASE_TABLE_BASE_COLUMN_COUNT;
 import static 
org.apache.phoenix.query.QueryConstants.DIVERGED_VIEW_BASE_COLUMN_COUNT;
 import static 
org.apache.phoenix.util.UpgradeUtil.SELECT_BASE_COLUMN_COUNT_FROM_HEADER_ROW;
@@ -694,17 +697,30 @@ public class UpgradeIT extends ParallelStatsDisabledIT {
 }
 }
 
+private void putUnlockKVInSysMutex(byte[] row) throws Exception {
+try (Connection conn = getConnection(false, null)) {
+ConnectionQueryServices services = 
conn.unwrap(PhoenixConnection.class).getQueryServices();
+try (HTableInterface sysMutexTable = 
services.getTable(PhoenixDatabaseMetaData.SYSTEM_MUTEX_NAME_BYTES)) {
+byte[] family = 
PhoenixDatabaseMetaData.SYSTEM_MUTEX_FAMILY_NAME_BYTES;
+byte[] qualifier = UPGRADE_MUTEX;
+Put put = new Put(row);
+put.add(family, qualifier, UPGRADE_MUTEX_UNLOCKED);
+sysMutexTable.put(put);
+sysMutexTable.flushCommits();
+}
+}
+}
+
 @Test
 public void testAcquiringAndReleasingUpgradeMutex() throws Exception {
 ConnectionQueryServices services = null;
 byte[] mutexRowKey = SchemaUtil.getTableKey(null, 
PhoenixDatabaseMetaData.SYSTEM_CATALOG_SCHEMA,
 generateUniqueName());
-boolean dropSysMutexTable = false;
 try (Connection conn = getConnection(false, null)) {
 services = conn.unwrap(PhoenixConnection.class).getQueryServices();
+putUnlockKVInSysMutex(mutexRowKey);
 assertTrue(((ConnectionQueryServicesImpl)services)
 
.acquireUpgradeMutex(MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_4_7_0, 
mutexRowKey));
-dropSysMutexTable = true;
 try {
 ((ConnectionQueryServicesImpl)services)
 
.acquireUpgradeMutex(MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_4_7_0, 
mutexRowKey);
@@ -714,16 +730,6 @@ public class UpgradeIT extends ParallelStatsDisabledIT {
 }
 
assertTrue(((ConnectionQueryServicesImpl)services).releaseUpgradeMutex(mutexRowKey));
 
assertFalse(((ConnectionQueryServicesImpl)services).releaseUpgradeMutex(mutexRowKey));
-} finally {
-// We need to drop the SYSTEM.MUTEX table else other tests calling 
acquireUpgradeMutex will unexpectedly fail because they
-// won't see the UNLOCKED cell present for their key. This cell is 
inserted into the table the first time we create the 
-// SYSTEM.MUTEX table.
-if (services != null && dropSysMutexTable) {
-try (HBaseAdmin admin = services.getAdmin()) {
-
admin.disableTable(PhoenixDatabaseMetaData.SYSTEM_MUTEX_NAME_BYTES);
-

Apache-Phoenix | EncodeColumns | Build Successful

[Apache Jenkins Server]

encodecolumns2 branch build status Successful

Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/encodecolumns2

Compiled Artifacts https://builds.apache.org/job/Phoenix-encode-columns/lastSuccessfulBuild/artifact/

Test Report https://builds.apache.org/job/Phoenix-encode-columns/lastCompletedBuild/testReport/

Changes
[samarth] Refactor code to store and use column qualifiers in SYSTEM.CATALOG



Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout

[2/3] phoenix git commit: Refactor code to store and use column qualifiers in SYSTEM.CATALOG

[samarth]

http://git-wip-us.apache.org/repos/asf/phoenix/blob/f955c025/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
index 6357e52..3cca2de 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
@@ -26,7 +26,6 @@ import static 
org.apache.phoenix.monitoring.GlobalClientMetrics.GLOBAL_QUERY_TIM
 import static org.apache.phoenix.schema.PTable.IndexType.LOCAL;
 import static org.apache.phoenix.schema.PTableType.INDEX;
 import static org.apache.phoenix.util.ByteUtil.EMPTY_BYTE_ARRAY;
-import static 
org.apache.phoenix.util.EncodedColumnsUtil.getEncodedColumnQualifier;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInput;
@@ -87,6 +86,7 @@ import org.apache.phoenix.query.QueryServicesOptions;
 import org.apache.phoenix.schema.PColumnFamily;
 import org.apache.phoenix.schema.PTable;
 import org.apache.phoenix.schema.PTable.IndexType;
+import org.apache.phoenix.schema.PTable.QualifierEncodingScheme;
 import org.apache.phoenix.schema.PTable.StorageScheme;
 import org.apache.phoenix.schema.PTable.ViewType;
 import org.apache.phoenix.schema.StaleRegionBoundaryCacheException;
@@ -248,13 +248,14 @@ public abstract class BaseResultIterators extends 
ExplainTable implements Result
 ScanUtil.andFilterAtEnd(scan, new 
PageFilter(plan.getLimit()));
 }
 }
+
scan.setAttribute(BaseScannerRegionObserver.QUALIFIER_ENCODING_SCHEME, new 
byte[]{table.getEncodingScheme().getSerializedMetadataValue()});
 // When analyzing the table, there is no look up for key values 
being done.
 // So there is no point setting the range.
 if (EncodedColumnsUtil.setQualifierRanges(table) && 
!ScanUtil.isAnalyzeTable(scan)) {
 Pair range = getEncodedQualifierRange(scan, 
context);
 if (range != null) {
-scan.setAttribute(BaseScannerRegionObserver.MIN_QUALIFIER, 
getEncodedColumnQualifier(range.getFirst()));
-scan.setAttribute(BaseScannerRegionObserver.MAX_QUALIFIER, 
getEncodedColumnQualifier(range.getSecond()));
+scan.setAttribute(BaseScannerRegionObserver.MIN_QUALIFIER, 
Bytes.toBytes(range.getFirst()));
+scan.setAttribute(BaseScannerRegionObserver.MAX_QUALIFIER, 
Bytes.toBytes(range.getSecond()));
 }
 }
 if (optimizeProjection) {
@@ -266,25 +267,25 @@ public abstract class BaseResultIterators extends 
ExplainTable implements Result
 private static Pair getEncodedQualifierRange(Scan scan, 
StatementContext context)
 throws SQLException {
 PTable table = context.getCurrentTable().getTable();
-StorageScheme storageScheme = table.getStorageScheme();
-checkArgument(storageScheme == 
StorageScheme.ONE_CELL_PER_KEYVALUE_COLUMN,
+QualifierEncodingScheme encodingScheme = table.getEncodingScheme();
+checkArgument(encodingScheme != 
QualifierEncodingScheme.NON_ENCODED_QUALIFIERS,
 "Method should only be used for tables using encoded column 
names");
 Pair minMaxQualifiers = new Pair<>();
 for (Pair whereCol : 
context.getWhereConditionColumns()) {
 byte[] cq = whereCol.getSecond();
 if (cq != null) {
-int qualifier = getEncodedColumnQualifier(cq);
+int qualifier = table.getEncodingScheme().getDecodedValue(cq);
 determineQualifierRange(qualifier, minMaxQualifiers);
 }
 }
 Map> familyMap = scan.getFamilyMap();
 
-Map> qualifierRanges = 
EncodedColumnsUtil.getQualifierRanges(table);
+Map> qualifierRanges = 
EncodedColumnsUtil.getFamilyQualifierRanges(table);
 for (Entry> entry : familyMap.entrySet()) 
{
 if (entry.getValue() != null) {
 for (byte[] cq : entry.getValue()) {
 if (cq != null) {
-int qualifier = getEncodedColumnQualifier(cq);
+int qualifier = 
table.getEncodingScheme().getDecodedValue(cq);
 determineQualifierRange(qualifier, minMaxQualifiers);
 }
 }
@@ -299,8 +300,10 @@ public abstract class BaseResultIterators extends 
ExplainTable implements Result
 family = IndexUtil.getLocalIndexColumnFamily(family);
 }
 

[1/3] phoenix git commit: Refactor code to store and use column qualifiers in SYSTEM.CATALOG

[samarth]

Repository: phoenix
Updated Branches:
  refs/heads/encodecolumns2 7041c560c -> f955c025c


http://git-wip-us.apache.org/repos/asf/phoenix/blob/f955c025/phoenix-core/src/test/java/org/apache/phoenix/execute/LiteralResultIteratorPlanTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/execute/LiteralResultIteratorPlanTest.java
 
b/phoenix-core/src/test/java/org/apache/phoenix/execute/LiteralResultIteratorPlanTest.java
index 0cd22ef..e8e42a6 100644
--- 
a/phoenix-core/src/test/java/org/apache/phoenix/execute/LiteralResultIteratorPlanTest.java
+++ 
b/phoenix-core/src/test/java/org/apache/phoenix/execute/LiteralResultIteratorPlanTest.java
@@ -174,9 +174,10 @@ public class LiteralResultIteratorPlanTest {
 for (int i = 0; i < row.length; i++) {
 String name = ParseNodeFactory.createTempAlias();
 Expression expr = LiteralExpression.newConstant(row[i]);
+PName colName = PNameFactory.newName(name);
 columns.add(new PColumnImpl(PNameFactory.newName(name),
 PNameFactory.newName(VALUE_COLUMN_FAMILY), 
expr.getDataType(), expr.getMaxLength(),
-expr.getScale(), expr.isNullable(), i, 
expr.getSortOrder(), null, null, false, name, false, false, null));
+expr.getScale(), expr.isNullable(), i, 
expr.getSortOrder(), null, null, false, name, false, false, 
colName.getBytes()));
 }
 try {
 PTable pTable = PTableImpl.makePTable(null, PName.EMPTY_NAME, 
PName.EMPTY_NAME, PTableType.SUBQUERY, null,

http://git-wip-us.apache.org/repos/asf/phoenix/blob/f955c025/phoenix-core/src/test/java/org/apache/phoenix/execute/UnnestArrayPlanTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/execute/UnnestArrayPlanTest.java
 
b/phoenix-core/src/test/java/org/apache/phoenix/execute/UnnestArrayPlanTest.java
index ff62f63..195c2f0 100644
--- 
a/phoenix-core/src/test/java/org/apache/phoenix/execute/UnnestArrayPlanTest.java
+++ 
b/phoenix-core/src/test/java/org/apache/phoenix/execute/UnnestArrayPlanTest.java
@@ -48,6 +48,7 @@ import org.apache.phoenix.jdbc.PhoenixStatement;
 import org.apache.phoenix.parse.SelectStatement;
 import org.apache.phoenix.schema.PColumn;
 import org.apache.phoenix.schema.PColumnImpl;
+import org.apache.phoenix.schema.PName;
 import org.apache.phoenix.schema.PNameFactory;
 import org.apache.phoenix.schema.RowKeyValueAccessor;
 import org.apache.phoenix.schema.SortOrder;
@@ -118,8 +119,10 @@ public class UnnestArrayPlanTest {
 LiteralExpression dummy = LiteralExpression.newConstant(null, 
arrayType);
 RowKeyValueAccessor accessor = new 
RowKeyValueAccessor(Arrays.asList(dummy), 0);
 UnnestArrayPlan plan = new UnnestArrayPlan(subPlan, new 
RowKeyColumnExpression(dummy, accessor), withOrdinality);
-PColumn elemColumn = new PColumnImpl(PNameFactory.newName("ELEM"), 
PNameFactory.newName(VALUE_COLUMN_FAMILY), baseType, null, null, true, 0, 
SortOrder.getDefault(), null, null, false, "", false, false, null);
-PColumn indexColumn = withOrdinality ? new 
PColumnImpl(PNameFactory.newName("IDX"), 
PNameFactory.newName(VALUE_COLUMN_FAMILY), PInteger.INSTANCE, null, null, true, 
0, SortOrder.getDefault(), null, null, false, "", false, false, null) : null;
+PName colName = PNameFactory.newName("ELEM");
+PColumn elemColumn = new PColumnImpl(PNameFactory.newName("ELEM"), 
PNameFactory.newName(VALUE_COLUMN_FAMILY), baseType, null, null, true, 0, 
SortOrder.getDefault(), null, null, false, "", false, false, 
colName.getBytes());
+colName = PNameFactory.newName("IDX");
+PColumn indexColumn = withOrdinality ? new PColumnImpl(colName, 
PNameFactory.newName(VALUE_COLUMN_FAMILY), PInteger.INSTANCE, null, null, true, 
0, SortOrder.getDefault(), null, null, false, "", false, false, 
colName.getBytes()) : null;
 List columns = withOrdinality ? Arrays.asList(elemColumn, 
indexColumn) : Arrays.asList(elemColumn);
 ProjectedColumnExpression elemExpr = new 
ProjectedColumnExpression(elemColumn, columns, 0, 
elemColumn.getName().getString());
 ProjectedColumnExpression indexExpr = withOrdinality ? new 
ProjectedColumnExpression(indexColumn, columns, 1, 
indexColumn.getName().getString()) : null;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/f955c025/phoenix-core/src/test/java/org/apache/phoenix/expression/ColumnExpressionTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/expression/ColumnExpressionTest.java
 
b/phoenix-core/src/test/java/org/apache/phoenix/expression/ColumnExpressionTest.java
index 98c2495..2788235 100644
--- 
a/phoenix-core/src/test/java/org/apache/phoenix/expression/ColumnExpressionTest.java
+++ 

[3/3] phoenix git commit: Refactor code to store and use column qualifiers in SYSTEM.CATALOG

[samarth]

Refactor code to store and use column qualifiers in SYSTEM.CATALOG


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

Branch: refs/heads/encodecolumns2
Commit: f955c025cf358f3d7be47f8c935a403e7d387b6e
Parents: 7041c56
Author: Samarth 
Authored: Wed Dec 21 13:15:02 2016 -0800
Committer: Samarth 
Committed: Wed Dec 21 13:15:02 2016 -0800

--
 .../apache/phoenix/end2end/AlterTableIT.java|   7 +-
 .../apache/phoenix/end2end/StoreNullsIT.java|  10 +-
 .../phoenix/end2end/index/DropMetadataIT.java   |   4 +-
 .../apache/phoenix/compile/FromCompiler.java|  19 ++-
 .../apache/phoenix/compile/JoinCompiler.java|   9 +-
 .../phoenix/compile/ListJarsQueryPlan.java  |   6 +-
 .../apache/phoenix/compile/PostDDLCompiler.java |   2 +-
 .../phoenix/compile/ProjectionCompiler.java |  14 +-
 .../apache/phoenix/compile/TraceQueryPlan.java  |   4 +-
 .../compile/TupleProjectionCompiler.java|   8 +-
 .../apache/phoenix/compile/UnionCompiler.java   |   3 +-
 .../apache/phoenix/compile/WhereCompiler.java   |   3 +-
 .../coprocessor/BaseScannerRegionObserver.java  |   1 +
 .../GroupedAggregateRegionObserver.java |   6 +-
 .../coprocessor/MetaDataEndpointImpl.java   |  26 +--
 .../phoenix/coprocessor/ScanRegionObserver.java |  11 +-
 .../UngroupedAggregateRegionObserver.java   |   3 +-
 .../coprocessor/generated/PTableProtos.java | 157 ++-
 .../apache/phoenix/execute/BaseQueryPlan.java   |   2 +-
 .../expression/ArrayColumnExpression.java   |  30 +++-
 .../expression/KeyValueColumnExpression.java|  30 ++--
 .../apache/phoenix/index/IndexMaintainer.java   |  29 ++--
 .../phoenix/iterate/BaseResultIterators.java|  23 +--
 .../iterate/RegionScannerResultIterator.java|   7 +-
 .../phoenix/jdbc/PhoenixDatabaseMetaData.java   |   4 +-
 .../mapreduce/FormatToBytesWritableMapper.java  |   2 +-
 .../mapreduce/FormatToKeyValueReducer.java  |   2 +-
 .../apache/phoenix/query/QueryConstants.java|  18 ++-
 .../org/apache/phoenix/schema/ColumnRef.java|   6 +-
 .../apache/phoenix/schema/DelegateColumn.java   |   4 +-
 .../apache/phoenix/schema/MetaDataClient.java   |  34 ++--
 .../java/org/apache/phoenix/schema/PColumn.java |   2 +-
 .../phoenix/schema/PColumnFamilyImpl.java   |  41 +++--
 .../org/apache/phoenix/schema/PColumnImpl.java  |  28 ++--
 .../apache/phoenix/schema/PMetaDataImpl.java|   2 +-
 .../java/org/apache/phoenix/schema/PTable.java  | 135 +++-
 .../org/apache/phoenix/schema/PTableImpl.java   | 118 ++
 .../apache/phoenix/schema/ProjectedColumn.java  |  11 +-
 .../tuple/EncodedColumnQualiferCellsList.java   |  19 ++-
 .../tuple/PositionBasedMultiKeyValueTuple.java  |   3 +-
 .../schema/tuple/PositionBasedResultTuple.java  |   3 +-
 .../apache/phoenix/util/EncodedColumnsUtil.java |  77 +
 .../java/org/apache/phoenix/util/IndexUtil.java |   9 +-
 .../phoenix/compile/WhereCompilerTest.java  |   4 +-
 .../phoenix/execute/CorrelatePlanTest.java  |   3 +-
 .../execute/LiteralResultIteratorPlanTest.java  |   3 +-
 .../phoenix/execute/UnnestArrayPlanTest.java|   7 +-
 .../expression/ColumnExpressionTest.java|  35 +++--
 .../EncodedColumnQualifierCellsListTest.java|  98 ++--
 .../java/org/apache/phoenix/util/TestUtil.java  |  10 +-
 phoenix-protocol/src/main/PTable.proto  |   2 +-
 51 files changed, 601 insertions(+), 493 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/f955c025/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 3084a92..91e9964 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
@@ -20,8 +20,8 @@ package org.apache.phoenix.end2end;
 import static 
org.apache.hadoop.hbase.HColumnDescriptor.DEFAULT_REPLICATION_SCOPE;
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.COLUMN_FAMILY;
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.COLUMN_NAME;
+import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.COLUMN_QUALIFIER;
 import static 
org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.COLUMN_QUALIFIER_COUNTER;
-import static 
org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.ENCODED_COLUMN_QUALIFIER;
 import static