[01/11] phoenix git commit: PHOENIX-3156 DistinctPrefixFilter optimization produces incorrect results with some non-pk WHERE conditions. [Forced Update!]

[samarth]

Repository: phoenix
Updated Branches:
  refs/heads/encodecolumns a0d529894 -> 450dbc59a (forced update)


PHOENIX-3156 DistinctPrefixFilter optimization produces incorrect results with 
some non-pk WHERE conditions.


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

Branch: refs/heads/encodecolumns
Commit: e3690cb7db6b577602a9f0b3dddf633043befff6
Parents: 9651f59
Author: Lars Hofhansl 
Authored: Fri Aug 5 21:39:56 2016 -0700
Committer: Lars Hofhansl 
Committed: Fri Aug 5 21:39:56 2016 -0700

--
 .../org/apache/phoenix/end2end/DistinctPrefixFilterIT.java| 7 ---
 .../java/org/apache/phoenix/iterate/BaseResultIterators.java  | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e3690cb7/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 9d31070..1a0e4e1 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
@@ -171,8 +171,6 @@ public class DistinctPrefixFilterIT extends 
BaseHBaseManagedTimeTableReuseIT {
 testPlan("SELECT COUNT(*) FROM (SELECT DISTINCT(prefix1) FROM 
"+testTable+")", true);
 testPlan("SELECT /*+ RANGE_SCAN */ DISTINCT prefix1 FROM "+testTable, 
false);
 testPlan("SELECT DISTINCT prefix1, prefix2 FROM "+testTable, true);
-// use the filter even when the boolean expression filter is used
-testPlan("SELECT DISTINCT prefix1, prefix2 FROM "+testTable+ " WHERE 
col1 > 0.5", true);
 // do not use the filter when the distinct is on the entire key
 testPlan("SELECT DISTINCT prefix1, prefix2, prefix3 FROM "+testTable, 
false);
 testPlan("SELECT DISTINCT (prefix1, prefix2, prefix3) FROM 
"+testTable, false);
@@ -193,7 +191,6 @@ public class DistinctPrefixFilterIT extends 
BaseHBaseManagedTimeTableReuseIT {
 testPlan("SELECT (prefix1, prefix2, prefix3) FROM "+testTable+" GROUP 
BY (prefix1, prefix2, prefix3)", false);
 testPlan("SELECT prefix1, 1, 2 FROM "+testTable+" GROUP BY prefix1", 
true);
 testPlan("SELECT prefix1 FROM "+testTable+" GROUP BY prefix1, col1", 
false);
-testPlan("SELECT DISTINCT prefix1, prefix2 FROM "+testTable+" WHERE 
col1 > 0.5", true);
 
 testPlan("SELECT COUNT(DISTINCT prefix1) FROM "+testTable+" HAVING 
COUNT(col1) > 10", false);
 testPlan("SELECT COUNT(DISTINCT prefix1) FROM "+testTable+" ORDER BY 
COUNT(col1)", true);
@@ -204,6 +201,8 @@ public class DistinctPrefixFilterIT extends 
BaseHBaseManagedTimeTableReuseIT {
 testPlan("SELECT COUNT(DISTINCT prefix1) FROM "+testTable+" HAVING 
COUNT(DISTINCT prefix2) > 10", false);
 testPlan("SELECT COUNT(DISTINCT prefix1) FROM "+testTable+" HAVING 
COUNT(DISTINCT prefix1) > 10", false);
 testPlan("SELECT COUNT(DISTINCT prefix1) / 10 FROM "+testTable, false);
+// do not use the filter when the boolean expression filter is used
+testPlan("SELECT DISTINCT prefix1, prefix2 FROM "+testTable+" WHERE 
col1 > 0.5", false);
 }
 
 private void testPlan(String query, boolean optimizable) throws Exception {
@@ -220,6 +219,7 @@ public class DistinctPrefixFilterIT extends 
BaseHBaseManagedTimeTableReuseIT {
 testSkipRange("SELECT %s prefix1 FROM "+ testTableF + " GROUP BY 
prefix1, prefix2 HAVING prefix2 = 2147483647", 2);
 testSkipRange("SELECT %s prefix1 FROM "+ testTableF + " GROUP BY 
prefix1, prefix2 HAVING prefix1 = 2147483647", 1);
 testSkipRange("SELECT %s prefix1 FROM "+ testTableF + " WHERE col1 > 
0.99 GROUP BY prefix1, prefix2 HAVING prefix2 = 2", -1);
+testSkipRange("SELECT %s prefix1 FROM "+ testTableF + " WHERE col1 >=0 
and col2 > 990 GROUP BY prefix1, prefix2 HAVING prefix2 = 2", -1);
 
 testSkipRange("SELECT %s prefix1 FROM "+ testTableV + " GROUP BY 
prefix1, prefix2 HAVING prefix1 IN ('1','2')", 6);
 testSkipRange("SELECT %s prefix1 FROM "+ testTableV + " GROUP BY 
prefix1, prefix2 HAVING prefix1 IN ('1','2') AND prefix2 IN ('1','2')", 4);
@@ -228,6 +228,7 @@ public class DistinctPrefixFilterIT extends 
BaseHBaseManagedTimeTableReuseIT {
 testSkipRange("SELECT %s prefix1 FROM "+ testTableV + " GROUP BY 
prefix1, prefix2 HAVING prefix2 = '22'", 1);
 

[03/11] phoenix git commit: PHOENIX-3152 Incorrect comparator in QueryOptimizer may cause IllegalArgumentException

[samarth]

PHOENIX-3152 Incorrect comparator in QueryOptimizer may cause 
IllegalArgumentException


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

Branch: refs/heads/encodecolumns
Commit: b8e65d0d1ac5aa39ac70e463ec774825ce53f568
Parents: 71728df
Author: Sergey Soldatov 
Authored: Sat Aug 6 16:31:13 2016 -0700
Committer: Sergey Soldatov 
Committed: Sat Aug 6 19:45:22 2016 -0700

--
 .../apache/phoenix/optimize/QueryOptimizer.java | 21 +++-
 1 file changed, 12 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/b8e65d0d/phoenix-core/src/main/java/org/apache/phoenix/optimize/QueryOptimizer.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/optimize/QueryOptimizer.java 
b/phoenix-core/src/main/java/org/apache/phoenix/optimize/QueryOptimizer.java
index e4198ee..bd9c811 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/optimize/QueryOptimizer.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/optimize/QueryOptimizer.java
@@ -383,35 +383,38 @@ public class QueryOptimizer {
 // For shared indexes (i.e. indexes on views and local 
indexes),
 // a) add back any view constants as these won't be in the 
index, and
 // b) ignore the viewIndexId which will be part of the row key 
columns.
-int c = 
(plan2.getContext().getScanRanges().getBoundPkColumnCount() + 
(table2.getViewIndexId() == null ? 0 : (boundRanges - 1))) - 
+int c = 
(plan2.getContext().getScanRanges().getBoundPkColumnCount() + 
(table2.getViewIndexId() == null ? 0 : (boundRanges - 1))) -
 
(plan1.getContext().getScanRanges().getBoundPkColumnCount() + 
(table1.getViewIndexId() == null ? 0 : (boundRanges - 1)));
 if (c != 0) return c;
-if (plan1.getGroupBy()!=null && plan2.getGroupBy()!=null) {
+if (plan1.getGroupBy() != null && plan2.getGroupBy() != null) {
 if (plan1.getGroupBy().isOrderPreserving() != 
plan2.getGroupBy().isOrderPreserving()) {
 return plan1.getGroupBy().isOrderPreserving() ? -1 : 1;
-} 
+}
 }
 // Use smaller table (table with fewest kv columns)
 c = (table1.getColumns().size() - 
table1.getPKColumns().size()) - (table2.getColumns().size() - 
table2.getPKColumns().size());
 if (c != 0) return c;
-
+
 // If all things are equal, don't choose local index as it 
forces scan
 // on every region (unless there's no start/stop key)
-if (table1.getIndexType() == IndexType.LOCAL) {
+
+if (table1.getIndexType() == IndexType.LOCAL && 
table2.getIndexType() !=
+IndexType.LOCAL) {
 return 
plan1.getContext().getScanRanges().getRanges().isEmpty() ? -1 : 1;
 }
-if (table2.getIndexType() == IndexType.LOCAL) {
+if (table2.getIndexType() == IndexType.LOCAL && 
table1.getIndexType() !=
+IndexType.LOCAL) {
 return 
plan2.getContext().getScanRanges().getRanges().isEmpty() ? 1 : -1;
 }
 
 // All things being equal, just use the table based on the 
Hint.USE_DATA_OVER_INDEX_TABLE
-if (table1.getType() == PTableType.INDEX) {
+
+if (table1.getType() == PTableType.INDEX && table2.getType() 
!= PTableType.INDEX) {
 return comparisonOfDataVersusIndexTable;
 }
-if (table2.getType() == PTableType.INDEX) {
+if (table2.getType() == PTableType.INDEX && table1.getType() 
!= PTableType.INDEX) {
 return -comparisonOfDataVersusIndexTable;
 }
-
 return 0;
 }
 

[10/11] phoenix git commit: Encode column names and take advantage of encoding in group by and order by

[samarth]

http://git-wip-us.apache.org/repos/asf/phoenix/blob/450dbc59/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java
index 13963d7..5e64209 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/WhereCompiler.java
@@ -56,6 +56,7 @@ import org.apache.phoenix.schema.TableRef;
 import org.apache.phoenix.schema.TypeMismatchException;
 import org.apache.phoenix.schema.types.PBoolean;
 import org.apache.phoenix.util.ByteUtil;
+import org.apache.phoenix.util.EncodedColumnsUtil;
 import org.apache.phoenix.util.ScanUtil;
 import org.apache.phoenix.util.SchemaUtil;
 
@@ -170,8 +171,8 @@ public class WhereCompiler {
 TableRef tableRef = ref.getTableRef();
 if (tableRef.equals(context.getCurrentTable()) && 
!SchemaUtil.isPKColumn(ref.getColumn())) {
 // track the where condition columns. Later we need to ensure 
the Scan in HRS scans these column CFs
-
context.addWhereCoditionColumn(ref.getColumn().getFamilyName().getBytes(), 
ref.getColumn().getName()
-.getBytes());
+byte[] cq = 
EncodedColumnsUtil.getColumnQualifier(ref.getColumn(), tableRef.getTable());
+
context.addWhereCoditionColumn(ref.getColumn().getFamilyName().getBytes(), cq);
 }
 return ref.newColumnExpression(node.isTableNameCaseSensitive(), 
node.isCaseSensitive());
 }
@@ -194,7 +195,7 @@ public class WhereCompiler {
 // just use that.
 try {
 if (!SchemaUtil.isPKColumn(ref.getColumn())) {
-table.getColumn(ref.getColumn().getName().getString());
+
table.getPColumnForColumnName(ref.getColumn().getName().getString());
 }
 } catch (AmbiguousColumnException e) {
 disambiguateWithFamily = true;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/450dbc59/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
index be4766f..5922b5d 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseScannerRegionObserver.java
@@ -25,7 +25,6 @@ import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CoprocessorEnvironment;
 import org.apache.hadoop.hbase.DoNotRetryIOException;
-import org.apache.hadoop.hbase.HColumnDescriptor;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.HRegionInfo;
 import org.apache.hadoop.hbase.KeyValue;
@@ -51,18 +50,19 @@ import org.apache.phoenix.schema.KeyValueSchema;
 import org.apache.phoenix.schema.StaleRegionBoundaryCacheException;
 import org.apache.phoenix.schema.ValueBitSet;
 import org.apache.phoenix.schema.tuple.MultiKeyValueTuple;
+import org.apache.phoenix.schema.tuple.PositionBasedMultiKeyValueTuple;
+import org.apache.phoenix.schema.tuple.PositionBasedResultTuple;
 import org.apache.phoenix.schema.tuple.ResultTuple;
 import org.apache.phoenix.schema.tuple.Tuple;
 import org.apache.phoenix.util.IndexUtil;
 import org.apache.phoenix.util.ScanUtil;
 import org.apache.phoenix.util.ServerUtil;
+import org.apache.tephra.Transaction;
 import org.cloudera.htrace.Span;
 import org.cloudera.htrace.Trace;
 
 import com.google.common.collect.ImmutableList;
 
-import org.apache.tephra.Transaction;
-
 
 abstract public class BaseScannerRegionObserver extends BaseRegionObserver {
 
@@ -79,6 +79,7 @@ abstract public class BaseScannerRegionObserver extends 
BaseRegionObserver {
 public static final String DELETE_CQ = "_DeleteCQ";
 public static final String DELETE_CF = "_DeleteCF";
 public static final String EMPTY_CF = "_EmptyCF";
+public static final String EMPTY_COLUMN_QUALIFIER = 
"_EmptyColumnQualifier";
 public static final String SPECIFIC_ARRAY_INDEX = "_SpecificArrayIndex";
 public static final String GROUP_BY_LIMIT = "_GroupByLimit";
 public static final String LOCAL_INDEX = "_LocalIndex";
@@ -102,6 +103,8 @@ abstract public class BaseScannerRegionObserver extends 
BaseRegionObserver {
 public final static String SCAN_OFFSET = "_RowOffset";
 public static final String SCAN_START_ROW_SUFFIX = "_ScanStartRowSuffix";
 public static final String SCAN_STOP_ROW_SUFFIX = "_ScanStopRowSuffix";
+public final 

[07/11] phoenix git commit: Encode column names and take advantage of encoding in group by and order by

[samarth]

http://git-wip-us.apache.org/repos/asf/phoenix/blob/450dbc59/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
index 1264e32..c9cefaf 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java
@@ -35,6 +35,7 @@ import static 
org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.COLUMN_COUNT;
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.COLUMN_DEF;
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.COLUMN_FAMILY;
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.COLUMN_NAME;
+import static 
org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.COLUMN_QUALIFIER_COUNTER;
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.COLUMN_SIZE;
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.DATA_TABLE_NAME;
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.DATA_TYPE;
@@ -42,6 +43,7 @@ import static 
org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.DECIMAL_DIGITS;
 import static 
org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.DEFAULT_COLUMN_FAMILY_NAME;
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.DEFAULT_VALUE;
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.DISABLE_WAL;
+import static 
org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.ENCODED_COLUMN_QUALIFIER;
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.FUNCTION_NAME;
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.IMMUTABLE_ROWS;
 import static 
org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.INDEX_DISABLE_TIMESTAMP;
@@ -68,6 +70,7 @@ import static 
org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.PK_NAME;
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.RETURN_TYPE;
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.SALT_BUCKETS;
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.SORT_ORDER;
+import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.STORAGE_SCHEME;
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.STORE_NULLS;
 import static 
org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.SYSTEM_CATALOG_SCHEMA;
 import static 
org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.SYSTEM_CATALOG_TABLE;
@@ -85,6 +88,7 @@ import static 
org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.VIEW_INDEX_ID;
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.VIEW_STATEMENT;
 import static org.apache.phoenix.jdbc.PhoenixDatabaseMetaData.VIEW_TYPE;
 import static 
org.apache.phoenix.query.QueryConstants.BASE_TABLE_BASE_COLUMN_COUNT;
+import static 
org.apache.phoenix.query.QueryConstants.ENCODED_CQ_COUNTER_INITIAL_VALUE;
 import static org.apache.phoenix.query.QueryServices.DROP_METADATA_ATTRIB;
 import static 
org.apache.phoenix.query.QueryServicesOptions.DEFAULT_DROP_METADATA;
 import static 
org.apache.phoenix.query.QueryServicesOptions.DEFAULT_RUN_UPDATE_STATS_ASYNC;
@@ -188,8 +192,10 @@ import 
org.apache.phoenix.query.ConnectionQueryServices.Feature;
 import org.apache.phoenix.query.QueryConstants;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.query.QueryServicesOptions;
+import org.apache.phoenix.schema.PTable.EncodedCQCounter;
 import org.apache.phoenix.schema.PTable.IndexType;
 import org.apache.phoenix.schema.PTable.LinkType;
+import org.apache.phoenix.schema.PTable.StorageScheme;
 import org.apache.phoenix.schema.PTable.ViewType;
 import org.apache.phoenix.schema.stats.PTableStats;
 import org.apache.phoenix.schema.types.PDataType;
@@ -201,6 +207,7 @@ import org.apache.phoenix.schema.types.PUnsignedLong;
 import org.apache.phoenix.schema.types.PVarbinary;
 import org.apache.phoenix.schema.types.PVarchar;
 import org.apache.phoenix.util.ByteUtil;
+import org.apache.phoenix.util.EncodedColumnsUtil;
 import org.apache.phoenix.util.IndexUtil;
 import org.apache.phoenix.util.LogUtil;
 import org.apache.phoenix.util.MetaDataUtil;
@@ -223,6 +230,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import com.google.common.primitives.Ints;
+import static org.apache.phoenix.schema.PTable.EncodedCQCounter.NULL_COUNTER;
 
 public class MetaDataClient {
 private static final Logger logger = 
LoggerFactory.getLogger(MetaDataClient.class);
@@ -261,9 +269,10 @@ public class MetaDataClient {
 UPDATE_CACHE_FREQUENCY + "," +
 IS_NAMESPACE_MAPPED + "," +
 AUTO_PARTITION_SEQ +  "," +
-APPEND_ONLY_SCHEMA +
-") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 
?, ?, ?, ?, ?, ?, ?)";
-
+APPEND_ONLY_SCHEMA + "," +
+STORAGE_SCHEME +
+   

[11/11] phoenix git commit: Encode column names and take advantage of encoding in group by and order by

[samarth]

Encode column names and take advantage of encoding in group by and order by


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

Branch: refs/heads/encodecolumns
Commit: 450dbc59a17ff38b956798c0c71755168cd457ac
Parents: 04dc321
Author: Samarth 
Authored: Fri Aug 5 13:53:46 2016 -0700
Committer: Samarth 
Committed: Sun Aug 7 18:38:10 2016 -0700

--
 .../apache/phoenix/end2end/AlterTableIT.java|  207 +++-
 .../phoenix/end2end/AlterTableWithViewsIT.java  |  118 +-
 .../apache/phoenix/end2end/CreateTableIT.java   |   22 +
 .../apache/phoenix/end2end/DynamicColumnIT.java |2 +-
 .../org/apache/phoenix/end2end/GroupByIT.java   |3 -
 .../phoenix/end2end/PhoenixRuntimeIT.java   |6 +-
 .../phoenix/end2end/RowValueConstructorIT.java  |2 +-
 .../phoenix/end2end/StatsCollectorIT.java   |4 +-
 .../StatsCollectorWithSplitsAndMultiCFIT.java   |   10 +-
 .../apache/phoenix/end2end/UpsertValuesIT.java  |   40 +
 .../phoenix/end2end/index/DropMetadataIT.java   |   11 +-
 .../phoenix/end2end/index/IndexTestUtil.java|   13 +-
 .../phoenix/compile/CreateTableCompiler.java|2 +-
 .../phoenix/compile/ExpressionCompiler.java |3 +-
 .../apache/phoenix/compile/FromCompiler.java|   54 +-
 .../apache/phoenix/compile/JoinCompiler.java|8 +-
 .../phoenix/compile/ListJarsQueryPlan.java  |3 +-
 .../apache/phoenix/compile/PostDDLCompiler.java |   11 +-
 .../phoenix/compile/ProjectionCompiler.java |   10 +-
 .../apache/phoenix/compile/TraceQueryPlan.java  |2 +-
 .../compile/TupleProjectionCompiler.java|   28 +-
 .../apache/phoenix/compile/UnionCompiler.java   |6 +-
 .../apache/phoenix/compile/WhereCompiler.java   |7 +-
 .../coprocessor/BaseScannerRegionObserver.java  |   45 +-
 .../coprocessor/DelegateRegionScanner.java  |5 +
 .../GroupedAggregateRegionObserver.java |   36 +-
 .../coprocessor/HashJoinRegionScanner.java  |2 +-
 .../coprocessor/MetaDataEndpointImpl.java   |  148 ++-
 .../phoenix/coprocessor/ScanRegionObserver.java |   16 +-
 .../coprocessor/SequenceRegionObserver.java |1 +
 .../UngroupedAggregateRegionObserver.java   |   26 +-
 .../coprocessor/generated/PTableProtos.java | 1047 +-
 .../apache/phoenix/execute/BaseQueryPlan.java   |   16 +-
 .../apache/phoenix/execute/MutationState.java   |2 +-
 .../phoenix/execute/SortMergeJoinPlan.java  |1 +
 .../apache/phoenix/execute/TupleProjector.java  |6 +-
 .../expression/KeyValueColumnExpression.java|   16 +-
 .../expression/ProjectedColumnExpression.java   |1 +
 .../phoenix/filter/ColumnProjectionFilter.java  |   24 +-
 .../filter/MultiKeyValueComparisonFilter.java   |4 +-
 .../filter/SingleKeyValueComparisonFilter.java  |2 +-
 .../example/CoveredColumnIndexCodec.java|1 -
 .../apache/phoenix/index/IndexMaintainer.java   |  127 ++-
 .../index/PhoenixTransactionalIndexer.java  |   16 +-
 .../phoenix/iterate/BaseResultIterators.java|   80 +-
 .../iterate/LookAheadResultIterator.java|2 +-
 .../phoenix/iterate/MappedByteBufferQueue.java  |1 +
 .../phoenix/iterate/OrderedResultIterator.java  |3 +-
 .../iterate/RegionScannerResultIterator.java|   14 +-
 .../apache/phoenix/jdbc/PhoenixConnection.java  |2 +-
 .../phoenix/jdbc/PhoenixDatabaseMetaData.java   |   12 +-
 .../apache/phoenix/jdbc/PhoenixResultSet.java   |2 +-
 .../apache/phoenix/join/HashCacheFactory.java   |1 +
 .../mapreduce/FormatToBytesWritableMapper.java  |   25 +-
 .../mapreduce/FormatToKeyValueReducer.java  |   30 +-
 .../query/ConnectionQueryServicesImpl.java  |1 +
 .../apache/phoenix/query/QueryConstants.java|   53 +-
 .../phoenix/query/QueryServicesOptions.java |2 +-
 .../org/apache/phoenix/schema/ColumnRef.java|5 +-
 .../apache/phoenix/schema/DelegateColumn.java   |5 +
 .../apache/phoenix/schema/DelegateTable.java|   20 +-
 .../apache/phoenix/schema/KeyValueSchema.java   |2 +
 .../apache/phoenix/schema/MetaDataClient.java   |  261 -
 .../java/org/apache/phoenix/schema/PColumn.java |9 +-
 .../apache/phoenix/schema/PColumnFamily.java|   14 +-
 .../phoenix/schema/PColumnFamilyImpl.java   |   50 +-
 .../org/apache/phoenix/schema/PColumnImpl.java  |   24 +-
 .../apache/phoenix/schema/PMetaDataImpl.java|4 +-
 .../java/org/apache/phoenix/schema/PName.java   |   26 +
 .../java/org/apache/phoenix/schema/PTable.java  |   91 +-
 .../org/apache/phoenix/schema/PTableImpl.java   |  343 +++---
 .../org/apache/phoenix/schema/PTableKey.java|6 +-
 

[05/11] phoenix git commit: Encode column names and take advantage of encoding in group by and order by

[samarth]

http://git-wip-us.apache.org/repos/asf/phoenix/blob/450dbc59/phoenix-core/src/main/java/org/apache/phoenix/util/EncodedColumnsUtil.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/util/EncodedColumnsUtil.java 
b/phoenix-core/src/main/java/org/apache/phoenix/util/EncodedColumnsUtil.java
new file mode 100644
index 000..bfbfc54
--- /dev/null
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/EncodedColumnsUtil.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.phoenix.util;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import org.apache.hadoop.hbase.util.Pair;
+import org.apache.phoenix.query.QueryConstants;
+import org.apache.phoenix.schema.PColumn;
+import org.apache.phoenix.schema.PTable;
+import org.apache.phoenix.schema.PTable.StorageScheme;
+import org.apache.phoenix.schema.types.PInteger;
+
+public class EncodedColumnsUtil {
+
+public static boolean usesEncodedColumnNames(PTable table) {
+return table.getStorageScheme() != null && table.getStorageScheme() == 
StorageScheme.ENCODED_COLUMN_NAMES;
+}
+
+public static byte[] getEncodedColumnQualifier(PColumn column) {
+checkArgument(!SchemaUtil.isPKColumn(column), "No column qualifiers 
for PK columns");
+checkArgument(!column.isDynamic(), "No encoded column qualifiers for 
dynamic columns");
+return PInteger.INSTANCE.toBytes(column.getEncodedColumnQualifier());
+}
+
+public static byte[] getColumnQualifier(PColumn column, PTable table) {
+  return EncodedColumnsUtil.getColumnQualifier(column, 
usesEncodedColumnNames(table));
+}
+
+public static byte[] getColumnQualifier(PColumn column, boolean 
encodedColumnName) {
+checkArgument(!SchemaUtil.isPKColumn(column), "No column qualifiers 
for PK columns");
+if (column.isDynamic()) { // Dynamic column names don't have encoded 
column names
+return column.getName().getBytes();
+}
+return encodedColumnName ? 
PInteger.INSTANCE.toBytes(column.getEncodedColumnQualifier()) : 
column.getName().getBytes(); 
+}
+
+/**
+ * @return pair of byte arrays. The first part of the pair is the empty 
key value's column qualifier, and the second
+ * part is the value to use for it.
+ */
+public static Pair getEmptyKeyValueInfo(PTable table) {
+return usesEncodedColumnNames(table) ? new 
Pair<>(QueryConstants.ENCODED_EMPTY_COLUMN_BYTES,
+QueryConstants.ENCODED_EMPTY_COLUMN_VALUE_BYTES) : new 
Pair<>(QueryConstants.EMPTY_COLUMN_BYTES,
+QueryConstants.EMPTY_COLUMN_VALUE_BYTES);
+}
+
+/**
+ * @return pair of byte arrays. The first part of the pair is the empty 
key value's column qualifier, and the second
+ * part is the value to use for it.
+ */
+public static Pair getEmptyKeyValueInfo(boolean 
usesEncodedColumnNames) {
+return usesEncodedColumnNames ? new 
Pair<>(QueryConstants.ENCODED_EMPTY_COLUMN_BYTES,
+QueryConstants.ENCODED_EMPTY_COLUMN_VALUE_BYTES) : new 
Pair<>(QueryConstants.EMPTY_COLUMN_BYTES,
+QueryConstants.EMPTY_COLUMN_VALUE_BYTES);
+}
+
+public static boolean hasEncodedColumnName(PColumn column){
+return !SchemaUtil.isPKColumn(column) && !column.isDynamic() && 
column.getEncodedColumnQualifier() != null;
+}
+
+}

http://git-wip-us.apache.org/repos/asf/phoenix/blob/450dbc59/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java
--
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java 
b/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java
index 7cd7eb3..76ec772 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/IndexUtil.java
@@ -18,6 +18,9 @@
 package org.apache.phoenix.util;
 
 import static 
org.apache.phoenix.query.QueryConstants.LOCAL_INDEX_COLUMN_FAMILY_PREFIX;
+import static 

[08/11] phoenix git commit: Encode column names and take advantage of encoding in group by and order by

[samarth]

http://git-wip-us.apache.org/repos/asf/phoenix/blob/450dbc59/phoenix-core/src/main/java/org/apache/phoenix/expression/KeyValueColumnExpression.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/expression/KeyValueColumnExpression.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/expression/KeyValueColumnExpression.java
index 4b5fdbb..35862c4 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/expression/KeyValueColumnExpression.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/expression/KeyValueColumnExpression.java
@@ -28,6 +28,7 @@ import 
org.apache.phoenix.expression.visitor.ExpressionVisitor;
 import org.apache.phoenix.schema.PColumn;
 import org.apache.phoenix.schema.PDatum;
 import org.apache.phoenix.schema.tuple.Tuple;
+import org.apache.phoenix.util.EncodedColumnsUtil;
 import org.apache.phoenix.util.SchemaUtil;
 
 
@@ -41,13 +42,13 @@ import org.apache.phoenix.util.SchemaUtil;
 public class KeyValueColumnExpression extends ColumnExpression {
 private byte[] cf;
 private byte[] cq;
-private String displayName; // client-side only
+private String displayName; // client-side only. TODO: samarth see what 
can you do for encoded column names.
 
 public KeyValueColumnExpression() {
 }
 
-public KeyValueColumnExpression(PColumn column) {
-this(column, null);
+public KeyValueColumnExpression(PColumn column, boolean encodedColumnName) 
{
+this(column, null, encodedColumnName);
 }
 
 public KeyValueColumnExpression(PDatum column, byte[] cf, byte[] cq) {
@@ -56,18 +57,19 @@ public class KeyValueColumnExpression extends 
ColumnExpression {
 this.cq = cq;
 }
 
-public KeyValueColumnExpression(PColumn column, String displayName) {
+public KeyValueColumnExpression(PColumn column, String displayName, 
boolean encodedColumnName) {
 super(column);
 this.cf = column.getFamilyName().getBytes();
-this.cq = column.getName().getBytes();
+this.cq = EncodedColumnsUtil.getColumnQualifier(column, 
encodedColumnName);
 this.displayName = displayName;
 }
 
 public byte[] getColumnFamily() {
 return cf;
 }
-
-public byte[] getColumnName() {
+
+//TODO: samarth look for the callers of this.
+public byte[] getColumnQualifier() {
 return cq;
 }
 

http://git-wip-us.apache.org/repos/asf/phoenix/blob/450dbc59/phoenix-core/src/main/java/org/apache/phoenix/expression/ProjectedColumnExpression.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/expression/ProjectedColumnExpression.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/expression/ProjectedColumnExpression.java
index 3a38dee..2744f35 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/expression/ProjectedColumnExpression.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/expression/ProjectedColumnExpression.java
@@ -154,6 +154,7 @@ public class ProjectedColumnExpression extends 
ColumnExpression {
 return Determinism.PER_INVOCATION;
 }
 
+@Override
 public ProjectedColumnExpression clone() {
 return new ProjectedColumnExpression(this.column, this.columns, 
this.position, this.displayName);
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/450dbc59/phoenix-core/src/main/java/org/apache/phoenix/filter/ColumnProjectionFilter.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/filter/ColumnProjectionFilter.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/filter/ColumnProjectionFilter.java
index b8b0350..d1f6211 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/filter/ColumnProjectionFilter.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/filter/ColumnProjectionFilter.java
@@ -40,7 +40,7 @@ import org.apache.hadoop.hbase.util.Writables;
 import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.io.WritableUtils;
 import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr;
-import org.apache.phoenix.query.QueryConstants;
+import org.apache.phoenix.util.EncodedColumnsUtil;
 
 /**
  * When selecting specific columns in a SELECT query, this filter passes only 
selected columns
@@ -53,6 +53,8 @@ public class ColumnProjectionFilter extends FilterBase 
implements Writable {
 private byte[] emptyCFName;
 private Map 
columnsTracker;
 private Set conditionOnlyCfs;
+private boolean usesEncodedColumnNames;
+private byte[] emptyKVQualifier;
 
 public ColumnProjectionFilter() {
 
@@ -60,10 +62,12 @@ public class ColumnProjectionFilter extends FilterBase 
implements Writable {
 
 public ColumnProjectionFilter(byte[] emptyCFName,
 Map 
columnsTracker,
-  

[09/11] phoenix git commit: Encode column names and take advantage of encoding in group by and order by

[samarth]

http://git-wip-us.apache.org/repos/asf/phoenix/blob/450dbc59/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/generated/PTableProtos.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/generated/PTableProtos.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/generated/PTableProtos.java
index 4171680..b6aed1a 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/generated/PTableProtos.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/generated/PTableProtos.java
@@ -269,6 +269,16 @@ public final class PTableProtos {
  * optional bool isDynamic = 14;
  */
 boolean getIsDynamic();
+
+// optional int32 columnQualifier = 15;
+/**
+ * optional int32 columnQualifier = 15;
+ */
+boolean hasColumnQualifier();
+/**
+ * optional int32 columnQualifier = 15;
+ */
+int getColumnQualifier();
   }
   /**
* Protobuf type {@code PColumn}
@@ -391,6 +401,11 @@ public final class PTableProtos {
   isDynamic_ = input.readBool();
   break;
 }
+case 120: {
+  bitField0_ |= 0x4000;
+  columnQualifier_ = input.readInt32();
+  break;
+}
   }
 }
   } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -709,6 +724,22 @@ public final class PTableProtos {
   return isDynamic_;
 }
 
+// optional int32 columnQualifier = 15;
+public static final int COLUMNQUALIFIER_FIELD_NUMBER = 15;
+private int columnQualifier_;
+/**
+ * optional int32 columnQualifier = 15;
+ */
+public boolean hasColumnQualifier() {
+  return ((bitField0_ & 0x4000) == 0x4000);
+}
+/**
+ * optional int32 columnQualifier = 15;
+ */
+public int getColumnQualifier() {
+  return columnQualifier_;
+}
+
 private void initFields() {
   columnNameBytes_ = com.google.protobuf.ByteString.EMPTY;
   familyNameBytes_ = com.google.protobuf.ByteString.EMPTY;
@@ -724,6 +755,7 @@ public final class PTableProtos {
   expression_ = "";
   isRowTimestamp_ = false;
   isDynamic_ = false;
+  columnQualifier_ = 0;
 }
 private byte memoizedIsInitialized = -1;
 public final boolean isInitialized() {
@@ -799,6 +831,9 @@ public final class PTableProtos {
   if (((bitField0_ & 0x2000) == 0x2000)) {
 output.writeBool(14, isDynamic_);
   }
+  if (((bitField0_ & 0x4000) == 0x4000)) {
+output.writeInt32(15, columnQualifier_);
+  }
   getUnknownFields().writeTo(output);
 }
 
@@ -864,6 +899,10 @@ public final class PTableProtos {
 size += com.google.protobuf.CodedOutputStream
   .computeBoolSize(14, isDynamic_);
   }
+  if (((bitField0_ & 0x4000) == 0x4000)) {
+size += com.google.protobuf.CodedOutputStream
+  .computeInt32Size(15, columnQualifier_);
+  }
   size += getUnknownFields().getSerializedSize();
   memoizedSerializedSize = size;
   return size;
@@ -957,6 +996,11 @@ public final class PTableProtos {
 result = result && (getIsDynamic()
 == other.getIsDynamic());
   }
+  result = result && (hasColumnQualifier() == other.hasColumnQualifier());
+  if (hasColumnQualifier()) {
+result = result && (getColumnQualifier()
+== other.getColumnQualifier());
+  }
   result = result &&
   getUnknownFields().equals(other.getUnknownFields());
   return result;
@@ -1026,6 +1070,10 @@ public final class PTableProtos {
 hash = (37 * hash) + ISDYNAMIC_FIELD_NUMBER;
 hash = (53 * hash) + hashBoolean(getIsDynamic());
   }
+  if (hasColumnQualifier()) {
+hash = (37 * hash) + COLUMNQUALIFIER_FIELD_NUMBER;
+hash = (53 * hash) + getColumnQualifier();
+  }
   hash = (29 * hash) + getUnknownFields().hashCode();
   memoizedHashCode = hash;
   return hash;
@@ -1163,6 +1211,8 @@ public final class PTableProtos {
 bitField0_ = (bitField0_ & ~0x1000);
 isDynamic_ = false;
 bitField0_ = (bitField0_ & ~0x2000);
+columnQualifier_ = 0;
+bitField0_ = (bitField0_ & ~0x4000);
 return this;
   }
 
@@ -1247,6 +1297,10 @@ public final class PTableProtos {
   to_bitField0_ |= 0x2000;
 }
 result.isDynamic_ = isDynamic_;
+if (((from_bitField0_ & 0x4000) == 0x4000)) {
+  to_bitField0_ |= 0x4000;
+}
+result.columnQualifier_ = columnQualifier_;
 result.bitField0_ = to_bitField0_;
 onBuilt();
 return result;
@@ -1309,6 +1363,9 @@ public final class PTableProtos {
 if (other.hasIsDynamic()) {
   setIsDynamic(other.getIsDynamic());
 }
+if 

[02/11] phoenix git commit: PHOENIX-3158 COUNT(DISTINCT) may return null instead of 0 after PHOENIX-258.

[samarth]

PHOENIX-3158 COUNT(DISTINCT) may return null instead of 0 after PHOENIX-258.


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

Branch: refs/heads/encodecolumns
Commit: 71728dfc5bad3bcc473986cbfd0ed5e7a8c0b38c
Parents: e3690cb
Author: Lars Hofhansl 
Authored: Sat Aug 6 16:27:32 2016 -0700
Committer: Lars Hofhansl 
Committed: Sat Aug 6 16:27:32 2016 -0700

--
 .../it/java/org/apache/phoenix/end2end/DistinctPrefixFilterIT.java | 2 ++
 .../src/main/java/org/apache/phoenix/execute/AggregatePlan.java| 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/71728dfc/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 1a0e4e1..e8e9e07 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
@@ -290,6 +290,8 @@ public class DistinctPrefixFilterIT extends 
BaseHBaseManagedTimeTableReuseIT {
 
 testCount("SELECT %s COUNT(DISTINCT col1) FROM " + testTable, -1);
 testCount("SELECT %s COUNT(DISTINCT col2) FROM " + testTable, -1);
+
+testCount("SELECT %s COUNT(DISTINCT prefix1) FROM " + testTable + " 
WHERE col1 < 0", -1);
 }
 
 @Test

http://git-wip-us.apache.org/repos/asf/phoenix/blob/71728dfc/phoenix-core/src/main/java/org/apache/phoenix/execute/AggregatePlan.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/execute/AggregatePlan.java 
b/phoenix-core/src/main/java/org/apache/phoenix/execute/AggregatePlan.java
index 136379d..00d478a 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/execute/AggregatePlan.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/AggregatePlan.java
@@ -223,7 +223,7 @@ public class AggregatePlan extends BaseQueryPlan {
 
 AggregatingResultIterator aggResultIterator;
 // No need to merge sort for ungrouped aggregation
-if (groupBy.isEmpty()) {
+if (groupBy.isEmpty() || groupBy.isUngroupedAggregate()) {
 aggResultIterator = new UngroupedAggregatingResultIterator(new 
ConcatResultIterator(iterators), aggregators);
 // If salted or local index we still need a merge sort as we'll 
potentially have multiple group by keys that aren't contiguous.
 } else if (groupBy.isOrderPreserving() && 
!(this.getTableRef().getTable().getBucketNum() != null || 
this.getTableRef().getTable().getIndexType() == IndexType.LOCAL)) {

[06/11] phoenix git commit: Encode column names and take advantage of encoding in group by and order by

[samarth]

http://git-wip-us.apache.org/repos/asf/phoenix/blob/450dbc59/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
index 847979a..bb71367 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java
@@ -38,6 +38,7 @@ import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
 import org.apache.hadoop.hbase.util.ByteStringer;
 import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.hbase.util.Pair;
 import org.apache.phoenix.coprocessor.generated.PTableProtos;
 import org.apache.phoenix.exception.DataExceedsCapacityException;
 import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr;
@@ -52,8 +53,10 @@ import org.apache.phoenix.schema.types.PChar;
 import org.apache.phoenix.schema.types.PDataType;
 import org.apache.phoenix.schema.types.PDouble;
 import org.apache.phoenix.schema.types.PFloat;
+import org.apache.phoenix.schema.types.PInteger;
 import org.apache.phoenix.schema.types.PVarchar;
 import org.apache.phoenix.util.ByteUtil;
+import org.apache.phoenix.util.EncodedColumnsUtil;
 import org.apache.phoenix.util.SchemaUtil;
 import org.apache.phoenix.util.SizedUtil;
 import org.apache.phoenix.util.StringUtil;
@@ -70,6 +73,7 @@ import com.google.common.collect.ListMultimap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
+
 /**
  *
  * Base class for PTable implementors.  Provides abstraction for
@@ -98,7 +102,8 @@ public class PTableImpl implements PTable {
 private List families;
 private Map familyByBytes;
 private Map familyByString;
-private ListMultimap columnsByName;
+private ListMultimap columnsByName;
+private ListMultimap kvColumnsByEncodedColumnNames;
 private PName pkName;
 private Integer bucketNum;
 private RowKeySchema rowKeySchema;
@@ -130,6 +135,8 @@ public class PTableImpl implements PTable {
 private boolean isNamespaceMapped;
 private String autoPartitionSeqName;
 private boolean isAppendOnlySchema;
+private StorageScheme storageScheme;
+private EncodedCQCounter encodedCQCounter;
 
 public PTableImpl() {
 this.indexes = Collections.emptyList();
@@ -161,8 +168,9 @@ public class PTableImpl implements PTable {
 this.isNamespaceMapped = isNamespaceMapped;
 }
 
+// For indexes stored in shared physical tables
 public PTableImpl(PName tenantId, PName schemaName, PName tableName, long 
timestamp, List families, 
-List columns, List physicalNames, Short 
viewIndexId, boolean multiTenant, boolean isNamespaceMpped) throws SQLException 
{ // For indexes stored in shared physical tables
+List columns, List physicalNames, Short 
viewIndexId, boolean multiTenant, boolean isNamespaceMpped, StorageScheme 
storageScheme, EncodedCQCounter encodedCQCounter) throws SQLException {
 this.pkColumns = this.allColumns = Collections.emptyList();
 this.rowKeySchema = RowKeySchema.EMPTY_SCHEMA;
 this.indexes = Collections.emptyList();
@@ -176,7 +184,7 @@ public class PTableImpl implements PTable {
 init(tenantId, this.schemaName, this.tableName, PTableType.INDEX, 
state, timeStamp, sequenceNumber, pkName, bucketNum, columns,
 this.schemaName, parentTableName, indexes, isImmutableRows, 
physicalNames, defaultFamilyName,
 null, disableWAL, multiTenant, storeNulls, viewType, viewIndexId, 
indexType, baseColumnCount, rowKeyOrderOptimizable,
-isTransactional, updateCacheFrequency, indexDisableTimestamp, 
isNamespaceMpped, null, false);
+isTransactional, updateCacheFrequency, indexDisableTimestamp, 
isNamespaceMpped, null, false, storageScheme, encodedCQCounter);
 }
 
 public PTableImpl(long timeStamp) { // For delete marker
@@ -220,7 +228,7 @@ public class PTableImpl implements PTable {
 indexes, table.isImmutableRows(), table.getPhysicalNames(), 
table.getDefaultFamilyName(), viewStatement,
 table.isWALDisabled(), table.isMultiTenant(), 
table.getStoreNulls(), table.getViewType(), table.getViewIndexId(), 
table.getIndexType(),
 table.getBaseColumnCount(), table.rowKeyOrderOptimizable(), 
table.isTransactional(), table.getUpdateCacheFrequency(),
-table.getIndexDisableTimestamp(), table.isNamespaceMapped(), 
table.getAutoPartitionSeqName(), table.isAppendOnlySchema());
+table.getIndexDisableTimestamp(), table.isNamespaceMapped(), 
table.getAutoPartitionSeqName(), table.isAppendOnlySchema(), 
table.getStorageScheme(), 

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

[Apache Jenkins Server]

See 

Changes:

[ankitsinghal59] PHOENIX-3149 Local index got corrupted if intermediate 
compaction

--
[...truncated 2105 lines...]
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.006 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.index.AsyncImmutableIndexIT
org.apache.phoenix.end2end.index.AsyncImmutableIndexIT  Time elapsed: 0.005 sec 
 <<< ERROR!
java.lang.RuntimeException: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.AsyncImmutableIndexIT.doSetup(AsyncImmutableIndexIT.java:52)
Caused by: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.AsyncImmutableIndexIT.doSetup(AsyncImmutableIndexIT.java:52)
Caused by: java.lang.RuntimeException: Master not initialized after 20ms 
seconds
at 
org.apache.phoenix.end2end.index.AsyncImmutableIndexIT.doSetup(AsyncImmutableIndexIT.java:52)

Running org.apache.phoenix.end2end.index.ImmutableIndexWithStatsIT
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.006 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.index.ImmutableIndexWithStatsIT
org.apache.phoenix.end2end.index.ImmutableIndexWithStatsIT  Time elapsed: 0.005 
sec  <<< ERROR!
java.lang.RuntimeException: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.ImmutableIndexWithStatsIT.doSetup(ImmutableIndexWithStatsIT.java:52)
Caused by: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.ImmutableIndexWithStatsIT.doSetup(ImmutableIndexWithStatsIT.java:52)
Caused by: java.lang.RuntimeException: Master not initialized after 20ms 
seconds
at 
org.apache.phoenix.end2end.index.ImmutableIndexWithStatsIT.doSetup(ImmutableIndexWithStatsIT.java:52)

Running org.apache.phoenix.end2end.index.MutableIndexFailureIT
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.004 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.index.MutableIndexFailureIT
org.apache.phoenix.end2end.index.MutableIndexFailureIT  Time elapsed: 0.003 sec 
 <<< ERROR!
java.lang.RuntimeException: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.MutableIndexFailureIT.doSetup(MutableIndexFailureIT.java:115)
Caused by: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.MutableIndexFailureIT.doSetup(MutableIndexFailureIT.java:115)
Caused by: java.lang.RuntimeException: Master not initialized after 20ms 
seconds
at 
org.apache.phoenix.end2end.index.MutableIndexFailureIT.doSetup(MutableIndexFailureIT.java:115)

Running org.apache.phoenix.hbase.index.FailForUnsupportedHBaseVersionsIT
Running org.apache.phoenix.end2end.index.MutableIndexReplicationIT
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.004 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.index.MutableIndexReplicationIT
org.apache.phoenix.end2end.index.MutableIndexReplicationIT  Time elapsed: 0.004 
sec  <<< ERROR!
java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.MutableIndexReplicationIT.setupConfigsAndStartCluster(MutableIndexReplicationIT.java:170)
at 
org.apache.phoenix.end2end.index.MutableIndexReplicationIT.setUpBeforeClass(MutableIndexReplicationIT.java:108)
Caused by: java.lang.RuntimeException: Master not initialized after 20ms 
seconds
at 
org.apache.phoenix.end2end.index.MutableIndexReplicationIT.setupConfigsAndStartCluster(MutableIndexReplicationIT.java:170)
at 
org.apache.phoenix.end2end.index.MutableIndexReplicationIT.setUpBeforeClass(MutableIndexReplicationIT.java:108)

Running org.apache.phoenix.end2end.index.ReadOnlyIndexFailureIT
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.007 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.index.ReadOnlyIndexFailureIT
org.apache.phoenix.end2end.index.ReadOnlyIndexFailureIT  Time elapsed: 0.007 
sec  <<< ERROR!
java.lang.RuntimeException: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.ReadOnlyIndexFailureIT.doSetup(ReadOnlyIndexFailureIT.java:119)
Caused by: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.ReadOnlyIndexFailureIT.doSetup(ReadOnlyIndexFailureIT.java:119)
Caused by: java.lang.RuntimeException: Master not initialized after 20ms 
seconds
at 
org.apache.phoenix.end2end.index.ReadOnlyIndexFailureIT.doSetup(ReadOnlyIndexFailureIT.java:119)

Running org.apache.phoenix.end2end.index.txn.TxWriteFailureIT
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.006 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.index.txn.TxWriteFailureIT
org.apache.phoenix.end2end.index.txn.TxWriteFailureIT  Time elapsed: 0.005 sec  
<<< ERROR!
java.lang.RuntimeException: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.txn.TxWriteFailureIT.doSetup(TxWriteFailureIT.java:86)
Caused 

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
[ankitsinghal59] PHOENIX-3149 Local index got corrupted if intermediate compaction happen



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

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

[Apache Jenkins Server]

4.x-HBase-0.98 branch build status Successful

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

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

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

Changes
[ankitsinghal59] PHOENIX-3149 Local index got corrupted if intermediate compaction



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

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
[ankitsinghal59] PHOENIX-3149 Local index got corrupted if intermediate compaction happen



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

[phoenix] Git Push Summary

[ankit]

Repository: phoenix
Updated Tags:  refs/tags/v4.8.0-HBase-1.2-rc2 [created] a61973445

[phoenix] Git Push Summary

[ankit]

Repository: phoenix
Updated Tags:  refs/tags/v4.8.0-HBase-0.98-rc2 [created] 0a0b84555

[phoenix] Git Push Summary

[ankit]

Repository: phoenix
Updated Tags:  refs/tags/v4.8.0-HBase-1.1-rc2 [created] 11c047847

[phoenix] Git Push Summary

[ankit]

Repository: phoenix
Updated Tags:  refs/tags/v4.8.0-HBase-1.0-rc2 [created] a75365470

svn commit: r14693 - in /dev/phoenix/apache-phoenix-4.8.0-HBase-0.98-rc2: ./ bin/ src/

[ankit]

Author: ankit
Date: Sun Aug  7 09:01:55 2016
New Revision: 14693

Log:
Apache Phoenix 4.8.0-HBase-0.98-rc2

Added:
dev/phoenix/apache-phoenix-4.8.0-HBase-0.98-rc2/
dev/phoenix/apache-phoenix-4.8.0-HBase-0.98-rc2/bin/

dev/phoenix/apache-phoenix-4.8.0-HBase-0.98-rc2/bin/apache-phoenix-4.8.0-HBase-0.98-bin.tar.gz
   (with props)

dev/phoenix/apache-phoenix-4.8.0-HBase-0.98-rc2/bin/apache-phoenix-4.8.0-HBase-0.98-bin.tar.gz.asc

dev/phoenix/apache-phoenix-4.8.0-HBase-0.98-rc2/bin/apache-phoenix-4.8.0-HBase-0.98-bin.tar.gz.md5

dev/phoenix/apache-phoenix-4.8.0-HBase-0.98-rc2/bin/apache-phoenix-4.8.0-HBase-0.98-bin.tar.gz.sha
dev/phoenix/apache-phoenix-4.8.0-HBase-0.98-rc2/src/

dev/phoenix/apache-phoenix-4.8.0-HBase-0.98-rc2/src/apache-phoenix-4.8.0-HBase-0.98-src.tar.gz
   (with props)

dev/phoenix/apache-phoenix-4.8.0-HBase-0.98-rc2/src/apache-phoenix-4.8.0-HBase-0.98-src.tar.gz.asc

dev/phoenix/apache-phoenix-4.8.0-HBase-0.98-rc2/src/apache-phoenix-4.8.0-HBase-0.98-src.tar.gz.md5

dev/phoenix/apache-phoenix-4.8.0-HBase-0.98-rc2/src/apache-phoenix-4.8.0-HBase-0.98-src.tar.gz.sha

Added: 
dev/phoenix/apache-phoenix-4.8.0-HBase-0.98-rc2/bin/apache-phoenix-4.8.0-HBase-0.98-bin.tar.gz
==
Binary file - no diff available.

Propchange: 
dev/phoenix/apache-phoenix-4.8.0-HBase-0.98-rc2/bin/apache-phoenix-4.8.0-HBase-0.98-bin.tar.gz
--
svn:mime-type = application/octet-stream

Added: 
dev/phoenix/apache-phoenix-4.8.0-HBase-0.98-rc2/bin/apache-phoenix-4.8.0-HBase-0.98-bin.tar.gz.asc
==
--- 
dev/phoenix/apache-phoenix-4.8.0-HBase-0.98-rc2/bin/apache-phoenix-4.8.0-HBase-0.98-bin.tar.gz.asc
 (added)
+++ 
dev/phoenix/apache-phoenix-4.8.0-HBase-0.98-rc2/bin/apache-phoenix-4.8.0-HBase-0.98-bin.tar.gz.asc
 Sun Aug  7 09:01:55 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQIcBAABAgAGBQJXpviLAAoJEA1I7xd5+orrHHkP/0G4PMx3+mXnbdTIotf9HrSC
+GuH+wWBFJGXjj+C3nCuo7hzpQCtx9meQQsVCw00zlQ9C+1axQOMgvXmGXpIq6M6s
+GtAye9Qfgc+/nrGBx59kTczZsWT5JTHKSym/n6lFHXHG14VRKhKM/CUgTAq9ivjw
+pbgi/gZWvw1lY9mS5G/f2SRpk8/E7073snOOaP1qgG2BHxY+blnKVBcK9IAezJfN
+aaxJSFmZRLTBmCMINTdcMT8zbUny8xwe0l4JISq8J0o3SEOYEbidV8NCSqA59HAx
+HhymvQUsTnMoxUZUKBUsnNl6swdzEqUJ39lRKri1d5lSfox2L2V+YotatJ027ash
+pg1nhpU/MB2LGR847ovUQ5UN4Ll6FOapo7ulgwtiFdHckdkpoIYwMoyuu0R0N2y1
+vvgjSppEIIsBOm2q86Sm3zxlwqcxetv1dLPoO/Q7WWQzkBbT8YHPRkY/GistBCCN
+rlAkI6326W4WnSJu4YGcJcRdyzkiO4Sm94b8hjZoTm9YM8YbwGwbA94TqXsREh4W
+6H0lP3WW5oAXCHFHmvPNhati0ulNDp5hkwWx4hXlQ4NW249GpSOYr3g8266EtdKi
+FrWXKAJ63fMciUXLy+JGVLuifKSU9K0j8XtkrpOj/dQJpvu7UPSPVinqgHrExqWH
+GFzMdsKp4aWflUi7ZBPF
+=ro0I
+-END PGP SIGNATURE-

Added: 
dev/phoenix/apache-phoenix-4.8.0-HBase-0.98-rc2/bin/apache-phoenix-4.8.0-HBase-0.98-bin.tar.gz.md5
==
--- 
dev/phoenix/apache-phoenix-4.8.0-HBase-0.98-rc2/bin/apache-phoenix-4.8.0-HBase-0.98-bin.tar.gz.md5
 (added)
+++ 
dev/phoenix/apache-phoenix-4.8.0-HBase-0.98-rc2/bin/apache-phoenix-4.8.0-HBase-0.98-bin.tar.gz.md5
 Sun Aug  7 09:01:55 2016
@@ -0,0 +1 @@
+6a8bf2062227b7c0fca58582d7e90372 *apache-phoenix-4.8.0-HBase-0.98-bin.tar.gz

Added: 
dev/phoenix/apache-phoenix-4.8.0-HBase-0.98-rc2/bin/apache-phoenix-4.8.0-HBase-0.98-bin.tar.gz.sha
==
--- 
dev/phoenix/apache-phoenix-4.8.0-HBase-0.98-rc2/bin/apache-phoenix-4.8.0-HBase-0.98-bin.tar.gz.sha
 (added)
+++ 
dev/phoenix/apache-phoenix-4.8.0-HBase-0.98-rc2/bin/apache-phoenix-4.8.0-HBase-0.98-bin.tar.gz.sha
 Sun Aug  7 09:01:55 2016
@@ -0,0 +1,2 @@
+b94f2c18e7885d62618643931582865d06efa894f9cf318716f8d03246cf6b7093f5a7418e73fa19484e00d2eb1601f40fc08cb46fe09f4c66c686076577190e
 *apache-phoenix-4.8.0-HBase-0.98-bin.tar.gz
+2e0583f9c091f069c4f09c01262c52c502a2efb36fd21606639cd1c0e892cf7d 
*apache-phoenix-4.8.0-HBase-0.98-bin.tar.gz

Added: 
dev/phoenix/apache-phoenix-4.8.0-HBase-0.98-rc2/src/apache-phoenix-4.8.0-HBase-0.98-src.tar.gz
==
Binary file - no diff available.

Propchange: 
dev/phoenix/apache-phoenix-4.8.0-HBase-0.98-rc2/src/apache-phoenix-4.8.0-HBase-0.98-src.tar.gz
--
svn:mime-type = application/octet-stream

Added: 
dev/phoenix/apache-phoenix-4.8.0-HBase-0.98-rc2/src/apache-phoenix-4.8.0-HBase-0.98-src.tar.gz.asc
==
--- 
dev/phoenix/apache-phoenix-4.8.0-HBase-0.98-rc2/src/apache-phoenix-4.8.0-HBase-0.98-src.tar.gz.asc
 (added)
+++ 
dev/phoenix/apache-phoenix-4.8.0-HBase-0.98-rc2/src/apache-phoenix-4.8.0-HBase-0.98-src.tar.gz.asc
 Sun 

svn commit: r14692 - in /dev/phoenix/apache-phoenix-4.8.0-HBase-1.0-rc2: ./ bin/ src/

[ankit]

Author: ankit
Date: Sun Aug  7 08:54:17 2016
New Revision: 14692

Log:
Apache Phoenix 4.8.0-HBase-1.0-rc2

Added:
dev/phoenix/apache-phoenix-4.8.0-HBase-1.0-rc2/
dev/phoenix/apache-phoenix-4.8.0-HBase-1.0-rc2/bin/

dev/phoenix/apache-phoenix-4.8.0-HBase-1.0-rc2/bin/apache-phoenix-4.8.0-HBase-1.0-bin.tar.gz
   (with props)

dev/phoenix/apache-phoenix-4.8.0-HBase-1.0-rc2/bin/apache-phoenix-4.8.0-HBase-1.0-bin.tar.gz.asc

dev/phoenix/apache-phoenix-4.8.0-HBase-1.0-rc2/bin/apache-phoenix-4.8.0-HBase-1.0-bin.tar.gz.md5

dev/phoenix/apache-phoenix-4.8.0-HBase-1.0-rc2/bin/apache-phoenix-4.8.0-HBase-1.0-bin.tar.gz.sha
dev/phoenix/apache-phoenix-4.8.0-HBase-1.0-rc2/src/

dev/phoenix/apache-phoenix-4.8.0-HBase-1.0-rc2/src/apache-phoenix-4.8.0-HBase-1.0-src.tar.gz
   (with props)

dev/phoenix/apache-phoenix-4.8.0-HBase-1.0-rc2/src/apache-phoenix-4.8.0-HBase-1.0-src.tar.gz.asc

dev/phoenix/apache-phoenix-4.8.0-HBase-1.0-rc2/src/apache-phoenix-4.8.0-HBase-1.0-src.tar.gz.md5

dev/phoenix/apache-phoenix-4.8.0-HBase-1.0-rc2/src/apache-phoenix-4.8.0-HBase-1.0-src.tar.gz.sha

Added: 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.0-rc2/bin/apache-phoenix-4.8.0-HBase-1.0-bin.tar.gz
==
Binary file - no diff available.

Propchange: 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.0-rc2/bin/apache-phoenix-4.8.0-HBase-1.0-bin.tar.gz
--
svn:mime-type = application/octet-stream

Added: 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.0-rc2/bin/apache-phoenix-4.8.0-HBase-1.0-bin.tar.gz.asc
==
--- 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.0-rc2/bin/apache-phoenix-4.8.0-HBase-1.0-bin.tar.gz.asc
 (added)
+++ 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.0-rc2/bin/apache-phoenix-4.8.0-HBase-1.0-bin.tar.gz.asc
 Sun Aug  7 08:54:17 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQIcBAABAgAGBQJXpvbnAAoJEA1I7xd5+orryVUP/18oYUeVMnKwBCbpgPyntZlo
+dojvXAM+Us7/Xqe2hEpIdjgitJwHI3LbQyIQ0Mc7jLloofE8pnCg1Bv+4X+0lZnP
+Y+svCEBtxQFVZEHxov3/qb79jRXF2g5gwjN/iTmjuMgsmZ7PrNqIrgdbHr0ElPNs
+czmwaw8BVMLYAEtORy4mGOEL+TnNNwTLP6EbOkxyhqIQuiN4VDlaqGUgZNv4SOvd
+bOHhj4YutRU67Hr09UndWNd6J/7QmKu9M14q7IKQS8nloVSPnOpUyOU9j7ENqA+s
+0HWDYaB4R0RAE9Xh3Wjwp5B3LN51hlWT5Mztvoa1aelk2LQb47k8xbJ9NIb8H+Y0
+4XBNwyKScBMqm3i/GhdUzv3wjhR+eiS62iyhS3yyKmzF6dh96k31ORn9mOA3ugWT
+LaMMwB+TAHbgwZhta/Z95tPC+F/xotAlTCOQVGjtWUJ0pJ48aqRiqPWHTkHxBaI0
+IZ+Fi1ATpMtuvAI44uqcAMokLO2k+IpXjnoGSiztrqjettQYjmV1OgPAO/qQ95l7
+ECk95Gppgrg0dnyMzDZRtk1iEDVQipZKmxqW5apbz8Rl2Ib5yr+Fjxrfuak7zoRc
++BkbRAmZi7MkRegG8GrU8+1gXatJhDQPb6WdwsgcPXK25q7nEEWc1K5U6plJV1I9
+bpXUJzypO8IaQtDCtp+B
+=L1Qj
+-END PGP SIGNATURE-

Added: 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.0-rc2/bin/apache-phoenix-4.8.0-HBase-1.0-bin.tar.gz.md5
==
--- 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.0-rc2/bin/apache-phoenix-4.8.0-HBase-1.0-bin.tar.gz.md5
 (added)
+++ 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.0-rc2/bin/apache-phoenix-4.8.0-HBase-1.0-bin.tar.gz.md5
 Sun Aug  7 08:54:17 2016
@@ -0,0 +1 @@
+9ca56ea2cf03e3777d6a2e54839266a3 *apache-phoenix-4.8.0-HBase-1.0-bin.tar.gz

Added: 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.0-rc2/bin/apache-phoenix-4.8.0-HBase-1.0-bin.tar.gz.sha
==
--- 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.0-rc2/bin/apache-phoenix-4.8.0-HBase-1.0-bin.tar.gz.sha
 (added)
+++ 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.0-rc2/bin/apache-phoenix-4.8.0-HBase-1.0-bin.tar.gz.sha
 Sun Aug  7 08:54:17 2016
@@ -0,0 +1,2 @@
+b7b50eddabe2fe0a6559da8a0fbb06507dc8d62b24b4180721e1be5021e880907704b8bdac11297c5e20c5cfbb1ba6fe878a85f214606e4baf343669a6a7d65b
 *apache-phoenix-4.8.0-HBase-1.0-bin.tar.gz
+4d26e4e54a03f79a47acf8152128168b763de5fa2603b05c8f5fb6c1c29f78ea 
*apache-phoenix-4.8.0-HBase-1.0-bin.tar.gz

Added: 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.0-rc2/src/apache-phoenix-4.8.0-HBase-1.0-src.tar.gz
==
Binary file - no diff available.

Propchange: 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.0-rc2/src/apache-phoenix-4.8.0-HBase-1.0-src.tar.gz
--
svn:mime-type = application/octet-stream

Added: 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.0-rc2/src/apache-phoenix-4.8.0-HBase-1.0-src.tar.gz.asc
==
--- 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.0-rc2/src/apache-phoenix-4.8.0-HBase-1.0-src.tar.gz.asc
 (added)
+++ 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.0-rc2/src/apache-phoenix-4.8.0-HBase-1.0-src.tar.gz.asc
 Sun Aug  7 08:54:17 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP 

svn commit: r14691 - in /dev/phoenix/apache-phoenix-4.8.0-HBase-1.1-rc2: ./ bin/ src/

[ankit]

Author: ankit
Date: Sun Aug  7 08:48:03 2016
New Revision: 14691

Log:
Apache Phoenix 4.8.0-HBase-1.1-rc2

Added:
dev/phoenix/apache-phoenix-4.8.0-HBase-1.1-rc2/
dev/phoenix/apache-phoenix-4.8.0-HBase-1.1-rc2/bin/

dev/phoenix/apache-phoenix-4.8.0-HBase-1.1-rc2/bin/apache-phoenix-4.8.0-HBase-1.1-bin.tar.gz
   (with props)

dev/phoenix/apache-phoenix-4.8.0-HBase-1.1-rc2/bin/apache-phoenix-4.8.0-HBase-1.1-bin.tar.gz.asc

dev/phoenix/apache-phoenix-4.8.0-HBase-1.1-rc2/bin/apache-phoenix-4.8.0-HBase-1.1-bin.tar.gz.md5

dev/phoenix/apache-phoenix-4.8.0-HBase-1.1-rc2/bin/apache-phoenix-4.8.0-HBase-1.1-bin.tar.gz.sha
dev/phoenix/apache-phoenix-4.8.0-HBase-1.1-rc2/src/

dev/phoenix/apache-phoenix-4.8.0-HBase-1.1-rc2/src/apache-phoenix-4.8.0-HBase-1.1-src.tar.gz
   (with props)

dev/phoenix/apache-phoenix-4.8.0-HBase-1.1-rc2/src/apache-phoenix-4.8.0-HBase-1.1-src.tar.gz.asc

dev/phoenix/apache-phoenix-4.8.0-HBase-1.1-rc2/src/apache-phoenix-4.8.0-HBase-1.1-src.tar.gz.md5

dev/phoenix/apache-phoenix-4.8.0-HBase-1.1-rc2/src/apache-phoenix-4.8.0-HBase-1.1-src.tar.gz.sha

Added: 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.1-rc2/bin/apache-phoenix-4.8.0-HBase-1.1-bin.tar.gz
==
Binary file - no diff available.

Propchange: 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.1-rc2/bin/apache-phoenix-4.8.0-HBase-1.1-bin.tar.gz
--
svn:mime-type = application/octet-stream

Added: 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.1-rc2/bin/apache-phoenix-4.8.0-HBase-1.1-bin.tar.gz.asc
==
--- 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.1-rc2/bin/apache-phoenix-4.8.0-HBase-1.1-bin.tar.gz.asc
 (added)
+++ 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.1-rc2/bin/apache-phoenix-4.8.0-HBase-1.1-bin.tar.gz.asc
 Sun Aug  7 08:48:03 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQIcBAABAgAGBQJXpvUhAAoJEA1I7xd5+orrgi4P/A3Lifq5kzMfungZNYId4nbI
+8AQeY+KhN0BNT98trCTk7DYNtXA/QvTWAFvKzE1bT+i1BGmTLk6mSQACsM/YX4TP
+K7WYZkstORd6g7oDs3wUJeFnfM3zr6butLEhiDDco0fSusXiOcC2FhHlegREArVB
+3lTyXE4JcbiSIVQrVCy8ue60O9oj+K042zIW8YRjwbDv1n2BU52Sg1T7J/eXjk7d
+Cc9t1NLw0cRWU1kMM8ciJbp9rOrBwDBa8XD/tiz4UbouZ4e26U8Fjxp5iF+5di3d
+Bts/cXxKdXWjSn1ucYKN/OjEyCBmKYbns4qs3Fkb1eSlReQD4UbHPJJxKGKhHr7y
+74B6ry1Z9xoGqedyu3W6cKFIQM3zfcDAPXK/+MdIamc++Vt54l28QV5NT5Lt2Bu+
+Hsv5sjmCr9DGOOFvyzGi+KPl73RfwuMHdw6170G0eyxA+gwplWMs9P8IJHJf9/7X
+8b6R9vClBgBV1cHf9L1fJP9dhHS5FIYhTyirfwK5o23VV0TLrfrkm/O6tt3TPxag
+UG8PukAE0J+Oh6s0WH7NRW3u6n680JfHr7HAz4KYCsJXic8VsPj0fRbNSCLKraAK
+iZiI4wE4ColkJ5+lP8TItV4kU2U4K9iDMe8FUexiA8QYEmxS517SFmhQGf8YvkU3
+jTlgPLno3tGydq/ccSyw
+=B6A5
+-END PGP SIGNATURE-

Added: 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.1-rc2/bin/apache-phoenix-4.8.0-HBase-1.1-bin.tar.gz.md5
==
--- 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.1-rc2/bin/apache-phoenix-4.8.0-HBase-1.1-bin.tar.gz.md5
 (added)
+++ 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.1-rc2/bin/apache-phoenix-4.8.0-HBase-1.1-bin.tar.gz.md5
 Sun Aug  7 08:48:03 2016
@@ -0,0 +1 @@
+ee2917f09d37ffdd5b68d9a04b10e1f1 *apache-phoenix-4.8.0-HBase-1.1-bin.tar.gz

Added: 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.1-rc2/bin/apache-phoenix-4.8.0-HBase-1.1-bin.tar.gz.sha
==
--- 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.1-rc2/bin/apache-phoenix-4.8.0-HBase-1.1-bin.tar.gz.sha
 (added)
+++ 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.1-rc2/bin/apache-phoenix-4.8.0-HBase-1.1-bin.tar.gz.sha
 Sun Aug  7 08:48:03 2016
@@ -0,0 +1,2 @@
+7e50b18fd4034aa028a82db070c4dadaab51915c054543cf0b2ee342d84ca8ea3594c1152fdc429aee987ce1abad5efc896feaec220c9016a60e7367e554
 *apache-phoenix-4.8.0-HBase-1.1-bin.tar.gz
+5dee892c0b830dca596dae035c70f53c8046a0149c5d721e5a83b2b15727a7a7 
*apache-phoenix-4.8.0-HBase-1.1-bin.tar.gz

Added: 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.1-rc2/src/apache-phoenix-4.8.0-HBase-1.1-src.tar.gz
==
Binary file - no diff available.

Propchange: 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.1-rc2/src/apache-phoenix-4.8.0-HBase-1.1-src.tar.gz
--
svn:mime-type = application/octet-stream

Added: 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.1-rc2/src/apache-phoenix-4.8.0-HBase-1.1-src.tar.gz.asc
==
--- 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.1-rc2/src/apache-phoenix-4.8.0-HBase-1.1-src.tar.gz.asc
 (added)
+++ 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.1-rc2/src/apache-phoenix-4.8.0-HBase-1.1-src.tar.gz.asc
 Sun Aug  7 08:48:03 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP 

svn commit: r14690 - in /dev/phoenix/apache-phoenix-4.8.0-HBase-1.2-rc2: ./ bin/ src/

[ankit]

Author: ankit
Date: Sun Aug  7 08:40:59 2016
New Revision: 14690

Log:
Apache Phoenix 4.8.0-HBase-1.2-rc2

Added:
dev/phoenix/apache-phoenix-4.8.0-HBase-1.2-rc2/
dev/phoenix/apache-phoenix-4.8.0-HBase-1.2-rc2/bin/

dev/phoenix/apache-phoenix-4.8.0-HBase-1.2-rc2/bin/apache-phoenix-4.8.0-HBase-1.2-bin.tar.gz
   (with props)

dev/phoenix/apache-phoenix-4.8.0-HBase-1.2-rc2/bin/apache-phoenix-4.8.0-HBase-1.2-bin.tar.gz.asc

dev/phoenix/apache-phoenix-4.8.0-HBase-1.2-rc2/bin/apache-phoenix-4.8.0-HBase-1.2-bin.tar.gz.md5

dev/phoenix/apache-phoenix-4.8.0-HBase-1.2-rc2/bin/apache-phoenix-4.8.0-HBase-1.2-bin.tar.gz.sha
dev/phoenix/apache-phoenix-4.8.0-HBase-1.2-rc2/src/

dev/phoenix/apache-phoenix-4.8.0-HBase-1.2-rc2/src/apache-phoenix-4.8.0-HBase-1.2-src.tar.gz
   (with props)

dev/phoenix/apache-phoenix-4.8.0-HBase-1.2-rc2/src/apache-phoenix-4.8.0-HBase-1.2-src.tar.gz.asc

dev/phoenix/apache-phoenix-4.8.0-HBase-1.2-rc2/src/apache-phoenix-4.8.0-HBase-1.2-src.tar.gz.md5

dev/phoenix/apache-phoenix-4.8.0-HBase-1.2-rc2/src/apache-phoenix-4.8.0-HBase-1.2-src.tar.gz.sha

Added: 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.2-rc2/bin/apache-phoenix-4.8.0-HBase-1.2-bin.tar.gz
==
Binary file - no diff available.

Propchange: 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.2-rc2/bin/apache-phoenix-4.8.0-HBase-1.2-bin.tar.gz
--
svn:mime-type = application/octet-stream

Added: 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.2-rc2/bin/apache-phoenix-4.8.0-HBase-1.2-bin.tar.gz.asc
==
--- 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.2-rc2/bin/apache-phoenix-4.8.0-HBase-1.2-bin.tar.gz.asc
 (added)
+++ 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.2-rc2/bin/apache-phoenix-4.8.0-HBase-1.2-bin.tar.gz.asc
 Sun Aug  7 08:40:59 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQIcBAABAgAGBQJXpvNtAAoJEA1I7xd5+orrwVUP/1tjqnYrDW3XpfyJsBv9DGuJ
+rLSxZPecivnIaAJY8ksFYfARtijeS4EqAzmWOvSME+j2j7HlIUeazP6XiEoekgbR
+sXkqqM52dN243Je0cjFqIix/jrIRhQzpWXPF6xijKl+1MqF4cBuW3hlwt2495Nvo
+oVmbea5qCDiaW3vbFtzsQKMwOyqL6S3eg33nCK/LkuW+be+DXohyfdwLAbqkl6v0
+e1EmPSqa8nIRyFuaFqImJpMBPDEqrsosU+E/Y9NBpHouI/XcgCcLfN14yGGeQpdi
+6W+aUWPP3LMiM53VyqH6OB/p1p1wxTPXUrgwouFc1QG8YO7RPaFgqQKWs8FJFeCk
+DgJyYr2g3g9QosMVk/dtZqVN32eABd8AyxjKBpj3Q13o7mWrJSD6TouJR4HgS7Gy
+7QMEoi5RggtWfHECvUZcLYEp/QTETXqp+ECeurnphD6AIstlrSxKI90R5mdylx7E
+Tn9oLWnPwJEL36QDjCIPoQBMvG7bXGZvyMgYv4YR7nBacdX2oOrKgW5ZO+QJVSxH
+O7V05zIaU/HqLGcfxjFQlY3Del+TAw1ji+0d635LQhpbNI3yhWSFx/H0LFtKK+Cw
+44AqzN2lkVZdHJY2uTRlOLiiamZkr9a0SqcsxDAiDUBM0G7SgeZCByoJ7hDgpECF
+OY/jQJmxo3ANNeVeszTk
+=+HiH
+-END PGP SIGNATURE-

Added: 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.2-rc2/bin/apache-phoenix-4.8.0-HBase-1.2-bin.tar.gz.md5
==
--- 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.2-rc2/bin/apache-phoenix-4.8.0-HBase-1.2-bin.tar.gz.md5
 (added)
+++ 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.2-rc2/bin/apache-phoenix-4.8.0-HBase-1.2-bin.tar.gz.md5
 Sun Aug  7 08:40:59 2016
@@ -0,0 +1 @@
+eb8e83cf7739a65201e80678a6a4bfca *apache-phoenix-4.8.0-HBase-1.2-bin.tar.gz

Added: 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.2-rc2/bin/apache-phoenix-4.8.0-HBase-1.2-bin.tar.gz.sha
==
--- 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.2-rc2/bin/apache-phoenix-4.8.0-HBase-1.2-bin.tar.gz.sha
 (added)
+++ 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.2-rc2/bin/apache-phoenix-4.8.0-HBase-1.2-bin.tar.gz.sha
 Sun Aug  7 08:40:59 2016
@@ -0,0 +1,2 @@
+81f2482b043e9d526a3193a94de97899daf006400b279a5877c845ef8f66bc566c3d57d66a53e837fda91b49f41e33a424c136973f9967fd49caf9f27b85f780
 *apache-phoenix-4.8.0-HBase-1.2-bin.tar.gz
+826bb05182dacafd2ca76ecc17ecf24d35aea1ce6fc2ccbfb90ff4b4ded051f5 
*apache-phoenix-4.8.0-HBase-1.2-bin.tar.gz

Added: 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.2-rc2/src/apache-phoenix-4.8.0-HBase-1.2-src.tar.gz
==
Binary file - no diff available.

Propchange: 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.2-rc2/src/apache-phoenix-4.8.0-HBase-1.2-src.tar.gz
--
svn:mime-type = application/octet-stream

Added: 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.2-rc2/src/apache-phoenix-4.8.0-HBase-1.2-src.tar.gz.asc
==
--- 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.2-rc2/src/apache-phoenix-4.8.0-HBase-1.2-src.tar.gz.asc
 (added)
+++ 
dev/phoenix/apache-phoenix-4.8.0-HBase-1.2-rc2/src/apache-phoenix-4.8.0-HBase-1.2-src.tar.gz.asc
 Sun Aug  7 08:40:59 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP 

phoenix git commit: PHOENIX-3149 Local index got corrupted if intermediate compaction happen during the split.(Sergey Soldatov)

[ankit]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 b8e65d0d1 -> 04dc321e9


PHOENIX-3149 Local index got corrupted if intermediate compaction happen during 
the split.(Sergey Soldatov)


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 04dc321e99d7bc92c67f56345796540674604ea2
Parents: b8e65d0
Author: Ankit Singhal 
Authored: Sun Aug 7 13:56:08 2016 +0530
Committer: Ankit Singhal 
Committed: Sun Aug 7 13:57:25 2016 +0530

--
 .../hbase/regionserver/IndexHalfStoreFileReaderGenerator.java   | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/04dc321e/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
index 3bbc3df..7f6e82b 100644
--- 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
+++ 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
@@ -184,7 +184,6 @@ public class IndexHalfStoreFileReaderGenerator extends 
BaseRegionObserver {
 long earliestPutTs, InternalScanner s, CompactionRequest request) 
throws IOException {
 if (!store.getFamily().getNameAsString()
 .startsWith(QueryConstants.LOCAL_INDEX_COLUMN_FAMILY_PREFIX)
-|| !scanType.equals(ScanType.COMPACT_DROP_DELETES)
 || s != null
 || !store.hasReferences()) {
 return s;

phoenix git commit: PHOENIX-3149 Local index got corrupted if intermediate compaction happen during the split.(Sergey Soldatov)

[ankit]

Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-0.98 52785b4a9 -> 7c0358223


PHOENIX-3149 Local index got corrupted if intermediate compaction happen during 
the split.(Sergey Soldatov)


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

Branch: refs/heads/4.8-HBase-0.98
Commit: 7c0358223c092117ce12e185f54f4061b2799b02
Parents: 52785b4
Author: Ankit Singhal 
Authored: Sun Aug 7 13:56:08 2016 +0530
Committer: Ankit Singhal 
Committed: Sun Aug 7 13:56:08 2016 +0530

--
 .../hbase/regionserver/IndexHalfStoreFileReaderGenerator.java   | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/7c035822/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
index 3bbc3df..7f6e82b 100644
--- 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
+++ 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
@@ -184,7 +184,6 @@ public class IndexHalfStoreFileReaderGenerator extends 
BaseRegionObserver {
 long earliestPutTs, InternalScanner s, CompactionRequest request) 
throws IOException {
 if (!store.getFamily().getNameAsString()
 .startsWith(QueryConstants.LOCAL_INDEX_COLUMN_FAMILY_PREFIX)
-|| !scanType.equals(ScanType.COMPACT_DROP_DELETES)
 || s != null
 || !store.hasReferences()) {
 return s;

phoenix git commit: PHOENIX-3149 Local index got corrupted if intermediate compaction happen during the split.(Sergey Soldatov)

[ankit]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 62d45662b -> b64b08f31


PHOENIX-3149 Local index got corrupted if intermediate compaction happen during 
the split.(Sergey Soldatov)


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

Branch: refs/heads/4.x-HBase-1.0
Commit: b64b08f313490fabd6675066007897f5b472e92c
Parents: 62d4566
Author: Ankit Singhal 
Authored: Sun Aug 7 13:55:00 2016 +0530
Committer: Ankit Singhal 
Committed: Sun Aug 7 13:55:38 2016 +0530

--
 .../hbase/regionserver/IndexHalfStoreFileReaderGenerator.java   | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/b64b08f3/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
index 1bd6222..45b5aef 100644
--- 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
+++ 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
@@ -185,7 +185,6 @@ public class IndexHalfStoreFileReaderGenerator extends 
BaseRegionObserver {
 long earliestPutTs, InternalScanner s, CompactionRequest request) 
throws IOException {
 if (!store.getFamily().getNameAsString()
 .startsWith(QueryConstants.LOCAL_INDEX_COLUMN_FAMILY_PREFIX)
-|| !scanType.equals(ScanType.COMPACT_DROP_DELETES)
 || s != null
 || !store.hasReferences()) {
 return s;

phoenix git commit: PHOENIX-3149 Local index got corrupted if intermediate compaction happen during the split.(Sergey Soldatov)

[ankit]

Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-1.0 3c0499533 -> 9e6899b2a


PHOENIX-3149 Local index got corrupted if intermediate compaction happen during 
the split.(Sergey Soldatov)


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

Branch: refs/heads/4.8-HBase-1.0
Commit: 9e6899b2a3fe8ebbeaf95b557e103bc8f638db6c
Parents: 3c04995
Author: Ankit Singhal 
Authored: Sun Aug 7 13:55:00 2016 +0530
Committer: Ankit Singhal 
Committed: Sun Aug 7 13:55:00 2016 +0530

--
 .../hbase/regionserver/IndexHalfStoreFileReaderGenerator.java   | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/9e6899b2/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
index 1bd6222..45b5aef 100644
--- 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
+++ 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
@@ -185,7 +185,6 @@ public class IndexHalfStoreFileReaderGenerator extends 
BaseRegionObserver {
 long earliestPutTs, InternalScanner s, CompactionRequest request) 
throws IOException {
 if (!store.getFamily().getNameAsString()
 .startsWith(QueryConstants.LOCAL_INDEX_COLUMN_FAMILY_PREFIX)
-|| !scanType.equals(ScanType.COMPACT_DROP_DELETES)
 || s != null
 || !store.hasReferences()) {
 return s;

phoenix git commit: PHOENIX-3149 Local index got corrupted if intermediate compaction happen during the split.(Sergey Soldatov)

[ankit]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 2308ba94d -> 1d234eab1


PHOENIX-3149 Local index got corrupted if intermediate compaction happen during 
the split.(Sergey Soldatov)


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

Branch: refs/heads/4.x-HBase-1.1
Commit: 1d234eab1489471fef106805b5a6548bf780bf1a
Parents: 2308ba9
Author: Ankit Singhal 
Authored: Sun Aug 7 13:52:28 2016 +0530
Committer: Ankit Singhal 
Committed: Sun Aug 7 13:53:15 2016 +0530

--
 .../hbase/regionserver/IndexHalfStoreFileReaderGenerator.java   | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/1d234eab/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
index 4a42984..7cd6405 100644
--- 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
+++ 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
@@ -186,7 +186,6 @@ public class IndexHalfStoreFileReaderGenerator extends 
BaseRegionObserver {
 long earliestPutTs, InternalScanner s, CompactionRequest request) 
throws IOException {
 if (!store.getFamily().getNameAsString()
 .startsWith(QueryConstants.LOCAL_INDEX_COLUMN_FAMILY_PREFIX)
-|| !scanType.equals(ScanType.COMPACT_DROP_DELETES)
 || s != null
 || !store.hasReferences()) {
 return s;

phoenix git commit: PHOENIX-3149 Local index got corrupted if intermediate compaction happen during the split.(Sergey Soldatov)

[ankit]

Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-1.1 e151e6159 -> 1b84ccbc3


PHOENIX-3149 Local index got corrupted if intermediate compaction happen during 
the split.(Sergey Soldatov)


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

Branch: refs/heads/4.8-HBase-1.1
Commit: 1b84ccbc384757d8602fcc496d94d25b78894e0a
Parents: e151e61
Author: Ankit Singhal 
Authored: Sun Aug 7 13:52:28 2016 +0530
Committer: Ankit Singhal 
Committed: Sun Aug 7 13:52:28 2016 +0530

--
 .../hbase/regionserver/IndexHalfStoreFileReaderGenerator.java   | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/1b84ccbc/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
index 4a42984..7cd6405 100644
--- 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
+++ 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
@@ -186,7 +186,6 @@ public class IndexHalfStoreFileReaderGenerator extends 
BaseRegionObserver {
 long earliestPutTs, InternalScanner s, CompactionRequest request) 
throws IOException {
 if (!store.getFamily().getNameAsString()
 .startsWith(QueryConstants.LOCAL_INDEX_COLUMN_FAMILY_PREFIX)
-|| !scanType.equals(ScanType.COMPACT_DROP_DELETES)
 || s != null
 || !store.hasReferences()) {
 return s;

phoenix git commit: PHOENIX-3149 Local index got corrupted if intermediate compaction happen during the split.(Sergey Soldatov)

[ankit]

Repository: phoenix
Updated Branches:
  refs/heads/master bb0d89bd9 -> ba82b1cb5


PHOENIX-3149 Local index got corrupted if intermediate compaction happen during 
the split.(Sergey Soldatov)


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

Branch: refs/heads/master
Commit: ba82b1cb5a14c2cf109deb8a862389142d92f541
Parents: bb0d89b
Author: Ankit Singhal 
Authored: Sun Aug 7 13:50:06 2016 +0530
Committer: Ankit Singhal 
Committed: Sun Aug 7 13:51:23 2016 +0530

--
 .../hbase/regionserver/IndexHalfStoreFileReaderGenerator.java   | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/ba82b1cb/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
index 4a42984..7cd6405 100644
--- 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
+++ 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
@@ -186,7 +186,6 @@ public class IndexHalfStoreFileReaderGenerator extends 
BaseRegionObserver {
 long earliestPutTs, InternalScanner s, CompactionRequest request) 
throws IOException {
 if (!store.getFamily().getNameAsString()
 .startsWith(QueryConstants.LOCAL_INDEX_COLUMN_FAMILY_PREFIX)
-|| !scanType.equals(ScanType.COMPACT_DROP_DELETES)
 || s != null
 || !store.hasReferences()) {
 return s;

phoenix git commit: PHOENIX-3149 Local index got corrupted if intermediate compaction happen during the split.(Sergey Soldatov)

[ankit]

Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-1.2 e47eceb0f -> 95926ac2b


PHOENIX-3149 Local index got corrupted if intermediate compaction happen during 
the split.(Sergey Soldatov)


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

Branch: refs/heads/4.8-HBase-1.2
Commit: 95926ac2bb69e5326c3aff9b41d29594a54a5cbe
Parents: e47eceb
Author: Ankit Singhal 
Authored: Sun Aug 7 13:50:06 2016 +0530
Committer: Ankit Singhal 
Committed: Sun Aug 7 13:50:06 2016 +0530

--
 .../hbase/regionserver/IndexHalfStoreFileReaderGenerator.java   | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/95926ac2/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
index 4a42984..7cd6405 100644
--- 
a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
+++ 
b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/IndexHalfStoreFileReaderGenerator.java
@@ -186,7 +186,6 @@ public class IndexHalfStoreFileReaderGenerator extends 
BaseRegionObserver {
 long earliestPutTs, InternalScanner s, CompactionRequest request) 
throws IOException {
 if (!store.getFamily().getNameAsString()
 .startsWith(QueryConstants.LOCAL_INDEX_COLUMN_FAMILY_PREFIX)
-|| !scanType.equals(ScanType.COMPACT_DROP_DELETES)
 || s != null
 || !store.hasReferences()) {
 return s;