phoenix git commit: PHOENIX-4438 IT tests require additional configuration for HBase 2.0

2017-12-06 Thread ssa
Repository: phoenix
Updated Branches:
  refs/heads/5.x-HBase-2.0 b973717fe -> 491486954


PHOENIX-4438 IT tests require additional configuration for HBase 2.0


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

Branch: refs/heads/5.x-HBase-2.0
Commit: 4914869545791af1efc011ae1b01e26af0db6c47
Parents: b973717
Author: Sergey Soldatov 
Authored: Wed Dec 6 23:26:52 2017 -0800
Committer: Sergey Soldatov 
Committed: Wed Dec 6 23:38:31 2017 -0800

--
 pom.xml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/49148695/pom.xml
--
diff --git a/pom.xml b/pom.xml
index e7ccf0c..295c94d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,7 +120,7 @@
 
 
 8
-8
+4
 false
 false
 
@@ -242,7 +242,7 @@
 alphabetical
 
--Xmx2000m -XX:MaxPermSize=256m 
-Djava.security.egd=file:/dev/./urandom 
"-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}"
 -XX:NewRatio=4 -XX:SurvivorRatio=8 -XX:+UseCompressedOops 
-XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+DisableExplicitGC 
-XX:+UseCMSInitiatingOccupancyOnly -XX:+CMSClassUnloadingEnabled 
-XX:+CMSScavengeBeforeRemark -XX:CMSInitiatingOccupancyFraction=68 
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/
+-Xmx2000m -XX:MaxPermSize=256m 
-Djava.security.egd=file:/dev/./urandom 
"-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}"
 -XX:NewRatio=4 -XX:SurvivorRatio=8 -XX:+UseCompressedOops 
-XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+DisableExplicitGC 
-XX:+UseCMSInitiatingOccupancyOnly -XX:+CMSClassUnloadingEnabled 
-XX:+CMSScavengeBeforeRemark -XX:CMSInitiatingOccupancyFraction=68 
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/ 
-Dorg.apache.hadoop.hbase.shaded.io.netty.packagePrefix=org.apache.hadoop.hbase.shaded.
 
${test.output.tofile}
 kill
 
${basedir}/src/it/java
@@ -271,7 +271,7 @@
 at 
org.apache.phoenix.coprocessor.MetaDataEndpointImpl.doGetTable(MetaDataEndpointImpl.java:2835)
 at 
org.apache.phoenix.coprocessor.MetaDataEndpointImpl.getTable(MetaDataEndpointImpl.java:490)
 -->

--Xmx3000m -XX:MaxPermSize=256m 
-Djava.security.egd=file:/dev/./urandom 
"-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}"
 -XX:NewRatio=4 -XX:SurvivorRatio=8 -XX:+UseCompressedOops 
-XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+DisableExplicitGC 
-XX:+UseCMSInitiatingOccupancyOnly -XX:+CMSClassUnloadingEnabled 
-XX:+CMSScavengeBeforeRemark -XX:CMSInitiatingOccupancyFraction=68 
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/
+-Xmx3000m -XX:MaxPermSize=256m 
-Djava.security.egd=file:/dev/./urandom 
"-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}"
 -XX:NewRatio=4 -XX:SurvivorRatio=8 -XX:+UseCompressedOops 
-XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+DisableExplicitGC 
-XX:+UseCMSInitiatingOccupancyOnly -XX:+CMSClassUnloadingEnabled 
-XX:+CMSScavengeBeforeRemark -XX:CMSInitiatingOccupancyFraction=68 
-XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/ 
-Dorg.apache.hadoop.hbase.shaded.io.netty.packagePrefix=org.apache.hadoop.hbase.shaded.
 
${test.output.tofile}
 kill
 
${basedir}/src/it/java
@@ -289,7 +289,7 @@
 ${numForkedIT}
 alphabetical
 true
--enableassertions -Xmx2000m -XX:MaxPermSize=128m 
-Djava.security.egd=file:/dev/./urandom 
"-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}"
 -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/
+-enableassertions -Xmx2000m -XX:MaxPermSize=128m 
-Djava.security.egd=file:/dev/./urandom 
"-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}"
 -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/ 
-Dorg.apache.hadoop.hbase.shaded.io.netty.packagePrefix=org.apache.hadoop.hbase.shaded.
 
${test.output.tofile}
 
${basedir}/src/it/java
 
org.apache.phoenix.end2end.HBaseManagedTimeTest
@@ -307,7 +307,7 @@
  ${numForkedIT}
  alphabetical
  false
- -enableassertions -Xmx2000m -XX:MaxPermSize=256m 
-Djava.security.egd=file:/dev/./urandom 

Jenkins build is back to normal : Phoenix-4.x-HBase-1.2 #215

2017-12-06 Thread Apache Jenkins Server
See 




svn commit: r23422 - /dev/phoenix/apache-phoenix-4.13.1-HBase-0.98-rc0/ /release/phoenix/apache-phoenix-4.13.1-HBase-0.98/

2017-12-06 Thread mujtaba
Author: mujtaba
Date: Thu Dec  7 00:52:58 2017
New Revision: 23422

Log:
apache-phoenix-4.13.1-HBase-0.98

Added:
release/phoenix/apache-phoenix-4.13.1-HBase-0.98/
  - copied from r23421, dev/phoenix/apache-phoenix-4.13.1-HBase-0.98-rc0/
Removed:
dev/phoenix/apache-phoenix-4.13.1-HBase-0.98-rc0/



svn commit: r23421 - /dev/phoenix/apache-phoenix-4.13.1-HBase-1.1-rc0/ /release/phoenix/apache-phoenix-4.13.1-HBase-1.1/

2017-12-06 Thread mujtaba
Author: mujtaba
Date: Thu Dec  7 00:52:31 2017
New Revision: 23421

Log:
apache-phoenix-4.13.1-HBase-1.1

Added:
release/phoenix/apache-phoenix-4.13.1-HBase-1.1/
  - copied from r23420, dev/phoenix/apache-phoenix-4.13.1-HBase-1.1-rc0/
Removed:
dev/phoenix/apache-phoenix-4.13.1-HBase-1.1-rc0/



svn commit: r23420 - /dev/phoenix/apache-phoenix-4.13.1-HBase-1.2-rc0/ /release/phoenix/apache-phoenix-4.13.1-HBase-1.2/

2017-12-06 Thread mujtaba
Author: mujtaba
Date: Thu Dec  7 00:52:13 2017
New Revision: 23420

Log:
apache-phoenix-4.13.1-HBase-1.2

Added:
release/phoenix/apache-phoenix-4.13.1-HBase-1.2/
  - copied from r23419, dev/phoenix/apache-phoenix-4.13.1-HBase-1.2-rc0/
Removed:
dev/phoenix/apache-phoenix-4.13.1-HBase-1.2-rc0/



svn commit: r23419 - /dev/phoenix/apache-phoenix-4.13.1-HBase-1.3-rc0/ /release/phoenix/apache-phoenix-4.13.1-HBase-1.3/

2017-12-06 Thread mujtaba
Author: mujtaba
Date: Thu Dec  7 00:51:47 2017
New Revision: 23419

Log:
apache-phoenix-4.13.1-HBase-1.3

Added:
release/phoenix/apache-phoenix-4.13.1-HBase-1.3/
  - copied from r23418, dev/phoenix/apache-phoenix-4.13.1-HBase-1.3-rc0/
Removed:
dev/phoenix/apache-phoenix-4.13.1-HBase-1.3-rc0/



Build failed in Jenkins: Phoenix | Master #1888

2017-12-06 Thread Apache Jenkins Server
See 


Changes:

[ssa] PHOENIX-4439 QueryServer pid file name doesn't comply the usual schema

--
[...truncated 49.52 KB...]
[INFO] Running org.apache.phoenix.util.LogUtilTest
[INFO] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.044 s 
- in org.apache.phoenix.util.MetaDataUtilTest
[INFO] Running org.apache.phoenix.util.TenantIdByteConversionTest
[INFO] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.192 s 
- in org.apache.phoenix.query.KeyRangeMoreTest
[INFO] Running org.apache.phoenix.util.ByteUtilTest
[INFO] Tests run: 18, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.036 s 
- in org.apache.phoenix.util.TenantIdByteConversionTest
[INFO] Running org.apache.phoenix.util.ScanUtilTest
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.948 s 
- in org.apache.phoenix.filter.SkipScanBigFilterTest
[INFO] Running org.apache.phoenix.util.SequenceUtilTest
[INFO] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.112 s 
- in org.apache.phoenix.util.LogUtilTest
[INFO] Tests run: 20, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.031 s 
- in org.apache.phoenix.util.ScanUtilTest
[INFO] Running org.apache.phoenix.util.PhoenixContextExecutorTest
[INFO] Running org.apache.phoenix.util.QueryUtilTest
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.002 s 
- in org.apache.phoenix.util.PhoenixContextExecutorTest
[INFO] Running org.apache.phoenix.util.json.JsonUpsertExecutorTest
[INFO] Tests run: 18, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.01 s 
- in org.apache.phoenix.util.SequenceUtilTest
[INFO] Running org.apache.phoenix.util.PropertiesUtilTest
[INFO] Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.016 s 
- in org.apache.phoenix.util.QueryUtilTest
[INFO] Running org.apache.phoenix.util.QualifierEncodingSchemeTest
[INFO] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.061 s 
- in org.apache.phoenix.util.ByteUtilTest
[INFO] Running org.apache.phoenix.util.LikeExpressionTest
[INFO] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.006 s 
- in org.apache.phoenix.util.QualifierEncodingSchemeTest
[INFO] Running org.apache.phoenix.util.PrefixByteEncoderDecoderTest
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.005 s 
- in org.apache.phoenix.util.LikeExpressionTest
[INFO] Running org.apache.phoenix.util.IndexUtilTest
[INFO] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.006 s 
- in org.apache.phoenix.util.PrefixByteEncoderDecoderTest
[INFO] Running org.apache.phoenix.util.JDBCUtilTest
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.005 s 
- in org.apache.phoenix.util.IndexUtilTest
[INFO] Running org.apache.phoenix.util.Base62EncoderTest
[INFO] Tests run: 13, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.011 s 
- in org.apache.phoenix.util.JDBCUtilTest
[INFO] Running org.apache.phoenix.util.ColumnInfoTest
[INFO] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.047 s 
- in org.apache.phoenix.util.PropertiesUtilTest
[INFO] Running org.apache.phoenix.util.DateUtilTest
[INFO] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.012 s 
- in org.apache.phoenix.util.ColumnInfoTest
[INFO] Running org.apache.phoenix.util.StringUtilTest
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.029 s 
- in org.apache.phoenix.util.Base62EncoderTest
[INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.844 s 
- in org.apache.phoenix.util.csv.CsvUpsertExecutorTest
[INFO] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.005 s 
- in org.apache.phoenix.util.StringUtilTest
[INFO] Running org.apache.phoenix.compile.WhereOptimizerTest
[INFO] Running org.apache.phoenix.util.PhoenixRuntimeTest
[INFO] Running org.apache.phoenix.compile.ScanRangesIntersectTest
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.006 s 
- in org.apache.phoenix.compile.ScanRangesIntersectTest
[INFO] Running org.apache.phoenix.compile.QueryOptimizerTest
[INFO] Tests run: 22, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.031 s 
- in org.apache.phoenix.util.DateUtilTest
[INFO] Running org.apache.phoenix.compile.SaltedScanRangesTest
[INFO] Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.012 s 
- in org.apache.phoenix.compile.SaltedScanRangesTest
[INFO] Running org.apache.phoenix.compile.HavingCompilerTest
[INFO] Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.36 s 
- in org.apache.phoenix.compile.HavingCompilerTest
[INFO] Running org.apache.phoenix.compile.QueryMetaDataTest
[INFO] Tests run: 24, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.928 s 
- in org.apache.phoenix.index.IndexMaintainerTest
[INFO] Running org.apache.phoenix.compile.QueryCompilerTest
[INFO] 

[3/5] phoenix git commit: PHOENIX-4439 QueryServer pid file name doesn't comply the usual schema we are using in hadoop ecosystem

2017-12-06 Thread ssa
PHOENIX-4439 QueryServer pid file name doesn't comply the usual schema we are 
using in hadoop ecosystem


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

Branch: refs/heads/4.x-HBase-1.2
Commit: bfec658d0c54f07970c6a96867e8950e0bd69d71
Parents: c9a695a
Author: Sergey Soldatov 
Authored: Wed Dec 6 11:23:48 2017 -0800
Committer: Sergey Soldatov 
Committed: Wed Dec 6 14:04:20 2017 -0800

--
 bin/queryserver.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/bfec658d/bin/queryserver.py
--
diff --git a/bin/queryserver.py b/bin/queryserver.py
index fefe0a5..711bcc4 100755
--- a/bin/queryserver.py
+++ b/bin/queryserver.py
@@ -76,7 +76,7 @@ hadoop_config_path = phoenix_utils.hadoop_conf
 hadoop_classpath = phoenix_utils.hadoop_classpath
 
 # TODO: add windows support
-phoenix_file_basename = '%s-queryserver' % getpass.getuser()
+phoenix_file_basename = 'phoenix-%s-queryserver' % getpass.getuser()
 phoenix_log_file = '%s.log' % phoenix_file_basename
 phoenix_out_file = '%s.out' % phoenix_file_basename
 phoenix_pid_file = '%s.pid' % phoenix_file_basename



[5/5] phoenix git commit: PHOENIX-4439 QueryServer pid file name doesn't comply the usual schema we are using in hadoop ecosystem

2017-12-06 Thread ssa
PHOENIX-4439 QueryServer pid file name doesn't comply the usual schema we are 
using in hadoop ecosystem


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

Branch: refs/heads/4.x-HBase-1.1
Commit: 3634aac10a1171a98c5e4e5d843547d6a818c146
Parents: 21437b1
Author: Sergey Soldatov 
Authored: Wed Dec 6 11:23:48 2017 -0800
Committer: Sergey Soldatov 
Committed: Wed Dec 6 14:13:57 2017 -0800

--
 bin/queryserver.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/3634aac1/bin/queryserver.py
--
diff --git a/bin/queryserver.py b/bin/queryserver.py
index fefe0a5..711bcc4 100755
--- a/bin/queryserver.py
+++ b/bin/queryserver.py
@@ -76,7 +76,7 @@ hadoop_config_path = phoenix_utils.hadoop_conf
 hadoop_classpath = phoenix_utils.hadoop_classpath
 
 # TODO: add windows support
-phoenix_file_basename = '%s-queryserver' % getpass.getuser()
+phoenix_file_basename = 'phoenix-%s-queryserver' % getpass.getuser()
 phoenix_log_file = '%s.log' % phoenix_file_basename
 phoenix_out_file = '%s.out' % phoenix_file_basename
 phoenix_pid_file = '%s.pid' % phoenix_file_basename



[2/5] phoenix git commit: PHOENIX-4439 QueryServer pid file name doesn't comply the usual schema we are using in hadoop ecosystem

2017-12-06 Thread ssa
PHOENIX-4439 QueryServer pid file name doesn't comply the usual schema we are 
using in hadoop ecosystem


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

Branch: refs/heads/master
Commit: ee728a4d19c004ad456b24cd228fb2351362472d
Parents: 25359a9
Author: Sergey Soldatov 
Authored: Wed Dec 6 11:23:48 2017 -0800
Committer: Sergey Soldatov 
Committed: Wed Dec 6 14:03:26 2017 -0800

--
 bin/queryserver.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/ee728a4d/bin/queryserver.py
--
diff --git a/bin/queryserver.py b/bin/queryserver.py
index fefe0a5..711bcc4 100755
--- a/bin/queryserver.py
+++ b/bin/queryserver.py
@@ -76,7 +76,7 @@ hadoop_config_path = phoenix_utils.hadoop_conf
 hadoop_classpath = phoenix_utils.hadoop_classpath
 
 # TODO: add windows support
-phoenix_file_basename = '%s-queryserver' % getpass.getuser()
+phoenix_file_basename = 'phoenix-%s-queryserver' % getpass.getuser()
 phoenix_log_file = '%s.log' % phoenix_file_basename
 phoenix_out_file = '%s.out' % phoenix_file_basename
 phoenix_pid_file = '%s.pid' % phoenix_file_basename



[4/5] phoenix git commit: PHOENIX-4439 QueryServer pid file name doesn't comply the usual schema we are using in hadoop ecosystem

2017-12-06 Thread ssa
PHOENIX-4439 QueryServer pid file name doesn't comply the usual schema we are 
using in hadoop ecosystem


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

Branch: refs/heads/4.x-cdh5.11.2
Commit: 1334b26b839652bb0bdebee56c81664706a2fc62
Parents: a99dc69
Author: Sergey Soldatov 
Authored: Wed Dec 6 11:23:48 2017 -0800
Committer: Sergey Soldatov 
Committed: Wed Dec 6 14:13:22 2017 -0800

--
 bin/queryserver.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/1334b26b/bin/queryserver.py
--
diff --git a/bin/queryserver.py b/bin/queryserver.py
index fefe0a5..711bcc4 100755
--- a/bin/queryserver.py
+++ b/bin/queryserver.py
@@ -76,7 +76,7 @@ hadoop_config_path = phoenix_utils.hadoop_conf
 hadoop_classpath = phoenix_utils.hadoop_classpath
 
 # TODO: add windows support
-phoenix_file_basename = '%s-queryserver' % getpass.getuser()
+phoenix_file_basename = 'phoenix-%s-queryserver' % getpass.getuser()
 phoenix_log_file = '%s.log' % phoenix_file_basename
 phoenix_out_file = '%s.out' % phoenix_file_basename
 phoenix_pid_file = '%s.pid' % phoenix_file_basename



[1/5] phoenix git commit: PHOENIX-4439 QueryServer pid file name doesn't comply the usual schema we are using in hadoop ecosystem

2017-12-06 Thread ssa
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 21437b151 -> 3634aac10
  refs/heads/4.x-HBase-1.2 c9a695a38 -> bfec658d0
  refs/heads/4.x-cdh5.11.2 a99dc69ce -> 1334b26b8
  refs/heads/5.x-HBase-2.0 9855dc931 -> b973717fe
  refs/heads/master 25359a95f -> ee728a4d1


PHOENIX-4439 QueryServer pid file name doesn't comply the usual schema we are 
using in hadoop ecosystem


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

Branch: refs/heads/5.x-HBase-2.0
Commit: b973717fe69fcc0976e46ce4bcab1dee42b22946
Parents: 9855dc9
Author: Sergey Soldatov 
Authored: Wed Dec 6 11:23:48 2017 -0800
Committer: Sergey Soldatov 
Committed: Wed Dec 6 14:01:56 2017 -0800

--
 bin/queryserver.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/b973717f/bin/queryserver.py
--
diff --git a/bin/queryserver.py b/bin/queryserver.py
index fefe0a5..711bcc4 100755
--- a/bin/queryserver.py
+++ b/bin/queryserver.py
@@ -76,7 +76,7 @@ hadoop_config_path = phoenix_utils.hadoop_conf
 hadoop_classpath = phoenix_utils.hadoop_classpath
 
 # TODO: add windows support
-phoenix_file_basename = '%s-queryserver' % getpass.getuser()
+phoenix_file_basename = 'phoenix-%s-queryserver' % getpass.getuser()
 phoenix_log_file = '%s.log' % phoenix_file_basename
 phoenix_out_file = '%s.out' % phoenix_file_basename
 phoenix_pid_file = '%s.pid' % phoenix_file_basename



Build failed in Jenkins: Phoenix | 4.x-HBase-0.98 #1769

2017-12-06 Thread Apache Jenkins Server
See 


Changes:

[tdsilva] PHOENIX-4386 Calculate the estimatedSize of MutationState using

--
[...truncated 105.12 KB...]
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 155.819 
s - in org.apache.phoenix.end2end.index.GlobalImmutableNonTxIndexIT
[INFO] Running org.apache.phoenix.end2end.index.IndexMaintenanceIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 168.3 s 
- in org.apache.phoenix.end2end.index.GlobalImmutableTxIndexIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 154.101 
s - in org.apache.phoenix.end2end.index.GlobalMutableNonTxIndexIT
[INFO] Tests run: 14, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 76.928 
s - in org.apache.phoenix.end2end.index.IndexMaintenanceIT
[INFO] Running org.apache.phoenix.end2end.index.IndexWithTableSchemaChangeIT
[INFO] Running org.apache.phoenix.end2end.index.IndexMetadataIT
[INFO] Running org.apache.phoenix.end2end.index.IndexUsageIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 167.654 
s - in org.apache.phoenix.end2end.index.GlobalMutableTxIndexIT
[INFO] Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 301.199 
s - in org.apache.phoenix.end2end.index.DropColumnIT
[INFO] Running org.apache.phoenix.end2end.index.LocalImmutableNonTxIndexIT
[INFO] Running org.apache.phoenix.end2end.index.LocalImmutableTxIndexIT
[INFO] Tests run: 14, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 59.244 
s - in org.apache.phoenix.end2end.index.IndexMetadataIT
[INFO] Running org.apache.phoenix.end2end.index.LocalMutableNonTxIndexIT
[INFO] Tests run: 18, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 155.028 
s - in org.apache.phoenix.end2end.index.IndexWithTableSchemaChangeIT
[INFO] Running org.apache.phoenix.end2end.index.LocalMutableTxIndexIT
[INFO] Tests run: 37, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 185.944 
s - in org.apache.phoenix.end2end.index.IndexUsageIT
[INFO] Running org.apache.phoenix.end2end.index.MutableIndexIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 287.82 
s - in org.apache.phoenix.end2end.index.LocalImmutableNonTxIndexIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 296.51 
s - in org.apache.phoenix.end2end.index.LocalMutableNonTxIndexIT
[INFO] Running org.apache.phoenix.end2end.index.SaltedIndexIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 315.926 
s - in org.apache.phoenix.end2end.index.LocalImmutableTxIndexIT
[INFO] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.276 s 
- in org.apache.phoenix.end2end.index.SaltedIndexIT
[INFO] Running org.apache.phoenix.end2end.index.txn.RollbackIT
[INFO] Running org.apache.phoenix.end2end.index.ViewIndexIT
[INFO] Running org.apache.phoenix.end2end.index.txn.MutableRollbackIT
[INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 45.034 s 
- in org.apache.phoenix.end2end.index.txn.RollbackIT
[INFO] Running org.apache.phoenix.end2end.join.HashJoinCacheIT
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.587 s 
- in org.apache.phoenix.end2end.join.HashJoinCacheIT
[INFO] Running org.apache.phoenix.end2end.join.HashJoinGlobalIndexIT
[WARNING] Tests run: 12, Failures: 0, Errors: 0, Skipped: 2, Time elapsed: 
50.621 s - in org.apache.phoenix.end2end.index.ViewIndexIT
[INFO] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 58.636 s 
- in org.apache.phoenix.end2end.index.txn.MutableRollbackIT
[INFO] Running org.apache.phoenix.end2end.join.HashJoinMoreIT
[INFO] Running org.apache.phoenix.end2end.join.HashJoinLocalIndexIT
[INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 36.353 s 
- in org.apache.phoenix.end2end.join.HashJoinMoreIT
[INFO] Running org.apache.phoenix.end2end.join.HashJoinNoIndexIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 320.796 
s - in org.apache.phoenix.end2end.index.LocalMutableTxIndexIT
[INFO] Running org.apache.phoenix.end2end.join.SortMergeJoinGlobalIndexIT
[INFO] Tests run: 33, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 152.731 
s - in org.apache.phoenix.end2end.join.HashJoinNoIndexIT
[INFO] Tests run: 33, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 235.671 
s - in org.apache.phoenix.end2end.join.HashJoinGlobalIndexIT
[INFO] Running org.apache.phoenix.end2end.join.SortMergeJoinLocalIndexIT
[INFO] Running org.apache.phoenix.end2end.join.SortMergeJoinNoIndexIT
[INFO] Tests run: 64, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 507.015 
s - in org.apache.phoenix.end2end.index.MutableIndexIT
[INFO] Running org.apache.phoenix.end2end.join.SubqueryIT
[INFO] Tests run: 34, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 272.293 
s - in org.apache.phoenix.end2end.join.SortMergeJoinGlobalIndexIT
[INFO] Running 

Build failed in Jenkins: Phoenix | Master #1887

2017-12-06 Thread Apache Jenkins Server
See 


Changes:

[tdsilva] PHOENIX-4386 Calculate the estimatedSize of MutationState using

--
[...truncated 49.60 KB...]
[INFO] Running org.apache.phoenix.util.LogUtilTest
[INFO] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.254 s 
- in org.apache.phoenix.util.PhoenixEncodeDecodeTest
[INFO] Running org.apache.phoenix.util.TenantIdByteConversionTest
[INFO] Tests run: 18, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.026 s 
- in org.apache.phoenix.util.TenantIdByteConversionTest
[INFO] Running org.apache.phoenix.util.ByteUtilTest
[INFO] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.12 s - 
in org.apache.phoenix.util.ByteUtilTest
[INFO] Running org.apache.phoenix.util.ScanUtilTest
[INFO] Tests run: 20, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.029 s 
- in org.apache.phoenix.util.ScanUtilTest
[INFO] Running org.apache.phoenix.util.SequenceUtilTest
[INFO] Tests run: 18, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.01 s 
- in org.apache.phoenix.util.SequenceUtilTest
[INFO] Running org.apache.phoenix.util.PhoenixContextExecutorTest
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.001 s 
- in org.apache.phoenix.util.PhoenixContextExecutorTest
[INFO] Running org.apache.phoenix.util.QueryUtilTest
[INFO] Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.006 s 
- in org.apache.phoenix.util.QueryUtilTest
[INFO] Running org.apache.phoenix.util.json.JsonUpsertExecutorTest
[INFO] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.254 s 
- in org.apache.phoenix.util.LogUtilTest
[INFO] Running org.apache.phoenix.util.PropertiesUtilTest
[INFO] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.064 s 
- in org.apache.phoenix.util.PropertiesUtilTest
[INFO] Running org.apache.phoenix.util.QualifierEncodingSchemeTest
[INFO] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.007 s 
- in org.apache.phoenix.util.QualifierEncodingSchemeTest
[INFO] Running org.apache.phoenix.util.LikeExpressionTest
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.005 s 
- in org.apache.phoenix.util.LikeExpressionTest
[INFO] Running org.apache.phoenix.util.PrefixByteEncoderDecoderTest
[INFO] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.012 s 
- in org.apache.phoenix.util.PrefixByteEncoderDecoderTest
[INFO] Running org.apache.phoenix.util.IndexUtilTest
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.004 s 
- in org.apache.phoenix.util.IndexUtilTest
[INFO] Running org.apache.phoenix.util.JDBCUtilTest
[INFO] Tests run: 13, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.016 s 
- in org.apache.phoenix.util.JDBCUtilTest
[INFO] Running org.apache.phoenix.util.Base62EncoderTest
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.03 s - 
in org.apache.phoenix.util.Base62EncoderTest
[INFO] Running org.apache.phoenix.util.ColumnInfoTest
[INFO] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.012 s 
- in org.apache.phoenix.util.ColumnInfoTest
[INFO] Running org.apache.phoenix.util.DateUtilTest
[INFO] Tests run: 22, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.047 s 
- in org.apache.phoenix.util.DateUtilTest
[INFO] Running org.apache.phoenix.util.StringUtilTest
[INFO] Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.006 s 
- in org.apache.phoenix.util.StringUtilTest
[INFO] Running org.apache.phoenix.util.PhoenixRuntimeTest
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.117 s 
- in org.apache.phoenix.filter.SkipScanBigFilterTest
[INFO] Running org.apache.phoenix.compile.WhereOptimizerTest
[INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.063 s 
- in org.apache.phoenix.util.csv.CsvUpsertExecutorTest
[INFO] Running org.apache.phoenix.compile.ScanRangesIntersectTest
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.003 s 
- in org.apache.phoenix.compile.ScanRangesIntersectTest
[INFO] Running org.apache.phoenix.compile.QueryOptimizerTest
[INFO] Tests run: 24, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.535 s 
- in org.apache.phoenix.index.IndexMaintainerTest
[INFO] Running org.apache.phoenix.compile.SaltedScanRangesTest
[INFO] Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.024 s 
- in org.apache.phoenix.compile.SaltedScanRangesTest
[INFO] Running org.apache.phoenix.compile.HavingCompilerTest
[INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.57 s - 
in org.apache.phoenix.util.json.JsonUpsertExecutorTest
[INFO] Running org.apache.phoenix.compile.QueryMetaDataTest
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.404 s 
- in org.apache.phoenix.query.ScannerLeaseRenewalTest
[INFO] Running 

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

2017-12-06 Thread Apache Jenkins Server
See 




phoenix git commit: PHOENIX-4386 Calculate the estimatedSize of MutationState using Map<TableRef, Map<ImmutableBytesPtr, RowMutationState>> mutations (addendum)

2017-12-06 Thread tdsilva
Repository: phoenix
Updated Branches:
  refs/heads/master 071fbce49 -> 25359a95f


PHOENIX-4386 Calculate the estimatedSize of MutationState using Map> mutations (addendum)


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

Branch: refs/heads/master
Commit: 25359a95f1a8c5aa6e852e750fd6da6e10249387
Parents: 071fbce
Author: Thomas D'Silva 
Authored: Mon Nov 20 19:13:53 2017 -0800
Committer: Thomas D'Silva 
Committed: Wed Dec 6 12:26:15 2017 -0800

--
 .../apache/phoenix/execute/PartialCommitIT.java |   5 +-
 .../apache/phoenix/compile/DeleteCompiler.java  |  11 +-
 .../apache/phoenix/compile/UpsertCompiler.java  |   7 +-
 .../apache/phoenix/execute/MutationState.java   | 127 ---
 .../java/org/apache/phoenix/util/IndexUtil.java |   4 +-
 .../org/apache/phoenix/util/KeyValueUtil.java   |   5 +-
 6 files changed, 98 insertions(+), 61 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/25359a95/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java
index 10fd7f8..e5b57e3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java
@@ -33,7 +33,6 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
@@ -52,8 +51,8 @@ import 
org.apache.hadoop.hbase.coprocessor.SimpleRegionObserver;
 import org.apache.hadoop.hbase.regionserver.wal.WALEdit;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.phoenix.end2end.BaseOwnClusterIT;
+import org.apache.phoenix.execute.MutationState.MultiRowMutationState;
 import org.apache.phoenix.hbase.index.Indexer;
-import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr;
 import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.monitoring.GlobalMetric;
 import org.apache.phoenix.monitoring.MetricType;
@@ -285,7 +284,7 @@ public class PartialCommitIT extends BaseOwnClusterIT {
 private PhoenixConnection 
getConnectionWithTableOrderPreservingMutationState() throws SQLException {
 Connection con = driver.connect(url, new Properties());
 PhoenixConnection phxCon = new 
PhoenixConnection(con.unwrap(PhoenixConnection.class));
-final 
Map> mutations = 
Maps.newTreeMap(new TableRefComparator());
+final Map mutations = 
Maps.newTreeMap(new TableRefComparator());
 // passing a null mutation state forces the 
connection.newMutationState() to be used to create the MutationState
 return new PhoenixConnection(phxCon, null) {
 @Override

http://git-wip-us.apache.org/repos/asf/phoenix/blob/25359a95/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java
index f9ca300..a06e2ca 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java
@@ -26,7 +26,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 import org.apache.hadoop.hbase.Cell;
@@ -43,6 +42,7 @@ import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.exception.SQLExceptionInfo;
 import org.apache.phoenix.execute.AggregatePlan;
 import org.apache.phoenix.execute.MutationState;
+import org.apache.phoenix.execute.MutationState.MultiRowMutationState;
 import org.apache.phoenix.execute.MutationState.RowMutationState;
 import org.apache.phoenix.filter.SkipScanFilter;
 import org.apache.phoenix.hbase.index.ValueGetter;
@@ -91,7 +91,6 @@ import org.apache.phoenix.util.ScanUtil;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import com.sun.istack.NotNull;
 
 public class DeleteCompiler {
@@ -121,14 

phoenix git commit: PHOENIX-4386 Calculate the estimatedSize of MutationState using Map<TableRef, Map<ImmutableBytesPtr, RowMutationState>> mutations (addendum)

2017-12-06 Thread tdsilva
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 983ce023f -> 1df7aa5bb


PHOENIX-4386 Calculate the estimatedSize of MutationState using Map> mutations (addendum)


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 1df7aa5bb602ee210241e478fc30c75ab4550e88
Parents: 983ce02
Author: Thomas D'Silva 
Authored: Mon Nov 20 19:13:53 2017 -0800
Committer: Thomas D'Silva 
Committed: Wed Dec 6 11:29:47 2017 -0800

--
 .../apache/phoenix/execute/PartialCommitIT.java |   5 +-
 .../apache/phoenix/compile/DeleteCompiler.java  |  11 +-
 .../apache/phoenix/compile/UpsertCompiler.java  |   7 +-
 .../apache/phoenix/execute/MutationState.java   | 127 ---
 .../java/org/apache/phoenix/util/IndexUtil.java |   4 +-
 .../org/apache/phoenix/util/KeyValueUtil.java   |   5 +-
 6 files changed, 98 insertions(+), 61 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/1df7aa5b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java
index 84edc84..c432aae 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/execute/PartialCommitIT.java
@@ -33,7 +33,6 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
@@ -52,8 +51,8 @@ import 
org.apache.hadoop.hbase.coprocessor.SimpleRegionObserver;
 import org.apache.hadoop.hbase.regionserver.wal.WALEdit;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.phoenix.end2end.BaseOwnClusterIT;
+import org.apache.phoenix.execute.MutationState.MultiRowMutationState;
 import org.apache.phoenix.hbase.index.Indexer;
-import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr;
 import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.monitoring.GlobalMetric;
 import org.apache.phoenix.monitoring.MetricType;
@@ -285,7 +284,7 @@ public class PartialCommitIT extends BaseOwnClusterIT {
 private PhoenixConnection 
getConnectionWithTableOrderPreservingMutationState() throws SQLException {
 Connection con = driver.connect(url, new Properties());
 PhoenixConnection phxCon = new 
PhoenixConnection(con.unwrap(PhoenixConnection.class));
-final 
Map> mutations = 
Maps.newTreeMap(new TableRefComparator());
+final Map mutations = 
Maps.newTreeMap(new TableRefComparator());
 // passing a null mutation state forces the 
connection.newMutationState() to be used to create the MutationState
 return new PhoenixConnection(phxCon, null) {
 @Override

http://git-wip-us.apache.org/repos/asf/phoenix/blob/1df7aa5b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java
index f9ca300..a06e2ca 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java
@@ -26,7 +26,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 
 import org.apache.hadoop.hbase.Cell;
@@ -43,6 +42,7 @@ import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.exception.SQLExceptionInfo;
 import org.apache.phoenix.execute.AggregatePlan;
 import org.apache.phoenix.execute.MutationState;
+import org.apache.phoenix.execute.MutationState.MultiRowMutationState;
 import org.apache.phoenix.execute.MutationState.RowMutationState;
 import org.apache.phoenix.filter.SkipScanFilter;
 import org.apache.phoenix.hbase.index.ValueGetter;
@@ -91,7 +91,6 @@ import org.apache.phoenix.util.ScanUtil;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import com.sun.istack.NotNull;
 
 public class DeleteCompiler {

phoenix git commit: PHOENIX-3050 Handle DESC columns in child/parent join optimization

2017-12-06 Thread maryannxue
Repository: phoenix
Updated Branches:
  refs/heads/master d77c237b5 -> 071fbce49


PHOENIX-3050 Handle DESC columns in child/parent join optimization


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

Branch: refs/heads/master
Commit: 071fbce499c5303ffdcd4bbe25c1cda788aced0c
Parents: d77c237
Author: maryannxue 
Authored: Wed Dec 6 12:07:16 2017 -0800
Committer: maryannxue 
Committed: Wed Dec 6 12:07:16 2017 -0800

--
 .../phoenix/end2end/join/HashJoinMoreIT.java |  5 +
 .../org/apache/phoenix/compile/JoinCompiler.java | 19 +--
 .../apache/phoenix/compile/QueryCompiler.java|  6 +++---
 .../apache/phoenix/compile/WhereOptimizer.java   |  5 -
 4 files changed, 21 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/071fbce4/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java
index 37ffd02..f09f1d3 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/join/HashJoinMoreIT.java
@@ -895,6 +895,11 @@ public class HashJoinMoreIT extends 
ParallelStatsDisabledIT {
 + "FROM ( SELECT ACCOUNT_ID, BUCKET_ID, OBJECT_ID, 
MAX(OBJECT_VERSION) AS MAXVER "
 + "   FROM test2961 GROUP BY ACCOUNT_ID, BUCKET_ID, 
OBJECT_ID) AS X "
 + "   INNER JOIN test2961 AS OBJ ON X.ACCOUNT_ID = 
OBJ.ACCOUNT_ID AND X.BUCKET_ID = OBJ.BUCKET_ID AND X.OBJECT_ID = OBJ.OBJECT_ID 
AND  X.MAXVER = OBJ.OBJECT_VERSION";
+rs = conn.createStatement().executeQuery("explain " + q);
+String plan = QueryUtil.getExplainPlan(rs);
+String dynamicFilter = "DYNAMIC SERVER FILTER BY (OBJ.ACCOUNT_ID, 
OBJ.BUCKET_ID, OBJ.OBJECT_ID, OBJ.OBJECT_VERSION) IN ((X.ACCOUNT_ID, 
X.BUCKET_ID, X.OBJECT_ID, X.MAXVER))";
+assertTrue("Expected '" + dynamicFilter + "' to be used for the 
query, but got:\n" + plan,
+plan.contains(dynamicFilter));
 rs = conn.createStatement().executeQuery(q);
 assertTrue(rs.next());
 assertEquals("", rs.getString(4));

http://git-wip-us.apache.org/repos/asf/phoenix/blob/071fbce4/phoenix-core/src/main/java/org/apache/phoenix/compile/JoinCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/JoinCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/JoinCompiler.java
index 887e2d2..439a79b 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/JoinCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/JoinCompiler.java
@@ -110,6 +110,12 @@ import com.google.common.collect.Sets;
 
 public class JoinCompiler {
 
+public enum Strategy {
+HASH_BUILD_LEFT,
+HASH_BUILD_RIGHT,
+SORT_MERGE,
+}
+
 public enum ColumnRefType {
 JOINLOCAL,
 GENERAL,
@@ -489,7 +495,7 @@ public class JoinCompiler {
 return dependencies;
 }
 
-public Pair 
compileJoinConditions(StatementContext lhsCtx, StatementContext rhsCtx, boolean 
sortExpressions) throws SQLException {
+public Pair 
compileJoinConditions(StatementContext lhsCtx, StatementContext rhsCtx, 
Strategy strategy) throws SQLException {
 if (onConditions.isEmpty()) {
 return new Pair(
 Collections. 
singletonList(LiteralExpression.newConstant(1)),
@@ -505,15 +511,16 @@ public class JoinCompiler {
 rhsCompiler.reset();
 Expression right = condition.getRHS().accept(rhsCompiler);
 PDataType toType = getCommonType(left.getDataType(), 
right.getDataType());
-if (left.getDataType() != toType || left.getSortOrder() == 
SortOrder.DESC) {
-left = CoerceExpression.create(left, toType, 
SortOrder.ASC, left.getMaxLength());
+SortOrder toSortOrder = strategy == Strategy.SORT_MERGE ? 
SortOrder.ASC : (strategy == Strategy.HASH_BUILD_LEFT ? right.getSortOrder() : 
left.getSortOrder());
+if (left.getDataType() != toType || left.getSortOrder() != 
toSortOrder) {
+left = CoerceExpression.create(left,