[1/2] phoenix git commit: Update poms to support omid hbase versions

2018-10-23 Thread ohads 
Repository: phoenix
Updated Branches:
  refs/heads/omid2 8e4590ed6 -> 688456889


Update poms to support omid hbase versions

Signed-off-by: Ohad Shacham 


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

Branch: refs/heads/omid2
Commit: 688456889e75f3dccd935568cf29a7c5dd3de5ce
Parents: 47bf31b
Author: Yonatan Gottesman 
Authored: Mon Oct 22 20:44:19 2018 +0300
Committer: Ohad Shacham 
Committed: Tue Oct 23 10:56:40 2018 +0300

--
 phoenix-core/pom.xml | 8 
 pom.xml  | 8 
 2 files changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/68845688/phoenix-core/pom.xml
--
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 0502a71..d70ed1a 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -206,7 +206,7 @@
   
   
 org.apache.omid
-omid-hbase-client
+omid-hbase-client-hbase1.3
 ${omid.version}
 
   
@@ -217,7 +217,7 @@
   
   
 org.apache.omid
-omid-hbase-coprocessor
+omid-hbase-coprocessor-hbase1.3
 ${omid.version}
 
   
@@ -228,7 +228,7 @@
   
   
 org.apache.omid
-omid-tso-server
+omid-tso-server-hbase1.3
 ${omid.version}
 
   
@@ -239,7 +239,7 @@
   
   
 org.apache.omid
-omid-tso-server
+omid-tso-server-hbase1.3
 ${omid.version}
 test-jar
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/68845688/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 6facc35..ca40753 100644
--- a/pom.xml
+++ b/pom.xml
@@ -816,7 +816,7 @@
   
   
 org.apache.omid
-omid-tso-server
+omid-tso-server-hbase1.3
 ${omid.version}
 
   
@@ -827,7 +827,7 @@
   
   
 org.apache.omid
-omid-hbase-client
+omid-hbase-client-hbase1.3
 ${omid.version}
 
   
@@ -838,7 +838,7 @@
   
   
 org.apache.omid
-omid-hbase-coprocessor
+omid-hbase-coprocessor-hbase1.3
 ${omid.version}
 
   
@@ -849,7 +849,7 @@
   
   
 org.apache.omid
-omid-tso-server
+omid-tso-server-hbase1.3
 ${omid.version}
 test-jar

[2/2] phoenix git commit: Omid lowLatency support bug fix

2018-10-23 Thread ohads 
Omid lowLatency support bug fix

Signed-off-by: Ohad Shacham 


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

Branch: refs/heads/omid2
Commit: 47bf31b30b226367a9e5f95cecaa277531206981
Parents: 8e4590e
Author: Yonatan Gottesman 
Authored: Sun Oct 21 14:17:07 2018 +0300
Committer: Ohad Shacham 
Committed: Tue Oct 23 10:56:40 2018 +0300

--
 .../apache/phoenix/transaction/OmidTransactionProvider.java   | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/47bf31b3/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionProvider.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionProvider.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionProvider.java
index e81991a..610a5d1 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionProvider.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/transaction/OmidTransactionProvider.java
@@ -55,6 +55,7 @@ public class OmidTransactionProvider implements 
PhoenixTransactionProvider {
 
 private HBaseTransactionManager transactionManager = null;
 private volatile CommitTable.Client commitTableClient = null;
+private CommitTable.Writer commitTableWriter = null;
 
 public static final OmidTransactionProvider getInstance() {
 return INSTANCE;
@@ -151,8 +152,10 @@ public class OmidTransactionProvider implements 
PhoenixTransactionProvider {
 
clientConf.setConflictAnalysisLevel(OmidClientConfiguration.ConflictDetectionLevel.ROW);
 clientConf.setHBaseConfiguration(config);
 commitTableClient = commitTable.getClient();
-
-transactionManager = 
HBaseTransactionManager.builder(clientConf).commitTableClient(commitTableClient)
+commitTableWriter = commitTable.getWriter();
+transactionManager = HBaseTransactionManager.builder(clientConf)
+.commitTableClient(commitTableClient)
+.commitTableWriter(commitTableWriter)
 .tsoClient(client).build();
 } catch (IOException | InterruptedException e) {
 throw new SQLExceptionInfo.Builder(

Apache Phoenix - Timeout crawler - Build https://builds.apache.org/job/Phoenix-omid2/136/

2018-10-23 Thread Apache Jenkins Server 
[...truncated 50 lines...]

Build failed in Jenkins: Phoenix Compile Compatibility with HBase #795

2018-10-23 Thread Apache Jenkins Server 
See 


--
Started by timer
[EnvInject] - Loading node environment variables.
Building remotely on H25 (ubuntu xenial) in workspace 

[Phoenix_Compile_Compat_wHBase] $ /bin/bash /tmp/jenkins8953963866349493191.sh
core file size  (blocks, -c) 0
data seg size   (kbytes, -d) unlimited
scheduling priority (-e) 0
file size   (blocks, -f) unlimited
pending signals (-i) 386407
max locked memory   (kbytes, -l) 64
max memory size (kbytes, -m) unlimited
open files  (-n) 6
pipe size(512 bytes, -p) 8
POSIX message queues (bytes, -q) 819200
real-time priority  (-r) 0
stack size  (kbytes, -s) 8192
cpu time   (seconds, -t) unlimited
max user processes  (-u) 10240
virtual memory  (kbytes, -v) unlimited
file locks  (-x) unlimited
core id : 0
core id : 1
core id : 2
core id : 3
core id : 4
core id : 5
physical id : 0
physical id : 1
MemTotal:   98957728 kB
MemFree:48168776 kB
Filesystem  Size  Used Avail Use% Mounted on
udev 48G 0   48G   0% /dev
tmpfs   9.5G  386M  9.1G   4% /run
/dev/sda1   364G  237G  109G  69% /
tmpfs48G 0   48G   0% /dev/shm
tmpfs   5.0M 0  5.0M   0% /run/lock
tmpfs48G 0   48G   0% /sys/fs/cgroup
/dev/loop3   32M   32M 0 100% /snap/snapcraft/1594
tmpfs   1.0M 0  1.0M   0% /var/snap/lxd/common/ns
/dev/loop5   88M   88M 0 100% /snap/core/5328
/dev/loop6   28M   28M 0 100% /snap/snapcraft/1803
tmpfs   9.5G 0  9.5G   0% /run/user/910
/dev/loop1   28M   28M 0 100% /snap/snapcraft/1871
/dev/loop17  88M   88M 0 100% /snap/core/5548
/dev/loop7   67M   67M 0 100% /snap/lxd/9210
/dev/loop8   67M   67M 0 100% /snap/lxd/9239
/dev/loop9   88M   88M 0 100% /snap/core/5662
/dev/loop10  67M   67M 0 100% /snap/lxd/9263
apache-maven-2.2.1
apache-maven-3.0.4
apache-maven-3.0.5
apache-maven-3.1.1
apache-maven-3.2.1
apache-maven-3.2.5
apache-maven-3.3.3
apache-maven-3.3.9
apache-maven-3.5.0
apache-maven-3.5.2
apache-maven-3.5.4
latest
latest2
latest3


===
Verifying compile level compatibility with HBase 0.98 with Phoenix 
4.x-HBase-0.98
===

Cloning into 'hbase'...
Switched to a new branch '0.98'
Branch 0.98 set up to track remote branch 0.98 from origin.
[ERROR] Plugin org.codehaus.mojo:findbugs-maven-plugin:2.5.2 or one of its 
dependencies could not be resolved: Failed to read artifact descriptor for 
org.codehaus.mojo:findbugs-maven-plugin:jar:2.5.2: Could not transfer artifact 
org.codehaus.mojo:findbugs-maven-plugin:pom:2.5.2 from/to central 
(https://repo.maven.apache.org/maven2): Received fatal alert: protocol_version 
-> [Help 1]
[ERROR] 
[ERROR] To see the full stack trace of the errors, re-run Maven with the -e 
switch.
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR] 
[ERROR] For more information about the errors and possible solutions, please 
read the following articles:
[ERROR] [Help 1] 
http://cwiki.apache.org/confluence/display/MAVEN/PluginResolutionException
Build step 'Execute shell' marked build as failure

Build failed in Jenkins: Phoenix-omid2 #136

2018-10-23 Thread Apache Jenkins Server 
See 


Changes:

[ohads] Omid lowLatency support bug fix

[ohads] Update poms to support omid hbase versions

--
[...truncated 2.94 MB...]
[INFO] Running org.apache.phoenix.rpc.UpdateCacheIT
[INFO] Running org.apache.phoenix.iterate.PhoenixQueryTimeoutIT
[INFO] Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 35.443 s 
- in org.apache.phoenix.rpc.UpdateCacheIT
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.462 s 
- in org.apache.phoenix.iterate.PhoenixQueryTimeoutIT
[INFO] Running org.apache.phoenix.trace.PhoenixTracingEndToEndIT
[INFO] Running org.apache.phoenix.iterate.RoundRobinResultIteratorIT
[INFO] Running org.apache.phoenix.trace.PhoenixTableMetricsWriterIT
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.455 s 
- in org.apache.phoenix.trace.PhoenixTableMetricsWriterIT
[INFO] Running org.apache.phoenix.tx.FlappingTransactionIT
[INFO] Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 63.235 s 
- in org.apache.phoenix.iterate.RoundRobinResultIteratorIT
[INFO] Running org.apache.phoenix.tx.ParameterizedTransactionIT
[INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 27.811 s 
- in org.apache.phoenix.tx.FlappingTransactionIT
[INFO] Running org.apache.phoenix.tx.TransactionIT
[INFO] Tests run: 34, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 762.041 
s - in org.apache.phoenix.end2end.join.SortMergeJoinLocalIndexIT
[INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 97.052 s 
- in org.apache.phoenix.trace.PhoenixTracingEndToEndIT
[INFO] Running org.apache.phoenix.util.IndexScrutinyIT
[INFO] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 26.029 s 
- in org.apache.phoenix.util.IndexScrutinyIT
[INFO] Running org.apache.phoenix.tx.TxCheckpointIT
[INFO] Tests run: 24, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 172.058 
s - in org.apache.phoenix.tx.TransactionIT
[INFO] Tests run: 78, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 472.796 
s - in org.apache.phoenix.tx.ParameterizedTransactionIT
[INFO] Tests run: 50, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 440.047 
s - in org.apache.phoenix.tx.TxCheckpointIT
[INFO] 
[INFO] Results:
[INFO] 
[WARNING] Tests run: 3496, Failures: 0, Errors: 0, Skipped: 1
[INFO] 
[INFO] 
[INFO] --- maven-failsafe-plugin:2.20:integration-test (HBaseManagedTimeTests) 
@ phoenix-core ---
[INFO] 
[INFO] ---
[INFO]  T E S T S
[INFO] ---
[INFO] 
[INFO] Results:
[INFO] 
[INFO] Tests run: 0, Failures: 0, Errors: 0, Skipped: 0
[INFO] 
[INFO] 
[INFO] --- maven-failsafe-plugin:2.20:integration-test 
(NeedTheirOwnClusterTests) @ phoenix-core ---
[INFO] 
[INFO] ---
[INFO]  T E S T S
[INFO] ---
[INFO] Running 
org.apache.hadoop.hbase.regionserver.wal.WALReplayWithIndexWritesAndCompressedWALIT
[INFO] Running org.apache.phoenix.end2end.ChangePermissionsIT
[INFO] Running 
org.apache.hadoop.hbase.regionserver.wal.WALRecoveryRegionPostOpenIT
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 43.124 s 
- in 
org.apache.hadoop.hbase.regionserver.wal.WALReplayWithIndexWritesAndCompressedWALIT
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.769 s 
- in org.apache.hadoop.hbase.regionserver.wal.WALRecoveryRegionPostOpenIT
[INFO] Running 
org.apache.phoenix.end2end.ColumnEncodedImmutableNonTxStatsCollectorIT
[INFO] Running 
org.apache.phoenix.end2end.ColumnEncodedImmutableTxStatsCollectorIT
[INFO] Running 
org.apache.phoenix.end2end.ColumnEncodedMutableNonTxStatsCollectorIT
[WARNING] Tests run: 28, Failures: 0, Errors: 0, Skipped: 4, Time elapsed: 
223.589 s - in 
org.apache.phoenix.end2end.ColumnEncodedImmutableNonTxStatsCollectorIT
[WARNING] Tests run: 28, Failures: 0, Errors: 0, Skipped: 4, Time elapsed: 
218.487 s - in 
org.apache.phoenix.end2end.ColumnEncodedMutableNonTxStatsCollectorIT
[WARNING] Tests run: 28, Failures: 0, Errors: 0, Skipped: 4, Time elapsed: 
221.812 s - in 
org.apache.phoenix.end2end.ColumnEncodedImmutableTxStatsCollectorIT
[INFO] Running org.apache.phoenix.end2end.ConnectionUtilIT
[INFO] Running org.apache.phoenix.end2end.ColumnEncodedMutableTxStatsCollectorIT
[INFO] Running org.apache.phoenix.end2end.ContextClassloaderIT
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 49.235 s 
- in org.apache.phoenix.end2end.ConnectionUtilIT
[INFO] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.713 s 
- in org.apache.phoenix.end2end.ContextClassloaderIT
[INFO] Running org.apache.phoenix.end2end.CostBasedDecisionIT
[INFO] Running org.apache.phoenix.end2end.CountDistinctCompressionIT
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped:

phoenix git commit: PHOENIX-4975 Addendum to fix failing unit tests for Omid due to shadow cells and no local indexes

2018-10-23 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.3 79ca07134 -> 2ff316a80


PHOENIX-4975 Addendum to fix failing unit tests for Omid due to shadow cells 
and no local indexes


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

Branch: refs/heads/4.x-HBase-1.3
Commit: 2ff316a8094fee089057e49d080cc8d0d0790531
Parents: 79ca071
Author: James Taylor 
Authored: Tue Oct 16 23:49:23 2018 -0700
Committer: James Taylor 
Committed: Tue Oct 23 08:19:02 2018 -0700

--
 .../phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java   | 9 ++---
 .../org/apache/phoenix/schema/stats/StatsCollectorIT.java   | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/2ff316a8/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
index 0a0dd21..9665fb6 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
@@ -74,9 +74,12 @@ public class StatsEnabledSplitSystemCatalogIT extends 
BaseUniqueNamesOwnClusterI
this.tableDDLOptions = optionBuilder.toString();
}
 
-   @Parameters(name = "transactional = {0}")
-   public static Collection data() {
-   return Arrays.asList(new Object[] { null, "TEPHRA", "OMID" });
+   @Parameters(name = "transactionProvider = {0}")
+   public static Collection data() {
+return TestUtil.filterTxParamData(Arrays.asList(new Object[][] { 
+{ "TEPHRA" },
+{ "OMID" }, 
+{ null }}),0);
}

@BeforeClass

http://git-wip-us.apache.org/repos/asf/phoenix/blob/2ff316a8/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
index 0caf61a..f1c4e45 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
@@ -635,7 +635,7 @@ public abstract class StatsCollectorIT extends 
BaseUniqueNamesOwnClusterIT {
 // an exact byte count based on the number or rows is not 
possible because
 // it is variable on a row-by-row basis.
 long sumOfGuidePostsWidth = rs.getLong(3);
-assertTrue(hasShadowCells ? sumOfGuidePostsWidth > 2 * c2Bytes 
&& sumOfGuidePostsWidth <= 3 * c2Bytes: rs.getLong(3) == c2Bytes);
+assertTrue(hasShadowCells ? sumOfGuidePostsWidth > c2Bytes : 
sumOfGuidePostsWidth == c2Bytes);
 count++;
 }
 }

[5/5] phoenix git commit: Merge branch '4.x-HBase-1.3' into omid2

2018-10-23 Thread jamestaylor 
Merge branch '4.x-HBase-1.3' into omid2


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

Branch: refs/heads/omid2
Commit: f66538074d9c5b58a29f795403c477548de12a0f
Parents: 6884568 2ff316a
Author: James Taylor 
Authored: Tue Oct 23 09:24:33 2018 -0700
Committer: James Taylor 
Committed: Tue Oct 23 09:24:33 2018 -0700

--
 .../StatsEnabledSplitSystemCatalogIT.java   |  9 +++--
 .../phoenix/end2end/index/MutableIndexIT.java   | 38 +++-
 .../coprocessor/MetaDataEndpointImpl.java   | 19 ++
 .../filter/ApplyAndFilterDeletesFilter.java |  9 +++--
 4 files changed, 62 insertions(+), 13 deletions(-)
--

[2/5] phoenix git commit: PHOENIX-4960 Write to table with global index failed if meta of index changed (split, move, etc)

2018-10-23 Thread jamestaylor 
PHOENIX-4960 Write to table with global index failed if meta of index changed 
(split, move, etc)


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

Branch: refs/heads/omid2
Commit: 3d5bae8dcd79651fdd10333f88a2ab8ee37303bf
Parents: 4a05f14
Author: Vincent Poon 
Authored: Mon Oct 15 19:11:40 2018 -0700
Committer: Vincent Poon 
Committed: Mon Oct 22 12:04:15 2018 -0700

--
 .../org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/3d5bae8d/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
index 21370f3..aa78b1b 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
@@ -3987,6 +3987,10 @@ public class MetaDataEndpointImpl extends 
MetaDataProtocol implements Coprocesso
 newKVs.remove(disableTimeStampKVIndex);
 newKVs.set(indexStateKVIndex, 
KeyValueUtil.newKeyValue(key, TABLE_FAMILY_BYTES,
 INDEX_STATE_BYTES, timeStamp, 
Bytes.toBytes(newState.getSerializedValue(;
+} else if (disableTimeStampKVIndex == -1) { // clear 
disableTimestamp if client didn't pass it in
+newKVs.add(KeyValueUtil.newKeyValue(key, 
TABLE_FAMILY_BYTES,
+
PhoenixDatabaseMetaData.INDEX_DISABLE_TIMESTAMP_BYTES, timeStamp, 
PLong.INSTANCE.toBytes(0)));
+disableTimeStampKVIndex = newKVs.size() - 1;
 }
 } else if (newState == PIndexState.DISABLE) {
 //reset the counter for pending disable when 
transitioning from PENDING_DISABLE to DISABLE

phoenix git commit: PHOENIX-4975 Addendum to fix failing unit tests for Omid due to shadow cells and no local indexes

2018-10-23 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.4 73951ac8c -> 305a8dba4


PHOENIX-4975 Addendum to fix failing unit tests for Omid due to shadow cells 
and no local indexes


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

Branch: refs/heads/4.x-HBase-1.4
Commit: 305a8dba482a3befe4271aac6b16764038f0053b
Parents: 73951ac
Author: James Taylor 
Authored: Tue Oct 16 23:49:23 2018 -0700
Committer: James Taylor 
Committed: Tue Oct 23 09:18:05 2018 -0700

--
 .../phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java   | 9 ++---
 .../org/apache/phoenix/schema/stats/StatsCollectorIT.java   | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/305a8dba/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
index 0a0dd21..9665fb6 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
@@ -74,9 +74,12 @@ public class StatsEnabledSplitSystemCatalogIT extends 
BaseUniqueNamesOwnClusterI
this.tableDDLOptions = optionBuilder.toString();
}
 
-   @Parameters(name = "transactional = {0}")
-   public static Collection data() {
-   return Arrays.asList(new Object[] { null, "TEPHRA", "OMID" });
+   @Parameters(name = "transactionProvider = {0}")
+   public static Collection data() {
+return TestUtil.filterTxParamData(Arrays.asList(new Object[][] { 
+{ "TEPHRA" },
+{ "OMID" }, 
+{ null }}),0);
}

@BeforeClass

http://git-wip-us.apache.org/repos/asf/phoenix/blob/305a8dba/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
index 0caf61a..f1c4e45 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
@@ -635,7 +635,7 @@ public abstract class StatsCollectorIT extends 
BaseUniqueNamesOwnClusterIT {
 // an exact byte count based on the number or rows is not 
possible because
 // it is variable on a row-by-row basis.
 long sumOfGuidePostsWidth = rs.getLong(3);
-assertTrue(hasShadowCells ? sumOfGuidePostsWidth > 2 * c2Bytes 
&& sumOfGuidePostsWidth <= 3 * c2Bytes: rs.getLong(3) == c2Bytes);
+assertTrue(hasShadowCells ? sumOfGuidePostsWidth > c2Bytes : 
sumOfGuidePostsWidth == c2Bytes);
 count++;
 }
 }

phoenix git commit: PHOENIX-4975 Addendum to fix failing unit tests for Omid due to shadow cells and no local indexes

2018-10-23 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/master 72d6109cd -> 0c28ea285


PHOENIX-4975 Addendum to fix failing unit tests for Omid due to shadow cells 
and no local indexes


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

Branch: refs/heads/master
Commit: 0c28ea2856aa0798953b790c002644969a36ae5e
Parents: 72d6109
Author: James Taylor 
Authored: Tue Oct 16 23:49:23 2018 -0700
Committer: James Taylor 
Committed: Tue Oct 23 09:20:49 2018 -0700

--
 .../phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java   | 9 ++---
 .../org/apache/phoenix/schema/stats/StatsCollectorIT.java   | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/0c28ea28/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
index 0a0dd21..9665fb6 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
@@ -74,9 +74,12 @@ public class StatsEnabledSplitSystemCatalogIT extends 
BaseUniqueNamesOwnClusterI
this.tableDDLOptions = optionBuilder.toString();
}
 
-   @Parameters(name = "transactional = {0}")
-   public static Collection data() {
-   return Arrays.asList(new Object[] { null, "TEPHRA", "OMID" });
+   @Parameters(name = "transactionProvider = {0}")
+   public static Collection data() {
+return TestUtil.filterTxParamData(Arrays.asList(new Object[][] { 
+{ "TEPHRA" },
+{ "OMID" }, 
+{ null }}),0);
}

@BeforeClass

http://git-wip-us.apache.org/repos/asf/phoenix/blob/0c28ea28/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
index feec3fb..21258e0 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
@@ -635,7 +635,7 @@ public abstract class StatsCollectorIT extends 
BaseUniqueNamesOwnClusterIT {
 // an exact byte count based on the number or rows is not 
possible because
 // it is variable on a row-by-row basis.
 long sumOfGuidePostsWidth = rs.getLong(3);
-assertTrue(hasShadowCells ? sumOfGuidePostsWidth > 2 * c2Bytes 
&& sumOfGuidePostsWidth <= 3 * c2Bytes: rs.getLong(3) == c2Bytes);
+assertTrue(hasShadowCells ? sumOfGuidePostsWidth > c2Bytes : 
sumOfGuidePostsWidth == c2Bytes);
 count++;
 }
 }

[3/5] phoenix git commit: PHOENIX-4988 Incorrect index rowkey generated when updating only non-indexed columns after a delete

2018-10-23 Thread jamestaylor 
PHOENIX-4988 Incorrect index rowkey generated when updating only non-indexed 
columns after a delete


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

Branch: refs/heads/omid2
Commit: 79ca07134f86c5405da5111b4622ff74360e96ae
Parents: 3d5bae8
Author: Vincent Poon 
Authored: Mon Oct 22 10:59:33 2018 -0700
Committer: Vincent Poon 
Committed: Mon Oct 22 13:17:09 2018 -0700

--
 .../phoenix/end2end/index/MutableIndexIT.java   | 38 +++-
 .../filter/ApplyAndFilterDeletesFilter.java |  9 +++--
 2 files changed, 44 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/79ca0713/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java
index a994094..5415e87 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java
@@ -60,6 +60,7 @@ import org.apache.phoenix.schema.PIndexState;
 import org.apache.phoenix.schema.PTableKey;
 import org.apache.phoenix.util.ByteUtil;
 import org.apache.phoenix.util.EnvironmentEdgeManager;
+import org.apache.phoenix.util.IndexScrutiny;
 import org.apache.phoenix.util.IndexUtil;
 import org.apache.phoenix.util.PhoenixRuntime;
 import org.apache.phoenix.util.PropertiesUtil;
@@ -948,7 +949,42 @@ public class MutableIndexIT extends 
ParallelStatsDisabledIT {
   assertEquals(1, rs.getInt(2));
   assertEquals(0.5F, rs.getFloat(1), 0.0);
   assertEquals("foo", rs.getString(3));
-  } 
+  }
+  }
+
+  /**
+   * PHOENIX-4988
+   * Test updating only a non-indexed column after two successive deletes to 
an indexed row
+   */
+  @Test
+  public void testUpdateNonIndexedColumn() throws Exception {
+  String tableName = "TBL_" + generateUniqueName();
+  String indexName = "IDX_" + generateUniqueName();
+  String fullTableName = 
SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, tableName);
+  String fullIndexName = 
SchemaUtil.getTableName(TestUtil.DEFAULT_SCHEMA_NAME, indexName);
+  try (Connection conn = getConnection()) {
+  conn.setAutoCommit(false);
+  conn.createStatement().execute("CREATE TABLE " + fullTableName + " 
(k VARCHAR NOT NULL PRIMARY KEY, v1 VARCHAR, v2 VARCHAR) " + tableDDLOptions);
+  conn.createStatement().execute("CREATE " + (localIndex ? " LOCAL " : 
"") + " INDEX " + indexName + " ON " + fullTableName + " (v2)");
+  conn.createStatement().executeUpdate("UPSERT INTO " + fullTableName 
+ "(k,v1,v2) VALUES ('testKey','v1_1','v2_1')");
+  conn.commit();
+  conn.createStatement().executeUpdate("DELETE FROM " + fullTableName);
+  conn.commit();
+  conn.createStatement().executeUpdate("UPSERT INTO " + fullTableName 
+ "(k,v1,v2) VALUES ('testKey','v1_2','v2_2')");
+  conn.commit();
+  conn.createStatement().executeUpdate("DELETE FROM " + fullTableName);
+  conn.commit();
+  conn.createStatement().executeUpdate("UPSERT INTO " + fullTableName 
+ "(k,v1) VALUES ('testKey','v1_3')");
+  conn.commit();
+  IndexScrutiny.scrutinizeIndex(conn, fullTableName, fullIndexName);
+  // PHOENIX-4980
+  // When there is a flush after a data table update of non-indexed 
columns, the
+  // index gets out of sync on the next write
+  getUtility().getHBaseAdmin().flush(TableName.valueOf(fullTableName));
+  conn.createStatement().executeUpdate("UPSERT INTO " + fullTableName 
+ "(k,v1,v2) VALUES ('testKey','v1_4','v2_3')");
+  conn.commit();
+  IndexScrutiny.scrutinizeIndex(conn, fullTableName, fullIndexName);
+  }
   }
 
 private void upsertRow(String dml, Connection tenantConn, int i) throws 
SQLException {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/79ca0713/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/filter/ApplyAndFilterDeletesFilter.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/filter/ApplyAndFilterDeletesFilter.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/filter/ApplyAndFilterDeletesFilter.java
index a1f01ed..b5c3414 100644
---

[4/5] phoenix git commit: PHOENIX-4975 Addendum to fix failing unit tests for Omid due to shadow cells and no local indexes

2018-10-23 Thread jamestaylor 
PHOENIX-4975 Addendum to fix failing unit tests for Omid due to shadow cells 
and no local indexes


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

Branch: refs/heads/omid2
Commit: 2ff316a8094fee089057e49d080cc8d0d0790531
Parents: 79ca071
Author: James Taylor 
Authored: Tue Oct 16 23:49:23 2018 -0700
Committer: James Taylor 
Committed: Tue Oct 23 08:19:02 2018 -0700

--
 .../phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java   | 9 ++---
 .../org/apache/phoenix/schema/stats/StatsCollectorIT.java   | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/2ff316a8/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
index 0a0dd21..9665fb6 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
@@ -74,9 +74,12 @@ public class StatsEnabledSplitSystemCatalogIT extends 
BaseUniqueNamesOwnClusterI
this.tableDDLOptions = optionBuilder.toString();
}
 
-   @Parameters(name = "transactional = {0}")
-   public static Collection data() {
-   return Arrays.asList(new Object[] { null, "TEPHRA", "OMID" });
+   @Parameters(name = "transactionProvider = {0}")
+   public static Collection data() {
+return TestUtil.filterTxParamData(Arrays.asList(new Object[][] { 
+{ "TEPHRA" },
+{ "OMID" }, 
+{ null }}),0);
}

@BeforeClass

http://git-wip-us.apache.org/repos/asf/phoenix/blob/2ff316a8/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
index 0caf61a..f1c4e45 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
@@ -635,7 +635,7 @@ public abstract class StatsCollectorIT extends 
BaseUniqueNamesOwnClusterIT {
 // an exact byte count based on the number or rows is not 
possible because
 // it is variable on a row-by-row basis.
 long sumOfGuidePostsWidth = rs.getLong(3);
-assertTrue(hasShadowCells ? sumOfGuidePostsWidth > 2 * c2Bytes 
&& sumOfGuidePostsWidth <= 3 * c2Bytes: rs.getLong(3) == c2Bytes);
+assertTrue(hasShadowCells ? sumOfGuidePostsWidth > c2Bytes : 
sumOfGuidePostsWidth == c2Bytes);
 count++;
 }
 }

[1/5] phoenix git commit: PHOENIX-4963 Do not throw when transitioning to PENDING_DISABLE if index is already disabled

2018-10-23 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/omid2 688456889 -> f66538074


PHOENIX-4963 Do not throw when transitioning to PENDING_DISABLE if index is 
already disabled


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

Branch: refs/heads/omid2
Commit: 4a05f1489f1293a889e8ff3ca90348dce889e847
Parents: 6b345db
Author: Vincent Poon 
Authored: Tue Oct 16 16:13:11 2018 -0700
Committer: Vincent Poon 
Committed: Tue Oct 16 16:16:19 2018 -0700

--
 .../phoenix/coprocessor/MetaDataEndpointImpl.java| 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/4a05f148/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
index 83c7f4d..21370f3 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
@@ -3949,6 +3949,14 @@ public class MetaDataEndpointImpl extends 
MetaDataProtocol implements Coprocesso
 return;
 }
 } else if (currentState == PIndexState.DISABLE) {
+// Index already disabled, so can't revert to 
PENDING_DISABLE
+if (newState == PIndexState.PENDING_DISABLE) {
+// returning TABLE_ALREADY_EXISTS here means the 
client doesn't throw an exception
+
builder.setReturnCode(MetaDataProtos.MutationCode.TABLE_ALREADY_EXISTS);
+
builder.setMutationTime(EnvironmentEdgeManager.currentTimeMillis());
+done.run(builder.build());
+return;
+}
 // Can't transition back to INACTIVE if 
INDEX_DISABLE_TIMESTAMP is 0
 if (newState != PIndexState.BUILDING && newState != 
PIndexState.DISABLE &&
 (newState != PIndexState.INACTIVE || curTimeStampVal 
== 0)) {
@@ -3961,13 +3969,6 @@ public class MetaDataEndpointImpl extends 
MetaDataProtocol implements Coprocesso
 if (newState == PIndexState.ACTIVE) {
 newState = PIndexState.DISABLE;
 }
-// Can't transition from DISABLE to PENDING_DISABLE
-if (newState == PIndexState.PENDING_DISABLE) {
-
builder.setReturnCode(MetaDataProtos.MutationCode.UNALLOWED_TABLE_MUTATION);
-
builder.setMutationTime(EnvironmentEdgeManager.currentTimeMillis());
-done.run(builder.build());
-return;
-}
 }
 if (newState == PIndexState.PENDING_DISABLE && currentState != 
PIndexState.PENDING_DISABLE) {
 // reset count for first PENDING_DISABLE

phoenix git commit: PHOENIX-4975 Addendum to fix failing unit tests for Omid due to shadow cells and no local indexes

2018-10-23 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.2 b1cb0261c -> a6f17eb5d


PHOENIX-4975 Addendum to fix failing unit tests for Omid due to shadow cells 
and no local indexes


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

Branch: refs/heads/4.x-HBase-1.2
Commit: a6f17eb5d1973b151e4603135c48911339ad604c
Parents: b1cb026
Author: James Taylor 
Authored: Tue Oct 16 23:49:23 2018 -0700
Committer: James Taylor 
Committed: Tue Oct 23 09:31:48 2018 -0700

--
 .../phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java   | 9 ++---
 .../org/apache/phoenix/schema/stats/StatsCollectorIT.java   | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/a6f17eb5/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
index 0a0dd21..9665fb6 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsEnabledSplitSystemCatalogIT.java
@@ -74,9 +74,12 @@ public class StatsEnabledSplitSystemCatalogIT extends 
BaseUniqueNamesOwnClusterI
this.tableDDLOptions = optionBuilder.toString();
}
 
-   @Parameters(name = "transactional = {0}")
-   public static Collection data() {
-   return Arrays.asList(new Object[] { null, "TEPHRA", "OMID" });
+   @Parameters(name = "transactionProvider = {0}")
+   public static Collection data() {
+return TestUtil.filterTxParamData(Arrays.asList(new Object[][] { 
+{ "TEPHRA" },
+{ "OMID" }, 
+{ null }}),0);
}

@BeforeClass

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a6f17eb5/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
index 0caf61a..f1c4e45 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java
@@ -635,7 +635,7 @@ public abstract class StatsCollectorIT extends 
BaseUniqueNamesOwnClusterIT {
 // an exact byte count based on the number or rows is not 
possible because
 // it is variable on a row-by-row basis.
 long sumOfGuidePostsWidth = rs.getLong(3);
-assertTrue(hasShadowCells ? sumOfGuidePostsWidth > 2 * c2Bytes 
&& sumOfGuidePostsWidth <= 3 * c2Bytes: rs.getLong(3) == c2Bytes);
+assertTrue(hasShadowCells ? sumOfGuidePostsWidth > c2Bytes : 
sumOfGuidePostsWidth == c2Bytes);
 count++;
 }
 }

Jenkins build is back to normal : Phoenix-4.x-HBase-1.3 #240

2018-10-23 Thread Apache Jenkins Server 
See

Build failed in Jenkins: Phoenix | Master #2221

2018-10-23 Thread Apache Jenkins Server 
See 


Changes:

[jamestaylor] PHOENIX-4975 Addendum to fix failing unit tests for Omid due to 
shadow

--
[...truncated 1.28 MB...]
[INFO] Running org.apache.phoenix.rpc.UpdateCacheIT
[INFO] Running org.apache.phoenix.replication.SystemCatalogWALEntryFilterIT
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.108 s 
- in org.apache.phoenix.replication.SystemCatalogWALEntryFilterIT
[INFO] Running org.apache.phoenix.trace.PhoenixTableMetricsWriterIT
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.386 s 
- in org.apache.phoenix.trace.PhoenixTableMetricsWriterIT
[INFO] Running org.apache.phoenix.trace.PhoenixTracingEndToEndIT
[WARNING] Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0 s - 
in org.apache.phoenix.trace.PhoenixTracingEndToEndIT
[INFO] Running org.apache.phoenix.tx.FlappingTransactionIT
[INFO] Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 30.604 s 
- in org.apache.phoenix.rpc.UpdateCacheIT
[INFO] Running org.apache.phoenix.tx.ParameterizedTransactionIT
[INFO] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.721 s 
- in org.apache.phoenix.tx.FlappingTransactionIT
[INFO] Running org.apache.phoenix.tx.TransactionIT
[INFO] Tests run: 24, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 349.626 
s - in org.apache.phoenix.end2end.join.SubqueryIT
[INFO] Running org.apache.phoenix.tx.TxCheckpointIT
[INFO] Tests run: 34, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 800.079 
s - in org.apache.phoenix.end2end.join.SortMergeJoinLocalIndexIT
[INFO] Tests run: 12, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 107.15 
s - in org.apache.phoenix.tx.TransactionIT
[INFO] Running org.apache.phoenix.util.IndexScrutinyIT
[INFO] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 23.625 s 
- in org.apache.phoenix.util.IndexScrutinyIT
[INFO] Tests run: 52, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 378.57 
s - in org.apache.phoenix.tx.ParameterizedTransactionIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 370.932 
s - in org.apache.phoenix.tx.TxCheckpointIT
[INFO] 
[INFO] Results:
[INFO] 
[ERROR] Failures: 
[ERROR]   ConcurrentMutationsIT.testLockUntilMVCCAdvanced:385 Expected data 
table row count to match expected:<1> but was:<0>
[ERROR]   ConcurrentMutationsIT.testRowLockDuringPreBatchMutateWhenIndexed:329 
Expected data table row count to match expected:<1> but was:<0>
[ERROR] Errors: 
[ERROR]   UpsertSelectAutoCommitIT.testUpsertSelectDoesntSeeUpsertedData:167 » 
DoNotRetryIO
[ERROR]   
MutableIndexSplitForwardScanIT.testSplitDuringIndexScan:30->MutableIndexSplitIT.testSplitDuringIndexScan:87->MutableIndexSplitIT.splitDuringScan:152
 » StaleRegionBoundaryCache
[ERROR]   
MutableIndexSplitForwardScanIT.testSplitDuringIndexScan:30->MutableIndexSplitIT.testSplitDuringIndexScan:87->MutableIndexSplitIT.splitDuringScan:152
 » StaleRegionBoundaryCache
[ERROR]   
MutableIndexSplitReverseScanIT.testSplitDuringIndexScan:30->MutableIndexSplitIT.testSplitDuringIndexScan:87->MutableIndexSplitIT.splitDuringScan:152
 » StaleRegionBoundaryCache
[ERROR]   
MutableIndexSplitReverseScanIT.testSplitDuringIndexScan:30->MutableIndexSplitIT.testSplitDuringIndexScan:87->MutableIndexSplitIT.splitDuringScan:152
 » StaleRegionBoundaryCache
[INFO] 
[ERROR] Tests run: 3393, Failures: 2, Errors: 5, Skipped: 10
[INFO] 
[INFO] 
[INFO] --- maven-failsafe-plugin:2.20:integration-test (HBaseManagedTimeTests) 
@ phoenix-core ---
[INFO] 
[INFO] ---
[INFO]  T E S T S
[INFO] ---
[INFO] 
[INFO] Results:
[INFO] 
[INFO] Tests run: 0, Failures: 0, Errors: 0, Skipped: 0
[INFO] 
[INFO] 
[INFO] --- maven-failsafe-plugin:2.20:integration-test 
(NeedTheirOwnClusterTests) @ phoenix-core ---
[INFO] 
[INFO] ---
[INFO]  T E S T S
[INFO] ---
[INFO] Running 
org.apache.hadoop.hbase.regionserver.wal.WALReplayWithIndexWritesAndCompressedWALIT
[WARNING] Tests run: 1, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 0.002 
s - in 
org.apache.hadoop.hbase.regionserver.wal.WALReplayWithIndexWritesAndCompressedWALIT
[INFO] Running org.apache.phoenix.end2end.ChangePermissionsIT
[INFO] Running 
org.apache.hadoop.hbase.regionserver.wal.WALRecoveryRegionPostOpenIT
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 16.561 s 
- in org.apache.hadoop.hbase.regionserver.wal.WALRecoveryRegionPostOpenIT
[INFO] Running 
org.apache.phoenix.end2end.ColumnEncodedImmutableTxStatsCollectorIT
[INFO] Running 
org.apache.phoenix.end2end.ColumnEncodedImmutableNonTxStatsCollectorIT
[INFO] Running 
org.apache.phoenix.end2end.ColumnEncodedMutableNonTxStatsCollectorIT
[WARNING] Tests run: 28, Failures:

Build failed in Jenkins: Phoenix-omid2 #137

2018-10-23 Thread Apache Jenkins Server 
See 


Changes:

[vincentpoon] PHOENIX-4963 Do not throw when transitioning to PENDING_DISABLE 
if index

[vincentpoon] PHOENIX-4960 Write to table with global index failed if meta of 
index

[vincentpoon] PHOENIX-4988 Incorrect index rowkey generated when updating only

[jamestaylor] PHOENIX-4975 Addendum to fix failing unit tests for Omid due to 
shadow

--
[...truncated 3.95 MB...]
[INFO] Building jar: 

[INFO] 
[INFO] --- maven-jar-plugin:2.4:test-jar (default) @ phoenix-queryserver-client 
---
[INFO] Building jar: 

[INFO] 
[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ phoenix-queryserver-client 
---
[INFO] Building jar: 

[INFO] 
[INFO] --- maven-site-plugin:3.2:attach-descriptor (attach-descriptor) @ 
phoenix-queryserver-client ---
[INFO] 
[INFO] --- maven-shade-plugin:2.4.3:shade (thin-client) @ 
phoenix-queryserver-client ---
[INFO] Including org.apache.calcite.avatica:avatica-core:jar:1.12.0 in the 
shaded jar.
[INFO] Including org.apache.calcite.avatica:avatica-metrics:jar:1.12.0 in the 
shaded jar.
[INFO] Including com.fasterxml.jackson.core:jackson-core:jar:2.9.4 in the 
shaded jar.
[INFO] Including com.fasterxml.jackson.core:jackson-annotations:jar:2.9.4 in 
the shaded jar.
[INFO] Including com.fasterxml.jackson.core:jackson-databind:jar:2.9.4 in the 
shaded jar.
[INFO] Including com.google.protobuf:protobuf-java:jar:3.1.0 in the shaded jar.
[INFO] Including org.apache.httpcomponents:httpclient:jar:4.5.2 in the shaded 
jar.
[INFO] Including org.apache.httpcomponents:httpcore:jar:4.4.4 in the shaded jar.
[INFO] Including org.slf4j:slf4j-api:jar:1.6.4 in the shaded jar.
[INFO] Including sqlline:sqlline:jar:1.2.0 in the shaded jar.
[INFO] Including jline:jline:jar:2.11 in the shaded jar.
[INFO] Including org.apache.hadoop:hadoop-common:jar:2.7.1 in the shaded jar.
[INFO] Including org.apache.hadoop:hadoop-annotations:jar:2.7.1 in the shaded 
jar.
[INFO] Including com.google.guava:guava:jar:13.0.1 in the shaded jar.
[INFO] Including commons-cli:commons-cli:jar:1.2 in the shaded jar.
[INFO] Including org.apache.commons:commons-math3:jar:3.1.1 in the shaded jar.
[INFO] Including xmlenc:xmlenc:jar:0.52 in the shaded jar.
[INFO] Including commons-httpclient:commons-httpclient:jar:3.1 in the shaded 
jar.
[INFO] Including commons-codec:commons-codec:jar:1.7 in the shaded jar.
[INFO] Including commons-io:commons-io:jar:2.4 in the shaded jar.
[INFO] Including commons-net:commons-net:jar:3.1 in the shaded jar.
[INFO] Including commons-collections:commons-collections:jar:3.2.2 in the 
shaded jar.
[INFO] Including javax.servlet:servlet-api:jar:2.5 in the shaded jar.
[INFO] Including org.mortbay.jetty:jetty:jar:6.1.26 in the shaded jar.
[INFO] Including org.mortbay.jetty:jetty-util:jar:6.1.26 in the shaded jar.
[INFO] Including javax.servlet.jsp:jsp-api:jar:2.1 in the shaded jar.
[INFO] Including com.sun.jersey:jersey-core:jar:1.9 in the shaded jar.
[INFO] Including com.sun.jersey:jersey-json:jar:1.9 in the shaded jar.
[INFO] Including org.codehaus.jettison:jettison:jar:1.1 in the shaded jar.
[INFO] Including com.sun.xml.bind:jaxb-impl:jar:2.2.3-1 in the shaded jar.
[INFO] Including javax.xml.bind:jaxb-api:jar:2.2.2 in the shaded jar.
[INFO] Including javax.xml.stream:stax-api:jar:1.0-2 in the shaded jar.
[INFO] Including javax.activation:activation:jar:1.1 in the shaded jar.
[INFO] Including com.sun.jersey:jersey-server:jar:1.9 in the shaded jar.
[INFO] Including asm:asm:jar:3.1 in the shaded jar.
[INFO] Including commons-logging:commons-logging:jar:1.2 in the shaded jar.
[INFO] Including log4j:log4j:jar:1.2.17 in the shaded jar.
[INFO] Including net.java.dev.jets3t:jets3t:jar:0.9.0 in the shaded jar.
[INFO] Including com.jamesmurty.utils:java-xmlbuilder:jar:0.4 in the shaded jar.
[INFO] Including commons-lang:commons-lang:jar:2.6 in the shaded jar.
[INFO] Including commons-configuration:commons-configuration:jar:1.6 in the 
shaded jar.
[INFO] Including commons-digester:commons-digester:jar:1.8 in the shaded jar.
[INFO] Including commons-beanutils:commons-beanutils:jar:1.7.0 in the shaded 
jar.
[INFO] Including commons-beanutils:commons-beanutils-core:jar:1.8.0 in the 
shaded jar.
[INFO] Including org.slf4j:slf4j-log4j12:jar:1.7.10 in the shaded jar.
[INFO] Including org.codehaus.jackson:jackson-core-asl:jar:1.9.2 in the shaded 
jar.
[INFO] Including org.codehaus.jackson:jackson-mapper-asl:jar:1.9.2 in the 
shaded jar.
[INFO] Including

[2/2] phoenix git commit: Revert "PHOENIX-4839 IndexHalfStoreFileReaderGenerator throws NullPointerException(Aman Poonia)"

2018-10-23 Thread vincentpoon 
Revert "PHOENIX-4839 IndexHalfStoreFileReaderGenerator throws 
NullPointerException(Aman Poonia)"

This reverts commit 501ce1f5ddb01e91e7267f31861b8e5eeb88e1ea.
Patch not applicable to HBase-0.98


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

Branch: refs/heads/4.14-HBase-0.98
Commit: cd7e12102d7517e288306a1ce9a3488c7afcbc55
Parents: fce9bcf
Author: Vincent Poon 
Authored: Tue Oct 23 11:08:37 2018 -0700
Committer: Vincent Poon 
Committed: Tue Oct 23 18:38:29 2018 -0700

--
 .../regionserver/IndexHalfStoreFileReader.java  |   6 -
 .../IndexHalfStoreFileReaderGenerator.java  | 137 +--
 2 files changed, 125 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/cd7e1210/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java
 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java
index 8bd0d72..d1d12fb 100644
--- 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java
+++ 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java
@@ -123,10 +123,4 @@ public class IndexHalfStoreFileReader extends 
StoreFile.Reader {
 public boolean isTop() {
 return top;
 }
-
-@Override
-public StoreFileScanner getStoreFileScanner(boolean cacheBlocks, boolean 
pread, boolean isCompaction, long readPt) {
-return new LocalIndexStoreFileScanner(this, getScanner(cacheBlocks, 
pread, isCompaction), true,
-getHFileReader().hasMVCCInfo(), readPt);
-}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/phoenix/blob/cd7e1210/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
index 18d7228..037b299 100644
--- 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
+++ 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
@@ -17,8 +17,12 @@
  */
 package org.apache.hadoop.hbase.regionserver;
 
+import static 
org.apache.phoenix.coprocessor.BaseScannerRegionObserver.SCAN_START_ROW_SUFFIX;
+
 import java.io.IOException;
 import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -68,7 +72,7 @@ import org.apache.phoenix.util.RepairUtil;
 import com.google.common.collect.Lists;
 
 public class IndexHalfStoreFileReaderGenerator extends BaseRegionObserver {
-
+
 private static final String LOCAL_INDEX_AUTOMATIC_REPAIR = 
"local.index.automatic.repair";
 public static final Log LOG = 
LogFactory.getLog(IndexHalfStoreFileReaderGenerator.class);
 
@@ -148,9 +152,7 @@ public class IndexHalfStoreFileReaderGenerator extends 
BaseRegionObserver {
 try {
 conn = 
QueryUtil.getConnectionOnServer(ctx.getEnvironment().getConfiguration()).unwrap(
 PhoenixConnection.class);
-PTable dataTable =
-IndexUtil.getPDataTable(conn, 
ctx.getEnvironment().getRegion()
-.getTableDesc());
+PTable dataTable = IndexUtil.getPDataTable(conn, 
ctx.getEnvironment().getRegion().getTableDesc());
 List indexes = dataTable.getIndexes();
 Map indexMaintainers =
 new HashMap();
@@ -184,12 +186,19 @@ public class IndexHalfStoreFileReaderGenerator extends 
BaseRegionObserver {
 return reader;
 }
 
+@SuppressWarnings("deprecation")
 @Override
-public InternalScanner preCompact(
-ObserverContext c, Store store,
-InternalScanner s, ScanType scanType,
-CompactionRequest request) throws IOException {
+public InternalScanner 
preCompactScannerOpen(ObserverContext c,
+Store store, List scanners, ScanType 
scanType,
+long earliestPutTs, InternalScanner s, CompactionRequest request) 
throws IOException {
 if

[1/2] phoenix git commit: Revert "PHOENIX-4839 IndexHalfStoreFileReaderGenerator throws NullPointerException (Aman Poonia)"

2018-10-23 Thread vincentpoon 
Repository: phoenix
Updated Branches:
  refs/heads/4.14-HBase-0.98 193839828 -> cd7e12102


Revert "PHOENIX-4839 IndexHalfStoreFileReaderGenerator throws 
NullPointerException (Aman Poonia)"

This reverts commit 9e7ea88a40a966fc4ce3d19a02ed63116150f870.
Patch not applicable to HBase-0.98


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

Branch: refs/heads/4.14-HBase-0.98
Commit: fce9bcfb99d91c36f4c8c315cf5d9fe30e402341
Parents: 1938398
Author: Vincent Poon 
Authored: Tue Oct 23 11:08:04 2018 -0700
Committer: Vincent Poon 
Committed: Tue Oct 23 18:38:28 2018 -0700

--
 .../regionserver/IndexHalfStoreFileReader.java  | 48 
 .../IndexHalfStoreFileReaderGenerator.java  | 12 +++--
 2 files changed, 17 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/fce9bcfb/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java
 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java
index 273a1b0..8bd0d72 100644
--- 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java
+++ 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReader.java
@@ -17,8 +17,6 @@
  */
 package org.apache.hadoop.hbase.regionserver;
 
-import static 
org.apache.phoenix.coprocessor.BaseScannerRegionObserver.SCAN_START_ROW_SUFFIX;
-
 import java.io.IOException;
 import java.util.Map;
 
@@ -28,12 +26,10 @@ import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.CellUtil;
 import org.apache.hadoop.hbase.HRegionInfo;
 import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.io.FSDataInputStreamWrapper;
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
 import org.apache.hadoop.hbase.io.Reference;
 import org.apache.hadoop.hbase.io.hfile.CacheConfig;
-import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.phoenix.index.IndexMaintainer;
 
 /**
@@ -60,9 +56,8 @@ public class IndexHalfStoreFileReader extends 
StoreFile.Reader {
 private final Map 
indexMaintainers;
 private final byte[][] viewConstants;
 private final int offset;
-private final HRegionInfo childRegionInfo;
+private final HRegionInfo regionInfo;
 private final byte[] regionStartKeyInHFile;
-private final HRegionInfo currentRegion;
 
 /**
  * @param fs
@@ -74,19 +69,17 @@ public class IndexHalfStoreFileReader extends 
StoreFile.Reader {
  * @param conf
  * @param indexMaintainers
  * @param viewConstants
- * @param childRegionInfo
+ * @param regionInfo
  * @param regionStartKeyInHFile
  * @param splitKey
- * @param currentRegion
  * @throws IOException
  */
 public IndexHalfStoreFileReader(final FileSystem fs, final Path p, final 
CacheConfig cacheConf,
 final FSDataInputStreamWrapper in, long size, final Reference r,
 final Configuration conf,
 final Map 
indexMaintainers,
-final byte[][] viewConstants, final HRegionInfo childRegionInfo,
-byte[] regionStartKeyInHFile, byte[] splitKey, HRegionInfo 
currentRegion)
-throws IOException {
+final byte[][] viewConstants, final HRegionInfo regionInfo,
+byte[] regionStartKeyInHFile, byte[] splitKey) throws IOException {
 super(fs, p, in, size, cacheConf, conf);
 this.splitkey = splitKey == null ? r.getSplitKey() : splitKey;
 // Is it top or bottom half?
@@ -94,10 +87,9 @@ public class IndexHalfStoreFileReader extends 
StoreFile.Reader {
 this.splitRow = 
CellUtil.cloneRow(KeyValue.createKeyValueFromKey(splitkey));
 this.indexMaintainers = indexMaintainers;
 this.viewConstants = viewConstants;
-this.childRegionInfo = childRegionInfo;
+this.regionInfo = regionInfo;
 this.regionStartKeyInHFile = regionStartKeyInHFile;
 this.offset = regionStartKeyInHFile.length;
-this.currentRegion = currentRegion;
 }
 
 public int getOffset() {
@@ -113,7 +105,7 @@ public class IndexHalfStoreFileReader extends 
StoreFile.Reader {
 }
 
 public HRegionInfo getRegionInfo() {
-return childRegionInfo;
+return regionInfo;
 }
 
 public byte[] getRegionStartKeyInHFile() {
@@ -133,30 +125,8 @@ public class IndexHalfStoreFileReader extends 
StoreFile.Reader {