phoenix git commit: PHOENIX-3111 Possible Deadlock/delay while building index, upsert select, delete rows at server-addendum(Rajeshbabu)

[rajeshbabu]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 64b075229 -> 01f421a88


PHOENIX-3111 Possible Deadlock/delay while building index, upsert select, 
delete rows at server-addendum(Rajeshbabu)


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

Branch: refs/heads/4.x-HBase-1.0
Commit: 01f421a88665ef7594c87a3075c2517ee9b574ac
Parents: 64b0752
Author: Rajeshbabu Chintaguntla 
Authored: Wed Aug 3 11:18:16 2016 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Wed Aug 3 11:18:16 2016 +0530

--
 .../UngroupedAggregateRegionObserver.java   | 37 +---
 1 file changed, 16 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/01f421a8/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
index feea2b7..c03c90b 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
@@ -188,27 +188,20 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver
   }
   }
   Mutation[] mutationArray = new Mutation[mutations.size()];
+  // When memstore size reaches blockingMemstoreSize we are waiting 3 
seconds for the
+  // flush happen which decrease the memstore size and then writes allowed 
on the region.
+  for (int i = 0; region.getMemstoreSize().get() > blockingMemstoreSize && 
i < 30; i++) {
+  try {
+  checkForRegionClosing();
+  Thread.sleep(100);
+  } catch (InterruptedException e) {
+  Thread.currentThread().interrupt();
+  throw new IOException(e);
+  }
+  }
   // TODO: should we use the one that is all or none?
   logger.debug("Committing bactch of " + mutations.size() + " mutations 
for " + region.getRegionInfo().getTable().getNameAsString());
-  try {
-  region.batchMutate(mutations.toArray(mutationArray), 
HConstants.NO_NONCE, HConstants.NO_NONCE);
-  } catch (RegionTooBusyException rtbe) {
-// When memstore size reaches blockingMemstoreSize we are waiting 
3 seconds for the
-// flush happen which decrease the memstore size and then writes 
allowed on the region.
-for (int i = 0; region.getMemstoreSize().get() > 
blockingMemstoreSize && i < 30; i++) {
-try {
-checkForRegionClosing();
-Thread.sleep(100);
-} catch (InterruptedException e) {
-Thread.currentThread().interrupt();
-throw new IOException(e);
-}
-}
-if (region.getMemstoreSize().get() > blockingMemstoreSize) {
-throw rtbe;
-}
-region.batchMutate(mutationArray, HConstants.NO_NONCE, 
HConstants.NO_NONCE);
-  }
+  region.batchMutate(mutations.toArray(mutationArray), 
HConstants.NO_NONCE, HConstants.NO_NONCE);
 }
 
 /**
@@ -354,8 +347,10 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver
 }
 
 /**
- * Upper bound of memstore size allowed for region. Updates will be 
blocked until the flush
- * happen if the memstore reaches this threshold.
+ * Slow down the writes if the memstore size more than
+ * (hbase.hregion.memstore.block.multiplier - 1) times 
hbase.hregion.memstore.flush.size
+ * bytes. This avoids flush storm to hdfs for cases like index 
building where reads and
+ * write happen to all the table regions in the server.
  */
 final long blockingMemStoreSize = flushSize * (
 conf.getLong(HConstants.HREGION_MEMSTORE_BLOCK_MULTIPLIER,

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

[Apache Jenkins Server]

4.x-HBase-1.0 branch build status Successful

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

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

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

Changes
[tdsilva] PHOENIX-3130 Ignore ASYNC and build indexes synchronously based on



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

phoenix git commit: PHOENIX-3111 Possible Deadlock/delay while building index, upsert select, delete rows at server-addendum(Rajeshbabu)

[rajeshbabu]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 98cb683fe -> 61d7e946d


PHOENIX-3111 Possible Deadlock/delay while building index, upsert select, 
delete rows at server-addendum(Rajeshbabu)


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

Branch: refs/heads/4.x-HBase-1.1
Commit: 61d7e946dc4a8f31eb9653f9ec6460a995f73182
Parents: 98cb683
Author: Rajeshbabu Chintaguntla 
Authored: Wed Aug 3 11:06:37 2016 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Wed Aug 3 11:06:37 2016 +0530

--
 .../UngroupedAggregateRegionObserver.java   | 38 +---
 1 file changed, 17 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/61d7e946/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
index eda59d1..a7c6fde 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
@@ -187,28 +187,22 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver
   m.setAttribute(PhoenixIndexCodec.INDEX_UUID, indexUUID);
   }
   }
+  
   Mutation[] mutationArray = new Mutation[mutations.size()];
+  // When memstore size reaches blockingMemstoreSize we are waiting 3 
seconds for the
+  // flush happen which decrease the memstore size and then writes allowed 
on the region.
+  for (int i = 0; region.getMemstoreSize() > blockingMemstoreSize && i < 
30; i++) {
+  try {
+  checkForRegionClosing();
+  Thread.sleep(100);
+  } catch (InterruptedException e) {
+  Thread.currentThread().interrupt();
+  throw new IOException(e);
+  }
+  }
   // TODO: should we use the one that is all or none?
   logger.debug("Committing bactch of " + mutations.size() + " mutations 
for " + region.getRegionInfo().getTable().getNameAsString());
-  try {
-  region.batchMutate(mutations.toArray(mutationArray), 
HConstants.NO_NONCE, HConstants.NO_NONCE);
-  } catch (RegionTooBusyException rtbe) {
-// When memstore size reaches blockingMemstoreSize we are waiting 
3 seconds for the
-// flush happen which decrease the memstore size and then writes 
allowed on the region.
-for (int i = 0; region.getMemstoreSize() > blockingMemstoreSize && 
i < 30; i++) {
-try {
-checkForRegionClosing();
-Thread.sleep(100);
-} catch (InterruptedException e) {
-Thread.currentThread().interrupt();
-throw new IOException(e);
-}
-}
-if (region.getMemstoreSize() > blockingMemstoreSize) {
-throw rtbe;
-}
-region.batchMutate(mutationArray, HConstants.NO_NONCE, 
HConstants.NO_NONCE);
-  }
+  region.batchMutate(mutations.toArray(mutationArray), 
HConstants.NO_NONCE, HConstants.NO_NONCE);
 }
 
 /**
@@ -354,8 +348,10 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver
 }
 
 /**
- * Upper bound of memstore size allowed for region. Updates will be 
blocked until the flush
- * happen if the memstore reaches this threshold.
+ * Slow down the writes if the memstore size more than
+ * (hbase.hregion.memstore.block.multiplier - 1) times 
hbase.hregion.memstore.flush.size
+ * bytes. This avoids flush storm to hdfs for cases like index 
building where reads and
+ * write happen to all the table regions in the server.
  */
 final long blockingMemStoreSize = flushSize * (
 conf.getLong(HConstants.HREGION_MEMSTORE_BLOCK_MULTIPLIER,

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

[Apache Jenkins Server]

4.x-HBase-1.0 branch build status Successful

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

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

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

Changes
[tdsilva] PHOENIX-3130 Ignore ASYNC and build indexes synchronously based on



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

phoenix git commit: PHOENIX-3111 Possible Deadlock/delay while building index, upsert select, delete rows at server-addendum(Rajeshbabu)

[rajeshbabu]

Repository: phoenix
Updated Branches:
  refs/heads/master 50b3f9484 -> 27c4027fd


PHOENIX-3111 Possible Deadlock/delay while building index, upsert select, 
delete rows at server-addendum(Rajeshbabu)


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

Branch: refs/heads/master
Commit: 27c4027fd72cec790975c810724f3a778388e426
Parents: 50b3f94
Author: Rajeshbabu Chintaguntla 
Authored: Wed Aug 3 11:01:21 2016 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Wed Aug 3 11:01:21 2016 +0530

--
 .../UngroupedAggregateRegionObserver.java   | 38 +---
 1 file changed, 17 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/27c4027f/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
index eda59d1..a7c6fde 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
@@ -187,28 +187,22 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver
   m.setAttribute(PhoenixIndexCodec.INDEX_UUID, indexUUID);
   }
   }
+  
   Mutation[] mutationArray = new Mutation[mutations.size()];
+  // When memstore size reaches blockingMemstoreSize we are waiting 3 
seconds for the
+  // flush happen which decrease the memstore size and then writes allowed 
on the region.
+  for (int i = 0; region.getMemstoreSize() > blockingMemstoreSize && i < 
30; i++) {
+  try {
+  checkForRegionClosing();
+  Thread.sleep(100);
+  } catch (InterruptedException e) {
+  Thread.currentThread().interrupt();
+  throw new IOException(e);
+  }
+  }
   // TODO: should we use the one that is all or none?
   logger.debug("Committing bactch of " + mutations.size() + " mutations 
for " + region.getRegionInfo().getTable().getNameAsString());
-  try {
-  region.batchMutate(mutations.toArray(mutationArray), 
HConstants.NO_NONCE, HConstants.NO_NONCE);
-  } catch (RegionTooBusyException rtbe) {
-// When memstore size reaches blockingMemstoreSize we are waiting 
3 seconds for the
-// flush happen which decrease the memstore size and then writes 
allowed on the region.
-for (int i = 0; region.getMemstoreSize() > blockingMemstoreSize && 
i < 30; i++) {
-try {
-checkForRegionClosing();
-Thread.sleep(100);
-} catch (InterruptedException e) {
-Thread.currentThread().interrupt();
-throw new IOException(e);
-}
-}
-if (region.getMemstoreSize() > blockingMemstoreSize) {
-throw rtbe;
-}
-region.batchMutate(mutationArray, HConstants.NO_NONCE, 
HConstants.NO_NONCE);
-  }
+  region.batchMutate(mutations.toArray(mutationArray), 
HConstants.NO_NONCE, HConstants.NO_NONCE);
 }
 
 /**
@@ -354,8 +348,10 @@ public class UngroupedAggregateRegionObserver extends 
BaseScannerRegionObserver
 }
 
 /**
- * Upper bound of memstore size allowed for region. Updates will be 
blocked until the flush
- * happen if the memstore reaches this threshold.
+ * Slow down the writes if the memstore size more than
+ * (hbase.hregion.memstore.block.multiplier - 1) times 
hbase.hregion.memstore.flush.size
+ * bytes. This avoids flush storm to hdfs for cases like index 
building where reads and
+ * write happen to all the table regions in the server.
  */
 final long blockingMemStoreSize = flushSize * (
 conf.getLong(HConstants.HREGION_MEMSTORE_BLOCK_MULTIPLIER,

Apache-Phoenix | Master | Build Successful

[Apache Jenkins Server]

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

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

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

Changes
[tdsilva] PHOENIX-3130 Ignore ASYNC and build indexes synchronously based on



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

phoenix git commit: PHOENIX-3141 UnnestArrayIT causes builds to hang

[samarth]

Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-1.2 6d2ab9f42 -> 4533cf4f7


PHOENIX-3141 UnnestArrayIT causes builds to hang


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

Branch: refs/heads/4.8-HBase-1.2
Commit: 4533cf4f7022ff4b99fbc72b551df333a4b712e9
Parents: 6d2ab9f
Author: Samarth 
Authored: Tue Aug 2 21:45:42 2016 -0700
Committer: Samarth 
Committed: Tue Aug 2 21:45:42 2016 -0700

--
 .../org/apache/phoenix/end2end/UnnestArrayIT.java | 18 --
 1 file changed, 8 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/4533cf4f/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
index 4ca73e6..9c80cd5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
@@ -17,10 +17,10 @@
  */
 package org.apache.phoenix.end2end;
 
-import org.apache.phoenix.util.PhoenixRuntime;
-import org.apache.phoenix.util.PropertiesUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -28,13 +28,11 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Properties;
 
-import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.apache.phoenix.util.PhoenixRuntime;
+import org.apache.phoenix.util.PropertiesUtil;
+import org.junit.Test;
 
-@Ignore
-public class UnnestArrayIT extends BaseClientManagedTimeIT {
+public abstract class UnnestArrayIT extends BaseClientManagedTimeIT {
 
 private static long timestamp;
 

phoenix git commit: PHOENIX-3141 UnnestArrayIT causes builds to hang

[samarth]

Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-0.98 63f60865c -> 62c27090d


PHOENIX-3141 UnnestArrayIT causes builds to hang


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

Branch: refs/heads/4.8-HBase-0.98
Commit: 62c27090d7270c0a41729a9113e9c6c1fc16c900
Parents: 63f6086
Author: Samarth 
Authored: Tue Aug 2 21:43:43 2016 -0700
Committer: Samarth 
Committed: Tue Aug 2 21:43:43 2016 -0700

--
 .../org/apache/phoenix/end2end/UnnestArrayIT.java | 18 --
 1 file changed, 8 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/62c27090/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
index 4ca73e6..9c80cd5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
@@ -17,10 +17,10 @@
  */
 package org.apache.phoenix.end2end;
 
-import org.apache.phoenix.util.PhoenixRuntime;
-import org.apache.phoenix.util.PropertiesUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -28,13 +28,11 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Properties;
 
-import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.apache.phoenix.util.PhoenixRuntime;
+import org.apache.phoenix.util.PropertiesUtil;
+import org.junit.Test;
 
-@Ignore
-public class UnnestArrayIT extends BaseClientManagedTimeIT {
+public abstract class UnnestArrayIT extends BaseClientManagedTimeIT {
 
 private static long timestamp;
 

phoenix git commit: PHOENIX-3141 UnnestArrayIT causes builds to hang

[samarth]

Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-1.0 3f082c9a0 -> 7fd09b318


PHOENIX-3141 UnnestArrayIT causes builds to hang


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

Branch: refs/heads/4.8-HBase-1.0
Commit: 7fd09b3181d27fa6240a1cf1728d9a8c66b894d4
Parents: 3f082c9
Author: Samarth 
Authored: Tue Aug 2 21:44:22 2016 -0700
Committer: Samarth 
Committed: Tue Aug 2 21:44:22 2016 -0700

--
 .../org/apache/phoenix/end2end/UnnestArrayIT.java | 18 --
 1 file changed, 8 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/7fd09b31/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
index 4ca73e6..9c80cd5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
@@ -17,10 +17,10 @@
  */
 package org.apache.phoenix.end2end;
 
-import org.apache.phoenix.util.PhoenixRuntime;
-import org.apache.phoenix.util.PropertiesUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -28,13 +28,11 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Properties;
 
-import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.apache.phoenix.util.PhoenixRuntime;
+import org.apache.phoenix.util.PropertiesUtil;
+import org.junit.Test;
 
-@Ignore
-public class UnnestArrayIT extends BaseClientManagedTimeIT {
+public abstract class UnnestArrayIT extends BaseClientManagedTimeIT {
 
 private static long timestamp;
 

phoenix git commit: PHOENIX-3141 UnnestArrayIT causes builds to hang

[samarth]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 d4cde114d -> 64b075229


PHOENIX-3141 UnnestArrayIT causes builds to hang


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

Branch: refs/heads/4.x-HBase-1.0
Commit: 64b07522929b6b29bf9a0767d6335f2854be9e95
Parents: d4cde11
Author: Samarth 
Authored: Tue Aug 2 21:43:01 2016 -0700
Committer: Samarth 
Committed: Tue Aug 2 21:43:01 2016 -0700

--
 .../org/apache/phoenix/end2end/UnnestArrayIT.java | 18 --
 1 file changed, 8 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/64b07522/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
index 4ca73e6..9c80cd5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
@@ -17,10 +17,10 @@
  */
 package org.apache.phoenix.end2end;
 
-import org.apache.phoenix.util.PhoenixRuntime;
-import org.apache.phoenix.util.PropertiesUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -28,13 +28,11 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Properties;
 
-import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.apache.phoenix.util.PhoenixRuntime;
+import org.apache.phoenix.util.PropertiesUtil;
+import org.junit.Test;
 
-@Ignore
-public class UnnestArrayIT extends BaseClientManagedTimeIT {
+public abstract class UnnestArrayIT extends BaseClientManagedTimeIT {
 
 private static long timestamp;
 

phoenix git commit: PHOENIX-3141 UnnestArrayIT causes builds to hang

[samarth]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 009499df0 -> 98cb683fe


PHOENIX-3141 UnnestArrayIT causes builds to hang


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

Branch: refs/heads/4.x-HBase-1.1
Commit: 98cb683fe4642216da114f9400ca93c9891d4a45
Parents: 009499d
Author: Samarth 
Authored: Tue Aug 2 21:42:15 2016 -0700
Committer: Samarth 
Committed: Tue Aug 2 21:42:15 2016 -0700

--
 .../org/apache/phoenix/end2end/UnnestArrayIT.java | 18 --
 1 file changed, 8 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/98cb683f/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
index 4ca73e6..9c80cd5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
@@ -17,10 +17,10 @@
  */
 package org.apache.phoenix.end2end;
 
-import org.apache.phoenix.util.PhoenixRuntime;
-import org.apache.phoenix.util.PropertiesUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -28,13 +28,11 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Properties;
 
-import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.apache.phoenix.util.PhoenixRuntime;
+import org.apache.phoenix.util.PropertiesUtil;
+import org.junit.Test;
 
-@Ignore
-public class UnnestArrayIT extends BaseClientManagedTimeIT {
+public abstract class UnnestArrayIT extends BaseClientManagedTimeIT {
 
 private static long timestamp;
 

phoenix git commit: PHOENIX-3141 UnnestArrayIT causes builds to hang

[samarth]

Repository: phoenix
Updated Branches:
  refs/heads/master 243e5e22a -> 50b3f9484


PHOENIX-3141 UnnestArrayIT causes builds to hang


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

Branch: refs/heads/master
Commit: 50b3f948480286089896d81ff006720e6049a118
Parents: 243e5e2
Author: Samarth 
Authored: Tue Aug 2 21:41:47 2016 -0700
Committer: Samarth 
Committed: Tue Aug 2 21:41:47 2016 -0700

--
 .../org/apache/phoenix/end2end/UnnestArrayIT.java | 18 --
 1 file changed, 8 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/50b3f948/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
index 4ca73e6..9c80cd5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
@@ -17,10 +17,10 @@
  */
 package org.apache.phoenix.end2end;
 
-import org.apache.phoenix.util.PhoenixRuntime;
-import org.apache.phoenix.util.PropertiesUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -28,13 +28,11 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Properties;
 
-import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.apache.phoenix.util.PhoenixRuntime;
+import org.apache.phoenix.util.PropertiesUtil;
+import org.junit.Test;
 
-@Ignore
-public class UnnestArrayIT extends BaseClientManagedTimeIT {
+public abstract class UnnestArrayIT extends BaseClientManagedTimeIT {
 
 private static long timestamp;
 

phoenix git commit: PHOENIX-3141 UnnestArrayIT causes builds to hang

[samarth]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 787219fe7 -> 377ae6798


PHOENIX-3141 UnnestArrayIT causes builds to hang


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 377ae67986e0c4c7eeeac77cf9b33af31077a818
Parents: 787219f
Author: Samarth 
Authored: Tue Aug 2 21:40:09 2016 -0700
Committer: Samarth 
Committed: Tue Aug 2 21:40:09 2016 -0700

--
 .../org/apache/phoenix/end2end/UnnestArrayIT.java | 18 --
 1 file changed, 8 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/377ae679/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
index 4ca73e6..9c80cd5 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/UnnestArrayIT.java
@@ -17,10 +17,10 @@
  */
 package org.apache.phoenix.end2end;
 
-import org.apache.phoenix.util.PhoenixRuntime;
-import org.apache.phoenix.util.PropertiesUtil;
-import org.junit.Ignore;
-import org.junit.Test;
+import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
@@ -28,13 +28,11 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.Properties;
 
-import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import org.apache.phoenix.util.PhoenixRuntime;
+import org.apache.phoenix.util.PropertiesUtil;
+import org.junit.Test;
 
-@Ignore
-public class UnnestArrayIT extends BaseClientManagedTimeIT {
+public abstract class UnnestArrayIT extends BaseClientManagedTimeIT {
 
 private static long timestamp;
 

phoenix git commit: PHOENIX-3130 Ignore ASYNC and build indexes synchronously based on config property

[tdsilva]

Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-1.2 c357318bd -> 6d2ab9f42


PHOENIX-3130 Ignore ASYNC and build indexes synchronously based on config 
property


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

Branch: refs/heads/4.8-HBase-1.2
Commit: 6d2ab9f423a6ae8c085c9e6afad67f4f26536538
Parents: c357318
Author: Thomas D'Silva 
Authored: Mon Aug 1 12:00:27 2016 -0700
Committer: Thomas D'Silva 
Committed: Tue Aug 2 20:17:36 2016 -0700

--
 .../org/apache/phoenix/end2end/IndexToolIT.java |   4 +-
 .../end2end/index/AsyncImmutableIndexIT.java|  73 +++--
 .../end2end/index/AsyncIndexAutoBuildIT.java|  51 -
 .../end2end/index/AsyncIndexDisabledIT.java |  78 ++
 .../end2end/index/AsyncIndexRegularBuildIT.java |  62 ---
 .../end2end/index/AsyncIndexTestUtil.java   |  58 --
 .../coprocessor/MetaDataRegionObserver.java | 107 ++-
 .../phoenix/mapreduce/PhoenixInputFormat.java   |   2 -
 .../phoenix/mapreduce/index/IndexToolUtil.java  |   4 -
 .../index/automation/PhoenixMRJobSubmitter.java |  22 +++-
 .../apache/phoenix/query/QueryConstants.java|  21 +---
 .../org/apache/phoenix/query/QueryServices.java |   6 +-
 .../phoenix/query/QueryServicesOptions.java |  13 +--
 .../apache/phoenix/schema/MetaDataClient.java   |   5 +-
 .../phoenix/query/QueryServicesTestImpl.java|   4 +-
 15 files changed, 157 insertions(+), 353 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/6d2ab9f4/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
index 5621634..c66fea3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
@@ -37,6 +37,7 @@ import java.util.UUID;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.phoenix.mapreduce.index.IndexTool;
+import org.apache.phoenix.mapreduce.util.PhoenixConfigurationUtil;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.query.QueryServicesOptions;
 import org.apache.phoenix.util.PropertiesUtil;
@@ -86,9 +87,8 @@ public class IndexToolIT extends 
BaseOwnClusterHBaseManagedTimeIT {
 
 @BeforeClass
 public static void doSetup() throws Exception {
-Map serverProps = Maps.newHashMapWithExpectedSize(2);
+Map serverProps = Maps.newHashMapWithExpectedSize(1);
 serverProps.put(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, 
QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS);
-serverProps.put(QueryServices.ASYNC_INDEX_AUTO_BUILD_ATTRIB, 
Boolean.toString(false));
 Map clientProps = Maps.newHashMapWithExpectedSize(1);
 clientProps.put(QueryServices.TRANSACTIONS_ENABLED, "true");
 setUpRealDriver(new ReadOnlyProps(serverProps.entrySet().iterator()), 
new ReadOnlyProps(clientProps.entrySet().iterator()));

http://git-wip-us.apache.org/repos/asf/phoenix/blob/6d2ab9f4/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncImmutableIndexIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncImmutableIndexIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncImmutableIndexIT.java
index 6b65f9a..8c90b6e 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncImmutableIndexIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncImmutableIndexIT.java
@@ -23,29 +23,41 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.sql.Connection;
-import java.sql.DatabaseMetaData;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
+import java.util.Map;
 import java.util.Properties;
 
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
-import org.apache.phoenix.schema.PIndexState;
-import org.apache.phoenix.schema.PTableType;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.phoenix.end2end.BaseOwnClusterHBaseManagedTimeIT;
+import org.apache.phoenix.end2end.IndexToolIT;
+import org.apache.phoenix.mapreduce.index.IndexTool;
+import org.apache.phoenix.query.QueryServices;
+import org.apache.phoenix.query.QueryServicesOptions;
 import 

phoenix git commit: PHOENIX-3130 Ignore ASYNC and build indexes synchronously based on config property

[tdsilva]

Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-0.98 6dd6343ca -> 63f60865c


PHOENIX-3130 Ignore ASYNC and build indexes synchronously based on config 
property


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

Branch: refs/heads/4.8-HBase-0.98
Commit: 63f60865c96895ac3d5d099fdcda9ad7cbe7b27f
Parents: 6dd6343
Author: Thomas D'Silva 
Authored: Mon Aug 1 12:00:27 2016 -0700
Committer: Thomas D'Silva 
Committed: Tue Aug 2 20:17:06 2016 -0700

--
 .../org/apache/phoenix/end2end/IndexToolIT.java |   4 +-
 .../end2end/index/AsyncImmutableIndexIT.java|  73 +++--
 .../end2end/index/AsyncIndexAutoBuildIT.java|  51 -
 .../end2end/index/AsyncIndexDisabledIT.java |  78 ++
 .../end2end/index/AsyncIndexRegularBuildIT.java |  62 ---
 .../end2end/index/AsyncIndexTestUtil.java   |  58 --
 .../coprocessor/MetaDataRegionObserver.java | 107 ++-
 .../phoenix/mapreduce/PhoenixInputFormat.java   |   2 -
 .../phoenix/mapreduce/index/IndexToolUtil.java  |   4 -
 .../index/automation/PhoenixMRJobSubmitter.java |  22 +++-
 .../apache/phoenix/query/QueryConstants.java|  21 +---
 .../org/apache/phoenix/query/QueryServices.java |   6 +-
 .../phoenix/query/QueryServicesOptions.java |  13 +--
 .../apache/phoenix/schema/MetaDataClient.java   |   5 +-
 .../phoenix/query/QueryServicesTestImpl.java|   4 +-
 15 files changed, 157 insertions(+), 353 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/63f60865/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
index 5621634..c66fea3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
@@ -37,6 +37,7 @@ import java.util.UUID;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.phoenix.mapreduce.index.IndexTool;
+import org.apache.phoenix.mapreduce.util.PhoenixConfigurationUtil;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.query.QueryServicesOptions;
 import org.apache.phoenix.util.PropertiesUtil;
@@ -86,9 +87,8 @@ public class IndexToolIT extends 
BaseOwnClusterHBaseManagedTimeIT {
 
 @BeforeClass
 public static void doSetup() throws Exception {
-Map serverProps = Maps.newHashMapWithExpectedSize(2);
+Map serverProps = Maps.newHashMapWithExpectedSize(1);
 serverProps.put(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, 
QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS);
-serverProps.put(QueryServices.ASYNC_INDEX_AUTO_BUILD_ATTRIB, 
Boolean.toString(false));
 Map clientProps = Maps.newHashMapWithExpectedSize(1);
 clientProps.put(QueryServices.TRANSACTIONS_ENABLED, "true");
 setUpRealDriver(new ReadOnlyProps(serverProps.entrySet().iterator()), 
new ReadOnlyProps(clientProps.entrySet().iterator()));

http://git-wip-us.apache.org/repos/asf/phoenix/blob/63f60865/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncImmutableIndexIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncImmutableIndexIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncImmutableIndexIT.java
index 6b65f9a..8c90b6e 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncImmutableIndexIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncImmutableIndexIT.java
@@ -23,29 +23,41 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.sql.Connection;
-import java.sql.DatabaseMetaData;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
+import java.util.Map;
 import java.util.Properties;
 
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
-import org.apache.phoenix.schema.PIndexState;
-import org.apache.phoenix.schema.PTableType;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.phoenix.end2end.BaseOwnClusterHBaseManagedTimeIT;
+import org.apache.phoenix.end2end.IndexToolIT;
+import org.apache.phoenix.mapreduce.index.IndexTool;
+import org.apache.phoenix.query.QueryServices;
+import org.apache.phoenix.query.QueryServicesOptions;
 import 

phoenix git commit: PHOENIX-3130 Ignore ASYNC and build indexes synchronously based on config property

[tdsilva]

Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-1.1 2ee2d1df0 -> bf90e7ae5


PHOENIX-3130 Ignore ASYNC and build indexes synchronously based on config 
property


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

Branch: refs/heads/4.8-HBase-1.1
Commit: bf90e7ae5b30087b936cdf75671cd7dddf8ac502
Parents: 2ee2d1d
Author: Thomas D'Silva 
Authored: Mon Aug 1 12:00:27 2016 -0700
Committer: Thomas D'Silva 
Committed: Tue Aug 2 20:17:18 2016 -0700

--
 .../org/apache/phoenix/end2end/IndexToolIT.java |   4 +-
 .../end2end/index/AsyncImmutableIndexIT.java|  73 +++--
 .../end2end/index/AsyncIndexAutoBuildIT.java|  51 -
 .../end2end/index/AsyncIndexDisabledIT.java |  78 ++
 .../end2end/index/AsyncIndexRegularBuildIT.java |  62 ---
 .../end2end/index/AsyncIndexTestUtil.java   |  58 --
 .../coprocessor/MetaDataRegionObserver.java | 107 ++-
 .../phoenix/mapreduce/PhoenixInputFormat.java   |   2 -
 .../phoenix/mapreduce/index/IndexToolUtil.java  |   4 -
 .../index/automation/PhoenixMRJobSubmitter.java |  22 +++-
 .../apache/phoenix/query/QueryConstants.java|  21 +---
 .../org/apache/phoenix/query/QueryServices.java |   6 +-
 .../phoenix/query/QueryServicesOptions.java |  13 +--
 .../apache/phoenix/schema/MetaDataClient.java   |   5 +-
 .../phoenix/query/QueryServicesTestImpl.java|   4 +-
 15 files changed, 157 insertions(+), 353 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/bf90e7ae/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
index 5621634..c66fea3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
@@ -37,6 +37,7 @@ import java.util.UUID;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.phoenix.mapreduce.index.IndexTool;
+import org.apache.phoenix.mapreduce.util.PhoenixConfigurationUtil;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.query.QueryServicesOptions;
 import org.apache.phoenix.util.PropertiesUtil;
@@ -86,9 +87,8 @@ public class IndexToolIT extends 
BaseOwnClusterHBaseManagedTimeIT {
 
 @BeforeClass
 public static void doSetup() throws Exception {
-Map serverProps = Maps.newHashMapWithExpectedSize(2);
+Map serverProps = Maps.newHashMapWithExpectedSize(1);
 serverProps.put(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, 
QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS);
-serverProps.put(QueryServices.ASYNC_INDEX_AUTO_BUILD_ATTRIB, 
Boolean.toString(false));
 Map clientProps = Maps.newHashMapWithExpectedSize(1);
 clientProps.put(QueryServices.TRANSACTIONS_ENABLED, "true");
 setUpRealDriver(new ReadOnlyProps(serverProps.entrySet().iterator()), 
new ReadOnlyProps(clientProps.entrySet().iterator()));

http://git-wip-us.apache.org/repos/asf/phoenix/blob/bf90e7ae/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncImmutableIndexIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncImmutableIndexIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncImmutableIndexIT.java
index 6b65f9a..8c90b6e 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncImmutableIndexIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncImmutableIndexIT.java
@@ -23,29 +23,41 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.sql.Connection;
-import java.sql.DatabaseMetaData;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
+import java.util.Map;
 import java.util.Properties;
 
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
-import org.apache.phoenix.schema.PIndexState;
-import org.apache.phoenix.schema.PTableType;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.phoenix.end2end.BaseOwnClusterHBaseManagedTimeIT;
+import org.apache.phoenix.end2end.IndexToolIT;
+import org.apache.phoenix.mapreduce.index.IndexTool;
+import org.apache.phoenix.query.QueryServices;
+import org.apache.phoenix.query.QueryServicesOptions;
 import 

phoenix git commit: PHOENIX-3130 Ignore ASYNC and build indexes synchronously based on config property

[tdsilva]

Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-1.0 ce572433d -> 3f082c9a0


PHOENIX-3130 Ignore ASYNC and build indexes synchronously based on config 
property


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

Branch: refs/heads/4.8-HBase-1.0
Commit: 3f082c9a03e67aa4b4916674845aa28388162f80
Parents: ce57243
Author: Thomas D'Silva 
Authored: Mon Aug 1 12:00:27 2016 -0700
Committer: Thomas D'Silva 
Committed: Tue Aug 2 20:17:16 2016 -0700

--
 .../org/apache/phoenix/end2end/IndexToolIT.java |   4 +-
 .../end2end/index/AsyncImmutableIndexIT.java|  73 +++--
 .../end2end/index/AsyncIndexAutoBuildIT.java|  51 -
 .../end2end/index/AsyncIndexDisabledIT.java |  78 ++
 .../end2end/index/AsyncIndexRegularBuildIT.java |  62 ---
 .../end2end/index/AsyncIndexTestUtil.java   |  58 --
 .../coprocessor/MetaDataRegionObserver.java | 107 ++-
 .../phoenix/mapreduce/PhoenixInputFormat.java   |   2 -
 .../phoenix/mapreduce/index/IndexToolUtil.java  |   4 -
 .../index/automation/PhoenixMRJobSubmitter.java |  22 +++-
 .../apache/phoenix/query/QueryConstants.java|  21 +---
 .../org/apache/phoenix/query/QueryServices.java |   6 +-
 .../phoenix/query/QueryServicesOptions.java |  13 +--
 .../apache/phoenix/schema/MetaDataClient.java   |   5 +-
 .../phoenix/query/QueryServicesTestImpl.java|   4 +-
 15 files changed, 157 insertions(+), 353 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/3f082c9a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
index 5621634..c66fea3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
@@ -37,6 +37,7 @@ import java.util.UUID;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.phoenix.mapreduce.index.IndexTool;
+import org.apache.phoenix.mapreduce.util.PhoenixConfigurationUtil;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.query.QueryServicesOptions;
 import org.apache.phoenix.util.PropertiesUtil;
@@ -86,9 +87,8 @@ public class IndexToolIT extends 
BaseOwnClusterHBaseManagedTimeIT {
 
 @BeforeClass
 public static void doSetup() throws Exception {
-Map serverProps = Maps.newHashMapWithExpectedSize(2);
+Map serverProps = Maps.newHashMapWithExpectedSize(1);
 serverProps.put(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, 
QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS);
-serverProps.put(QueryServices.ASYNC_INDEX_AUTO_BUILD_ATTRIB, 
Boolean.toString(false));
 Map clientProps = Maps.newHashMapWithExpectedSize(1);
 clientProps.put(QueryServices.TRANSACTIONS_ENABLED, "true");
 setUpRealDriver(new ReadOnlyProps(serverProps.entrySet().iterator()), 
new ReadOnlyProps(clientProps.entrySet().iterator()));

http://git-wip-us.apache.org/repos/asf/phoenix/blob/3f082c9a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncImmutableIndexIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncImmutableIndexIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncImmutableIndexIT.java
index 6b65f9a..8c90b6e 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncImmutableIndexIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/AsyncImmutableIndexIT.java
@@ -23,29 +23,41 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.sql.Connection;
-import java.sql.DatabaseMetaData;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
+import java.util.Map;
 import java.util.Properties;
 
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
-import org.apache.phoenix.schema.PIndexState;
-import org.apache.phoenix.schema.PTableType;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.phoenix.end2end.BaseOwnClusterHBaseManagedTimeIT;
+import org.apache.phoenix.end2end.IndexToolIT;
+import org.apache.phoenix.mapreduce.index.IndexTool;
+import org.apache.phoenix.query.QueryServices;
+import org.apache.phoenix.query.QueryServicesOptions;
 import 

phoenix git commit: PHOENIX-3130 Ignore ASYNC and build indexes synchronously based on config property

[tdsilva]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 c6f15842d -> 009499df0


PHOENIX-3130 Ignore ASYNC and build indexes synchronously based on config 
property


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

Branch: refs/heads/4.x-HBase-1.1
Commit: 009499df07f65fe41e65484bf95cee65b4c221bf
Parents: c6f1584
Author: Thomas D'Silva 
Authored: Mon Aug 1 12:00:27 2016 -0700
Committer: Thomas D'Silva 
Committed: Tue Aug 2 20:29:19 2016 -0700

--
 .../org/apache/phoenix/end2end/IndexToolIT.java |   4 +-
 .../phoenix/end2end/MutableIndexToolIT.java |   3 +-
 .../end2end/index/AsyncImmutableIndexIT.java|  73 +++--
 .../end2end/index/AsyncIndexAutoBuildIT.java|  51 -
 .../end2end/index/AsyncIndexDisabledIT.java |  78 ++
 .../end2end/index/AsyncIndexRegularBuildIT.java |  62 ---
 .../end2end/index/AsyncIndexTestUtil.java   |  58 --
 .../apache/phoenix/end2end/index/IndexIT.java   | 105 ++
 .../coprocessor/MetaDataRegionObserver.java | 107 ++-
 .../phoenix/mapreduce/PhoenixInputFormat.java   |   2 -
 .../phoenix/mapreduce/index/IndexToolUtil.java  |   4 -
 .../index/automation/PhoenixMRJobSubmitter.java |  22 +++-
 .../apache/phoenix/query/QueryConstants.java|  21 +---
 .../org/apache/phoenix/query/QueryServices.java |   6 +-
 .../phoenix/query/QueryServicesOptions.java |  13 +--
 .../apache/phoenix/schema/MetaDataClient.java   |  16 +--
 .../phoenix/query/QueryServicesTestImpl.java|   4 +-
 17 files changed, 173 insertions(+), 456 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/009499df/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
index 5621634..c66fea3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
@@ -37,6 +37,7 @@ import java.util.UUID;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.phoenix.mapreduce.index.IndexTool;
+import org.apache.phoenix.mapreduce.util.PhoenixConfigurationUtil;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.query.QueryServicesOptions;
 import org.apache.phoenix.util.PropertiesUtil;
@@ -86,9 +87,8 @@ public class IndexToolIT extends 
BaseOwnClusterHBaseManagedTimeIT {
 
 @BeforeClass
 public static void doSetup() throws Exception {
-Map serverProps = Maps.newHashMapWithExpectedSize(2);
+Map serverProps = Maps.newHashMapWithExpectedSize(1);
 serverProps.put(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, 
QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS);
-serverProps.put(QueryServices.ASYNC_INDEX_AUTO_BUILD_ATTRIB, 
Boolean.toString(false));
 Map clientProps = Maps.newHashMapWithExpectedSize(1);
 clientProps.put(QueryServices.TRANSACTIONS_ENABLED, "true");
 setUpRealDriver(new ReadOnlyProps(serverProps.entrySet().iterator()), 
new ReadOnlyProps(clientProps.entrySet().iterator()));

http://git-wip-us.apache.org/repos/asf/phoenix/blob/009499df/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java
index cb41d2b..c335ff8 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java
@@ -45,9 +45,8 @@ public class MutableIndexToolIT extends 
BaseOwnClusterHBaseManagedTimeIT {
 
 @BeforeClass
 public static void doSetup() throws Exception {
-Map serverProps = Maps.newHashMapWithExpectedSize(2);
+Map serverProps = Maps.newHashMapWithExpectedSize(1);
 serverProps.put(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, 
QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS);
-serverProps.put(QueryServices.ASYNC_INDEX_AUTO_BUILD_ATTRIB, 
Boolean.toString(false));
 setUpRealDriver(new ReadOnlyProps(serverProps.entrySet().iterator()), 
ReadOnlyProps.EMPTY_PROPS);
 }
 

phoenix git commit: PHOENIX-3130 Ignore ASYNC and build indexes synchronously based on config property

[tdsilva]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 643436459 -> d4cde114d


PHOENIX-3130 Ignore ASYNC and build indexes synchronously based on config 
property


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

Branch: refs/heads/4.x-HBase-1.0
Commit: d4cde114da7f491b6fe13614e6ae595a50322836
Parents: 6434364
Author: Thomas D'Silva 
Authored: Mon Aug 1 12:00:27 2016 -0700
Committer: Thomas D'Silva 
Committed: Tue Aug 2 20:29:15 2016 -0700

--
 .../org/apache/phoenix/end2end/IndexToolIT.java |   4 +-
 .../phoenix/end2end/MutableIndexToolIT.java |   3 +-
 .../end2end/index/AsyncImmutableIndexIT.java|  73 +++--
 .../end2end/index/AsyncIndexAutoBuildIT.java|  51 -
 .../end2end/index/AsyncIndexDisabledIT.java |  78 ++
 .../end2end/index/AsyncIndexRegularBuildIT.java |  62 ---
 .../end2end/index/AsyncIndexTestUtil.java   |  58 --
 .../apache/phoenix/end2end/index/IndexIT.java   | 105 ++
 .../coprocessor/MetaDataRegionObserver.java | 107 ++-
 .../phoenix/mapreduce/PhoenixInputFormat.java   |   2 -
 .../phoenix/mapreduce/index/IndexToolUtil.java  |   4 -
 .../index/automation/PhoenixMRJobSubmitter.java |  22 +++-
 .../apache/phoenix/query/QueryConstants.java|  21 +---
 .../org/apache/phoenix/query/QueryServices.java |   6 +-
 .../phoenix/query/QueryServicesOptions.java |  13 +--
 .../apache/phoenix/schema/MetaDataClient.java   |  16 +--
 .../phoenix/query/QueryServicesTestImpl.java|   4 +-
 17 files changed, 173 insertions(+), 456 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/d4cde114/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
index 5621634..c66fea3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
@@ -37,6 +37,7 @@ import java.util.UUID;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.phoenix.mapreduce.index.IndexTool;
+import org.apache.phoenix.mapreduce.util.PhoenixConfigurationUtil;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.query.QueryServicesOptions;
 import org.apache.phoenix.util.PropertiesUtil;
@@ -86,9 +87,8 @@ public class IndexToolIT extends 
BaseOwnClusterHBaseManagedTimeIT {
 
 @BeforeClass
 public static void doSetup() throws Exception {
-Map serverProps = Maps.newHashMapWithExpectedSize(2);
+Map serverProps = Maps.newHashMapWithExpectedSize(1);
 serverProps.put(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, 
QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS);
-serverProps.put(QueryServices.ASYNC_INDEX_AUTO_BUILD_ATTRIB, 
Boolean.toString(false));
 Map clientProps = Maps.newHashMapWithExpectedSize(1);
 clientProps.put(QueryServices.TRANSACTIONS_ENABLED, "true");
 setUpRealDriver(new ReadOnlyProps(serverProps.entrySet().iterator()), 
new ReadOnlyProps(clientProps.entrySet().iterator()));

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d4cde114/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java
index cb41d2b..c335ff8 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java
@@ -45,9 +45,8 @@ public class MutableIndexToolIT extends 
BaseOwnClusterHBaseManagedTimeIT {
 
 @BeforeClass
 public static void doSetup() throws Exception {
-Map serverProps = Maps.newHashMapWithExpectedSize(2);
+Map serverProps = Maps.newHashMapWithExpectedSize(1);
 serverProps.put(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, 
QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS);
-serverProps.put(QueryServices.ASYNC_INDEX_AUTO_BUILD_ATTRIB, 
Boolean.toString(false));
 setUpRealDriver(new ReadOnlyProps(serverProps.entrySet().iterator()), 
ReadOnlyProps.EMPTY_PROPS);
 }
 

phoenix git commit: PHOENIX-3130 Ignore ASYNC and build indexes synchronously based on config property

[tdsilva]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 021b525b7 -> 787219fe7


PHOENIX-3130 Ignore ASYNC and build indexes synchronously based on config 
property


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 787219fe72c4c1644aedcdba8f0558032733b17d
Parents: 021b525
Author: Thomas D'Silva 
Authored: Mon Aug 1 12:00:27 2016 -0700
Committer: Thomas D'Silva 
Committed: Tue Aug 2 20:28:25 2016 -0700

--
 .../org/apache/phoenix/end2end/IndexToolIT.java |   4 +-
 .../phoenix/end2end/MutableIndexToolIT.java |   3 +-
 .../end2end/index/AsyncImmutableIndexIT.java|  73 +++--
 .../end2end/index/AsyncIndexAutoBuildIT.java|  51 -
 .../end2end/index/AsyncIndexDisabledIT.java |  78 ++
 .../end2end/index/AsyncIndexRegularBuildIT.java |  62 ---
 .../end2end/index/AsyncIndexTestUtil.java   |  58 --
 .../apache/phoenix/end2end/index/IndexIT.java   | 105 ++
 .../coprocessor/MetaDataRegionObserver.java | 107 ++-
 .../phoenix/mapreduce/PhoenixInputFormat.java   |   2 -
 .../phoenix/mapreduce/index/IndexToolUtil.java  |   4 -
 .../index/automation/PhoenixMRJobSubmitter.java |  22 +++-
 .../apache/phoenix/query/QueryConstants.java|  21 +---
 .../org/apache/phoenix/query/QueryServices.java |   6 +-
 .../phoenix/query/QueryServicesOptions.java |  13 +--
 .../apache/phoenix/schema/MetaDataClient.java   |  16 +--
 .../phoenix/query/QueryServicesTestImpl.java|   4 +-
 17 files changed, 173 insertions(+), 456 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/787219fe/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
index 5621634..c66fea3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
@@ -37,6 +37,7 @@ import java.util.UUID;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.phoenix.mapreduce.index.IndexTool;
+import org.apache.phoenix.mapreduce.util.PhoenixConfigurationUtil;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.query.QueryServicesOptions;
 import org.apache.phoenix.util.PropertiesUtil;
@@ -86,9 +87,8 @@ public class IndexToolIT extends 
BaseOwnClusterHBaseManagedTimeIT {
 
 @BeforeClass
 public static void doSetup() throws Exception {
-Map serverProps = Maps.newHashMapWithExpectedSize(2);
+Map serverProps = Maps.newHashMapWithExpectedSize(1);
 serverProps.put(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, 
QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS);
-serverProps.put(QueryServices.ASYNC_INDEX_AUTO_BUILD_ATTRIB, 
Boolean.toString(false));
 Map clientProps = Maps.newHashMapWithExpectedSize(1);
 clientProps.put(QueryServices.TRANSACTIONS_ENABLED, "true");
 setUpRealDriver(new ReadOnlyProps(serverProps.entrySet().iterator()), 
new ReadOnlyProps(clientProps.entrySet().iterator()));

http://git-wip-us.apache.org/repos/asf/phoenix/blob/787219fe/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java
index cb41d2b..c335ff8 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java
@@ -45,9 +45,8 @@ public class MutableIndexToolIT extends 
BaseOwnClusterHBaseManagedTimeIT {
 
 @BeforeClass
 public static void doSetup() throws Exception {
-Map serverProps = Maps.newHashMapWithExpectedSize(2);
+Map serverProps = Maps.newHashMapWithExpectedSize(1);
 serverProps.put(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, 
QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS);
-serverProps.put(QueryServices.ASYNC_INDEX_AUTO_BUILD_ATTRIB, 
Boolean.toString(false));
 setUpRealDriver(new ReadOnlyProps(serverProps.entrySet().iterator()), 
ReadOnlyProps.EMPTY_PROPS);
 }
 

phoenix git commit: PHOENIX-3130 Ignore ASYNC and build indexes synchronously based on config property

[tdsilva]

Repository: phoenix
Updated Branches:
  refs/heads/master 92c7faf76 -> 243e5e22a


PHOENIX-3130 Ignore ASYNC and build indexes synchronously based on config 
property


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

Branch: refs/heads/master
Commit: 243e5e22a1338aa60f22b23c64f28d7c364bb53f
Parents: 92c7faf
Author: Thomas D'Silva 
Authored: Mon Aug 1 12:00:27 2016 -0700
Committer: Thomas D'Silva 
Committed: Tue Aug 2 20:30:08 2016 -0700

--
 .../org/apache/phoenix/end2end/IndexToolIT.java |   4 +-
 .../phoenix/end2end/MutableIndexToolIT.java |   3 +-
 .../end2end/index/AsyncImmutableIndexIT.java|  73 +++--
 .../end2end/index/AsyncIndexAutoBuildIT.java|  51 -
 .../end2end/index/AsyncIndexDisabledIT.java |  78 ++
 .../end2end/index/AsyncIndexRegularBuildIT.java |  62 ---
 .../end2end/index/AsyncIndexTestUtil.java   |  58 --
 .../apache/phoenix/end2end/index/IndexIT.java   | 105 ++
 .../coprocessor/MetaDataRegionObserver.java | 107 ++-
 .../phoenix/mapreduce/PhoenixInputFormat.java   |   2 -
 .../phoenix/mapreduce/index/IndexToolUtil.java  |   4 -
 .../index/automation/PhoenixMRJobSubmitter.java |  22 +++-
 .../apache/phoenix/query/QueryConstants.java|  21 +---
 .../org/apache/phoenix/query/QueryServices.java |   6 +-
 .../phoenix/query/QueryServicesOptions.java |  13 +--
 .../apache/phoenix/schema/MetaDataClient.java   |  16 +--
 .../phoenix/query/QueryServicesTestImpl.java|   4 +-
 17 files changed, 173 insertions(+), 456 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/243e5e22/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
index 5621634..c66fea3 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java
@@ -37,6 +37,7 @@ import java.util.UUID;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.phoenix.mapreduce.index.IndexTool;
+import org.apache.phoenix.mapreduce.util.PhoenixConfigurationUtil;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.query.QueryServicesOptions;
 import org.apache.phoenix.util.PropertiesUtil;
@@ -86,9 +87,8 @@ public class IndexToolIT extends 
BaseOwnClusterHBaseManagedTimeIT {
 
 @BeforeClass
 public static void doSetup() throws Exception {
-Map serverProps = Maps.newHashMapWithExpectedSize(2);
+Map serverProps = Maps.newHashMapWithExpectedSize(1);
 serverProps.put(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, 
QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS);
-serverProps.put(QueryServices.ASYNC_INDEX_AUTO_BUILD_ATTRIB, 
Boolean.toString(false));
 Map clientProps = Maps.newHashMapWithExpectedSize(1);
 clientProps.put(QueryServices.TRANSACTIONS_ENABLED, "true");
 setUpRealDriver(new ReadOnlyProps(serverProps.entrySet().iterator()), 
new ReadOnlyProps(clientProps.entrySet().iterator()));

http://git-wip-us.apache.org/repos/asf/phoenix/blob/243e5e22/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java
index cb41d2b..c335ff8 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableIndexToolIT.java
@@ -45,9 +45,8 @@ public class MutableIndexToolIT extends 
BaseOwnClusterHBaseManagedTimeIT {
 
 @BeforeClass
 public static void doSetup() throws Exception {
-Map serverProps = Maps.newHashMapWithExpectedSize(2);
+Map serverProps = Maps.newHashMapWithExpectedSize(1);
 serverProps.put(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, 
QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS);
-serverProps.put(QueryServices.ASYNC_INDEX_AUTO_BUILD_ATTRIB, 
Boolean.toString(false));
 setUpRealDriver(new ReadOnlyProps(serverProps.entrySet().iterator()), 
ReadOnlyProps.EMPTY_PROPS);
 }
 

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

[Apache Jenkins Server]

See 

Jenkins build is back to normal : Phoenix-4.x-HBase-1.1 #147

[Apache Jenkins Server]

See 

Jenkins build is back to normal : Phoenix-4.x-HBase-1.0 #595

[Apache Jenkins Server]

See 

Build failed in Jenkins: Phoenix-4.x-HBase-1.0 #594

[Apache Jenkins Server]

See 

Changes:

[elserj] PHOENIX-3136 Do not relocate org.apache.calcite in

--
[...truncated 698 lines...]
Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 60.991 sec - in 
org.apache.phoenix.iterate.RoundRobinResultIteratorIT
Running org.apache.phoenix.tx.TxCheckpointIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 91.303 sec - in 
org.apache.phoenix.trace.PhoenixTracingEndToEndIT
Tests run: 20, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 77.781 sec - 
in org.apache.phoenix.tx.TxCheckpointIT
Tests run: 21, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 137.679 sec - 
in org.apache.phoenix.tx.TransactionIT
Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 364.297 sec - 
in org.apache.phoenix.end2end.index.LocalIndexIT
Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 583.451 sec - 
in org.apache.phoenix.end2end.index.MutableIndexIT

Results :

Tests run: 1070, Failures: 0, Errors: 0, Skipped: 5

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

---
 T E S T S
---
Running org.apache.phoenix.end2end.AlterSessionIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.13 sec - in 
org.apache.phoenix.end2end.AlterSessionIT
Running org.apache.phoenix.end2end.ArithmeticQueryIT
Running org.apache.phoenix.end2end.ArrayFillFunctionIT
Running org.apache.phoenix.end2end.ArrayToStringFunctionIT
Running org.apache.phoenix.end2end.ArraysWithNullsIT
Running org.apache.phoenix.end2end.AbsFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.386 sec - in 
org.apache.phoenix.end2end.AbsFunctionEnd2EndIT
Running org.apache.phoenix.end2end.AutoCommitIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.918 sec - in 
org.apache.phoenix.end2end.AutoCommitIT
Running org.apache.phoenix.end2end.CbrtFunctionEnd2EndIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.44 sec - in 
org.apache.phoenix.end2end.CbrtFunctionEnd2EndIT
Tests run: 26, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.9 sec - in 
org.apache.phoenix.end2end.ArrayFillFunctionIT
Running org.apache.phoenix.end2end.ConvertTimezoneFunctionIT
Running org.apache.phoenix.end2end.DecodeFunctionIT
Tests run: 36, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 11.384 sec - 
in org.apache.phoenix.end2end.ArrayToStringFunctionIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.374 sec - in 
org.apache.phoenix.end2end.DecodeFunctionIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.832 sec - in 
org.apache.phoenix.end2end.ConvertTimezoneFunctionIT
Running org.apache.phoenix.end2end.DynamicFamilyIT
Running org.apache.phoenix.end2end.DynamicUpsertIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.12 sec - in 
org.apache.phoenix.end2end.DynamicUpsertIT
Running org.apache.phoenix.end2end.FirstValueFunctionIT
Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 16.341 sec - 
in org.apache.phoenix.end2end.ArraysWithNullsIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.016 sec - in 
org.apache.phoenix.end2end.DynamicFamilyIT
Running org.apache.phoenix.end2end.GetSetByteBitFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.115 sec - in 
org.apache.phoenix.end2end.GetSetByteBitFunctionEnd2EndIT
Running org.apache.phoenix.end2end.MD5FunctionIT
Running org.apache.phoenix.end2end.LikeExpressionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.545 sec - in 
org.apache.phoenix.end2end.LikeExpressionIT
Running org.apache.phoenix.end2end.MinMaxAggregateFunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.875 sec - in 
org.apache.phoenix.end2end.MinMaxAggregateFunctionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.441 sec - in 
org.apache.phoenix.end2end.MD5FunctionIT
Running org.apache.phoenix.end2end.NthValueFunctionIT
Running org.apache.phoenix.end2end.OctetLengthFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.56 sec - in 
org.apache.phoenix.end2end.OctetLengthFunctionEnd2EndIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.254 sec - in 
org.apache.phoenix.end2end.FirstValueFunctionIT
Tests run: 26, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 24.769 sec - 
in org.apache.phoenix.end2end.ArithmeticQueryIT
Running org.apache.phoenix.end2end.PrimitiveTypeIT
Running org.apache.phoenix.end2end.QueryMoreIT
Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.272 sec - in 
org.apache.phoenix.end2end.PrimitiveTypeIT
Running org.apache.phoenix.end2end.RTrimFunctionIT
Running org.apache.phoenix.end2end.PowerFunctionEnd2EndIT

Build failed in Jenkins: Phoenix | Master #1350

[Apache Jenkins Server]

See 

Changes:

[elserj] PHOENIX-3126 Tie a driver instance to a specific user (Prabhjyot Singh)

--
[...truncated 722 lines...]
Running org.apache.phoenix.tx.TxCheckpointIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 110.448 sec - 
in org.apache.phoenix.trace.PhoenixTracingEndToEndIT
Tests run: 20, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 264.284 sec - 
in org.apache.phoenix.tx.TxCheckpointIT
Tests run: 21, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 340.647 sec - 
in org.apache.phoenix.tx.TransactionIT
Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 774.369 sec - 
in org.apache.phoenix.end2end.index.LocalIndexIT
Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 967.484 sec - 
in org.apache.phoenix.end2end.index.MutableIndexIT

Results :

Tests run: 1070, Failures: 0, Errors: 0, Skipped: 5

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

---
 T E S T S
---
Running org.apache.phoenix.end2end.ArithmeticQueryIT
Running org.apache.phoenix.end2end.AlterSessionIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.073 sec - in 
org.apache.phoenix.end2end.AlterSessionIT
Running org.apache.phoenix.end2end.ArraysWithNullsIT
Running org.apache.phoenix.end2end.ArrayToStringFunctionIT
Running org.apache.phoenix.end2end.AbsFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.723 sec - in 
org.apache.phoenix.end2end.AbsFunctionEnd2EndIT
Running org.apache.phoenix.end2end.AutoCommitIT
Running org.apache.phoenix.end2end.ArrayFillFunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.597 sec - in 
org.apache.phoenix.end2end.AutoCommitIT
Running org.apache.phoenix.end2end.CbrtFunctionEnd2EndIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.392 sec - in 
org.apache.phoenix.end2end.CbrtFunctionEnd2EndIT
Running org.apache.phoenix.end2end.ConvertTimezoneFunctionIT
Tests run: 36, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 26.627 sec - 
in org.apache.phoenix.end2end.ArrayToStringFunctionIT
Running org.apache.phoenix.end2end.DecodeFunctionIT
Tests run: 26, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 19.404 sec - 
in org.apache.phoenix.end2end.ArrayFillFunctionIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 19.049 sec - in 
org.apache.phoenix.end2end.ConvertTimezoneFunctionIT
Running org.apache.phoenix.end2end.DynamicFamilyIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 18.212 sec - in 
org.apache.phoenix.end2end.DecodeFunctionIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.941 sec - in 
org.apache.phoenix.end2end.DynamicFamilyIT
Running org.apache.phoenix.end2end.FirstValueFunctionIT
Running org.apache.phoenix.end2end.DynamicUpsertIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.104 sec - in 
org.apache.phoenix.end2end.DynamicUpsertIT
Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 51.222 sec - 
in org.apache.phoenix.end2end.ArraysWithNullsIT
Running org.apache.phoenix.end2end.GetSetByteBitFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.078 sec - in 
org.apache.phoenix.end2end.GetSetByteBitFunctionEnd2EndIT
Running org.apache.phoenix.end2end.MD5FunctionIT
Running org.apache.phoenix.end2end.LikeExpressionIT
Running org.apache.phoenix.end2end.DistinctPrefixFilterIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.985 sec - in 
org.apache.phoenix.end2end.MD5FunctionIT
Running org.apache.phoenix.end2end.MinMaxAggregateFunctionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.857 sec - in 
org.apache.phoenix.end2end.LikeExpressionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.554 sec - in 
org.apache.phoenix.end2end.MinMaxAggregateFunctionIT
Running org.apache.phoenix.end2end.NthValueFunctionIT
Running org.apache.phoenix.end2end.OctetLengthFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.502 sec - in 
org.apache.phoenix.end2end.OctetLengthFunctionEnd2EndIT
Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 15.254 sec - in 
org.apache.phoenix.end2end.DistinctPrefixFilterIT
Running org.apache.phoenix.end2end.PowerFunctionEnd2EndIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 27.489 sec - in 
org.apache.phoenix.end2end.FirstValueFunctionIT
Running org.apache.phoenix.end2end.QueryMoreIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.465 sec - in 
org.apache.phoenix.end2end.PowerFunctionEnd2EndIT
Running org.apache.phoenix.end2end.RTrimFunctionIT
Running org.apache.phoenix.end2end.PrimitiveTypeIT
Tests run: 9, Failures: 0, Errors: 0, 

[2/2] phoenix git commit: PHOENIX-3138 Integration tests are timing out

[jamestaylor]

PHOENIX-3138 Integration tests are timing out


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 021b525b788160c4b962f4512f75e8f3375370c4
Parents: d1d4a80
Author: James Taylor 
Authored: Tue Aug 2 14:56:24 2016 -0700
Committer: James Taylor 
Committed: Tue Aug 2 17:07:05 2016 -0700

--
 .../src/it/java/org/apache/phoenix/end2end/index/IndexIT.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/021b525b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
index df45ecb..aba7dac 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
@@ -53,7 +53,6 @@ import org.apache.phoenix.compile.ColumnResolver;
 import org.apache.phoenix.compile.FromCompiler;
 import org.apache.phoenix.coprocessor.generated.PTableProtos.PTableType;
 import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
 import org.apache.phoenix.end2end.Shadower;
 import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.jdbc.PhoenixConnection;
@@ -83,7 +82,7 @@ import org.junit.runners.Parameterized.Parameters;
 import com.google.common.collect.Maps;
 
 @RunWith(Parameterized.class)
-public class IndexIT extends BaseHBaseManagedTimeTableReuseIT {
+public class IndexIT extends BaseHBaseManagedTimeIT {
 private static final long MAX_WAIT_FOR_ASYNC_INDEX_BUILD = 3;

private final boolean localIndex;

[1/2] phoenix git commit: PHOENIX-3128 Remove extraneous operations during upsert with local immutable index

[jamestaylor]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 39cebc2ca -> 643436459


PHOENIX-3128 Remove extraneous operations during upsert with local immutable 
index


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

Branch: refs/heads/4.x-HBase-1.0
Commit: 5d3552fd8bff8b7d0dcc4a265eda9ea955cad4c5
Parents: 39cebc2
Author: James Taylor 
Authored: Tue Aug 2 12:03:33 2016 -0700
Committer: James Taylor 
Committed: Tue Aug 2 16:59:24 2016 -0700

--
 .../phoenix/end2end/DistinctPrefixFilterIT.java | 11 ++-
 .../apache/phoenix/end2end/index/IndexIT.java   | 39 +
 .../compile/PostLocalIndexDDLCompiler.java  | 15 ++--
 .../apache/phoenix/execute/MutationState.java   | 11 ++-
 .../hbase/index/covered/IndexMetaData.java  |  9 +-
 .../hbase/index/covered/NonTxIndexBuilder.java  |  6 +-
 .../phoenix/index/PhoenixIndexMetaData.java | 12 ++-
 .../index/PhoenixTransactionalIndexer.java  | 88 +---
 .../org/apache/phoenix/schema/PTableImpl.java   | 13 ++-
 .../apache/phoenix/util/TransactionUtil.java|  7 ++
 10 files changed, 164 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/5d3552fd/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctPrefixFilterIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctPrefixFilterIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctPrefixFilterIT.java
index 203d51e..9d31070 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctPrefixFilterIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctPrefixFilterIT.java
@@ -88,6 +88,15 @@ public class DistinctPrefixFilterIT extends 
BaseHBaseManagedTimeTableReuseIT {
 insertPrefixV("3", "1");
 insertPrefixV("3", "2");
 insertPrefixV("3", "3");
+conn.commit();
+ResultSet rs;
+rs = conn.createStatement().executeQuery("select /*+ NO_INDEX */ 
count(*) from " + testTableV);
+assertTrue(rs.next());
+long count1 = rs.getLong(1);
+rs = conn.createStatement().executeQuery("select count(*) from " + 
testTableV + "_idx");
+assertTrue(rs.next());
+long count2 = rs.getLong(1);
+assertEquals(count1,count2);
 
 multiply();
 multiply();
@@ -258,7 +267,7 @@ public class DistinctPrefixFilterIT extends 
BaseHBaseManagedTimeTableReuseIT {
 
 testCommonDistinct(testTableF);
 testCommonDistinct(testTableV);
-}
+}
 
 private void testCommonDistinct(String testTable) throws Exception {
 testSkipRange("SELECT %s DISTINCT prefix1 FROM " + testTable, 4);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/5d3552fd/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
index 35a0aad..df45ecb 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
@@ -26,6 +26,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.sql.Connection;
 import java.sql.Date;
@@ -39,7 +40,15 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.Properties;
 
+import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.CellScanner;
+import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.HTableDescriptor;
+import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.client.HTableInterface;
+import org.apache.hadoop.hbase.client.Result;
+import org.apache.hadoop.hbase.client.ResultScanner;
+import org.apache.hadoop.hbase.client.Scan;
 import org.apache.phoenix.compile.ColumnResolver;
 import org.apache.phoenix.compile.FromCompiler;
 import org.apache.phoenix.coprocessor.generated.PTableProtos.PTableType;
@@ -56,6 +65,7 @@ import org.apache.phoenix.query.BaseTest;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.schema.PIndexState;
 import org.apache.phoenix.schema.PTable;
+import org.apache.phoenix.schema.PTableKey;
 import org.apache.phoenix.util.DateUtil;
 import org.apache.phoenix.util.PropertiesUtil;
 import 

[2/2] phoenix git commit: PHOENIX-3138 Integration tests are timing out

[jamestaylor]

PHOENIX-3138 Integration tests are timing out


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

Branch: refs/heads/4.x-HBase-1.0
Commit: 643436459503fbaafa5a8c4b3b9a351d005c42e4
Parents: 5d3552f
Author: James Taylor 
Authored: Tue Aug 2 14:56:24 2016 -0700
Committer: James Taylor 
Committed: Tue Aug 2 16:59:41 2016 -0700

--
 .../src/it/java/org/apache/phoenix/end2end/index/IndexIT.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/64343645/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
index df45ecb..aba7dac 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
@@ -53,7 +53,6 @@ import org.apache.phoenix.compile.ColumnResolver;
 import org.apache.phoenix.compile.FromCompiler;
 import org.apache.phoenix.coprocessor.generated.PTableProtos.PTableType;
 import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
 import org.apache.phoenix.end2end.Shadower;
 import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.jdbc.PhoenixConnection;
@@ -83,7 +82,7 @@ import org.junit.runners.Parameterized.Parameters;
 import com.google.common.collect.Maps;
 
 @RunWith(Parameterized.class)
-public class IndexIT extends BaseHBaseManagedTimeTableReuseIT {
+public class IndexIT extends BaseHBaseManagedTimeIT {
 private static final long MAX_WAIT_FOR_ASYNC_INDEX_BUILD = 3;

private final boolean localIndex;

Build failed in Jenkins: Phoenix-4.x-HBase-1.0 #593

[Apache Jenkins Server]

See 

Changes:

[elserj] PHOENIX-3126 Tie a driver instance to a specific user (Prabhjyot Singh)

--
[...truncated 703 lines...]
Tests run: 66, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 226.263 sec - 
in org.apache.phoenix.end2end.index.IndexExpressionIT
Running org.apache.phoenix.tx.TxCheckpointIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 88.764 sec - in 
org.apache.phoenix.trace.PhoenixTracingEndToEndIT
Tests run: 20, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 76.871 sec - 
in org.apache.phoenix.tx.TxCheckpointIT
Tests run: 21, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 136.762 sec - 
in org.apache.phoenix.tx.TransactionIT
Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 359.406 sec - 
in org.apache.phoenix.end2end.index.LocalIndexIT
Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 580.219 sec - 
in org.apache.phoenix.end2end.index.MutableIndexIT

Results :

Tests run: 1070, Failures: 0, Errors: 0, Skipped: 5

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

---
 T E S T S
---
Running org.apache.phoenix.end2end.ArithmeticQueryIT
Running org.apache.phoenix.end2end.AbsFunctionEnd2EndIT
Running org.apache.phoenix.end2end.ArrayFillFunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.352 sec - in 
org.apache.phoenix.end2end.AbsFunctionEnd2EndIT
Running org.apache.phoenix.end2end.ArraysWithNullsIT
Running org.apache.phoenix.end2end.ArrayToStringFunctionIT
Running org.apache.phoenix.end2end.AlterSessionIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.094 sec - in 
org.apache.phoenix.end2end.AlterSessionIT
Running org.apache.phoenix.end2end.AutoCommitIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.616 sec - in 
org.apache.phoenix.end2end.AutoCommitIT
Running org.apache.phoenix.end2end.CbrtFunctionEnd2EndIT
Tests run: 26, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.008 sec - in 
org.apache.phoenix.end2end.ArrayFillFunctionIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.44 sec - in 
org.apache.phoenix.end2end.CbrtFunctionEnd2EndIT
Running org.apache.phoenix.end2end.ConvertTimezoneFunctionIT
Running org.apache.phoenix.end2end.DecodeFunctionIT
Tests run: 36, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.67 sec - in 
org.apache.phoenix.end2end.ArrayToStringFunctionIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.66 sec - in 
org.apache.phoenix.end2end.ConvertTimezoneFunctionIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.71 sec - in 
org.apache.phoenix.end2end.DecodeFunctionIT
Running org.apache.phoenix.end2end.DynamicFamilyIT
Running org.apache.phoenix.end2end.DynamicUpsertIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.117 sec - in 
org.apache.phoenix.end2end.DynamicUpsertIT
Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 16.068 sec - 
in org.apache.phoenix.end2end.ArraysWithNullsIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.001 sec - in 
org.apache.phoenix.end2end.DynamicFamilyIT
Running org.apache.phoenix.end2end.FirstValueFunctionIT
Running org.apache.phoenix.end2end.GetSetByteBitFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.09 sec - in 
org.apache.phoenix.end2end.GetSetByteBitFunctionEnd2EndIT
Running org.apache.phoenix.end2end.LikeExpressionIT
Running org.apache.phoenix.end2end.MD5FunctionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.102 sec - in 
org.apache.phoenix.end2end.LikeExpressionIT
Running org.apache.phoenix.end2end.MinMaxAggregateFunctionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.562 sec - in 
org.apache.phoenix.end2end.MD5FunctionIT
Running org.apache.phoenix.end2end.NthValueFunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.365 sec - in 
org.apache.phoenix.end2end.MinMaxAggregateFunctionIT
Running org.apache.phoenix.end2end.OctetLengthFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.809 sec - in 
org.apache.phoenix.end2end.OctetLengthFunctionEnd2EndIT
Tests run: 26, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 25.821 sec - 
in org.apache.phoenix.end2end.ArithmeticQueryIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.147 sec - in 
org.apache.phoenix.end2end.FirstValueFunctionIT
Running org.apache.phoenix.end2end.PowerFunctionEnd2EndIT
Running org.apache.phoenix.end2end.QueryMoreIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.469 sec - in 
org.apache.phoenix.end2end.PowerFunctionEnd2EndIT
Running org.apache.phoenix.end2end.PrimitiveTypeIT
Tests run: 9, Failures: 

phoenix git commit: PHOENIX-3138 Integration tests are timing out

[jamestaylor]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 05f841c6a -> c6f15842d


PHOENIX-3138 Integration tests are timing out


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

Branch: refs/heads/4.x-HBase-1.1
Commit: c6f15842d7d72f2485d571f01dcab5b8d9d224f4
Parents: 05f841c
Author: James Taylor 
Authored: Tue Aug 2 14:56:24 2016 -0700
Committer: James Taylor 
Committed: Tue Aug 2 16:57:40 2016 -0700

--
 .../src/it/java/org/apache/phoenix/end2end/index/IndexIT.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c6f15842/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
index df45ecb..aba7dac 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
@@ -53,7 +53,6 @@ import org.apache.phoenix.compile.ColumnResolver;
 import org.apache.phoenix.compile.FromCompiler;
 import org.apache.phoenix.coprocessor.generated.PTableProtos.PTableType;
 import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
 import org.apache.phoenix.end2end.Shadower;
 import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.jdbc.PhoenixConnection;
@@ -83,7 +82,7 @@ import org.junit.runners.Parameterized.Parameters;
 import com.google.common.collect.Maps;
 
 @RunWith(Parameterized.class)
-public class IndexIT extends BaseHBaseManagedTimeTableReuseIT {
+public class IndexIT extends BaseHBaseManagedTimeIT {
 private static final long MAX_WAIT_FOR_ASYNC_INDEX_BUILD = 3;

private final boolean localIndex;

phoenix git commit: PHOENIX-3128 Remove extraneous operations during upsert with local immutable index

[jamestaylor]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 644e5f585 -> 05f841c6a


PHOENIX-3128 Remove extraneous operations during upsert with local immutable 
index


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

Branch: refs/heads/4.x-HBase-1.1
Commit: 05f841c6a1f9c9fb736e2bb81940a80ed27cba27
Parents: 644e5f5
Author: James Taylor 
Authored: Tue Aug 2 12:03:33 2016 -0700
Committer: James Taylor 
Committed: Tue Aug 2 16:54:48 2016 -0700

--
 .../phoenix/end2end/DistinctPrefixFilterIT.java | 11 ++-
 .../apache/phoenix/end2end/index/IndexIT.java   | 39 +
 .../compile/PostLocalIndexDDLCompiler.java  | 15 ++--
 .../apache/phoenix/execute/MutationState.java   | 11 ++-
 .../hbase/index/covered/IndexMetaData.java  |  9 +-
 .../hbase/index/covered/NonTxIndexBuilder.java  |  6 +-
 .../phoenix/index/PhoenixIndexMetaData.java | 12 ++-
 .../index/PhoenixTransactionalIndexer.java  | 88 +---
 .../org/apache/phoenix/schema/PTableImpl.java   | 13 ++-
 .../apache/phoenix/util/TransactionUtil.java|  7 ++
 10 files changed, 164 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/05f841c6/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctPrefixFilterIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctPrefixFilterIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctPrefixFilterIT.java
index 203d51e..9d31070 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctPrefixFilterIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctPrefixFilterIT.java
@@ -88,6 +88,15 @@ public class DistinctPrefixFilterIT extends 
BaseHBaseManagedTimeTableReuseIT {
 insertPrefixV("3", "1");
 insertPrefixV("3", "2");
 insertPrefixV("3", "3");
+conn.commit();
+ResultSet rs;
+rs = conn.createStatement().executeQuery("select /*+ NO_INDEX */ 
count(*) from " + testTableV);
+assertTrue(rs.next());
+long count1 = rs.getLong(1);
+rs = conn.createStatement().executeQuery("select count(*) from " + 
testTableV + "_idx");
+assertTrue(rs.next());
+long count2 = rs.getLong(1);
+assertEquals(count1,count2);
 
 multiply();
 multiply();
@@ -258,7 +267,7 @@ public class DistinctPrefixFilterIT extends 
BaseHBaseManagedTimeTableReuseIT {
 
 testCommonDistinct(testTableF);
 testCommonDistinct(testTableV);
-}
+}
 
 private void testCommonDistinct(String testTable) throws Exception {
 testSkipRange("SELECT %s DISTINCT prefix1 FROM " + testTable, 4);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/05f841c6/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
index 35a0aad..df45ecb 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
@@ -26,6 +26,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.sql.Connection;
 import java.sql.Date;
@@ -39,7 +40,15 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.Properties;
 
+import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.CellScanner;
+import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.HTableDescriptor;
+import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.client.HTableInterface;
+import org.apache.hadoop.hbase.client.Result;
+import org.apache.hadoop.hbase.client.ResultScanner;
+import org.apache.hadoop.hbase.client.Scan;
 import org.apache.phoenix.compile.ColumnResolver;
 import org.apache.phoenix.compile.FromCompiler;
 import org.apache.phoenix.coprocessor.generated.PTableProtos.PTableType;
@@ -56,6 +65,7 @@ import org.apache.phoenix.query.BaseTest;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.schema.PIndexState;
 import org.apache.phoenix.schema.PTable;
+import org.apache.phoenix.schema.PTableKey;
 import org.apache.phoenix.util.DateUtil;
 import org.apache.phoenix.util.PropertiesUtil;
 import 

[2/2] phoenix git commit: PHOENIX-3128 Remove extraneous operations during upsert with local immutable index

[jamestaylor]

PHOENIX-3128 Remove extraneous operations during upsert with local immutable 
index


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

Branch: refs/heads/master
Commit: ca7c36d59247795d92f7fc23a4ae4038da215284
Parents: 7febdfa
Author: James Taylor 
Authored: Tue Aug 2 12:03:33 2016 -0700
Committer: James Taylor 
Committed: Tue Aug 2 16:26:40 2016 -0700

--
 .../phoenix/end2end/DistinctPrefixFilterIT.java | 11 ++-
 .../apache/phoenix/end2end/index/IndexIT.java   | 39 +
 .../compile/PostLocalIndexDDLCompiler.java  | 15 ++--
 .../apache/phoenix/execute/MutationState.java   | 11 ++-
 .../hbase/index/covered/IndexMetaData.java  |  9 +-
 .../hbase/index/covered/NonTxIndexBuilder.java  |  6 +-
 .../phoenix/index/PhoenixIndexMetaData.java | 12 ++-
 .../index/PhoenixTransactionalIndexer.java  | 89 +---
 .../org/apache/phoenix/schema/PTableImpl.java   | 13 ++-
 .../apache/phoenix/util/TransactionUtil.java|  7 ++
 10 files changed, 164 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/ca7c36d5/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctPrefixFilterIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctPrefixFilterIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctPrefixFilterIT.java
index 203d51e..9d31070 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctPrefixFilterIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DistinctPrefixFilterIT.java
@@ -88,6 +88,15 @@ public class DistinctPrefixFilterIT extends 
BaseHBaseManagedTimeTableReuseIT {
 insertPrefixV("3", "1");
 insertPrefixV("3", "2");
 insertPrefixV("3", "3");
+conn.commit();
+ResultSet rs;
+rs = conn.createStatement().executeQuery("select /*+ NO_INDEX */ 
count(*) from " + testTableV);
+assertTrue(rs.next());
+long count1 = rs.getLong(1);
+rs = conn.createStatement().executeQuery("select count(*) from " + 
testTableV + "_idx");
+assertTrue(rs.next());
+long count2 = rs.getLong(1);
+assertEquals(count1,count2);
 
 multiply();
 multiply();
@@ -258,7 +267,7 @@ public class DistinctPrefixFilterIT extends 
BaseHBaseManagedTimeTableReuseIT {
 
 testCommonDistinct(testTableF);
 testCommonDistinct(testTableV);
-}
+}
 
 private void testCommonDistinct(String testTable) throws Exception {
 testSkipRange("SELECT %s DISTINCT prefix1 FROM " + testTable, 4);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/ca7c36d5/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
index 35a0aad..df45ecb 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
@@ -26,6 +26,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.sql.Connection;
 import java.sql.Date;
@@ -39,7 +40,15 @@ import java.util.Collection;
 import java.util.Map;
 import java.util.Properties;
 
+import org.apache.hadoop.hbase.Cell;
+import org.apache.hadoop.hbase.CellScanner;
+import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.HTableDescriptor;
+import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.client.HTableInterface;
+import org.apache.hadoop.hbase.client.Result;
+import org.apache.hadoop.hbase.client.ResultScanner;
+import org.apache.hadoop.hbase.client.Scan;
 import org.apache.phoenix.compile.ColumnResolver;
 import org.apache.phoenix.compile.FromCompiler;
 import org.apache.phoenix.coprocessor.generated.PTableProtos.PTableType;
@@ -56,6 +65,7 @@ import org.apache.phoenix.query.BaseTest;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.schema.PIndexState;
 import org.apache.phoenix.schema.PTable;
+import org.apache.phoenix.schema.PTableKey;
 import org.apache.phoenix.util.DateUtil;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.QueryUtil;
@@ -63,6 +73,7 @@ import org.apache.phoenix.util.ReadOnlyProps;
 import 

[1/2] phoenix git commit: PHOENIX-3138 Integration tests are timing out

[jamestaylor]

Repository: phoenix
Updated Branches:
  refs/heads/master 7febdfa88 -> 92c7faf76


PHOENIX-3138 Integration tests are timing out


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

Branch: refs/heads/master
Commit: 92c7faf766a4e96a9d99fe025b0bb0f56b66ab32
Parents: ca7c36d
Author: James Taylor 
Authored: Tue Aug 2 14:56:24 2016 -0700
Committer: James Taylor 
Committed: Tue Aug 2 16:26:40 2016 -0700

--
 .../src/it/java/org/apache/phoenix/end2end/index/IndexIT.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/92c7faf7/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
index df45ecb..aba7dac 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexIT.java
@@ -53,7 +53,6 @@ import org.apache.phoenix.compile.ColumnResolver;
 import org.apache.phoenix.compile.FromCompiler;
 import org.apache.phoenix.coprocessor.generated.PTableProtos.PTableType;
 import org.apache.phoenix.end2end.BaseHBaseManagedTimeIT;
-import org.apache.phoenix.end2end.BaseHBaseManagedTimeTableReuseIT;
 import org.apache.phoenix.end2end.Shadower;
 import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.jdbc.PhoenixConnection;
@@ -83,7 +82,7 @@ import org.junit.runners.Parameterized.Parameters;
 import com.google.common.collect.Maps;
 
 @RunWith(Parameterized.class)
-public class IndexIT extends BaseHBaseManagedTimeTableReuseIT {
+public class IndexIT extends BaseHBaseManagedTimeIT {
 private static final long MAX_WAIT_FOR_ASYNC_INDEX_BUILD = 3;

private final boolean localIndex;

[3/8] phoenix git commit: PHOENIX-3136 Do not relocate org.apache.calcite in queryserver/thin-client

[elserj]

PHOENIX-3136 Do not relocate org.apache.calcite in queryserver/thin-client

Relocation of these classes breaks compatibility with previous versions
of Phoenix.


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

Branch: refs/heads/4.x-HBase-1.0
Commit: 39cebc2caf2232be907056c36ae32e27dfad7bec
Parents: af4fb44
Author: Josh Elser 
Authored: Tue Aug 2 11:51:37 2016 -0400
Committer: Josh Elser 
Committed: Tue Aug 2 19:04:02 2016 -0400

--
 phoenix-queryserver-client/pom.xml | 7 +++
 phoenix-queryserver/pom.xml| 7 +++
 2 files changed, 6 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/39cebc2c/phoenix-queryserver-client/pom.xml
--
diff --git a/phoenix-queryserver-client/pom.xml 
b/phoenix-queryserver-client/pom.xml
index d64cc3e..c2e8920 100644
--- a/phoenix-queryserver-client/pom.xml
+++ b/phoenix-queryserver-client/pom.xml
@@ -113,10 +113,9 @@
   
${shaded.package}.com.fasterxml
 
 
-
-  org.apache.calcite
-  
${shaded.package}.org.apache.calcite
-
+
 
   org.apache.commons
   
${shaded.package}.org.apache.commons

http://git-wip-us.apache.org/repos/asf/phoenix/blob/39cebc2c/phoenix-queryserver/pom.xml
--
diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml
index 599ed7d..441c6d5 100644
--- a/phoenix-queryserver/pom.xml
+++ b/phoenix-queryserver/pom.xml
@@ -105,10 +105,9 @@
   org.eclipse.jetty
   
${shaded.package}.org.eclipse.jetty
 
-
-  org.apache.calcite
-  
${shaded.package}.org.apache.calcite
-
+
   
 
   

[8/8] phoenix git commit: PHOENIX-3136 Do not relocate org.apache.calcite in queryserver/thin-client

[elserj]

PHOENIX-3136 Do not relocate org.apache.calcite in queryserver/thin-client

Relocation of these classes breaks compatibility with previous versions
of Phoenix.


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

Branch: refs/heads/4.8-HBase-0.98
Commit: 6dd6343caaa19861c59b6d54f669c2335acd4f68
Parents: 38c5511
Author: Josh Elser 
Authored: Tue Aug 2 11:51:37 2016 -0400
Committer: Josh Elser 
Committed: Tue Aug 2 19:21:22 2016 -0400

--
 phoenix-queryserver-client/pom.xml | 7 +++
 phoenix-queryserver/pom.xml| 7 +++
 2 files changed, 6 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/6dd6343c/phoenix-queryserver-client/pom.xml
--
diff --git a/phoenix-queryserver-client/pom.xml 
b/phoenix-queryserver-client/pom.xml
index 40915e9..be4e770 100644
--- a/phoenix-queryserver-client/pom.xml
+++ b/phoenix-queryserver-client/pom.xml
@@ -113,10 +113,9 @@
   
${shaded.package}.com.fasterxml
 
 
-
-  org.apache.calcite
-  
${shaded.package}.org.apache.calcite
-
+
 
   org.apache.commons
   
${shaded.package}.org.apache.commons

http://git-wip-us.apache.org/repos/asf/phoenix/blob/6dd6343c/phoenix-queryserver/pom.xml
--
diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml
index 25fcdac..92e7169 100644
--- a/phoenix-queryserver/pom.xml
+++ b/phoenix-queryserver/pom.xml
@@ -105,10 +105,9 @@
   org.eclipse.jetty
   
${shaded.package}.org.eclipse.jetty
 
-
-  org.apache.calcite
-  
${shaded.package}.org.apache.calcite
-
+
   
 
   

[5/8] phoenix git commit: PHOENIX-3136 Do not relocate org.apache.calcite in queryserver/thin-client

[elserj]

PHOENIX-3136 Do not relocate org.apache.calcite in queryserver/thin-client

Relocation of these classes breaks compatibility with previous versions
of Phoenix.


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

Branch: refs/heads/4.8-HBase-1.2
Commit: c357318bd6e4cceee5d55a8e2dd76f9b313301c6
Parents: 5b5f0c9
Author: Josh Elser 
Authored: Tue Aug 2 11:51:37 2016 -0400
Committer: Josh Elser 
Committed: Tue Aug 2 19:17:14 2016 -0400

--
 phoenix-queryserver-client/pom.xml | 7 +++
 phoenix-queryserver/pom.xml| 7 +++
 2 files changed, 6 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c357318b/phoenix-queryserver-client/pom.xml
--
diff --git a/phoenix-queryserver-client/pom.xml 
b/phoenix-queryserver-client/pom.xml
index 8b2ecc8..ecc9edd 100644
--- a/phoenix-queryserver-client/pom.xml
+++ b/phoenix-queryserver-client/pom.xml
@@ -113,10 +113,9 @@
   
${shaded.package}.com.fasterxml
 
 
-
-  org.apache.calcite
-  
${shaded.package}.org.apache.calcite
-
+
 
   org.apache.commons
   
${shaded.package}.org.apache.commons

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c357318b/phoenix-queryserver/pom.xml
--
diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml
index f09e1cb..1c186a1 100644
--- a/phoenix-queryserver/pom.xml
+++ b/phoenix-queryserver/pom.xml
@@ -105,10 +105,9 @@
   org.eclipse.jetty
   
${shaded.package}.org.eclipse.jetty
 
-
-  org.apache.calcite
-  
${shaded.package}.org.apache.calcite
-
+
   
 
   

[4/8] phoenix git commit: PHOENIX-3136 Do not relocate org.apache.calcite in queryserver/thin-client

[elserj]

PHOENIX-3136 Do not relocate org.apache.calcite in queryserver/thin-client

Relocation of these classes breaks compatibility with previous versions
of Phoenix.


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 446c58b1d5336bca37bda32f2736869df1ab5467
Parents: 845a5ac
Author: Josh Elser 
Authored: Tue Aug 2 11:51:37 2016 -0400
Committer: Josh Elser 
Committed: Tue Aug 2 19:10:58 2016 -0400

--
 phoenix-queryserver-client/pom.xml | 7 +++
 phoenix-queryserver/pom.xml| 7 +++
 2 files changed, 6 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/446c58b1/phoenix-queryserver-client/pom.xml
--
diff --git a/phoenix-queryserver-client/pom.xml 
b/phoenix-queryserver-client/pom.xml
index 40915e9..be4e770 100644
--- a/phoenix-queryserver-client/pom.xml
+++ b/phoenix-queryserver-client/pom.xml
@@ -113,10 +113,9 @@
   
${shaded.package}.com.fasterxml
 
 
-
-  org.apache.calcite
-  
${shaded.package}.org.apache.calcite
-
+
 
   org.apache.commons
   
${shaded.package}.org.apache.commons

http://git-wip-us.apache.org/repos/asf/phoenix/blob/446c58b1/phoenix-queryserver/pom.xml
--
diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml
index 25fcdac..92e7169 100644
--- a/phoenix-queryserver/pom.xml
+++ b/phoenix-queryserver/pom.xml
@@ -105,10 +105,9 @@
   org.eclipse.jetty
   
${shaded.package}.org.eclipse.jetty
 
-
-  org.apache.calcite
-  
${shaded.package}.org.apache.calcite
-
+
   
 
   

[7/8] phoenix git commit: PHOENIX-3136 Do not relocate org.apache.calcite in queryserver/thin-client

[elserj]

PHOENIX-3136 Do not relocate org.apache.calcite in queryserver/thin-client

Relocation of these classes breaks compatibility with previous versions
of Phoenix.


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

Branch: refs/heads/4.8-HBase-1.0
Commit: ce572433dcc80d14d924c4d0b04d23692f391c7f
Parents: 81ffc48
Author: Josh Elser 
Authored: Tue Aug 2 11:51:37 2016 -0400
Committer: Josh Elser 
Committed: Tue Aug 2 19:21:17 2016 -0400

--
 phoenix-queryserver-client/pom.xml | 7 +++
 phoenix-queryserver/pom.xml| 7 +++
 2 files changed, 6 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/ce572433/phoenix-queryserver-client/pom.xml
--
diff --git a/phoenix-queryserver-client/pom.xml 
b/phoenix-queryserver-client/pom.xml
index d64cc3e..c2e8920 100644
--- a/phoenix-queryserver-client/pom.xml
+++ b/phoenix-queryserver-client/pom.xml
@@ -113,10 +113,9 @@
   
${shaded.package}.com.fasterxml
 
 
-
-  org.apache.calcite
-  
${shaded.package}.org.apache.calcite
-
+
 
   org.apache.commons
   
${shaded.package}.org.apache.commons

http://git-wip-us.apache.org/repos/asf/phoenix/blob/ce572433/phoenix-queryserver/pom.xml
--
diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml
index 599ed7d..441c6d5 100644
--- a/phoenix-queryserver/pom.xml
+++ b/phoenix-queryserver/pom.xml
@@ -105,10 +105,9 @@
   org.eclipse.jetty
   
${shaded.package}.org.eclipse.jetty
 
-
-  org.apache.calcite
-  
${shaded.package}.org.apache.calcite
-
+
   
 
   

[6/8] phoenix git commit: PHOENIX-3136 Do not relocate org.apache.calcite in queryserver/thin-client

[elserj]

PHOENIX-3136 Do not relocate org.apache.calcite in queryserver/thin-client

Relocation of these classes breaks compatibility with previous versions
of Phoenix.


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

Branch: refs/heads/4.8-HBase-1.1
Commit: 2ee2d1df04b929771ca827e7905645ec75d91c10
Parents: f792b6e
Author: Josh Elser 
Authored: Tue Aug 2 11:51:37 2016 -0400
Committer: Josh Elser 
Committed: Tue Aug 2 19:21:11 2016 -0400

--
 phoenix-queryserver-client/pom.xml | 7 +++
 phoenix-queryserver/pom.xml| 7 +++
 2 files changed, 6 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/2ee2d1df/phoenix-queryserver-client/pom.xml
--
diff --git a/phoenix-queryserver-client/pom.xml 
b/phoenix-queryserver-client/pom.xml
index 25fd577..6554889 100644
--- a/phoenix-queryserver-client/pom.xml
+++ b/phoenix-queryserver-client/pom.xml
@@ -113,10 +113,9 @@
   
${shaded.package}.com.fasterxml
 
 
-
-  org.apache.calcite
-  
${shaded.package}.org.apache.calcite
-
+
 
   org.apache.commons
   
${shaded.package}.org.apache.commons

http://git-wip-us.apache.org/repos/asf/phoenix/blob/2ee2d1df/phoenix-queryserver/pom.xml
--
diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml
index 6a39697..1739f2a 100644
--- a/phoenix-queryserver/pom.xml
+++ b/phoenix-queryserver/pom.xml
@@ -105,10 +105,9 @@
   org.eclipse.jetty
   
${shaded.package}.org.eclipse.jetty
 
-
-  org.apache.calcite
-  
${shaded.package}.org.apache.calcite
-
+
   
 
   

[2/8] phoenix git commit: PHOENIX-3136 Do not relocate org.apache.calcite in queryserver/thin-client

[elserj]

PHOENIX-3136 Do not relocate org.apache.calcite in queryserver/thin-client

Relocation of these classes breaks compatibility with previous versions
of Phoenix.


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

Branch: refs/heads/4.x-HBase-1.1
Commit: 644e5f5853e85ddd296a96d4a1c20a14e656a835
Parents: 32c8c72
Author: Josh Elser 
Authored: Tue Aug 2 11:51:37 2016 -0400
Committer: Josh Elser 
Committed: Tue Aug 2 19:00:12 2016 -0400

--
 phoenix-queryserver-client/pom.xml | 7 +++
 phoenix-queryserver/pom.xml| 7 +++
 2 files changed, 6 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/644e5f58/phoenix-queryserver-client/pom.xml
--
diff --git a/phoenix-queryserver-client/pom.xml 
b/phoenix-queryserver-client/pom.xml
index 25fd577..6554889 100644
--- a/phoenix-queryserver-client/pom.xml
+++ b/phoenix-queryserver-client/pom.xml
@@ -113,10 +113,9 @@
   
${shaded.package}.com.fasterxml
 
 
-
-  org.apache.calcite
-  
${shaded.package}.org.apache.calcite
-
+
 
   org.apache.commons
   
${shaded.package}.org.apache.commons

http://git-wip-us.apache.org/repos/asf/phoenix/blob/644e5f58/phoenix-queryserver/pom.xml
--
diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml
index 6a39697..1739f2a 100644
--- a/phoenix-queryserver/pom.xml
+++ b/phoenix-queryserver/pom.xml
@@ -105,10 +105,9 @@
   org.eclipse.jetty
   
${shaded.package}.org.eclipse.jetty
 
-
-  org.apache.calcite
-  
${shaded.package}.org.apache.calcite
-
+
   
 
   

[1/8] phoenix git commit: PHOENIX-3126 Tie a driver instance to a specific user (Prabhjyot Singh)

[elserj]

Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-0.98 56318fb0d -> 38c55115c
  refs/heads/4.8-HBase-1.0 b5261c23c -> 81ffc484e
  refs/heads/4.8-HBase-1.1 a14b977da -> f792b6e96
  refs/heads/4.8-HBase-1.2 8786a3d4a -> 5b5f0c91e
  refs/heads/4.x-HBase-0.98 15219d0fa -> 845a5ac7a
  refs/heads/4.x-HBase-1.0 971426372 -> af4fb4483
  refs/heads/4.x-HBase-1.1 c9e3d7d3d -> 32c8c7262
  refs/heads/master 545cc1c02 -> a9ea8a3ba


PHOENIX-3126 Tie a driver instance to a specific user (Prabhjyot Singh)

Prevent the case where a user's Kerberos credentials are
unintentionally used by a different user.


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

Branch: refs/heads/master
Commit: a9ea8a3baa32714a1640c1197609910863daca79
Parents: 545cc1c
Author: Josh Elser 
Authored: Tue Aug 2 16:56:34 2016 -0400
Committer: Josh Elser 
Committed: Tue Aug 2 18:23:37 2016 -0400

--
 .../apache/phoenix/jdbc/PhoenixEmbeddedDriver.java   | 15 +++
 1 file changed, 15 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/a9ea8a3b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
index d2dd94f..375388a 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
@@ -19,6 +19,7 @@ package org.apache.phoenix.jdbc;
 
 import static 
org.apache.phoenix.util.PhoenixRuntime.PHOENIX_TEST_DRIVER_URL_PARAM;
 
+import java.io.IOException;
 import java.sql.Connection;
 import java.sql.Driver;
 import java.sql.DriverPropertyInfo;
@@ -35,6 +36,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.security.User;
 import org.apache.phoenix.coprocessor.MetaDataProtocol;
 import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.exception.SQLExceptionInfo;
@@ -340,6 +342,7 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 private final boolean isConnectionless;
 private final String principal;
 private final String keytab;
+private final User user;
 
 public ConnectionInfo(String zookeeperQuorum, Integer port, String 
rootNode, String principal, String keytab) {
 this.zookeeperQuorum = zookeeperQuorum;
@@ -348,6 +351,14 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 this.isConnectionless = 
PhoenixRuntime.CONNECTIONLESS.equals(zookeeperQuorum);
 this.principal = principal;
 this.keytab = keytab;
+try {
+this.user = User.getCurrent();
+} catch (IOException e) {
+throw new RuntimeException("Couldn't get the current user!!");
+}
+if (null == this.user) {
+throw new RuntimeException("Acquired null user which should 
never happen");
+}
 }
 
 public ConnectionInfo(String zookeeperQuorum, Integer port, String 
rootNode) {
@@ -406,6 +417,8 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 result = prime * result + ((rootNode == null) ? 0 : 
rootNode.hashCode());
 result = prime * result + ((principal == null) ? 0 : 
principal.hashCode());
 result = prime * result + ((keytab == null) ? 0 : 
keytab.hashCode());
+// `user` is guaranteed to be non-null
+result = prime * result + user.hashCode();
 return result;
 }
 
@@ -415,6 +428,8 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 if (obj == null) return false;
 if (getClass() != obj.getClass()) return false;
 ConnectionInfo other = (ConnectionInfo) obj;
+// `user` is guaranteed to be non-null
+if (!other.user.equals(user)) return false;
 if (zookeeperQuorum == null) {
 if (other.zookeeperQuorum != null) return false;
 } else if (!zookeeperQuorum.equals(other.zookeeperQuorum)) return 
false;

[3/8] phoenix git commit: PHOENIX-3126 Tie a driver instance to a specific user (Prabhjyot Singh)

[elserj]

PHOENIX-3126 Tie a driver instance to a specific user (Prabhjyot Singh)

Prevent the case where a user's Kerberos credentials are
unintentionally used by a different user.


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

Branch: refs/heads/4.x-HBase-1.0
Commit: af4fb44834e4add5c16fee5525491dbc98277f1f
Parents: 9714263
Author: Josh Elser 
Authored: Tue Aug 2 16:56:34 2016 -0400
Committer: Josh Elser 
Committed: Tue Aug 2 18:24:04 2016 -0400

--
 .../apache/phoenix/jdbc/PhoenixEmbeddedDriver.java   | 15 +++
 1 file changed, 15 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/af4fb448/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
index d2dd94f..375388a 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
@@ -19,6 +19,7 @@ package org.apache.phoenix.jdbc;
 
 import static 
org.apache.phoenix.util.PhoenixRuntime.PHOENIX_TEST_DRIVER_URL_PARAM;
 
+import java.io.IOException;
 import java.sql.Connection;
 import java.sql.Driver;
 import java.sql.DriverPropertyInfo;
@@ -35,6 +36,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.security.User;
 import org.apache.phoenix.coprocessor.MetaDataProtocol;
 import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.exception.SQLExceptionInfo;
@@ -340,6 +342,7 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 private final boolean isConnectionless;
 private final String principal;
 private final String keytab;
+private final User user;
 
 public ConnectionInfo(String zookeeperQuorum, Integer port, String 
rootNode, String principal, String keytab) {
 this.zookeeperQuorum = zookeeperQuorum;
@@ -348,6 +351,14 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 this.isConnectionless = 
PhoenixRuntime.CONNECTIONLESS.equals(zookeeperQuorum);
 this.principal = principal;
 this.keytab = keytab;
+try {
+this.user = User.getCurrent();
+} catch (IOException e) {
+throw new RuntimeException("Couldn't get the current user!!");
+}
+if (null == this.user) {
+throw new RuntimeException("Acquired null user which should 
never happen");
+}
 }
 
 public ConnectionInfo(String zookeeperQuorum, Integer port, String 
rootNode) {
@@ -406,6 +417,8 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 result = prime * result + ((rootNode == null) ? 0 : 
rootNode.hashCode());
 result = prime * result + ((principal == null) ? 0 : 
principal.hashCode());
 result = prime * result + ((keytab == null) ? 0 : 
keytab.hashCode());
+// `user` is guaranteed to be non-null
+result = prime * result + user.hashCode();
 return result;
 }
 
@@ -415,6 +428,8 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 if (obj == null) return false;
 if (getClass() != obj.getClass()) return false;
 ConnectionInfo other = (ConnectionInfo) obj;
+// `user` is guaranteed to be non-null
+if (!other.user.equals(user)) return false;
 if (zookeeperQuorum == null) {
 if (other.zookeeperQuorum != null) return false;
 } else if (!zookeeperQuorum.equals(other.zookeeperQuorum)) return 
false;

[5/8] phoenix git commit: PHOENIX-3126 Tie a driver instance to a specific user (Prabhjyot Singh)

[elserj]

PHOENIX-3126 Tie a driver instance to a specific user (Prabhjyot Singh)

Prevent the case where a user's Kerberos credentials are
unintentionally used by a different user.


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

Branch: refs/heads/4.8-HBase-1.2
Commit: 5b5f0c91eac0b5f8e631ede8b12eb2e14dc4b0eb
Parents: 8786a3d
Author: Josh Elser 
Authored: Tue Aug 2 16:56:34 2016 -0400
Committer: Josh Elser 
Committed: Tue Aug 2 18:24:24 2016 -0400

--
 .../apache/phoenix/jdbc/PhoenixEmbeddedDriver.java   | 15 +++
 1 file changed, 15 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/5b5f0c91/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
index d2dd94f..375388a 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
@@ -19,6 +19,7 @@ package org.apache.phoenix.jdbc;
 
 import static 
org.apache.phoenix.util.PhoenixRuntime.PHOENIX_TEST_DRIVER_URL_PARAM;
 
+import java.io.IOException;
 import java.sql.Connection;
 import java.sql.Driver;
 import java.sql.DriverPropertyInfo;
@@ -35,6 +36,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.security.User;
 import org.apache.phoenix.coprocessor.MetaDataProtocol;
 import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.exception.SQLExceptionInfo;
@@ -340,6 +342,7 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 private final boolean isConnectionless;
 private final String principal;
 private final String keytab;
+private final User user;
 
 public ConnectionInfo(String zookeeperQuorum, Integer port, String 
rootNode, String principal, String keytab) {
 this.zookeeperQuorum = zookeeperQuorum;
@@ -348,6 +351,14 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 this.isConnectionless = 
PhoenixRuntime.CONNECTIONLESS.equals(zookeeperQuorum);
 this.principal = principal;
 this.keytab = keytab;
+try {
+this.user = User.getCurrent();
+} catch (IOException e) {
+throw new RuntimeException("Couldn't get the current user!!");
+}
+if (null == this.user) {
+throw new RuntimeException("Acquired null user which should 
never happen");
+}
 }
 
 public ConnectionInfo(String zookeeperQuorum, Integer port, String 
rootNode) {
@@ -406,6 +417,8 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 result = prime * result + ((rootNode == null) ? 0 : 
rootNode.hashCode());
 result = prime * result + ((principal == null) ? 0 : 
principal.hashCode());
 result = prime * result + ((keytab == null) ? 0 : 
keytab.hashCode());
+// `user` is guaranteed to be non-null
+result = prime * result + user.hashCode();
 return result;
 }
 
@@ -415,6 +428,8 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 if (obj == null) return false;
 if (getClass() != obj.getClass()) return false;
 ConnectionInfo other = (ConnectionInfo) obj;
+// `user` is guaranteed to be non-null
+if (!other.user.equals(user)) return false;
 if (zookeeperQuorum == null) {
 if (other.zookeeperQuorum != null) return false;
 } else if (!zookeeperQuorum.equals(other.zookeeperQuorum)) return 
false;

[6/8] phoenix git commit: PHOENIX-3126 Tie a driver instance to a specific user (Prabhjyot Singh)

[elserj]

PHOENIX-3126 Tie a driver instance to a specific user (Prabhjyot Singh)

Prevent the case where a user's Kerberos credentials are
unintentionally used by a different user.


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

Branch: refs/heads/4.8-HBase-1.1
Commit: f792b6e961e3d830f30110911517c59b3469798a
Parents: a14b977
Author: Josh Elser 
Authored: Tue Aug 2 16:56:34 2016 -0400
Committer: Josh Elser 
Committed: Tue Aug 2 18:24:31 2016 -0400

--
 .../apache/phoenix/jdbc/PhoenixEmbeddedDriver.java   | 15 +++
 1 file changed, 15 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/f792b6e9/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
index d2dd94f..375388a 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
@@ -19,6 +19,7 @@ package org.apache.phoenix.jdbc;
 
 import static 
org.apache.phoenix.util.PhoenixRuntime.PHOENIX_TEST_DRIVER_URL_PARAM;
 
+import java.io.IOException;
 import java.sql.Connection;
 import java.sql.Driver;
 import java.sql.DriverPropertyInfo;
@@ -35,6 +36,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.security.User;
 import org.apache.phoenix.coprocessor.MetaDataProtocol;
 import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.exception.SQLExceptionInfo;
@@ -340,6 +342,7 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 private final boolean isConnectionless;
 private final String principal;
 private final String keytab;
+private final User user;
 
 public ConnectionInfo(String zookeeperQuorum, Integer port, String 
rootNode, String principal, String keytab) {
 this.zookeeperQuorum = zookeeperQuorum;
@@ -348,6 +351,14 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 this.isConnectionless = 
PhoenixRuntime.CONNECTIONLESS.equals(zookeeperQuorum);
 this.principal = principal;
 this.keytab = keytab;
+try {
+this.user = User.getCurrent();
+} catch (IOException e) {
+throw new RuntimeException("Couldn't get the current user!!");
+}
+if (null == this.user) {
+throw new RuntimeException("Acquired null user which should 
never happen");
+}
 }
 
 public ConnectionInfo(String zookeeperQuorum, Integer port, String 
rootNode) {
@@ -406,6 +417,8 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 result = prime * result + ((rootNode == null) ? 0 : 
rootNode.hashCode());
 result = prime * result + ((principal == null) ? 0 : 
principal.hashCode());
 result = prime * result + ((keytab == null) ? 0 : 
keytab.hashCode());
+// `user` is guaranteed to be non-null
+result = prime * result + user.hashCode();
 return result;
 }
 
@@ -415,6 +428,8 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 if (obj == null) return false;
 if (getClass() != obj.getClass()) return false;
 ConnectionInfo other = (ConnectionInfo) obj;
+// `user` is guaranteed to be non-null
+if (!other.user.equals(user)) return false;
 if (zookeeperQuorum == null) {
 if (other.zookeeperQuorum != null) return false;
 } else if (!zookeeperQuorum.equals(other.zookeeperQuorum)) return 
false;

[8/8] phoenix git commit: PHOENIX-3126 Tie a driver instance to a specific user (Prabhjyot Singh)

[elserj]

PHOENIX-3126 Tie a driver instance to a specific user (Prabhjyot Singh)

Prevent the case where a user's Kerberos credentials are
unintentionally used by a different user.


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

Branch: refs/heads/4.8-HBase-0.98
Commit: 38c55115cba1949161c37060d0e0be22863c6bc7
Parents: 56318fb
Author: Josh Elser 
Authored: Tue Aug 2 16:56:34 2016 -0400
Committer: Josh Elser 
Committed: Tue Aug 2 18:34:26 2016 -0400

--
 .../apache/phoenix/jdbc/PhoenixEmbeddedDriver.java   | 15 +++
 1 file changed, 15 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/38c55115/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
index d2dd94f..375388a 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
@@ -19,6 +19,7 @@ package org.apache.phoenix.jdbc;
 
 import static 
org.apache.phoenix.util.PhoenixRuntime.PHOENIX_TEST_DRIVER_URL_PARAM;
 
+import java.io.IOException;
 import java.sql.Connection;
 import java.sql.Driver;
 import java.sql.DriverPropertyInfo;
@@ -35,6 +36,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.security.User;
 import org.apache.phoenix.coprocessor.MetaDataProtocol;
 import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.exception.SQLExceptionInfo;
@@ -340,6 +342,7 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 private final boolean isConnectionless;
 private final String principal;
 private final String keytab;
+private final User user;
 
 public ConnectionInfo(String zookeeperQuorum, Integer port, String 
rootNode, String principal, String keytab) {
 this.zookeeperQuorum = zookeeperQuorum;
@@ -348,6 +351,14 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 this.isConnectionless = 
PhoenixRuntime.CONNECTIONLESS.equals(zookeeperQuorum);
 this.principal = principal;
 this.keytab = keytab;
+try {
+this.user = User.getCurrent();
+} catch (IOException e) {
+throw new RuntimeException("Couldn't get the current user!!");
+}
+if (null == this.user) {
+throw new RuntimeException("Acquired null user which should 
never happen");
+}
 }
 
 public ConnectionInfo(String zookeeperQuorum, Integer port, String 
rootNode) {
@@ -406,6 +417,8 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 result = prime * result + ((rootNode == null) ? 0 : 
rootNode.hashCode());
 result = prime * result + ((principal == null) ? 0 : 
principal.hashCode());
 result = prime * result + ((keytab == null) ? 0 : 
keytab.hashCode());
+// `user` is guaranteed to be non-null
+result = prime * result + user.hashCode();
 return result;
 }
 
@@ -415,6 +428,8 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 if (obj == null) return false;
 if (getClass() != obj.getClass()) return false;
 ConnectionInfo other = (ConnectionInfo) obj;
+// `user` is guaranteed to be non-null
+if (!other.user.equals(user)) return false;
 if (zookeeperQuorum == null) {
 if (other.zookeeperQuorum != null) return false;
 } else if (!zookeeperQuorum.equals(other.zookeeperQuorum)) return 
false;

[7/8] phoenix git commit: PHOENIX-3126 Tie a driver instance to a specific user (Prabhjyot Singh)

[elserj]

PHOENIX-3126 Tie a driver instance to a specific user (Prabhjyot Singh)

Prevent the case where a user's Kerberos credentials are
unintentionally used by a different user.


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

Branch: refs/heads/4.8-HBase-1.0
Commit: 81ffc484e016328e0b62109de08778920b18cc20
Parents: b5261c2
Author: Josh Elser 
Authored: Tue Aug 2 16:56:34 2016 -0400
Committer: Josh Elser 
Committed: Tue Aug 2 18:29:11 2016 -0400

--
 .../apache/phoenix/jdbc/PhoenixEmbeddedDriver.java   | 15 +++
 1 file changed, 15 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/81ffc484/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
index d2dd94f..375388a 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
@@ -19,6 +19,7 @@ package org.apache.phoenix.jdbc;
 
 import static 
org.apache.phoenix.util.PhoenixRuntime.PHOENIX_TEST_DRIVER_URL_PARAM;
 
+import java.io.IOException;
 import java.sql.Connection;
 import java.sql.Driver;
 import java.sql.DriverPropertyInfo;
@@ -35,6 +36,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.security.User;
 import org.apache.phoenix.coprocessor.MetaDataProtocol;
 import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.exception.SQLExceptionInfo;
@@ -340,6 +342,7 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 private final boolean isConnectionless;
 private final String principal;
 private final String keytab;
+private final User user;
 
 public ConnectionInfo(String zookeeperQuorum, Integer port, String 
rootNode, String principal, String keytab) {
 this.zookeeperQuorum = zookeeperQuorum;
@@ -348,6 +351,14 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 this.isConnectionless = 
PhoenixRuntime.CONNECTIONLESS.equals(zookeeperQuorum);
 this.principal = principal;
 this.keytab = keytab;
+try {
+this.user = User.getCurrent();
+} catch (IOException e) {
+throw new RuntimeException("Couldn't get the current user!!");
+}
+if (null == this.user) {
+throw new RuntimeException("Acquired null user which should 
never happen");
+}
 }
 
 public ConnectionInfo(String zookeeperQuorum, Integer port, String 
rootNode) {
@@ -406,6 +417,8 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 result = prime * result + ((rootNode == null) ? 0 : 
rootNode.hashCode());
 result = prime * result + ((principal == null) ? 0 : 
principal.hashCode());
 result = prime * result + ((keytab == null) ? 0 : 
keytab.hashCode());
+// `user` is guaranteed to be non-null
+result = prime * result + user.hashCode();
 return result;
 }
 
@@ -415,6 +428,8 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 if (obj == null) return false;
 if (getClass() != obj.getClass()) return false;
 ConnectionInfo other = (ConnectionInfo) obj;
+// `user` is guaranteed to be non-null
+if (!other.user.equals(user)) return false;
 if (zookeeperQuorum == null) {
 if (other.zookeeperQuorum != null) return false;
 } else if (!zookeeperQuorum.equals(other.zookeeperQuorum)) return 
false;

[4/8] phoenix git commit: PHOENIX-3126 Tie a driver instance to a specific user (Prabhjyot Singh)

[elserj]

PHOENIX-3126 Tie a driver instance to a specific user (Prabhjyot Singh)

Prevent the case where a user's Kerberos credentials are
unintentionally used by a different user.


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 845a5ac7a021eaa830a7f0b616bb8dd2179c62ee
Parents: 15219d0
Author: Josh Elser 
Authored: Tue Aug 2 16:56:34 2016 -0400
Committer: Josh Elser 
Committed: Tue Aug 2 18:24:12 2016 -0400

--
 .../apache/phoenix/jdbc/PhoenixEmbeddedDriver.java   | 15 +++
 1 file changed, 15 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/845a5ac7/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
index d2dd94f..375388a 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
@@ -19,6 +19,7 @@ package org.apache.phoenix.jdbc;
 
 import static 
org.apache.phoenix.util.PhoenixRuntime.PHOENIX_TEST_DRIVER_URL_PARAM;
 
+import java.io.IOException;
 import java.sql.Connection;
 import java.sql.Driver;
 import java.sql.DriverPropertyInfo;
@@ -35,6 +36,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.security.User;
 import org.apache.phoenix.coprocessor.MetaDataProtocol;
 import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.exception.SQLExceptionInfo;
@@ -340,6 +342,7 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 private final boolean isConnectionless;
 private final String principal;
 private final String keytab;
+private final User user;
 
 public ConnectionInfo(String zookeeperQuorum, Integer port, String 
rootNode, String principal, String keytab) {
 this.zookeeperQuorum = zookeeperQuorum;
@@ -348,6 +351,14 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 this.isConnectionless = 
PhoenixRuntime.CONNECTIONLESS.equals(zookeeperQuorum);
 this.principal = principal;
 this.keytab = keytab;
+try {
+this.user = User.getCurrent();
+} catch (IOException e) {
+throw new RuntimeException("Couldn't get the current user!!");
+}
+if (null == this.user) {
+throw new RuntimeException("Acquired null user which should 
never happen");
+}
 }
 
 public ConnectionInfo(String zookeeperQuorum, Integer port, String 
rootNode) {
@@ -406,6 +417,8 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 result = prime * result + ((rootNode == null) ? 0 : 
rootNode.hashCode());
 result = prime * result + ((principal == null) ? 0 : 
principal.hashCode());
 result = prime * result + ((keytab == null) ? 0 : 
keytab.hashCode());
+// `user` is guaranteed to be non-null
+result = prime * result + user.hashCode();
 return result;
 }
 
@@ -415,6 +428,8 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 if (obj == null) return false;
 if (getClass() != obj.getClass()) return false;
 ConnectionInfo other = (ConnectionInfo) obj;
+// `user` is guaranteed to be non-null
+if (!other.user.equals(user)) return false;
 if (zookeeperQuorum == null) {
 if (other.zookeeperQuorum != null) return false;
 } else if (!zookeeperQuorum.equals(other.zookeeperQuorum)) return 
false;

[2/8] phoenix git commit: PHOENIX-3126 Tie a driver instance to a specific user (Prabhjyot Singh)

[elserj]

PHOENIX-3126 Tie a driver instance to a specific user (Prabhjyot Singh)

Prevent the case where a user's Kerberos credentials are
unintentionally used by a different user.


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

Branch: refs/heads/4.x-HBase-1.1
Commit: 32c8c7262c9337b54dcc5bc401c2fd24c9f42586
Parents: c9e3d7d
Author: Josh Elser 
Authored: Tue Aug 2 16:56:34 2016 -0400
Committer: Josh Elser 
Committed: Tue Aug 2 18:23:55 2016 -0400

--
 .../apache/phoenix/jdbc/PhoenixEmbeddedDriver.java   | 15 +++
 1 file changed, 15 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/32c8c726/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
index d2dd94f..375388a 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java
@@ -19,6 +19,7 @@ package org.apache.phoenix.jdbc;
 
 import static 
org.apache.phoenix.util.PhoenixRuntime.PHOENIX_TEST_DRIVER_URL_PARAM;
 
+import java.io.IOException;
 import java.sql.Connection;
 import java.sql.Driver;
 import java.sql.DriverPropertyInfo;
@@ -35,6 +36,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.security.User;
 import org.apache.phoenix.coprocessor.MetaDataProtocol;
 import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.exception.SQLExceptionInfo;
@@ -340,6 +342,7 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 private final boolean isConnectionless;
 private final String principal;
 private final String keytab;
+private final User user;
 
 public ConnectionInfo(String zookeeperQuorum, Integer port, String 
rootNode, String principal, String keytab) {
 this.zookeeperQuorum = zookeeperQuorum;
@@ -348,6 +351,14 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 this.isConnectionless = 
PhoenixRuntime.CONNECTIONLESS.equals(zookeeperQuorum);
 this.principal = principal;
 this.keytab = keytab;
+try {
+this.user = User.getCurrent();
+} catch (IOException e) {
+throw new RuntimeException("Couldn't get the current user!!");
+}
+if (null == this.user) {
+throw new RuntimeException("Acquired null user which should 
never happen");
+}
 }
 
 public ConnectionInfo(String zookeeperQuorum, Integer port, String 
rootNode) {
@@ -406,6 +417,8 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 result = prime * result + ((rootNode == null) ? 0 : 
rootNode.hashCode());
 result = prime * result + ((principal == null) ? 0 : 
principal.hashCode());
 result = prime * result + ((keytab == null) ? 0 : 
keytab.hashCode());
+// `user` is guaranteed to be non-null
+result = prime * result + user.hashCode();
 return result;
 }
 
@@ -415,6 +428,8 @@ public abstract class PhoenixEmbeddedDriver implements 
Driver, SQLCloseable {
 if (obj == null) return false;
 if (getClass() != obj.getClass()) return false;
 ConnectionInfo other = (ConnectionInfo) obj;
+// `user` is guaranteed to be non-null
+if (!other.user.equals(user)) return false;
 if (zookeeperQuorum == null) {
 if (other.zookeeperQuorum != null) return false;
 } else if (!zookeeperQuorum.equals(other.zookeeperQuorum)) return 
false;