phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jeffr...@apache.org
Subject [44/50] [abbrv] git commit: merge master to 4.0 branch
Date Wed, 05 Mar 2014 22:55:30 GMT
merge master to 4.0 branch


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

Branch: refs/heads/4.0
Commit: b3a330cad6102434d8336d4eab935e2e56bbe7eb
Parents: 4f1c434 f22460c
Author: Jeffrey Zhong <jzhong@JZhongs-MacBook-Pro.local>
Authored: Tue Mar 4 16:49:50 2014 -0800
Committer: Jeffrey Zhong <jzhong@JZhongs-MacBook-Pro.local>
Committed: Tue Mar 4 17:23:54 2014 -0800

----------------------------------------------------------------------
 KEYS                                            |   73 +
 bin/csv-bulk-loader.py                          |   60 +
 bin/csv-bulk-loader.sh                          |   40 -
 bin/end2endTest.py                              |   44 +
 bin/log4j.properties                            |   21 +
 bin/performance.py                              |  128 ++
 bin/performance.sh                              |   95 -
 bin/psql.py                                     |   47 +
 bin/psql.sh                                     |   32 -
 bin/sqlline.py                                  |   59 +
 bin/sqlline.sh                                  |   39 -
 bin/upgradeTo2.sh                               |   32 -
 config/apache-access-logs.properties            |   21 +
 config/csv-bulk-load-config.properties          |   21 +
 dev/PhoenixCodeTemplate.xml                     |   21 +
 phoenix-assembly/pom.xml                        |   22 +
 phoenix-assembly/src/build/all.xml              |   22 +
 phoenix-assembly/src/build/client-minimal.xml   |   24 +-
 .../src/build/client-without-hbase.xml          |   22 +
 phoenix-assembly/src/build/client.xml           |   45 +-
 .../src/build/components-major-client.xml       |   22 +
 .../src/build/components-minimal.xml            |   32 +-
 phoenix-core/src/main/antlr3/PhoenixSQL.g       |   33 +-
 .../phoenix/schema/MetaDataSplitPolicy.java     |   30 +
 .../hadoop/hbase/index/CapturingAbortable.java  |   68 -
 .../hbase/index/IndexLogRollSynchronizer.java   |  135 --
 .../org/apache/hadoop/hbase/index/Indexer.java  |  703 --------
 .../apache/hadoop/hbase/index/ValueGetter.java  |   38 -
 .../hbase/index/builder/BaseIndexBuilder.java   |   99 --
 .../hbase/index/builder/IndexBuildManager.java  |  216 ---
 .../hbase/index/builder/IndexBuilder.java       |  144 --
 .../builder/IndexBuildingFailureException.java  |   50 -
 .../hadoop/hbase/index/covered/Batch.java       |   62 -
 .../hbase/index/covered/CoveredColumns.java     |   51 -
 .../covered/CoveredColumnsIndexBuilder.java     |  493 ------
 .../hadoop/hbase/index/covered/IndexCodec.java  |  112 --
 .../hadoop/hbase/index/covered/IndexUpdate.java |   79 -
 .../hbase/index/covered/KeyValueStore.java      |   35 -
 .../hbase/index/covered/LocalTableState.java    |  245 ---
 .../hadoop/hbase/index/covered/TableState.java  |   98 --
 .../hbase/index/covered/data/IndexMemStore.java |  333 ----
 .../index/covered/data/LazyValueGetter.java     |   89 -
 .../index/covered/data/LocalHBaseState.java     |   49 -
 .../hbase/index/covered/data/LocalTable.java    |   75 -
 .../index/covered/example/ColumnGroup.java      |   95 -
 .../index/covered/example/CoveredColumn.java    |   89 -
 .../example/CoveredColumnIndexCodec.java        |  366 ----
 .../CoveredColumnIndexSpecifierBuilder.java     |  166 --
 .../covered/example/CoveredColumnIndexer.java   |  145 --
 .../filter/ApplyAndFilterDeletesFilter.java     |  304 ----
 ...olumnTrackingNextLargestTimestampFilter.java |   62 -
 .../index/covered/filter/FamilyOnlyFilter.java  |   80 -
 .../covered/filter/MaxTimestampFilter.java      |   72 -
 .../covered/filter/NewerTimestampFilter.java    |   29 -
 .../index/covered/update/ColumnReference.java   |  168 --
 .../index/covered/update/ColumnTracker.java     |  117 --
 .../covered/update/IndexUpdateManager.java      |  241 ---
 .../covered/update/IndexedColumnGroup.java      |   30 -
 .../index/covered/update/SortedCollection.java  |  130 --
 .../index/exception/IndexWriteException.java    |   45 -
 .../MultiIndexWriteFailureException.java        |   46 -
 .../SingleIndexWriteFailureException.java       |   63 -
 .../hbase/index/parallel/BaseTaskRunner.java    |  131 --
 .../hbase/index/parallel/EarlyExitFailure.java  |   36 -
 .../index/parallel/QuickFailingTaskRunner.java  |   51 -
 .../hadoop/hbase/index/parallel/Task.java       |   42 -
 .../hadoop/hbase/index/parallel/TaskBatch.java  |   76 -
 .../hadoop/hbase/index/parallel/TaskRunner.java |   62 -
 .../hbase/index/parallel/ThreadPoolBuilder.java |   92 -
 .../hbase/index/parallel/ThreadPoolManager.java |  147 --
 .../parallel/WaitForCompletionTaskRunner.java   |   53 -
 .../hbase/index/scanner/EmptyScanner.java       |   32 -
 .../index/scanner/FilteredKeyValueScanner.java  |  142 --
 .../hadoop/hbase/index/scanner/Scanner.java     |   37 -
 .../hbase/index/scanner/ScannerBuilder.java     |  147 --
 .../hbase/index/table/CachingHTableFactory.java |  112 --
 .../index/table/CoprocessorHTableFactory.java   |   51 -
 .../hadoop/hbase/index/table/HTableFactory.java |   14 -
 .../index/table/HTableInterfaceReference.java   |   46 -
 .../hbase/index/util/ImmutableBytesPtr.java     |  113 --
 .../hbase/index/util/IndexManagementUtil.java   |  249 ---
 .../hadoop/hbase/index/wal/IndexedKeyValue.java |  162 --
 .../hadoop/hbase/index/wal/KeyValueCodec.java   |   78 -
 .../hbase/index/write/IndexCommitter.java       |   39 -
 .../hbase/index/write/IndexFailurePolicy.java   |   46 -
 .../hadoop/hbase/index/write/IndexWriter.java   |  226 ---
 .../hbase/index/write/IndexWriterUtils.java     |   74 -
 .../index/write/KillServerOnFailurePolicy.java  |   82 -
 .../write/ParallelWriterIndexCommitter.java     |  212 ---
 .../recovery/PerRegionIndexWriteCache.java      |   65 -
 .../recovery/StoreFailuresInCachePolicy.java    |   84 -
 .../TrackingParallelWriterIndexCommitter.java   |  228 ---
 .../regionserver/IndexKeyValueSkipListSet.java  |    2 -
 .../regionserver/wal/IndexedHLogReader.java     |   18 +
 .../regionserver/wal/IndexedWALEditCodec.java   |   22 +-
 .../org/apache/phoenix/cache/GlobalCache.java   |   68 +-
 .../org/apache/phoenix/cache/HashCache.java     |    4 +-
 .../phoenix/cache/IndexMetaDataCache.java       |   18 +
 .../apache/phoenix/cache/ServerCacheClient.java |    4 +-
 .../org/apache/phoenix/cache/TenantCache.java   |    4 +-
 .../apache/phoenix/cache/TenantCacheImpl.java   |   18 +-
 .../phoenix/cache/aggcache/SpillFile.java       |   18 +
 .../phoenix/cache/aggcache/SpillManager.java    |    4 +-
 .../apache/phoenix/cache/aggcache/SpillMap.java |   21 +-
 .../cache/aggcache/SpillableGroupByCache.java   |   20 +-
 .../apache/phoenix/client/ClientKeyValue.java   |   16 +
 .../phoenix/client/ClientKeyValueBuilder.java   |   17 +-
 .../phoenix/client/GenericKeyValueBuilder.java  |   18 +-
 .../apache/phoenix/client/KeyValueBuilder.java  |   25 +-
 .../phoenix/compile/AggregationManager.java     |    2 -
 .../org/apache/phoenix/compile/BindManager.java |    2 -
 .../apache/phoenix/compile/ColumnProjector.java |    2 -
 .../apache/phoenix/compile/ColumnResolver.java  |   12 +-
 .../phoenix/compile/CreateIndexCompiler.java    |   12 +-
 .../phoenix/compile/CreateSequenceCompiler.java |   21 +-
 .../phoenix/compile/CreateTableCompiler.java    |   82 +-
 .../apache/phoenix/compile/DeleteCompiler.java  |   47 +-
 .../phoenix/compile/DropSequenceCompiler.java   |    8 +-
 .../org/apache/phoenix/compile/ExplainPlan.java |    2 -
 .../phoenix/compile/ExpressionCompiler.java     |   27 +-
 .../phoenix/compile/ExpressionManager.java      |    2 -
 .../phoenix/compile/ExpressionProjector.java    |    4 +-
 .../apache/phoenix/compile/FromCompiler.java    |  183 +-
 .../apache/phoenix/compile/GroupByCompiler.java |    2 -
 .../apache/phoenix/compile/HavingCompiler.java  |    2 -
 .../phoenix/compile/IndexStatementRewriter.java |   79 +-
 .../apache/phoenix/compile/JoinCompiler.java    |  228 +--
 .../org/apache/phoenix/compile/KeyPart.java     |    2 -
 .../apache/phoenix/compile/LimitCompiler.java   |    6 +-
 .../MutatingParallelIteratorFactory.java        |   10 +-
 .../apache/phoenix/compile/MutationPlan.java    |    2 -
 .../apache/phoenix/compile/OrderByCompiler.java |    8 +-
 .../apache/phoenix/compile/PostDDLCompiler.java |   70 +-
 .../phoenix/compile/PostIndexDDLCompiler.java   |  116 +-
 .../phoenix/compile/ProjectionCompiler.java     |  251 ++-
 .../apache/phoenix/compile/QueryCompiler.java   |  100 +-
 .../org/apache/phoenix/compile/QueryPlan.java   |    6 +-
 .../apache/phoenix/compile/RowProjector.java    |   14 +-
 .../org/apache/phoenix/compile/ScanRanges.java  |    2 -
 .../apache/phoenix/compile/SequenceManager.java |   77 +-
 .../phoenix/compile/StatementContext.java       |   42 +-
 .../phoenix/compile/StatementNormalizer.java    |   91 +-
 .../apache/phoenix/compile/StatementPlan.java   |   17 +-
 .../TrackOrderPreservingExpressionCompiler.java |   28 +-
 .../apache/phoenix/compile/UpsertCompiler.java  |  242 +--
 .../apache/phoenix/compile/WhereCompiler.java   |   59 +-
 .../apache/phoenix/compile/WhereOptimizer.java  |   51 +-
 .../phoenix/coprocessor/BaseRegionScanner.java  |    2 -
 .../coprocessor/BaseScannerRegionObserver.java  |    2 -
 .../phoenix/coprocessor/GroupByCache.java       |    2 -
 .../GroupedAggregateRegionObserver.java         |    4 +-
 .../coprocessor/HashJoinRegionScanner.java      |   11 +-
 .../coprocessor/MetaDataEndpointImpl.java       |  282 ++-
 .../phoenix/coprocessor/MetaDataProtocol.java   |   12 +-
 .../coprocessor/MetaDataRegionObserver.java     |    5 +-
 .../phoenix/coprocessor/ScanRegionObserver.java |  127 +-
 .../coprocessor/SequenceRegionObserver.java     |   39 +-
 .../coprocessor/ServerCachingEndpointImpl.java  |    6 +-
 .../coprocessor/ServerCachingProtocol.java      |    2 -
 .../UngroupedAggregateRegionObserver.java       |   19 +-
 .../coprocessor/generated/PTableProtos.java     |  405 ++++-
 .../phoenix/exception/BatchUpdateExecution.java |   36 +
 .../phoenix/exception/PhoenixIOException.java   |    2 -
 .../exception/PhoenixParserException.java       |    2 -
 .../phoenix/exception/SQLExceptionCode.java     |    9 +-
 .../phoenix/exception/SQLExceptionInfo.java     |    2 -
 .../exception/UnknownFunctionException.java     |    2 -
 .../ValueTypeIncompatibleException.java         |    2 -
 .../apache/phoenix/execute/AggregatePlan.java   |   17 +-
 .../apache/phoenix/execute/BasicQueryPlan.java  |   26 +-
 .../apache/phoenix/execute/CommitException.java |    2 -
 .../phoenix/execute/DegenerateQueryPlan.java    |    2 -
 .../apache/phoenix/execute/HashJoinPlan.java    |   50 +-
 .../apache/phoenix/execute/MutationState.java   |   21 +-
 .../org/apache/phoenix/execute/ScanPlan.java    |    8 +-
 .../phoenix/expression/AddExpression.java       |    2 -
 .../phoenix/expression/AndExpression.java       |    2 -
 .../phoenix/expression/AndOrExpression.java     |    2 -
 .../expression/ArithmeticExpression.java        |    2 -
 .../expression/ArrayConstructorExpression.java  |  122 +-
 .../expression/BaseAddSubtractExpression.java   |    2 -
 .../expression/BaseCompoundExpression.java      |    2 -
 .../BaseDecimalAddSubtractExpression.java       |   18 +
 .../phoenix/expression/BaseExpression.java      |  157 +-
 .../expression/BaseSingleExpression.java        |   22 +-
 .../expression/BaseTerminalExpression.java      |    2 -
 .../phoenix/expression/CaseExpression.java      |    2 -
 .../phoenix/expression/CoerceExpression.java    |   37 +-
 .../phoenix/expression/ColumnExpression.java    |   16 +-
 .../expression/ComparisonExpression.java        |   24 +-
 .../expression/CurrentDateTimeFunction.java     |    2 -
 .../phoenix/expression/DateAddExpression.java   |   14 +-
 .../expression/DateSubtractExpression.java      |   14 +-
 .../expression/DecimalAddExpression.java        |    8 +-
 .../expression/DecimalDivideExpression.java     |    8 +-
 .../expression/DecimalMultiplyExpression.java   |    8 +-
 .../expression/DecimalSubtractExpression.java   |   10 +-
 .../phoenix/expression/DivideExpression.java    |    2 -
 .../phoenix/expression/DoubleAddExpression.java |    4 +-
 .../expression/DoubleDivideExpression.java      |    4 +-
 .../expression/DoubleMultiplyExpression.java    |    4 +-
 .../expression/DoubleSubtractExpression.java    |    4 +-
 .../apache/phoenix/expression/Expression.java   |    2 -
 .../phoenix/expression/ExpressionType.java      |    6 +-
 .../phoenix/expression/InListExpression.java    |   79 +-
 .../IndexKeyValueColumnExpression.java          |   26 -
 .../phoenix/expression/IsNullExpression.java    |    2 -
 .../expression/KeyValueColumnExpression.java    |   13 +-
 .../phoenix/expression/LikeExpression.java      |    6 +-
 .../phoenix/expression/LiteralExpression.java   |   47 +-
 .../phoenix/expression/LongAddExpression.java   |    4 +-
 .../expression/LongDivideExpression.java        |    4 +-
 .../expression/LongMultiplyExpression.java      |    4 +-
 .../expression/LongSubtractExpression.java      |    4 +-
 .../phoenix/expression/MultiplyExpression.java  |    2 -
 .../phoenix/expression/NotExpression.java       |    2 -
 .../apache/phoenix/expression/OrExpression.java |    2 -
 .../phoenix/expression/OrderByExpression.java   |   18 +
 .../expression/ProjectedColumnExpression.java   |   24 +-
 .../expression/RowKeyColumnExpression.java      |    4 +-
 .../phoenix/expression/RowKeyExpression.java    |   18 +
 .../RowValueConstructorExpression.java          |  141 --
 .../expression/StringConcatExpression.java      |   10 +-
 .../phoenix/expression/SubtractExpression.java  |    2 -
 .../expression/TimestampAddExpression.java      |   14 +-
 .../expression/TimestampSubtractExpression.java |   14 +-
 .../expression/aggregator/Aggregator.java       |    2 -
 .../expression/aggregator/Aggregators.java      |    2 -
 .../expression/aggregator/BaseAggregator.java   |   14 +-
 .../aggregator/BaseDecimalStddevAggregator.java |   10 +-
 .../aggregator/BaseStddevAggregator.java        |   10 +-
 .../aggregator/ClientAggregators.java           |    2 -
 .../expression/aggregator/CountAggregator.java  |    6 +-
 .../aggregator/DecimalStddevPopAggregator.java  |    8 +-
 .../aggregator/DecimalStddevSampAggregator.java |    8 +-
 .../aggregator/DecimalSumAggregator.java        |   10 +-
 .../DistinctCountClientAggregator.java          |    9 +-
 .../DistinctValueWithCountClientAggregator.java |   24 +-
 .../DistinctValueWithCountServerAggregator.java |    7 +-
 .../aggregator/DoubleSumAggregator.java         |   12 +-
 .../expression/aggregator/IntSumAggregator.java |    8 +-
 .../aggregator/LongSumAggregator.java           |    8 +-
 .../expression/aggregator/MaxAggregator.java    |    8 +-
 .../expression/aggregator/MinAggregator.java    |   10 +-
 .../aggregator/NumberSumAggregator.java         |   16 +-
 .../aggregator/PercentRankClientAggregator.java |    8 +-
 .../aggregator/PercentileClientAggregator.java  |    8 +-
 .../PercentileDiscClientAggregator.java         |    8 +-
 .../aggregator/ServerAggregators.java           |    2 -
 .../aggregator/StddevPopAggregator.java         |    8 +-
 .../aggregator/StddevSampAggregator.java        |    8 +-
 .../aggregator/UnsignedIntSumAggregator.java    |    8 +-
 .../aggregator/UnsignedLongSumAggregator.java   |    8 +-
 .../expression/function/AggregateFunction.java  |    2 -
 .../expression/function/ArrayIndexFunction.java |   18 +-
 .../function/ArrayLengthFunction.java           |    2 -
 .../function/AvgAggregateFunction.java          |    8 +-
 .../expression/function/CeilDateExpression.java |    2 -
 .../function/CeilDecimalExpression.java         |    2 -
 .../expression/function/CeilFunction.java       |    2 -
 .../function/CeilTimestampExpression.java       |   10 +-
 .../expression/function/CoalesceFunction.java   |   11 +-
 .../function/CompositeAggregateFunction.java    |    2 -
 .../function/CountAggregateFunction.java        |    4 +-
 .../function/CurrentDateFunction.java           |    2 -
 .../function/CurrentTimeFunction.java           |    2 -
 ...elegateConstantToCountAggregateFunction.java |    2 -
 .../DistinctCountAggregateFunction.java         |    4 +-
 ...DistinctValueWithCountAggregateFunction.java |    2 -
 .../function/FloorDateExpression.java           |    2 -
 .../function/FloorDecimalExpression.java        |    2 -
 .../expression/function/FloorFunction.java      |    2 -
 .../function/FunctionArgumentType.java          |   18 +
 .../expression/function/FunctionExpression.java |    2 -
 .../function/IndexStateNameFunction.java        |    2 -
 .../expression/function/InvertFunction.java     |   10 +-
 .../expression/function/LTrimFunction.java      |   14 +-
 .../expression/function/LengthFunction.java     |    4 +-
 .../expression/function/LowerFunction.java      |   20 +-
 .../expression/function/MD5Function.java        |    2 -
 .../function/MaxAggregateFunction.java          |   12 +-
 .../function/MinAggregateFunction.java          |   12 +-
 .../function/PercentRankAggregateFunction.java  |    4 +-
 .../PercentileContAggregateFunction.java        |    4 +-
 .../PercentileDiscAggregateFunction.java        |    4 +-
 .../expression/function/PrefixFunction.java     |   18 +
 .../expression/function/RTrimFunction.java      |   12 +-
 .../function/RegexpReplaceFunction.java         |    6 +-
 .../function/RegexpSubstrFunction.java          |    6 +-
 .../expression/function/ReverseFunction.java    |   28 +-
 .../function/RoundDateExpression.java           |   10 +-
 .../function/RoundDecimalExpression.java        |    4 +-
 .../expression/function/RoundFunction.java      |    2 -
 .../function/RoundTimestampExpression.java      |   10 +-
 .../function/SQLTableTypeFunction.java          |    2 -
 .../function/SQLViewTypeFunction.java           |    2 -
 .../expression/function/ScalarFunction.java     |    2 -
 .../function/SingleAggregateFunction.java       |    2 -
 .../function/SqlTypeNameFunction.java           |    4 +-
 .../expression/function/StddevPopFunction.java  |    6 +-
 .../expression/function/StddevSampFunction.java |    6 +-
 .../expression/function/SubstrFunction.java     |   22 +-
 .../function/SumAggregateFunction.java          |   20 +-
 .../phoenix/expression/function/TimeUnit.java   |    2 -
 .../expression/function/ToCharFunction.java     |    4 +-
 .../expression/function/ToDateFunction.java     |    4 +-
 .../expression/function/ToNumberFunction.java   |    6 +-
 .../expression/function/TrimFunction.java       |   14 +-
 .../expression/function/TruncFunction.java      |    2 -
 .../expression/function/UpperFunction.java      |   20 +-
 .../visitor/BaseExpressionVisitor.java          |    2 -
 .../expression/visitor/ExpressionVisitor.java   |    2 -
 .../visitor/KeyValueExpressionVisitor.java      |    2 -
 .../visitor/SingleAggregateFunctionVisitor.java |    2 -
 .../visitor/TraverseAllExpressionVisitor.java   |    2 -
 .../visitor/TraverseNoExpressionVisitor.java    |    2 -
 .../phoenix/filter/BooleanExpressionFilter.java |    6 +-
 .../phoenix/filter/ColumnProjectionFilter.java  |  168 ++
 .../filter/EvaluateOnCompletionVisitor.java     |   12 +-
 .../MultiCFCQKeyValueComparisonFilter.java      |    2 -
 .../filter/MultiCQKeyValueComparisonFilter.java |    4 +-
 .../filter/MultiKeyValueComparisonFilter.java   |   20 +-
 .../phoenix/filter/RowKeyComparisonFilter.java  |    9 +-
 .../SingleCFCQKeyValueComparisonFilter.java     |    2 -
 .../SingleCQKeyValueComparisonFilter.java       |    2 -
 .../filter/SingleKeyValueComparisonFilter.java  |    2 -
 .../apache/phoenix/filter/SkipScanFilter.java   |   13 +-
 .../phoenix/hbase/index/CapturingAbortable.java |   66 +
 .../hbase/index/IndexLogRollSynchronizer.java   |  133 ++
 .../org/apache/phoenix/hbase/index/Indexer.java |  701 ++++++++
 .../apache/phoenix/hbase/index/ValueGetter.java |   36 +
 .../hbase/index/builder/BaseIndexBuilder.java   |   97 ++
 .../hbase/index/builder/IndexBuildManager.java  |  214 +++
 .../hbase/index/builder/IndexBuilder.java       |  142 ++
 .../builder/IndexBuildingFailureException.java  |   48 +
 .../phoenix/hbase/index/covered/Batch.java      |   60 +
 .../hbase/index/covered/CoveredColumns.java     |   49 +
 .../covered/CoveredColumnsIndexBuilder.java     |  491 ++++++
 .../phoenix/hbase/index/covered/IndexCodec.java |  110 ++
 .../hbase/index/covered/IndexUpdate.java        |   77 +
 .../hbase/index/covered/KeyValueStore.java      |   33 +
 .../hbase/index/covered/LocalTableState.java    |  244 +++
 .../phoenix/hbase/index/covered/TableState.java |  116 ++
 .../hbase/index/covered/data/IndexMemStore.java |  331 ++++
 .../index/covered/data/LazyValueGetter.java     |   87 +
 .../index/covered/data/LocalHBaseState.java     |   47 +
 .../hbase/index/covered/data/LocalTable.java    |   73 +
 .../index/covered/example/ColumnGroup.java      |  112 ++
 .../index/covered/example/CoveredColumn.java    |  107 ++
 .../example/CoveredColumnIndexCodec.java        |  366 ++++
 .../CoveredColumnIndexSpecifierBuilder.java     |  184 ++
 .../covered/example/CoveredColumnIndexer.java   |  163 ++
 .../filter/ApplyAndFilterDeletesFilter.java     |  302 ++++
 ...olumnTrackingNextLargestTimestampFilter.java |   60 +
 .../index/covered/filter/FamilyOnlyFilter.java  |   80 +
 .../covered/filter/MaxTimestampFilter.java      |   70 +
 .../covered/filter/NewerTimestampFilter.java    |   47 +
 .../index/covered/update/ColumnReference.java   |  166 ++
 .../index/covered/update/ColumnTracker.java     |  115 ++
 .../covered/update/IndexUpdateManager.java      |  240 +++
 .../covered/update/IndexedColumnGroup.java      |   28 +
 .../index/covered/update/SortedCollection.java  |  128 ++
 .../index/exception/IndexWriteException.java    |   43 +
 .../MultiIndexWriteFailureException.java        |   44 +
 .../SingleIndexWriteFailureException.java       |   61 +
 .../hbase/index/parallel/BaseTaskRunner.java    |  129 ++
 .../hbase/index/parallel/EarlyExitFailure.java  |   34 +
 .../index/parallel/QuickFailingTaskRunner.java  |   49 +
 .../phoenix/hbase/index/parallel/Task.java      |   40 +
 .../phoenix/hbase/index/parallel/TaskBatch.java |   74 +
 .../hbase/index/parallel/TaskRunner.java        |   60 +
 .../hbase/index/parallel/ThreadPoolBuilder.java |   90 +
 .../hbase/index/parallel/ThreadPoolManager.java |  145 ++
 .../parallel/WaitForCompletionTaskRunner.java   |   51 +
 .../hbase/index/scanner/EmptyScanner.java       |   50 +
 .../index/scanner/FilteredKeyValueScanner.java  |  160 ++
 .../phoenix/hbase/index/scanner/Scanner.java    |   55 +
 .../hbase/index/scanner/ScannerBuilder.java     |  165 ++
 .../hbase/index/table/CachingHTableFactory.java |  110 ++
 .../index/table/CoprocessorHTableFactory.java   |   69 +
 .../hbase/index/table/HTableFactory.java        |   32 +
 .../index/table/HTableInterfaceReference.java   |   64 +
 .../hbase/index/util/ImmutableBytesPtr.java     |  111 ++
 .../hbase/index/util/IndexManagementUtil.java   |  247 +++
 .../hbase/index/wal/IndexedKeyValue.java        |  180 ++
 .../phoenix/hbase/index/wal/KeyValueCodec.java  |   96 ++
 .../hbase/index/write/IndexCommitter.java       |   37 +
 .../hbase/index/write/IndexFailurePolicy.java   |   45 +
 .../phoenix/hbase/index/write/IndexWriter.java  |  224 +++
 .../hbase/index/write/IndexWriterUtils.java     |   72 +
 .../index/write/KillServerOnFailurePolicy.java  |   81 +
 .../write/ParallelWriterIndexCommitter.java     |  210 +++
 .../recovery/PerRegionIndexWriteCache.java      |   64 +
 .../recovery/StoreFailuresInCachePolicy.java    |   84 +
 .../TrackingParallelWriterIndexCommitter.java   |  226 +++
 .../apache/phoenix/index/BaseIndexCodec.java    |    4 +-
 .../apache/phoenix/index/IndexMaintainer.java   |  164 +-
 .../phoenix/index/IndexMetaDataCacheClient.java |    2 -
 .../index/IndexMetaDataCacheFactory.java        |    2 -
 .../phoenix/index/PhoenixIndexBuilder.java      |    6 +-
 .../apache/phoenix/index/PhoenixIndexCodec.java |   18 +-
 .../index/PhoenixIndexFailurePolicy.java        |   10 +-
 .../iterate/AggregatingResultIterator.java      |    2 -
 .../phoenix/iterate/BaseResultIterator.java     |    2 -
 .../phoenix/iterate/ConcatResultIterator.java   |    2 -
 .../DefaultParallelIteratorRegionSplitter.java  |    2 -
 .../phoenix/iterate/DelegateResultIterator.java |    2 -
 .../DistinctAggregatingResultIterator.java      |    2 -
 .../apache/phoenix/iterate/ExplainTable.java    |   25 +-
 .../FilterAggregatingResultIterator.java        |    2 -
 .../phoenix/iterate/FilterResultIterator.java   |    2 -
 .../GroupedAggregatingResultIterator.java       |    2 -
 .../phoenix/iterate/LimitingResultIterator.java |    2 -
 .../iterate/LookAheadResultIterator.java        |    2 -
 .../iterate/MappedByteBufferSortedQueue.java    |    2 -
 .../iterate/MaterializedResultIterator.java     |    2 -
 .../iterate/MergeSortResultIterator.java        |    2 -
 .../iterate/MergeSortRowKeyResultIterator.java  |    2 -
 .../iterate/MergeSortTopNResultIterator.java    |    2 -
 .../OrderedAggregatingResultIterator.java       |    2 -
 .../phoenix/iterate/OrderedResultIterator.java  |    2 -
 .../iterate/ParallelIteratorRegionSplitter.java |    2 -
 .../ParallelIteratorRegionSplitterFactory.java  |    2 -
 .../phoenix/iterate/ParallelIterators.java      |  135 +-
 .../phoenix/iterate/PeekingResultIterator.java  |    2 -
 .../iterate/RegionScannerResultIterator.java    |    2 -
 .../apache/phoenix/iterate/ResultIterator.java  |    2 -
 .../apache/phoenix/iterate/ResultIterators.java |    2 -
 .../phoenix/iterate/ScanningResultIterator.java |    2 -
 .../phoenix/iterate/SequenceResultIterator.java |    8 +-
 ...SkipRangeParallelIteratorRegionSplitter.java |    2 -
 .../iterate/SpoolTooBigToDiskException.java     |   18 +
 .../phoenix/iterate/SpoolingResultIterator.java |   20 +-
 .../phoenix/iterate/TableResultIterator.java    |    2 -
 .../UngroupedAggregatingResultIterator.java     |    2 -
 .../java/org/apache/phoenix/jdbc/Jdbc7Shim.java |    2 -
 .../apache/phoenix/jdbc/PhoenixConnection.java  |  187 +-
 .../phoenix/jdbc/PhoenixDatabaseMetaData.java   |  449 +++--
 .../org/apache/phoenix/jdbc/PhoenixDriver.java  |   64 +-
 .../phoenix/jdbc/PhoenixEmbeddedDriver.java     |   35 +-
 .../phoenix/jdbc/PhoenixParameterMetaData.java  |    8 +-
 .../phoenix/jdbc/PhoenixPreparedStatement.java  |   82 +-
 .../apache/phoenix/jdbc/PhoenixResultSet.java   |    2 -
 .../phoenix/jdbc/PhoenixResultSetMetaData.java  |    2 -
 .../apache/phoenix/jdbc/PhoenixStatement.java   | 1031 +++++------
 .../phoenix/jdbc/PhoenixStatementFactory.java   |    2 -
 .../phoenix/job/AbstractRoundRobinQueue.java    |    2 -
 .../java/org/apache/phoenix/job/JobManager.java |    2 -
 .../apache/phoenix/join/HashCacheClient.java    |    5 +-
 .../apache/phoenix/join/HashCacheFactory.java   |    4 +-
 .../org/apache/phoenix/join/HashJoinInfo.java   |    4 +-
 .../MaxServerCacheSizeExceededException.java    |    2 -
 .../org/apache/phoenix/join/ScanProjector.java  |    8 +-
 .../phoenix/map/reduce/CSVBulkLoader.java       |    2 -
 .../apache/phoenix/map/reduce/MapReduceJob.java |    2 -
 .../phoenix/map/reduce/util/ConfigReader.java   |    2 -
 .../phoenix/memory/ChildMemoryManager.java      |    2 -
 .../phoenix/memory/DelegatingMemoryManager.java |    2 -
 .../phoenix/memory/GlobalMemoryManager.java     |    4 +-
 .../memory/InsufficientMemoryException.java     |    2 -
 .../apache/phoenix/memory/MemoryManager.java    |    2 -
 .../apache/phoenix/optimize/QueryOptimizer.java |  113 +-
 .../phoenix/parse/AddColumnStatement.java       |    2 -
 .../org/apache/phoenix/parse/AddParseNode.java  |    2 -
 .../parse/AggregateFunctionParseNode.java       |    2 -
 .../org/apache/phoenix/parse/AliasedNode.java   |    2 -
 .../phoenix/parse/AlterIndexStatement.java      |    4 +-
 .../phoenix/parse/AlterTableStatement.java      |    4 +-
 .../org/apache/phoenix/parse/AndParseNode.java  |    2 -
 .../phoenix/parse/ArithmeticParseNode.java      |    2 -
 .../phoenix/parse/ArrayConstructorNode.java     |    2 -
 .../phoenix/parse/AvgAggregateParseNode.java    |    2 -
 .../phoenix/parse/BaseParseNodeVisitor.java     |    2 -
 .../apache/phoenix/parse/BetweenParseNode.java  |    2 -
 .../apache/phoenix/parse/BinaryParseNode.java   |    2 -
 .../org/apache/phoenix/parse/BindParseNode.java |    2 -
 .../org/apache/phoenix/parse/BindTableNode.java |   12 +-
 .../apache/phoenix/parse/BindableStatement.java |    7 +-
 .../org/apache/phoenix/parse/CaseParseNode.java |    2 -
 .../org/apache/phoenix/parse/CastParseNode.java |    2 -
 .../org/apache/phoenix/parse/CeilParseNode.java |    2 -
 .../org/apache/phoenix/parse/ColumnDef.java     |   21 +-
 .../apache/phoenix/parse/ColumnFamilyDef.java   |    2 -
 .../org/apache/phoenix/parse/ColumnName.java    |    2 -
 .../apache/phoenix/parse/ColumnParseNode.java   |    2 -
 .../phoenix/parse/ComparisonParseNode.java      |    2 -
 .../apache/phoenix/parse/CompoundParseNode.java |    2 -
 .../apache/phoenix/parse/ConcreteTableNode.java |    6 +-
 .../phoenix/parse/CreateIndexStatement.java     |    6 +-
 .../phoenix/parse/CreateSequenceStatement.java  |    8 +-
 .../phoenix/parse/CreateTableStatement.java     |   10 +-
 .../phoenix/parse/CurrentDateParseNode.java     |    2 -
 .../phoenix/parse/CurrentTimeParseNode.java     |    2 -
 .../parse/DelegateConstantToCountParseNode.java |    2 -
 .../apache/phoenix/parse/DeleteStatement.java   |   16 +-
 .../apache/phoenix/parse/DerivedTableNode.java  |    6 +-
 .../phoenix/parse/DistinctCountParseNode.java   |    2 -
 .../apache/phoenix/parse/DivideParseNode.java   |    2 -
 .../phoenix/parse/DropColumnStatement.java      |    2 -
 .../phoenix/parse/DropIndexStatement.java       |   10 +-
 .../phoenix/parse/DropSequenceStatement.java    |   11 +-
 .../phoenix/parse/DropTableStatement.java       |   10 +-
 .../apache/phoenix/parse/EqualParseNode.java    |    2 -
 .../apache/phoenix/parse/ExistsParseNode.java   |    2 -
 .../apache/phoenix/parse/ExplainStatement.java  |   15 +-
 .../phoenix/parse/FamilyWildcardParseNode.java  |    2 -
 .../phoenix/parse/FilterableStatement.java      |    2 -
 .../apache/phoenix/parse/FloorParseNode.java    |    2 -
 .../apache/phoenix/parse/FunctionParseNode.java |    2 -
 .../parse/GreaterThanOrEqualParseNode.java      |    2 -
 .../phoenix/parse/GreaterThanParseNode.java     |    2 -
 .../java/org/apache/phoenix/parse/HintNode.java |    6 +-
 .../apache/phoenix/parse/InListParseNode.java   |    2 -
 .../org/apache/phoenix/parse/InParseNode.java   |    2 -
 .../phoenix/parse/IndexKeyConstraint.java       |   14 +-
 .../apache/phoenix/parse/IsNullParseNode.java   |    2 -
 .../org/apache/phoenix/parse/JoinTableNode.java |    4 +-
 .../phoenix/parse/LessThanOrEqualParseNode.java |    2 -
 .../apache/phoenix/parse/LessThanParseNode.java |    2 -
 .../org/apache/phoenix/parse/LikeParseNode.java |    2 -
 .../org/apache/phoenix/parse/LimitNode.java     |    2 -
 .../apache/phoenix/parse/LiteralParseNode.java  |    9 +-
 .../phoenix/parse/MaxAggregateParseNode.java    |    2 -
 .../phoenix/parse/MinAggregateParseNode.java    |    2 -
 .../apache/phoenix/parse/MultiplyParseNode.java |    2 -
 .../apache/phoenix/parse/MutableStatement.java  |   34 +
 .../org/apache/phoenix/parse/NamedNode.java     |   18 +
 .../apache/phoenix/parse/NamedParseNode.java    |    2 -
 .../apache/phoenix/parse/NamedTableNode.java    |   14 +-
 .../apache/phoenix/parse/NotEqualParseNode.java |    2 -
 .../org/apache/phoenix/parse/NotParseNode.java  |    2 -
 .../org/apache/phoenix/parse/OrParseNode.java   |    2 -
 .../org/apache/phoenix/parse/OrderByNode.java   |    2 -
 .../phoenix/parse/OuterJoinParseNode.java       |    2 -
 .../org/apache/phoenix/parse/ParseContext.java  |    2 -
 .../apache/phoenix/parse/ParseException.java    |    2 -
 .../org/apache/phoenix/parse/ParseNode.java     |    2 -
 .../apache/phoenix/parse/ParseNodeFactory.java  |   20 +-
 .../apache/phoenix/parse/ParseNodeRewriter.java |    7 +-
 .../apache/phoenix/parse/ParseNodeVisitor.java  |    5 +-
 .../phoenix/parse/PrimaryKeyConstraint.java     |   28 +-
 .../org/apache/phoenix/parse/PropertyName.java  |   18 +
 .../apache/phoenix/parse/RoundParseNode.java    |    2 -
 .../parse/RowValueConstructorParseNode.java     |    2 -
 .../org/apache/phoenix/parse/SQLParser.java     |    2 -
 .../apache/phoenix/parse/SelectStatement.java   |   14 +-
 .../phoenix/parse/SelectStatementRewriter.java  |    2 -
 .../phoenix/parse/SequenceValueParseNode.java   |   18 +
 .../phoenix/parse/SingleTableSQLStatement.java  |   39 -
 .../phoenix/parse/SingleTableStatement.java     |   37 +
 .../StatelessTraverseAllParseNodeVisitor.java   |   18 +
 .../phoenix/parse/StringConcatParseNode.java    |    2 -
 .../apache/phoenix/parse/SubqueryParseNode.java |    2 -
 .../apache/phoenix/parse/SubtractParseNode.java |    2 -
 .../phoenix/parse/SumAggregateParseNode.java    |    2 -
 .../org/apache/phoenix/parse/TableName.java     |    2 -
 .../org/apache/phoenix/parse/TableNode.java     |   12 -
 .../apache/phoenix/parse/TableNodeVisitor.java  |    2 -
 .../phoenix/parse/TableWildcardParseNode.java   |   50 +
 .../apache/phoenix/parse/TerminalParseNode.java |    2 -
 .../apache/phoenix/parse/ToCharParseNode.java   |    2 -
 .../apache/phoenix/parse/ToDateParseNode.java   |    2 -
 .../apache/phoenix/parse/ToNumberParseNode.java |   18 +
 .../parse/TraverseAllParseNodeVisitor.java      |    7 +-
 .../parse/TraverseNoParseNodeVisitor.java       |    7 +-
 .../apache/phoenix/parse/UnaryParseNode.java    |    2 -
 .../parse/UnsupportedAllParseNodeVisitor.java   |    7 +-
 .../apache/phoenix/parse/UpsertStatement.java   |    4 +-
 .../apache/phoenix/parse/WildcardParseNode.java |    2 -
 .../phoenix/query/BaseQueryServicesImpl.java    |    2 -
 .../phoenix/query/ChildQueryServices.java       |    2 -
 .../phoenix/query/ConfigurationFactory.java     |    2 -
 .../phoenix/query/ConnectionQueryServices.java  |   20 +-
 .../query/ConnectionQueryServicesImpl.java      |  770 +++++++--
 .../query/ConnectionlessQueryServicesImpl.java  |   55 +-
 .../query/DelegateConnectionQueryServices.java  |   44 +-
 .../phoenix/query/DelegateQueryServices.java    |    2 -
 .../phoenix/query/HBaseFactoryProvider.java     |    2 -
 .../phoenix/query/HConnectionFactory.java       |    2 -
 .../org/apache/phoenix/query/HTableFactory.java |    2 -
 .../java/org/apache/phoenix/query/KeyRange.java |    8 +-
 .../apache/phoenix/query/MetaDataMutated.java   |    9 +-
 .../apache/phoenix/query/QueryConstants.java    |  120 +-
 .../org/apache/phoenix/query/QueryServices.java |   10 +-
 .../apache/phoenix/query/QueryServicesImpl.java |    2 -
 .../phoenix/query/QueryServicesOptions.java     |   31 +-
 .../org/apache/phoenix/query/StatsManager.java  |    2 -
 .../apache/phoenix/query/StatsManagerImpl.java  |    2 -
 .../schema/AmbiguousColumnException.java        |    2 -
 .../phoenix/schema/AmbiguousTableException.java |    2 -
 .../schema/ArgumentTypeMismatchException.java   |    2 -
 .../schema/ColumnAlreadyExistsException.java    |    2 -
 .../schema/ColumnFamilyNotFoundException.java   |    2 -
 .../apache/phoenix/schema/ColumnModifier.java   |    2 -
 .../phoenix/schema/ColumnNotFoundException.java |    2 -
 .../org/apache/phoenix/schema/ColumnRef.java    |   38 +-
 .../ConcurrentTableMutationException.java       |    2 -
 .../schema/ConstraintViolationException.java    |    2 -
 .../apache/phoenix/schema/DelegateColumn.java   |   18 +-
 .../apache/phoenix/schema/DelegateDatum.java    |    6 +-
 .../schema/EmptySequenceCacheException.java     |   18 +
 .../ExecuteQueryNotApplicableException.java     |    2 -
 .../ExecuteUpdateNotApplicableException.java    |    2 -
 .../phoenix/schema/IllegalDataException.java    |    2 -
 .../apache/phoenix/schema/KeyValueSchema.java   |    4 +-
 .../apache/phoenix/schema/MetaDataClient.java   |  683 +++++---
 .../schema/MetaDataEntityNotFoundException.java |    2 -
 .../phoenix/schema/MetaDataSplitPolicy.java     |    2 -
 .../NewerTableAlreadyExistsException.java       |    2 -
 .../apache/phoenix/schema/PArrayDataType.java   |  681 +++++---
 .../org/apache/phoenix/schema/PBaseColumn.java  |   11 +-
 .../java/org/apache/phoenix/schema/PColumn.java |    6 +-
 .../apache/phoenix/schema/PColumnFamily.java    |    4 +-
 .../phoenix/schema/PColumnFamilyImpl.java       |   19 +-
 .../org/apache/phoenix/schema/PColumnImpl.java  |   55 +-
 .../org/apache/phoenix/schema/PDataType.java    |  649 +++----
 .../org/apache/phoenix/schema/PDateColumn.java  |    2 -
 .../java/org/apache/phoenix/schema/PDatum.java  |    6 +-
 .../org/apache/phoenix/schema/PIndexState.java  |    2 -
 .../apache/phoenix/schema/PIntegerColumn.java   |    2 -
 .../org/apache/phoenix/schema/PLongColumn.java  |    2 -
 .../org/apache/phoenix/schema/PMetaData.java    |   19 +-
 .../apache/phoenix/schema/PMetaDataImpl.java    |  211 ++-
 .../java/org/apache/phoenix/schema/PName.java   |   16 +-
 .../org/apache/phoenix/schema/PNameFactory.java |   36 +-
 .../org/apache/phoenix/schema/PNameImpl.java    |   18 +-
 .../apache/phoenix/schema/PNormalizedName.java  |   53 -
 .../java/org/apache/phoenix/schema/PRow.java    |    2 -
 .../apache/phoenix/schema/PStringColumn.java    |    2 -
 .../java/org/apache/phoenix/schema/PTable.java  |    9 +-
 .../org/apache/phoenix/schema/PTableImpl.java   |  201 ++-
 .../org/apache/phoenix/schema/PTableKey.java    |   67 +
 .../org/apache/phoenix/schema/PTableType.java   |    2 -
 .../org/apache/phoenix/schema/PhoenixArray.java |   18 +-
 .../phoenix/schema/ReadOnlyTableException.java  |    2 -
 .../org/apache/phoenix/schema/RowKeySchema.java |    6 +-
 .../phoenix/schema/RowKeyValueAccessor.java     |    2 -
 .../org/apache/phoenix/schema/SaltingUtil.java  |    8 +-
 .../org/apache/phoenix/schema/Sequence.java     |   44 +-
 .../schema/SequenceAlreadyExistsException.java  |    2 -
 .../org/apache/phoenix/schema/SequenceKey.java  |    2 -
 .../schema/SequenceNotFoundException.java       |    2 -
 .../org/apache/phoenix/schema/SortOrder.java    |  142 ++
 .../schema/TableAlreadyExistsException.java     |    8 +-
 .../phoenix/schema/TableNotFoundException.java  |    2 -
 .../org/apache/phoenix/schema/TableRef.java     |    2 -
 .../phoenix/schema/TypeMismatchException.java   |    2 -
 .../org/apache/phoenix/schema/ValueBitSet.java  |    2 -
 .../phoenix/schema/ValueRangeExcpetion.java     |    2 -
 .../org/apache/phoenix/schema/ValueSchema.java  |   44 +-
 .../apache/phoenix/schema/stat/PTableStats.java |    2 -
 .../phoenix/schema/stat/PTableStatsImpl.java    |    2 -
 .../apache/phoenix/schema/tuple/BaseTuple.java  |   27 +
 .../phoenix/schema/tuple/DelegateTuple.java     |   64 +
 .../schema/tuple/MultiKeyValueTuple.java        |    7 +-
 .../phoenix/schema/tuple/ResultTuple.java       |    5 +-
 .../schema/tuple/SingleKeyValueTuple.java       |    4 +-
 .../org/apache/phoenix/schema/tuple/Tuple.java  |   14 +-
 .../org/apache/phoenix/util/BigDecimalUtil.java |    2 -
 .../java/org/apache/phoenix/util/BitSet.java    |   18 +
 .../java/org/apache/phoenix/util/ByteUtil.java  |   16 +-
 .../java/org/apache/phoenix/util/CSVLoader.java |    2 -
 .../org/apache/phoenix/util/Closeables.java     |    2 -
 .../org/apache/phoenix/util/ColumnInfo.java     |   18 +
 .../java/org/apache/phoenix/util/DateUtil.java  |    2 -
 .../java/org/apache/phoenix/util/IndexUtil.java |   10 +-
 .../apache/phoenix/util/InstanceResolver.java   |    2 -
 .../java/org/apache/phoenix/util/JDBCUtil.java  |    2 -
 .../org/apache/phoenix/util/KeyValueUtil.java   |    2 -
 .../org/apache/phoenix/util/MetaDataUtil.java   |  159 +-
 .../org/apache/phoenix/util/NumberUtil.java     |    2 -
 .../org/apache/phoenix/util/PhoenixRuntime.java |    7 +-
 .../java/org/apache/phoenix/util/QueryUtil.java |   20 +-
 .../org/apache/phoenix/util/ReadOnlyProps.java  |   18 +
 .../org/apache/phoenix/util/ResultUtil.java     |    2 -
 .../org/apache/phoenix/util/SQLCloseable.java   |    2 -
 .../org/apache/phoenix/util/SQLCloseables.java  |    2 -
 .../java/org/apache/phoenix/util/ScanUtil.java  |    2 -
 .../org/apache/phoenix/util/SchemaUtil.java     |   59 +-
 .../org/apache/phoenix/util/ServerUtil.java     |    2 -
 .../java/org/apache/phoenix/util/SizedUtil.java |   14 +-
 .../org/apache/phoenix/util/StringUtil.java     |   40 +-
 .../util/TrustedByteArrayOutputStream.java      |    2 -
 .../java/org/apache/phoenix/util/TupleUtil.java |    5 +-
 phoenix-core/src/main/java/overview.html        |   23 +-
 .../hadoop/hbase/index/IndexTestingUtils.java   |   96 --
 .../hadoop/hbase/index/StubAbortable.java       |   43 -
 .../apache/hadoop/hbase/index/TableName.java    |   47 -
 .../TestFailForUnsupportedHBaseVersions.java    |  159 --
 .../covered/CoveredIndexCodecForTesting.java    |   73 -
 .../hbase/index/covered/TestCoveredColumns.java |   47 -
 .../TestEndToEndCoveredColumnsIndexBuilder.java |  344 ----
 .../index/covered/TestLocalTableState.java      |  199 ---
 .../index/covered/data/TestIndexMemStore.java   |   95 -
 .../covered/example/TestColumnTracker.java      |   63 -
 .../example/TestCoveredColumnIndexCodec.java    |  252 ---
 .../TestCoveredIndexSpecifierBuilder.java       |   74 -
 .../example/TestEndToEndCoveredIndexing.java    |  881 ----------
 .../TestEndtoEndIndexingWithCompression.java    |   52 -
 .../covered/example/TestFailWithoutRetries.java |  151 --
 .../filter/TestApplyAndFilterDeletesFilter.java |  210 ---
 .../covered/filter/TestFamilyOnlyFilter.java    |  107 --
 .../filter/TestNewerTimestampFilter.java        |   49 -
 .../covered/update/TestIndexUpdateManager.java  |  142 --
 .../index/parallel/TestThreadPoolBuilder.java   |   65 -
 .../index/parallel/TestThreadPoolManager.java   |   95 -
 .../index/util/TestIndexManagementUtil.java     |   68 -
 .../hbase/index/write/FakeTableFactory.java     |   33 -
 .../index/write/TestCachingHTableFactory.java   |   60 -
 .../hbase/index/write/TestIndexWriter.java      |  286 ----
 .../index/write/TestParalleIndexWriter.java     |  119 --
 .../write/TestParalleWriterIndexCommitter.java  |  119 --
 .../index/write/TestWALRecoveryCaching.java     |  371 ----
 .../recovery/TestPerRegionIndexWriteCache.java  |  207 ---
 .../wal/TestReadWriteKeyValuesWithCodec.java    |   25 +-
 ...ALReplayWithIndexWritesAndCompressedWAL.java |   31 +-
 ...exWritesAndUncompressedWALInHBase_094_9.java |   21 +-
 .../arithmetic/ArithmeticOperationTest.java     |    2 -
 .../phoenix/client/TestClientKeyValue.java      |    2 -
 .../phoenix/compile/HavingClauseTest.java       |  194 ---
 .../phoenix/compile/HavingCompilerTest.java     |  189 ++
 .../phoenix/compile/JoinQueryCompileTest.java   |  146 --
 .../phoenix/compile/JoinQueryCompilerTest.java  |  141 ++
 .../apache/phoenix/compile/LimitClauseTest.java |  157 --
 .../phoenix/compile/LimitCompilerTest.java      |  127 ++
 .../phoenix/compile/QueryCompileTest.java       | 1313 --------------
 .../phoenix/compile/QueryCompilerTest.java      | 1360 +++++++++++++++
 .../phoenix/compile/QueryMetaDataTest.java      |    2 -
 .../phoenix/compile/QueryOptimizerTest.java     |    2 -
 .../apache/phoenix/compile/ScanRangesTest.java  |   16 +-
 .../compile/SelectStatementRewriterTest.java    |  104 +-
 .../compile/StatementHintsCompilationTest.java  |   48 +-
 .../apache/phoenix/compile/ViewCompileTest.java |  119 --
 .../phoenix/compile/ViewCompilerTest.java       |  116 ++
 .../phoenix/compile/WhereClauseCompileTest.java |  931 ----------
 .../compile/WhereClauseOptimizerTest.java       | 1620 ------------------
 .../phoenix/compile/WhereCompilerTest.java      |  924 ++++++++++
 .../phoenix/compile/WhereOptimizerTest.java     | 1573 +++++++++++++++++
 .../apache/phoenix/end2end/AlterTableTest.java  |   67 +-
 .../phoenix/end2end/ArithmeticQueryTest.java    |   74 +-
 .../org/apache/phoenix/end2end/ArrayTest.java   |  332 +++-
 .../apache/phoenix/end2end/AutoCommitTest.java  |    2 -
 .../end2end/BaseClientManagedTimeTest.java      |    2 -
 .../phoenix/end2end/BaseConnectedQueryTest.java |   96 +-
 .../end2end/BaseHBaseManagedTimeTest.java       |    2 -
 .../end2end/BaseTenantSpecificTablesTest.java   |    8 -
 .../BaseTenantSpecificViewIndexTest.java        |   85 +
 .../apache/phoenix/end2end/BaseViewTest.java    |  133 ++
 .../phoenix/end2end/BinaryRowKeyTest.java       |    2 -
 .../apache/phoenix/end2end/CSVLoaderTest.java   |    2 -
 .../phoenix/end2end/CoalesceFunctionTest.java   |    2 -
 .../ColumnProjectionOptimizationTest.java       |  253 +++
 .../end2end/CompareDecimalToLongTest.java       |    2 -
 .../ConnectionQueryServicesTestImpl.java        |   14 +-
 .../apache/phoenix/end2end/CreateTableTest.java |    2 -
 .../phoenix/end2end/CustomEntityDataTest.java   |    2 -
 ...aultParallelIteratorsRegionSplitterTest.java |   21 +-
 .../org/apache/phoenix/end2end/DeleteTest.java  |    7 +-
 .../end2end/DescColumnSortOrderTest.java        |  555 ------
 .../phoenix/end2end/DistinctCountTest.java      |    2 -
 .../phoenix/end2end/DynamicColumnTest.java      |   11 +-
 .../phoenix/end2end/DynamicFamilyTest.java      |   13 +-
 .../phoenix/end2end/DynamicUpsertTest.java      |    2 -
 .../phoenix/end2end/ExecuteStatementsTest.java  |    2 -
 .../phoenix/end2end/ExtendedQueryExecTest.java  |    2 -
 .../apache/phoenix/end2end/FunkyNamesTest.java  |    2 -
 .../apache/phoenix/end2end/GroupByCaseTest.java |    2 -
 .../apache/phoenix/end2end/HashJoinTest.java    |  666 ++++---
 .../phoenix/end2end/InMemoryOrderByTest.java    |    2 -
 .../org/apache/phoenix/end2end/IsNullTest.java  |    2 -
 .../org/apache/phoenix/end2end/KeyOnlyTest.java |    2 -
 .../apache/phoenix/end2end/MD5FunctionTest.java |    2 -
 .../phoenix/end2end/MultiCfQueryExecTest.java   |    2 -
 .../phoenix/end2end/NativeHBaseTypesTest.java   |    2 -
 .../org/apache/phoenix/end2end/OrderByTest.java |    2 -
 .../apache/phoenix/end2end/PercentileTest.java  |    2 -
 .../phoenix/end2end/ProductMetricsTest.java     |    2 -
 .../end2end/QueryDatabaseMetaDataTest.java      |  144 +-
 .../end2end/QueryExecWithoutSCNTest.java        |    2 -
 .../apache/phoenix/end2end/QueryPlanTest.java   |    2 -
 .../org/apache/phoenix/end2end/QueryTest.java   |   60 +-
 .../phoenix/end2end/ReadIsolationLevelTest.java |    2 -
 .../phoenix/end2end/ReverseFunctionTest.java    |    2 -
 .../RoundFloorCeilFunctionsEnd2EndTest.java     |    2 -
 .../end2end/RowValueConstructorTest.java        |    2 -
 .../apache/phoenix/end2end/SaltedViewTest.java  |   35 +
 .../apache/phoenix/end2end/SequenceTest.java    |   76 +-
 .../phoenix/end2end/ServerExceptionTest.java    |    2 -
 ...RangeParallelIteratorRegionSplitterTest.java |   41 +-
 .../phoenix/end2end/SkipScanQueryTest.java      |   72 +-
 .../apache/phoenix/end2end/SortOrderFTest.java  |  552 ++++++
 .../phoenix/end2end/SpillableGroupByTest.java   |    2 -
 .../phoenix/end2end/SpooledOrderByTest.java     |    2 -
 .../phoenix/end2end/StatementHintsTest.java     |    2 -
 .../org/apache/phoenix/end2end/StddevTest.java  |    2 -
 .../end2end/TenantSpecificTablesDDLTest.java    |   49 +-
 .../end2end/TenantSpecificTablesDMLTest.java    |    2 -
 .../TenantSpecificViewIndexSaltedTest.java      |   13 +
 .../end2end/TenantSpecificViewIndexTest.java    |   28 +
 .../phoenix/end2end/ToCharFunctionTest.java     |    2 -
 .../phoenix/end2end/ToNumberFunctionTest.java   |    2 -
 .../org/apache/phoenix/end2end/TopNTest.java    |    2 -
 .../phoenix/end2end/UpsertBigValuesTest.java    |    2 -
 .../end2end/UpsertSelectAutoCommitTest.java     |    2 -
 .../phoenix/end2end/UpsertSelectTest.java       |   50 +-
 .../phoenix/end2end/UpsertValuesTest.java       |   93 +-
 .../phoenix/end2end/VariableLengthPKTest.java   |    2 -
 .../org/apache/phoenix/end2end/ViewTest.java    |  100 +-
 .../phoenix/end2end/index/BaseIndexTest.java    |    2 -
 .../end2end/index/BaseMutableIndexTest.java     |    2 -
 .../phoenix/end2end/index/DropViewTest.java     |    2 -
 .../end2end/index/ImmutableIndexTest.java       |   23 +-
 .../end2end/index/IndexMetadataTest.java        |   12 +-
 .../phoenix/end2end/index/IndexTestUtil.java    |   24 +-
 .../end2end/index/MutableIndexFailureTest.java  |    2 -
 .../phoenix/end2end/index/MutableIndexTest.java |    2 -
 .../phoenix/end2end/index/SaltedIndexTest.java  |    6 +-
 .../phoenix/end2end/salted/SaltedTableTest.java |    2 -
 .../salted/SaltedTableUpsertSelectTest.java     |   18 +
 .../salted/SaltedTableVarLengthRowKeyTest.java  |   18 +
 .../expression/CoerceExpressionTest.java        |    2 -
 .../expression/ColumnExpressionTest.java        |   11 +-
 .../DescColumnSortOrderExpressionTest.java      |  325 ----
 .../phoenix/expression/LikeExpressionTest.java  |    2 -
 .../RoundFloorCeilExpressionsUnitTests.java     |    2 -
 .../expression/SortOrderExpressionTest.java     |  322 ++++
 .../filter/SkipScanFilterIntersectTest.java     |   10 +-
 .../phoenix/filter/SkipScanFilterTest.java      |   26 +-
 .../phoenix/hbase/index/IndexTestingUtils.java  |   94 +
 .../phoenix/hbase/index/StubAbortable.java      |   41 +
 .../apache/phoenix/hbase/index/TableName.java   |   45 +
 .../TestFailForUnsupportedHBaseVersions.java    |  159 ++
 .../covered/CoveredIndexCodecForTesting.java    |   74 +
 .../hbase/index/covered/TestCoveredColumns.java |   46 +
 .../TestEndToEndCoveredColumnsIndexBuilder.java |  348 ++++
 .../index/covered/TestLocalTableState.java      |  199 +++
 .../index/covered/data/TestIndexMemStore.java   |   94 +
 .../covered/example/TestColumnTracker.java      |   61 +
 .../example/TestCoveredColumnIndexCodec.java    |  253 +++
 .../TestCoveredIndexSpecifierBuilder.java       |   75 +
 .../example/TestEndToEndCoveredIndexing.java    |  885 ++++++++++
 .../TestEndtoEndIndexingWithCompression.java    |   51 +
 .../covered/example/TestFailWithoutRetries.java |  152 ++
 .../filter/TestApplyAndFilterDeletesFilter.java |  209 +++
 .../covered/filter/TestFamilyOnlyFilter.java    |  106 ++
 .../filter/TestNewerTimestampFilter.java        |   48 +
 .../covered/update/TestIndexUpdateManager.java  |  140 ++
 .../index/parallel/TestThreadPoolBuilder.java   |   64 +
 .../index/parallel/TestThreadPoolManager.java   |   95 +
 .../index/util/TestIndexManagementUtil.java     |   66 +
 .../hbase/index/write/FakeTableFactory.java     |   51 +
 .../index/write/TestCachingHTableFactory.java   |   58 +
 .../hbase/index/write/TestIndexWriter.java      |  287 ++++
 .../index/write/TestParalleIndexWriter.java     |  119 ++
 .../write/TestParalleWriterIndexCommitter.java  |  119 ++
 .../index/write/TestWALRecoveryCaching.java     |  370 ++++
 .../recovery/TestPerRegionIndexWriteCache.java  |  205 +++
 .../phoenix/index/IndexMaintainerTest.java      |   39 +-
 .../iterate/AggregateResultScannerTest.java     |   15 +-
 .../iterate/ConcatResultIteratorTest.java       |    2 -
 .../iterate/MergeSortResultIteratorTest.java    |    2 -
 .../iterate/SpoolingResultIteratorTest.java     |    9 +-
 .../phoenix/jdbc/PhoenixEmbeddedDriverTest.java |   18 +
 .../apache/phoenix/jdbc/PhoenixTestDriver.java  |   22 +-
 .../apache/phoenix/logging/PerformanceLog.java  |    2 -
 .../phoenix/memory/MemoryManagerTest.java       |    2 -
 .../apache/phoenix/parse/QueryParserTest.java   |   16 +-
 .../query/BaseConnectionlessQueryTest.java      |   70 +-
 .../java/org/apache/phoenix/query/BaseTest.java |   30 +-
 .../phoenix/query/ConnectionlessUpsertTest.java |    2 -
 .../phoenix/query/HBaseFactoryProviderTest.java |    2 -
 .../phoenix/query/KeyRangeCoalesceTests.java    |   18 +
 .../phoenix/query/KeyRangeIntersectTests.java   |   18 +
 .../phoenix/query/KeyRangeUnionTests.java       |   18 +
 .../phoenix/query/QueryServicesTestImpl.java    |    9 +-
 .../phoenix/schema/PDataTypeForArraysTest.java  |  615 ++++++-
 .../apache/phoenix/schema/PDataTypeTest.java    |  174 +-
 .../phoenix/schema/PMetaDataImplTest.java       |  115 ++
 .../apache/phoenix/schema/RowKeySchemaTest.java |   35 +-
 .../phoenix/schema/RowKeyValueAccessorTest.java |   25 +-
 .../apache/phoenix/schema/SchemaUtilTest.java   |    2 -
 .../apache/phoenix/schema/SortOrderTest.java    |  113 ++
 .../apache/phoenix/schema/ValueBitSetTest.java  |    6 +-
 .../org/apache/phoenix/util/AssertResults.java  |    2 -
 .../org/apache/phoenix/util/ByteUtilTest.java   |    2 -
 .../org/apache/phoenix/util/DateUtilTest.java   |    2 -
 .../phoenix/util/GeneratePerformanceData.java   |    2 -
 .../apache/phoenix/util/LikeExpressionTest.java |    2 -
 .../apache/phoenix/util/MetaDataUtilTest.java   |   72 +-
 .../apache/phoenix/util/PhoenixRuntimeTest.java |   18 +
 .../org/apache/phoenix/util/ScanUtilTest.java   |   16 +-
 .../java/org/apache/phoenix/util/TestUtil.java  |   56 +-
 phoenix-flume/pom.xml                           |   22 +
 .../phoenix/flume/DefaultKeyGenerator.java      |    2 -
 .../apache/phoenix/flume/FlumeConstants.java    |    2 -
 .../org/apache/phoenix/flume/KeyGenerator.java  |    2 -
 .../org/apache/phoenix/flume/SchemaHandler.java |    2 -
 .../flume/serializer/BaseEventSerializer.java   |   53 +-
 .../flume/serializer/EventSerializer.java       |    2 -
 .../flume/serializer/EventSerializers.java      |    2 -
 .../flume/serializer/RegexEventSerializer.java  |    2 -
 .../apache/phoenix/flume/sink/PhoenixSink.java  |   10 +-
 .../apache/phoenix/flume/TestPhoenixSink.java   |    2 -
 .../phoenix/flume/TestRegexEventSerializer.java |    2 -
 phoenix-hadoop-compat/pom.xml                   |   22 +
 phoenix-hadoop1-compat/pom.xml                  |   22 +
 phoenix-hadoop2-compat/pom.xml                  |   22 +
 phoenix-pig/pom.xml                             |   22 +
 .../apache/phoenix/pig/PhoenixHBaseStorage.java |    2 -
 .../phoenix/pig/PhoenixPigConfiguration.java    |    2 -
 .../java/org/apache/phoenix/pig/TypeUtil.java   |    2 -
 .../pig/hadoop/PhoenixOutputCommitter.java      |    2 -
 .../phoenix/pig/hadoop/PhoenixOutputFormat.java |    2 -
 .../phoenix/pig/hadoop/PhoenixRecord.java       |    2 -
 .../phoenix/pig/hadoop/PhoenixRecordWriter.java |    2 -
 phoenix-protocol/src/main/PTable.proto          |    7 +-
 pom.xml                                         |   50 +
 917 files changed, 30800 insertions(+), 24728 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/b3a330ca/phoenix-assembly/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/b3a330ca/phoenix-assembly/src/build/all.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/b3a330ca/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/wal/IndexedHLogReader.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/b3a330ca/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/wal/IndexedWALEditCodec.java
----------------------------------------------------------------------
diff --cc phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/wal/IndexedWALEditCodec.java
index e59afba,5d87433..8278ea7
--- a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/wal/IndexedWALEditCodec.java
+++ b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/wal/IndexedWALEditCodec.java
@@@ -7,15 -25,14 +25,15 @@@ import java.io.IOException
  import java.io.InputStream;
  import java.io.OutputStream;
  
 +import org.apache.hadoop.conf.Configuration;
 +import org.apache.hadoop.hbase.Cell;
  import org.apache.hadoop.hbase.KeyValue;
 +import org.apache.hadoop.hbase.KeyValueUtil;
  import org.apache.hadoop.hbase.codec.BaseDecoder;
  import org.apache.hadoop.hbase.codec.BaseEncoder;
 -import org.apache.hadoop.hbase.codec.Decoder;
 -import org.apache.hadoop.hbase.codec.Encoder;
  
- import org.apache.hadoop.hbase.index.wal.IndexedKeyValue;
- import org.apache.hadoop.hbase.index.wal.KeyValueCodec;
+ import org.apache.phoenix.hbase.index.wal.IndexedKeyValue;
+ import org.apache.phoenix.hbase.index.wal.KeyValueCodec;
  
  
  /**

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/b3a330ca/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/b3a330ca/phoenix-core/src/main/java/org/apache/phoenix/cache/aggcache/SpillableGroupByCache.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/b3a330ca/phoenix-core/src/main/java/org/apache/phoenix/client/ClientKeyValue.java
----------------------------------------------------------------------
diff --cc phoenix-core/src/main/java/org/apache/phoenix/client/ClientKeyValue.java
index 9b75e75,5b6aacf..5c39bb4
--- a/phoenix-core/src/main/java/org/apache/phoenix/client/ClientKeyValue.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/client/ClientKeyValue.java
@@@ -413,17 -489,31 +413,33 @@@ public class ClientKeyValue extends Key
          + " does not support a single backing buffer.");
    }
  
 -  @Override
 -  public SplitKeyValue split() {
 -    throw new UnsupportedOperationException(ClientKeyValue.class.getSimpleName()
 -        + " should not be used for server-side operations");
 -  }
 -
 +  @SuppressWarnings("deprecation")
    @Override
    public byte[] getBuffer() {
 -    throw new UnsupportedOperationException(ClientKeyValue.class.getSimpleName()
 -        + " does not support a single backing buffer.");
 +    if (this.delegate != null) {
 +      return this.delegate.getBuffer();
 +    }
 +    this.delegate =
 +        new KeyValue(row.get(), row.getOffset(), row.getLength(), family.get(), family.getOffset(),
 +            family.getLength(), qualifier.get(), qualifier.getOffset(), qualifier.getLength(),
 +            this.ts, type, value.get(), value.getOffset(), value.getLength());
 +    return this.delegate.getBuffer();
    }
 -
++  
+   public ImmutableBytesWritable getRawRow() {
+     return this.row;
+   }
+ 
+   public ImmutableBytesWritable getRawFamily() {
+     return this.family;
+   }
+ 
+   public ImmutableBytesWritable getRawQualifier() {
+     return this.qualifier;
+   }
+ 
+   public ImmutableBytesWritable getRawValue() {
+     return this.value;
+   }
 -}
 +}
 +

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/b3a330ca/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java
----------------------------------------------------------------------
diff --cc phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java
index 74b05d6,ae61375..571e9a1
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/DeleteCompiler.java
@@@ -28,11 -26,9 +26,9 @@@ import java.util.Iterator
  import java.util.List;
  import java.util.Map;
  
 -import org.apache.hadoop.hbase.KeyValue;
 +import org.apache.hadoop.hbase.Cell;
- import org.apache.hadoop.hbase.KeyValue;
  import org.apache.hadoop.hbase.client.Scan;
  import org.apache.hadoop.hbase.filter.FilterList;
- import org.apache.hadoop.hbase.index.util.ImmutableBytesPtr;
  import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
  import org.apache.phoenix.cache.ServerCacheClient.ServerCache;
  import org.apache.phoenix.compile.GroupByCompiler.GroupBy;
@@@ -344,8 -363,8 +363,8 @@@ public class DeleteCompiler 
                          Tuple tuple;
                          long totalRowCount = 0;
                          while ((tuple=iterator.next()) != null) {// Runs query
 -                            KeyValue kv = tuple.getValue(0);
 -                            totalRowCount += PDataType.LONG.getCodec().decodeLong(kv.getBuffer(), kv.getValueOffset(), SortOrder.getDefault());
 +                            Cell kv = tuple.getValue(0);
-                             totalRowCount += PDataType.LONG.getCodec().decodeLong(kv.getValueArray(), kv.getValueOffset(), null);
++                            totalRowCount += PDataType.LONG.getCodec().decodeLong(kv.getValueArray(), kv.getValueOffset(), SortOrder.getDefault());
                          }
                          // Return total number of rows that have been delete. In the case of auto commit being off
                          // the mutations will all be in the mutation state of the current connection.

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/b3a330ca/phoenix-core/src/main/java/org/apache/phoenix/compile/UpsertCompiler.java
----------------------------------------------------------------------
diff --cc phoenix-core/src/main/java/org/apache/phoenix/compile/UpsertCompiler.java
index d7991c8,a45455e..83fca03
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/UpsertCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/UpsertCompiler.java
@@@ -30,10 -28,8 +28,8 @@@ import java.util.Collections
  import java.util.List;
  import java.util.Map;
  
 -import org.apache.hadoop.hbase.KeyValue;
 +import org.apache.hadoop.hbase.Cell;
- import org.apache.hadoop.hbase.KeyValue;
  import org.apache.hadoop.hbase.client.Scan;
- import org.apache.hadoop.hbase.index.util.ImmutableBytesPtr;
  import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
  import org.apache.hadoop.hbase.util.Bytes;
  import org.apache.phoenix.cache.ServerCacheClient.ServerCache;
@@@ -572,8 -597,8 +597,8 @@@ public class UpsertCompiler 
                      Tuple tuple;
                      long totalRowCount = 0;
                      while ((tuple=iterator.next()) != null) {// Runs query
 -                        KeyValue kv = tuple.getValue(0);
 -                        totalRowCount += PDataType.LONG.getCodec().decodeLong(kv.getBuffer(), kv.getValueOffset(), SortOrder.getDefault());
 +                        Cell kv = tuple.getValue(0);
-                         totalRowCount += PDataType.LONG.getCodec().decodeLong(kv.getValueArray(), kv.getValueOffset(), null);
++                        totalRowCount += PDataType.LONG.getCodec().decodeLong(kv.getValueArray(), kv.getValueOffset(), SortOrder.getDefault());
                      }
                      // Return total number of rows that have been updated. In the case of auto commit being off
                      // the mutations will all be in the mutation state of the current connection.

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/b3a330ca/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/BaseRegionScanner.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/b3a330ca/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GroupedAggregateRegionObserver.java
----------------------------------------------------------------------
diff --cc phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GroupedAggregateRegionObserver.java
index 331d278,d6c0063..9059e19
--- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GroupedAggregateRegionObserver.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/GroupedAggregateRegionObserver.java
@@@ -63,9 -59,9 +60,10 @@@ import org.apache.phoenix.expression.Ex
  import org.apache.phoenix.expression.ExpressionType;
  import org.apache.phoenix.expression.aggregator.Aggregator;
  import org.apache.phoenix.expression.aggregator.ServerAggregators;
+ import org.apache.phoenix.hbase.index.util.ImmutableBytesPtr;
  import org.apache.phoenix.join.HashJoinInfo;
  import org.apache.phoenix.join.ScanProjector;
 +import org.apache.phoenix.memory.GlobalMemoryManager;
  import org.apache.phoenix.memory.MemoryManager.MemoryChunk;
  import org.apache.phoenix.query.QueryConstants;
  import org.apache.phoenix.schema.tuple.MultiKeyValueTuple;

http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/b3a330ca/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/HashJoinRegionScanner.java
----------------------------------------------------------------------
diff --cc phoenix-core/src/main/java/org/apache/phoenix/coprocessor/HashJoinRegionScanner.java
index 370e6c9,e087c7e..8c9eeb2
--- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/HashJoinRegionScanner.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/HashJoinRegionScanner.java
@@@ -25,11 -23,11 +23,11 @@@ import java.util.LinkedList
  import java.util.List;
  import java.util.Queue;
  
 +import org.apache.hadoop.hbase.Cell;
+ import org.apache.hadoop.hbase.DoNotRetryIOException;
  import org.apache.hadoop.hbase.HRegionInfo;
 -import org.apache.hadoop.hbase.KeyValue;
  import org.apache.hadoop.hbase.client.Result;
  import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment;
- import org.apache.hadoop.hbase.index.util.ImmutableBytesPtr;
  import org.apache.hadoop.hbase.io.ImmutableBytesWritable;
  import org.apache.hadoop.hbase.regionserver.RegionScanner;
  import org.apache.hadoop.hbase.util.Bytes;


Mime
View raw message