[19/50] [abbrv] phoenix git commit: PHOENIX-3109 Improve and fix the way we are caching column family names for local indexes in IndexMaintainer

2016-08-05 Thread samarth 
PHOENIX-3109 Improve and fix the way we are caching column family names for 
local indexes in IndexMaintainer


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

Branch: refs/heads/encodecolumns
Commit: 925d3eefa66181e5c66d5f8340bfe809386ce827
Parents: d744886
Author: Samarth 
Authored: Fri Jul 22 13:50:55 2016 -0700
Committer: Samarth 
Committed: Fri Jul 22 13:50:55 2016 -0700

--
 .../coprocessor/MetaDataEndpointImpl.java   |  2 +-
 .../index/covered/update/ColumnReference.java   | 10 ++-
 .../index/util/ReadOnlyImmutableBytesPtr.java   | 59 --
 .../apache/phoenix/index/IndexMaintainer.java   | 64 +---
 .../apache/phoenix/schema/MetaDataClient.java   |  2 +-
 .../phoenix/index/IndexMaintainerTest.java  |  2 +-
 6 files changed, 36 insertions(+), 103 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/925d3eef/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
index 349c6fa..5d20fbb 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
@@ -3116,7 +3116,7 @@ public class MetaDataEndpointImpl extends 
MetaDataProtocol implements Coprocesso
 invalidateList.add(new ImmutableBytesPtr(indexKey));
 }
 // If the dropped column is a covered index column, invalidate the 
index
-else if (indexMaintainer.getCoverededColumns().contains(
+else if (indexMaintainer.getCoveredColumns().contains(
 new ColumnReference(columnToDelete.getFamilyName().getBytes(), 
columnToDelete
 .getName().getBytes( {
 invalidateList.add(new ImmutableBytesPtr(indexKey));

http://git-wip-us.apache.org/repos/asf/phoenix/blob/925d3eef/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/update/ColumnReference.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/update/ColumnReference.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/update/ColumnReference.java
index 4ea7295..452e15c 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/update/ColumnReference.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/update/ColumnReference.java
@@ -21,7 +21,6 @@ import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr;
-import org.apache.phoenix.hbase.index.util.ReadOnlyImmutableBytesPtr;
 
 /**
  * 
@@ -45,16 +44,15 @@ public class ColumnReference implements 
Comparable {
 private final ImmutableBytesPtr qualifierPtr;
 
 public ColumnReference(byte[] family, byte[] qualifier) {
-this.familyPtr = new ReadOnlyImmutableBytesPtr(family);
-this.qualifierPtr = new ReadOnlyImmutableBytesPtr(qualifier);
+this.familyPtr = new ImmutableBytesPtr(family);
+this.qualifierPtr = new ImmutableBytesPtr(qualifier);
 this.hashCode = calcHashCode(this.familyPtr, this.qualifierPtr);
 }
 
 public ColumnReference(byte[] family, int familyOffset, int familyLength, 
byte[] qualifier,
 int qualifierOffset, int qualifierLength) {
-this.familyPtr = new ReadOnlyImmutableBytesPtr(family, familyOffset, 
familyLength);
-this.qualifierPtr =
-new ReadOnlyImmutableBytesPtr(qualifier, qualifierOffset, 
qualifierLength);
+this.familyPtr = new ImmutableBytesPtr(family, familyOffset, 
familyLength);
+this.qualifierPtr = new ImmutableBytesPtr(qualifier, qualifierOffset, 
qualifierLength);
 this.hashCode = calcHashCode(this.familyPtr, this.qualifierPtr);
 }
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/925d3eef/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/util/ReadOnlyImmutableBytesPtr.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/util/ReadOnlyImmutableBytesPtr.java

phoenix git commit: PHOENIX-3109 Improve and fix the way we are caching column family names for local indexes in IndexMaintainer

2016-07-22 Thread samarth 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 b32816971 -> 1078209bf


PHOENIX-3109 Improve and fix the way we are caching column family names for 
local indexes in IndexMaintainer


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

Branch: refs/heads/4.x-HBase-1.1
Commit: 1078209bfcd1c73f1c60c28f56fd7d43e158e764
Parents: b328169
Author: Samarth 
Authored: Fri Jul 22 14:04:17 2016 -0700
Committer: Samarth 
Committed: Fri Jul 22 14:04:17 2016 -0700

--
 .../coprocessor/MetaDataEndpointImpl.java   |  2 +-
 .../index/covered/update/ColumnReference.java   |  9 ++-
 .../index/util/ReadOnlyImmutableBytesPtr.java   | 59 --
 .../apache/phoenix/index/IndexMaintainer.java   | 64 +---
 .../apache/phoenix/schema/MetaDataClient.java   |  2 +-
 .../phoenix/index/IndexMaintainerTest.java  |  2 +-
 6 files changed, 36 insertions(+), 102 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/1078209b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
index 8bea46b..7d3468d 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
@@ -3116,7 +3116,7 @@ public class MetaDataEndpointImpl extends 
MetaDataProtocol implements Coprocesso
 invalidateList.add(new ImmutableBytesPtr(indexKey));
 }
 // If the dropped column is a covered index column, invalidate the 
index
-else if (indexMaintainer.getCoverededColumns().contains(
+else if (indexMaintainer.getCoveredColumns().contains(
 new ColumnReference(columnToDelete.getFamilyName().getBytes(), 
columnToDelete
 .getName().getBytes( {
 invalidateList.add(new ImmutableBytesPtr(indexKey));

http://git-wip-us.apache.org/repos/asf/phoenix/blob/1078209b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/update/ColumnReference.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/update/ColumnReference.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/update/ColumnReference.java
index 8bd35f8..00348b3 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/update/ColumnReference.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/update/ColumnReference.java
@@ -22,7 +22,6 @@ import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr;
-import org.apache.phoenix.hbase.index.util.ReadOnlyImmutableBytesPtr;
 
 /**
  * 
@@ -46,15 +45,15 @@ public class ColumnReference implements 
Comparable {
 private final ImmutableBytesPtr qualifierPtr;
 
 public ColumnReference(byte[] family, byte[] qualifier) {
-this.familyPtr = new ReadOnlyImmutableBytesPtr(family);
-this.qualifierPtr = new ReadOnlyImmutableBytesPtr(qualifier);
+this.familyPtr = new ImmutableBytesPtr(family);
+this.qualifierPtr = new ImmutableBytesPtr(qualifier);
 this.hashCode = calcHashCode(this.familyPtr, this.qualifierPtr);
 }
 
 public ColumnReference(byte[] family, int familyOffset, int familyLength, 
byte[] qualifier,
 int qualifierOffset, int qualifierLength) {
-this.familyPtr = new ReadOnlyImmutableBytesPtr(family, familyOffset, 
familyLength);
-this.qualifierPtr = new ReadOnlyImmutableBytesPtr(qualifier, 
qualifierOffset, qualifierLength);
+this.familyPtr = new ImmutableBytesPtr(family, familyOffset, 
familyLength);
+this.qualifierPtr = new ImmutableBytesPtr(qualifier, qualifierOffset, 
qualifierLength);
 this.hashCode = calcHashCode(this.familyPtr, this.qualifierPtr);
 }
   

http://git-wip-us.apache.org/repos/asf/phoenix/blob/1078209b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/util/ReadOnlyImmutableBytesPtr.java
--
diff --git

phoenix git commit: PHOENIX-3109 Improve and fix the way we are caching column family names for local indexes in IndexMaintainer

2016-07-22 Thread samarth 
Repository: phoenix
Updated Branches:
  refs/heads/master 3878f3cbf -> 16d495a68


PHOENIX-3109 Improve and fix the way we are caching column family names for 
local indexes in IndexMaintainer


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

Branch: refs/heads/master
Commit: 16d495a689bab8a0c3bb2b0f06d29e9a4736f4d1
Parents: 3878f3c
Author: Samarth 
Authored: Fri Jul 22 13:45:29 2016 -0700
Committer: Samarth 
Committed: Fri Jul 22 13:45:29 2016 -0700

--
 .../coprocessor/MetaDataEndpointImpl.java   |  2 +-
 .../index/covered/update/ColumnReference.java   |  9 ++-
 .../index/util/ReadOnlyImmutableBytesPtr.java   | 59 --
 .../apache/phoenix/index/IndexMaintainer.java   | 64 +---
 .../apache/phoenix/schema/MetaDataClient.java   |  2 +-
 .../phoenix/index/IndexMaintainerTest.java  |  2 +-
 6 files changed, 36 insertions(+), 102 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/16d495a6/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
index 8bea46b..7d3468d 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java
@@ -3116,7 +3116,7 @@ public class MetaDataEndpointImpl extends 
MetaDataProtocol implements Coprocesso
 invalidateList.add(new ImmutableBytesPtr(indexKey));
 }
 // If the dropped column is a covered index column, invalidate the 
index
-else if (indexMaintainer.getCoverededColumns().contains(
+else if (indexMaintainer.getCoveredColumns().contains(
 new ColumnReference(columnToDelete.getFamilyName().getBytes(), 
columnToDelete
 .getName().getBytes( {
 invalidateList.add(new ImmutableBytesPtr(indexKey));

http://git-wip-us.apache.org/repos/asf/phoenix/blob/16d495a6/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/update/ColumnReference.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/update/ColumnReference.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/update/ColumnReference.java
index 8bd35f8..00348b3 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/update/ColumnReference.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/update/ColumnReference.java
@@ -22,7 +22,6 @@ import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr;
-import org.apache.phoenix.hbase.index.util.ReadOnlyImmutableBytesPtr;
 
 /**
  * 
@@ -46,15 +45,15 @@ public class ColumnReference implements 
Comparable {
 private final ImmutableBytesPtr qualifierPtr;
 
 public ColumnReference(byte[] family, byte[] qualifier) {
-this.familyPtr = new ReadOnlyImmutableBytesPtr(family);
-this.qualifierPtr = new ReadOnlyImmutableBytesPtr(qualifier);
+this.familyPtr = new ImmutableBytesPtr(family);
+this.qualifierPtr = new ImmutableBytesPtr(qualifier);
 this.hashCode = calcHashCode(this.familyPtr, this.qualifierPtr);
 }
 
 public ColumnReference(byte[] family, int familyOffset, int familyLength, 
byte[] qualifier,
 int qualifierOffset, int qualifierLength) {
-this.familyPtr = new ReadOnlyImmutableBytesPtr(family, familyOffset, 
familyLength);
-this.qualifierPtr = new ReadOnlyImmutableBytesPtr(qualifier, 
qualifierOffset, qualifierLength);
+this.familyPtr = new ImmutableBytesPtr(family, familyOffset, 
familyLength);
+this.qualifierPtr = new ImmutableBytesPtr(qualifier, qualifierOffset, 
qualifierLength);
 this.hashCode = calcHashCode(this.familyPtr, this.qualifierPtr);
 }
   

http://git-wip-us.apache.org/repos/asf/phoenix/blob/16d495a6/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/util/ReadOnlyImmutableBytesPtr.java
--
diff --git