You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2014/02/07 01:43:41 UTC

[2/2] git commit: Merge branch '2.2.3' of https://git-wip-us.apache.org/repos/asf/incubator-phoenix into 2.2.3

Merge branch '2.2.3' of https://git-wip-us.apache.org/repos/asf/incubator-phoenix into 2.2.3


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

Branch: refs/heads/2.2.3
Commit: 2e4bc61aadbfd4f67e94cf7b54b489e46e45d2e3
Parents: 93409c7 5ad8829
Author: James Taylor <ja...@apache.org>
Authored: Thu Feb 6 16:43:23 2014 -0800
Committer: James Taylor <ja...@apache.org>
Committed: Thu Feb 6 16:43:23 2014 -0800

----------------------------------------------------------------------
 bin/csv-bulk-loader.sh                                       | 2 +-
 bin/hbase-site.xml                                           | 2 +-
 bin/performance.sh                                           | 2 +-
 bin/psql.sh                                                  | 2 +-
 bin/sqlline.sh                                               | 2 +-
 bin/upgradeTo2.sh                                            | 2 +-
 dev/eclipse_prefs_phoenix.epf                                | 2 +-
 src/main/antlr3/PhoenixSQL.g                                 | 6 +++---
 .../hadoop/hbase/regionserver/IndexKeyValueSkipListSet.java  | 2 +-
 src/main/java/org/apache/hbase/index/CapturingAbortable.java | 2 +-
 .../org/apache/hbase/index/IndexLogRollSynchronizer.java     | 2 +-
 src/main/java/org/apache/hbase/index/Indexer.java            | 2 +-
 src/main/java/org/apache/hbase/index/ValueGetter.java        | 2 +-
 .../org/apache/hbase/index/builder/BaseIndexBuilder.java     | 2 +-
 .../org/apache/hbase/index/builder/IndexBuildManager.java    | 2 +-
 .../java/org/apache/hbase/index/builder/IndexBuilder.java    | 2 +-
 .../hbase/index/builder/IndexBuildingFailureException.java   | 2 +-
 src/main/java/org/apache/hbase/index/covered/Batch.java      | 2 +-
 .../java/org/apache/hbase/index/covered/CoveredColumns.java  | 2 +-
 .../hbase/index/covered/CoveredColumnsIndexBuilder.java      | 2 +-
 src/main/java/org/apache/hbase/index/covered/IndexCodec.java | 2 +-
 .../java/org/apache/hbase/index/covered/IndexUpdate.java     | 2 +-
 .../java/org/apache/hbase/index/covered/KeyValueStore.java   | 2 +-
 .../java/org/apache/hbase/index/covered/LocalTableState.java | 2 +-
 .../org/apache/hbase/index/covered/data/IndexMemStore.java   | 2 +-
 .../org/apache/hbase/index/covered/data/LazyValueGetter.java | 2 +-
 .../org/apache/hbase/index/covered/data/LocalHBaseState.java | 2 +-
 .../java/org/apache/hbase/index/covered/data/LocalTable.java | 2 +-
 .../index/covered/filter/ApplyAndFilterDeletesFilter.java    | 2 +-
 .../filter/ColumnTrackingNextLargestTimestampFilter.java     | 2 +-
 .../hbase/index/covered/filter/MaxTimestampFilter.java       | 2 +-
 .../apache/hbase/index/covered/update/ColumnReference.java   | 2 +-
 .../org/apache/hbase/index/covered/update/ColumnTracker.java | 2 +-
 .../hbase/index/covered/update/IndexUpdateManager.java       | 2 +-
 .../hbase/index/covered/update/IndexedColumnGroup.java       | 2 +-
 .../apache/hbase/index/covered/update/SortedCollection.java  | 2 +-
 .../apache/hbase/index/exception/IndexWriteException.java    | 2 +-
 .../index/exception/MultiIndexWriteFailureException.java     | 2 +-
 .../index/exception/SingleIndexWriteFailureException.java    | 2 +-
 .../java/org/apache/hbase/index/parallel/BaseTaskRunner.java | 2 +-
 .../org/apache/hbase/index/parallel/EarlyExitFailure.java    | 2 +-
 .../apache/hbase/index/parallel/QuickFailingTaskRunner.java  | 2 +-
 src/main/java/org/apache/hbase/index/parallel/Task.java      | 2 +-
 src/main/java/org/apache/hbase/index/parallel/TaskBatch.java | 2 +-
 .../java/org/apache/hbase/index/parallel/TaskRunner.java     | 2 +-
 .../org/apache/hbase/index/parallel/ThreadPoolBuilder.java   | 2 +-
 .../org/apache/hbase/index/parallel/ThreadPoolManager.java   | 2 +-
 .../hbase/index/parallel/WaitForCompletionTaskRunner.java    | 2 +-
 .../org/apache/hbase/index/table/CachingHTableFactory.java   | 2 +-
 .../java/org/apache/hbase/index/util/ImmutableBytesPtr.java  | 2 +-
 .../org/apache/hbase/index/util/IndexManagementUtil.java     | 2 +-
 .../java/org/apache/hbase/index/write/IndexCommitter.java    | 2 +-
 .../org/apache/hbase/index/write/IndexFailurePolicy.java     | 2 +-
 src/main/java/org/apache/hbase/index/write/IndexWriter.java  | 2 +-
 .../java/org/apache/hbase/index/write/IndexWriterUtils.java  | 2 +-
 .../apache/hbase/index/write/KillServerOnFailurePolicy.java  | 2 +-
 .../hbase/index/write/ParallelWriterIndexCommitter.java      | 2 +-
 .../hbase/index/write/recovery/PerRegionIndexWriteCache.java | 2 +-
 .../write/recovery/TrackingParallelWriterIndexCommitter.java | 2 +-
 src/main/java/org/apache/phoenix/cache/GlobalCache.java      | 4 ++--
 src/main/java/org/apache/phoenix/cache/HashCache.java        | 4 ++--
 .../java/org/apache/phoenix/cache/ServerCacheClient.java     | 6 +++---
 src/main/java/org/apache/phoenix/cache/TenantCache.java      | 4 ++--
 src/main/java/org/apache/phoenix/cache/TenantCacheImpl.java  | 4 ++--
 .../java/org/apache/phoenix/compile/AggregationManager.java  | 4 ++--
 src/main/java/org/apache/phoenix/compile/BindManager.java    | 4 ++--
 .../java/org/apache/phoenix/compile/ColumnProjector.java     | 4 ++--
 src/main/java/org/apache/phoenix/compile/ColumnResolver.java | 4 ++--
 .../java/org/apache/phoenix/compile/CreateIndexCompiler.java | 2 +-
 .../java/org/apache/phoenix/compile/CreateTableCompiler.java | 2 +-
 src/main/java/org/apache/phoenix/compile/DeleteCompiler.java | 2 +-
 src/main/java/org/apache/phoenix/compile/ExplainPlan.java    | 2 +-
 .../java/org/apache/phoenix/compile/ExpressionCompiler.java  | 2 +-
 .../java/org/apache/phoenix/compile/ExpressionManager.java   | 4 ++--
 .../java/org/apache/phoenix/compile/ExpressionProjector.java | 4 ++--
 src/main/java/org/apache/phoenix/compile/FromCompiler.java   | 4 ++--
 .../java/org/apache/phoenix/compile/GroupByCompiler.java     | 4 ++--
 src/main/java/org/apache/phoenix/compile/HavingCompiler.java | 4 ++--
 src/main/java/org/apache/phoenix/compile/KeyPart.java        | 4 ++--
 src/main/java/org/apache/phoenix/compile/LimitCompiler.java  | 2 +-
 .../phoenix/compile/MutatingParallelIteratorFactory.java     | 2 +-
 src/main/java/org/apache/phoenix/compile/MutationPlan.java   | 2 +-
 .../java/org/apache/phoenix/compile/OrderByCompiler.java     | 4 ++--
 .../java/org/apache/phoenix/compile/PostDDLCompiler.java     | 4 ++--
 .../org/apache/phoenix/compile/PostIndexDDLCompiler.java     | 2 +-
 .../java/org/apache/phoenix/compile/ProjectionCompiler.java  | 4 ++--
 src/main/java/org/apache/phoenix/compile/QueryCompiler.java  | 4 ++--
 src/main/java/org/apache/phoenix/compile/QueryPlan.java      | 4 ++--
 src/main/java/org/apache/phoenix/compile/RowProjector.java   | 4 ++--
 src/main/java/org/apache/phoenix/compile/ScanRanges.java     | 2 +-
 .../java/org/apache/phoenix/compile/StatementContext.java    | 4 ++--
 .../java/org/apache/phoenix/compile/StatementNormalizer.java | 4 ++--
 src/main/java/org/apache/phoenix/compile/StatementPlan.java  | 2 +-
 src/main/java/org/apache/phoenix/compile/UpsertCompiler.java | 2 +-
 src/main/java/org/apache/phoenix/compile/WhereCompiler.java  | 4 ++--
 src/main/java/org/apache/phoenix/compile/WhereOptimizer.java | 4 ++--
 .../org/apache/phoenix/coprocessor/BaseRegionScanner.java    | 2 +-
 .../phoenix/coprocessor/BaseScannerRegionObserver.java       | 2 +-
 .../phoenix/coprocessor/GroupedAggregateRegionObserver.java  | 4 ++--
 .../apache/phoenix/coprocessor/HashJoinRegionScanner.java    | 2 +-
 .../org/apache/phoenix/coprocessor/MetaDataEndpointImpl.java | 4 ++--
 .../org/apache/phoenix/coprocessor/MetaDataProtocol.java     | 4 ++--
 .../apache/phoenix/coprocessor/MetaDataRegionObserver.java   | 2 +-
 .../java/org/apache/phoenix/coprocessor/ScanProjector.java   | 2 +-
 .../org/apache/phoenix/coprocessor/ScanRegionObserver.java   | 4 ++--
 .../phoenix/coprocessor/ServerCachingEndpointImpl.java       | 4 ++--
 .../apache/phoenix/coprocessor/ServerCachingProtocol.java    | 4 ++--
 .../coprocessor/UngroupedAggregateRegionObserver.java        | 4 ++--
 .../org/apache/phoenix/exception/PhoenixIOException.java     | 2 +-
 .../org/apache/phoenix/exception/PhoenixParserException.java | 2 +-
 .../java/org/apache/phoenix/exception/SQLExceptionCode.java  | 4 ++--
 .../java/org/apache/phoenix/exception/SQLExceptionInfo.java  | 4 ++--
 .../apache/phoenix/exception/UnknownFunctionException.java   | 2 +-
 .../phoenix/exception/ValueTypeIncompatibleException.java    | 2 +-
 src/main/java/org/apache/phoenix/execute/AggregatePlan.java  | 4 ++--
 src/main/java/org/apache/phoenix/execute/BasicQueryPlan.java | 4 ++--
 .../java/org/apache/phoenix/execute/CommitException.java     | 2 +-
 .../java/org/apache/phoenix/execute/DegenerateQueryPlan.java | 2 +-
 src/main/java/org/apache/phoenix/execute/MutationState.java  | 4 ++--
 src/main/java/org/apache/phoenix/execute/ScanPlan.java       | 4 ++--
 .../java/org/apache/phoenix/expression/AddExpression.java    | 4 ++--
 .../java/org/apache/phoenix/expression/AndExpression.java    | 4 ++--
 .../java/org/apache/phoenix/expression/AndOrExpression.java  | 4 ++--
 .../org/apache/phoenix/expression/ArithmeticExpression.java  | 2 +-
 .../apache/phoenix/expression/BaseAddSubtractExpression.java | 2 +-
 .../apache/phoenix/expression/BaseCompoundExpression.java    | 2 +-
 .../java/org/apache/phoenix/expression/BaseExpression.java   | 4 ++--
 .../org/apache/phoenix/expression/BaseSingleExpression.java  | 4 ++--
 .../apache/phoenix/expression/BaseTerminalExpression.java    | 4 ++--
 .../java/org/apache/phoenix/expression/CaseExpression.java   | 4 ++--
 .../apache/phoenix/expression/CeilingDecimalExpression.java  | 2 +-
 .../phoenix/expression/CeilingTimestampExpression.java       | 2 +-
 .../java/org/apache/phoenix/expression/CoerceExpression.java | 2 +-
 .../java/org/apache/phoenix/expression/ColumnExpression.java | 4 ++--
 .../org/apache/phoenix/expression/ComparisonExpression.java  | 4 ++--
 .../org/apache/phoenix/expression/DateAddExpression.java     | 2 +-
 .../apache/phoenix/expression/DateSubtractExpression.java    | 2 +-
 .../org/apache/phoenix/expression/DecimalAddExpression.java  | 2 +-
 .../apache/phoenix/expression/DecimalDivideExpression.java   | 2 +-
 .../apache/phoenix/expression/DecimalMultiplyExpression.java | 2 +-
 .../apache/phoenix/expression/DecimalSubtractExpression.java | 4 ++--
 .../java/org/apache/phoenix/expression/DivideExpression.java | 4 ++--
 .../org/apache/phoenix/expression/DoubleAddExpression.java   | 2 +-
 .../apache/phoenix/expression/DoubleDivideExpression.java    | 2 +-
 .../apache/phoenix/expression/DoubleMultiplyExpression.java  | 2 +-
 .../apache/phoenix/expression/DoubleSubtractExpression.java  | 2 +-
 src/main/java/org/apache/phoenix/expression/Expression.java  | 4 ++--
 .../java/org/apache/phoenix/expression/ExpressionType.java   | 4 ++--
 .../apache/phoenix/expression/FloorDecimalExpression.java    | 2 +-
 .../apache/phoenix/expression/FloorTimestampExpression.java  | 2 +-
 .../java/org/apache/phoenix/expression/InListExpression.java | 2 +-
 .../java/org/apache/phoenix/expression/IsNullExpression.java | 4 ++--
 .../apache/phoenix/expression/KeyValueColumnExpression.java  | 4 ++--
 .../java/org/apache/phoenix/expression/LikeExpression.java   | 4 ++--
 .../org/apache/phoenix/expression/LiteralExpression.java     | 4 ++--
 .../org/apache/phoenix/expression/LongAddExpression.java     | 2 +-
 .../org/apache/phoenix/expression/LongDivideExpression.java  | 2 +-
 .../apache/phoenix/expression/LongMultiplyExpression.java    | 2 +-
 .../apache/phoenix/expression/LongSubtractExpression.java    | 4 ++--
 .../org/apache/phoenix/expression/MultiplyExpression.java    | 4 ++--
 .../java/org/apache/phoenix/expression/NotExpression.java    | 4 ++--
 .../java/org/apache/phoenix/expression/OrExpression.java     | 4 ++--
 .../apache/phoenix/expression/RowKeyColumnExpression.java    | 4 ++--
 .../phoenix/expression/RowValueConstructorExpression.java    | 4 ++--
 .../apache/phoenix/expression/StringConcatExpression.java    | 4 ++--
 .../org/apache/phoenix/expression/SubtractExpression.java    | 4 ++--
 .../apache/phoenix/expression/TimestampAddExpression.java    | 4 ++--
 .../phoenix/expression/TimestampSubtractExpression.java      | 4 ++--
 .../org/apache/phoenix/expression/aggregator/Aggregator.java | 4 ++--
 .../apache/phoenix/expression/aggregator/Aggregators.java    | 4 ++--
 .../apache/phoenix/expression/aggregator/BaseAggregator.java | 4 ++--
 .../expression/aggregator/BaseDecimalStddevAggregator.java   | 4 ++--
 .../phoenix/expression/aggregator/BaseStddevAggregator.java  | 4 ++--
 .../phoenix/expression/aggregator/ClientAggregators.java     | 4 ++--
 .../phoenix/expression/aggregator/CountAggregator.java       | 4 ++--
 .../expression/aggregator/DecimalStddevPopAggregator.java    | 4 ++--
 .../expression/aggregator/DecimalStddevSampAggregator.java   | 4 ++--
 .../phoenix/expression/aggregator/DecimalSumAggregator.java  | 4 ++--
 .../expression/aggregator/DistinctCountClientAggregator.java | 4 ++--
 .../aggregator/DistinctValueWithCountClientAggregator.java   | 4 ++--
 .../aggregator/DistinctValueWithCountServerAggregator.java   | 4 ++--
 .../phoenix/expression/aggregator/DoubleSumAggregator.java   | 2 +-
 .../phoenix/expression/aggregator/IntSumAggregator.java      | 4 ++--
 .../phoenix/expression/aggregator/LongSumAggregator.java     | 4 ++--
 .../apache/phoenix/expression/aggregator/MaxAggregator.java  | 4 ++--
 .../apache/phoenix/expression/aggregator/MinAggregator.java  | 4 ++--
 .../phoenix/expression/aggregator/NumberSumAggregator.java   | 4 ++--
 .../expression/aggregator/PercentRankClientAggregator.java   | 4 ++--
 .../expression/aggregator/PercentileClientAggregator.java    | 4 ++--
 .../aggregator/PercentileDiscClientAggregator.java           | 4 ++--
 .../phoenix/expression/aggregator/ServerAggregators.java     | 4 ++--
 .../phoenix/expression/aggregator/StddevPopAggregator.java   | 4 ++--
 .../phoenix/expression/aggregator/StddevSampAggregator.java  | 4 ++--
 .../expression/aggregator/UnsignedIntSumAggregator.java      | 4 ++--
 .../expression/aggregator/UnsignedLongSumAggregator.java     | 4 ++--
 .../phoenix/expression/function/AggregateFunction.java       | 4 ++--
 .../phoenix/expression/function/AvgAggregateFunction.java    | 2 +-
 .../apache/phoenix/expression/function/CoalesceFunction.java | 4 ++--
 .../expression/function/CompositeAggregateFunction.java      | 4 ++--
 .../phoenix/expression/function/CountAggregateFunction.java  | 4 ++--
 .../phoenix/expression/function/CurrentDateFunction.java     | 4 ++--
 .../phoenix/expression/function/CurrentTimeFunction.java     | 4 ++--
 .../function/DelegateConstantToCountAggregateFunction.java   | 4 ++--
 .../expression/function/DistinctCountAggregateFunction.java  | 4 ++--
 .../phoenix/expression/function/FunctionExpression.java      | 4 ++--
 .../phoenix/expression/function/IndexStateNameFunction.java  | 4 ++--
 .../apache/phoenix/expression/function/InvertFunction.java   | 2 +-
 .../apache/phoenix/expression/function/LTrimFunction.java    | 4 ++--
 .../apache/phoenix/expression/function/LengthFunction.java   | 4 ++--
 .../org/apache/phoenix/expression/function/MD5Function.java  | 2 +-
 .../phoenix/expression/function/MaxAggregateFunction.java    | 4 ++--
 .../phoenix/expression/function/MinAggregateFunction.java    | 4 ++--
 .../expression/function/PercentRankAggregateFunction.java    | 4 ++--
 .../expression/function/PercentileContAggregateFunction.java | 4 ++--
 .../expression/function/PercentileDiscAggregateFunction.java | 4 ++--
 .../apache/phoenix/expression/function/RTrimFunction.java    | 4 ++--
 .../phoenix/expression/function/RegexpReplaceFunction.java   | 4 ++--
 .../phoenix/expression/function/RegexpSubstrFunction.java    | 4 ++--
 .../apache/phoenix/expression/function/RoundFunction.java    | 4 ++--
 .../apache/phoenix/expression/function/ScalarFunction.java   | 2 +-
 .../phoenix/expression/function/SingleAggregateFunction.java | 4 ++--
 .../org/apache/phoenix/expression/function/SqlTableType.java | 4 ++--
 .../phoenix/expression/function/SqlTypeNameFunction.java     | 4 ++--
 .../phoenix/expression/function/StddevPopFunction.java       | 4 ++--
 .../phoenix/expression/function/StddevSampFunction.java      | 4 ++--
 .../apache/phoenix/expression/function/SubstrFunction.java   | 4 ++--
 .../phoenix/expression/function/SumAggregateFunction.java    | 4 ++--
 .../org/apache/phoenix/expression/function/TimeUnit.java     | 2 +-
 .../apache/phoenix/expression/function/ToCharFunction.java   | 4 ++--
 .../apache/phoenix/expression/function/ToDateFunction.java   | 4 ++--
 .../apache/phoenix/expression/function/ToNumberFunction.java | 4 ++--
 .../org/apache/phoenix/expression/function/TrimFunction.java | 4 ++--
 .../apache/phoenix/expression/function/TruncFunction.java    | 4 ++--
 .../phoenix/expression/visitor/BaseExpressionVisitor.java    | 2 +-
 .../apache/phoenix/expression/visitor/ExpressionVisitor.java | 4 ++--
 .../expression/visitor/KeyValueExpressionVisitor.java        | 4 ++--
 .../expression/visitor/SingleAggregateFunctionVisitor.java   | 4 ++--
 .../expression/visitor/TraverseAllExpressionVisitor.java     | 2 +-
 .../expression/visitor/TraverseNoExpressionVisitor.java      | 2 +-
 .../org/apache/phoenix/filter/BooleanExpressionFilter.java   | 4 ++--
 .../apache/phoenix/filter/EvaluateOnCompletionVisitor.java   | 4 ++--
 .../phoenix/filter/MultiCFCQKeyValueComparisonFilter.java    | 4 ++--
 .../phoenix/filter/MultiCQKeyValueComparisonFilter.java      | 4 ++--
 .../apache/phoenix/filter/MultiKeyValueComparisonFilter.java | 4 ++--
 .../org/apache/phoenix/filter/RowKeyComparisonFilter.java    | 4 ++--
 .../phoenix/filter/SingleCFCQKeyValueComparisonFilter.java   | 4 ++--
 .../phoenix/filter/SingleCQKeyValueComparisonFilter.java     | 4 ++--
 .../phoenix/filter/SingleKeyValueComparisonFilter.java       | 4 ++--
 src/main/java/org/apache/phoenix/filter/SkipScanFilter.java  | 4 ++--
 src/main/java/org/apache/phoenix/index/BaseIndexCodec.java   | 2 +-
 src/main/java/org/apache/phoenix/index/IndexMaintainer.java  | 4 ++--
 .../org/apache/phoenix/index/IndexMetaDataCacheClient.java   | 2 +-
 .../org/apache/phoenix/index/IndexMetaDataCacheFactory.java  | 2 +-
 .../java/org/apache/phoenix/index/PhoenixIndexBuilder.java   | 2 +-
 .../java/org/apache/phoenix/index/PhoenixIndexCodec.java     | 2 +-
 .../org/apache/phoenix/index/PhoenixIndexFailurePolicy.java  | 4 ++--
 .../apache/phoenix/iterate/AggregatingResultIterator.java    | 4 ++--
 .../java/org/apache/phoenix/iterate/BaseResultIterator.java  | 4 ++--
 .../org/apache/phoenix/iterate/ConcatResultIterator.java     | 4 ++--
 .../iterate/DefaultParallelIteratorRegionSplitter.java       | 6 +++---
 .../org/apache/phoenix/iterate/DelegateResultIterator.java   | 2 +-
 .../phoenix/iterate/DistinctAggregatingResultIterator.java   | 4 ++--
 src/main/java/org/apache/phoenix/iterate/ExplainTable.java   | 2 +-
 .../phoenix/iterate/FilterAggregatingResultIterator.java     | 4 ++--
 .../org/apache/phoenix/iterate/FilterResultIterator.java     | 4 ++--
 .../phoenix/iterate/GroupedAggregatingResultIterator.java    | 4 ++--
 .../org/apache/phoenix/iterate/LimitingResultIterator.java   | 4 ++--
 .../org/apache/phoenix/iterate/LookAheadResultIterator.java  | 2 +-
 .../apache/phoenix/iterate/MappedByteBufferSortedQueue.java  | 2 +-
 .../apache/phoenix/iterate/MaterializedResultIterator.java   | 4 ++--
 .../org/apache/phoenix/iterate/MergeSortResultIterator.java  | 4 ++--
 .../phoenix/iterate/MergeSortRowKeyResultIterator.java       | 4 ++--
 .../apache/phoenix/iterate/MergeSortTopNResultIterator.java  | 4 ++--
 .../phoenix/iterate/OrderedAggregatingResultIterator.java    | 4 ++--
 .../org/apache/phoenix/iterate/OrderedResultIterator.java    | 4 ++--
 .../phoenix/iterate/ParallelIteratorRegionSplitter.java      | 4 ++--
 .../iterate/ParallelIteratorRegionSplitterFactory.java       | 2 +-
 .../java/org/apache/phoenix/iterate/ParallelIterators.java   | 4 ++--
 .../org/apache/phoenix/iterate/PeekingResultIterator.java    | 4 ++--
 .../apache/phoenix/iterate/RegionScannerResultIterator.java  | 2 +-
 src/main/java/org/apache/phoenix/iterate/ResultIterator.java | 2 +-
 .../java/org/apache/phoenix/iterate/ResultIterators.java     | 2 +-
 .../org/apache/phoenix/iterate/ScanningResultIterator.java   | 2 +-
 .../iterate/SkipRangeParallelIteratorRegionSplitter.java     | 2 +-
 .../apache/phoenix/iterate/SpoolTooBigToDiskException.java   | 2 +-
 .../org/apache/phoenix/iterate/SpoolingResultIterator.java   | 8 ++++----
 .../java/org/apache/phoenix/iterate/TableResultIterator.java | 4 ++--
 .../phoenix/iterate/UngroupedAggregatingResultIterator.java  | 2 +-
 src/main/java/org/apache/phoenix/jdbc/Jdbc7Shim.java         | 2 +-
 src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java | 4 ++--
 .../org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java     | 4 ++--
 src/main/java/org/apache/phoenix/jdbc/PhoenixDriver.java     | 4 ++--
 .../java/org/apache/phoenix/jdbc/PhoenixEmbeddedDriver.java  | 6 +++---
 .../org/apache/phoenix/jdbc/PhoenixParameterMetaData.java    | 4 ++--
 .../org/apache/phoenix/jdbc/PhoenixPreparedStatement.java    | 4 ++--
 src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java  | 4 ++--
 .../org/apache/phoenix/jdbc/PhoenixResultSetMetaData.java    | 4 ++--
 src/main/java/org/apache/phoenix/jdbc/PhoenixStatement.java  | 4 ++--
 .../org/apache/phoenix/jdbc/PhoenixStatementFactory.java     | 2 +-
 .../java/org/apache/phoenix/job/AbstractRoundRobinQueue.java | 2 +-
 src/main/java/org/apache/phoenix/job/JobManager.java         | 4 ++--
 src/main/java/org/apache/phoenix/join/HashCacheClient.java   | 4 ++--
 src/main/java/org/apache/phoenix/join/HashCacheFactory.java  | 2 +-
 src/main/java/org/apache/phoenix/join/HashJoinInfo.java      | 2 +-
 .../org/apache/phoenix/join/HashJoiningRegionObserver.java   | 4 ++--
 .../phoenix/join/MaxServerCacheSizeExceededException.java    | 4 ++--
 .../java/org/apache/phoenix/map/reduce/CSVBulkLoader.java    | 2 +-
 .../java/org/apache/phoenix/map/reduce/MapReduceJob.java     | 2 +-
 .../org/apache/phoenix/map/reduce/util/ConfigReader.java     | 2 +-
 .../java/org/apache/phoenix/memory/ChildMemoryManager.java   | 4 ++--
 .../org/apache/phoenix/memory/DelegatingMemoryManager.java   | 4 ++--
 .../java/org/apache/phoenix/memory/GlobalMemoryManager.java  | 4 ++--
 .../apache/phoenix/memory/InsufficientMemoryException.java   | 4 ++--
 src/main/java/org/apache/phoenix/memory/MemoryManager.java   | 6 +++---
 .../java/org/apache/phoenix/parse/AddColumnStatement.java    | 2 +-
 src/main/java/org/apache/phoenix/parse/AddParseNode.java     | 4 ++--
 .../org/apache/phoenix/parse/AggregateFunctionParseNode.java | 2 +-
 src/main/java/org/apache/phoenix/parse/AliasedNode.java      | 4 ++--
 .../java/org/apache/phoenix/parse/AlterIndexStatement.java   | 2 +-
 .../java/org/apache/phoenix/parse/AlterTableStatement.java   | 2 +-
 src/main/java/org/apache/phoenix/parse/AndParseNode.java     | 4 ++--
 .../java/org/apache/phoenix/parse/ArithmeticParseNode.java   | 2 +-
 .../java/org/apache/phoenix/parse/AvgAggregateParseNode.java | 2 +-
 .../java/org/apache/phoenix/parse/BaseParseNodeVisitor.java  | 4 ++--
 src/main/java/org/apache/phoenix/parse/BetweenParseNode.java | 4 ++--
 src/main/java/org/apache/phoenix/parse/BinaryParseNode.java  | 4 ++--
 src/main/java/org/apache/phoenix/parse/BindParseNode.java    | 4 ++--
 src/main/java/org/apache/phoenix/parse/BindTableNode.java    | 4 ++--
 .../java/org/apache/phoenix/parse/BindableStatement.java     | 2 +-
 src/main/java/org/apache/phoenix/parse/CaseParseNode.java    | 4 ++--
 src/main/java/org/apache/phoenix/parse/CastParseNode.java    | 4 ++--
 src/main/java/org/apache/phoenix/parse/ColumnDef.java        | 4 ++--
 src/main/java/org/apache/phoenix/parse/ColumnFamilyDef.java  | 4 ++--
 src/main/java/org/apache/phoenix/parse/ColumnName.java       | 2 +-
 src/main/java/org/apache/phoenix/parse/ColumnParseNode.java  | 4 ++--
 .../java/org/apache/phoenix/parse/ComparisonParseNode.java   | 4 ++--
 .../java/org/apache/phoenix/parse/CompoundParseNode.java     | 4 ++--
 .../java/org/apache/phoenix/parse/ConcreteTableNode.java     | 4 ++--
 .../java/org/apache/phoenix/parse/CreateIndexStatement.java  | 2 +-
 .../java/org/apache/phoenix/parse/CreateTableStatement.java  | 2 +-
 .../java/org/apache/phoenix/parse/CurrentDateParseNode.java  | 2 +-
 .../java/org/apache/phoenix/parse/CurrentTimeParseNode.java  | 2 +-
 .../phoenix/parse/DelegateConstantToCountParseNode.java      | 2 +-
 src/main/java/org/apache/phoenix/parse/DeleteStatement.java  | 2 +-
 src/main/java/org/apache/phoenix/parse/DerivedTableNode.java | 4 ++--
 .../org/apache/phoenix/parse/DistinctCountParseNode.java     | 4 ++--
 src/main/java/org/apache/phoenix/parse/DivideParseNode.java  | 4 ++--
 .../java/org/apache/phoenix/parse/DropColumnStatement.java   | 2 +-
 .../java/org/apache/phoenix/parse/DropIndexStatement.java    | 2 +-
 .../java/org/apache/phoenix/parse/DropTableStatement.java    | 2 +-
 src/main/java/org/apache/phoenix/parse/EqualParseNode.java   | 4 ++--
 src/main/java/org/apache/phoenix/parse/ExistsParseNode.java  | 4 ++--
 src/main/java/org/apache/phoenix/parse/ExplainStatement.java | 2 +-
 .../org/apache/phoenix/parse/FamilyWildcardParseNode.java    | 4 ++--
 .../java/org/apache/phoenix/parse/FilterableStatement.java   | 2 +-
 .../java/org/apache/phoenix/parse/FunctionParseNode.java     | 4 ++--
 .../apache/phoenix/parse/GreaterThanOrEqualParseNode.java    | 4 ++--
 .../java/org/apache/phoenix/parse/GreaterThanParseNode.java  | 4 ++--
 src/main/java/org/apache/phoenix/parse/HintNode.java         | 2 +-
 src/main/java/org/apache/phoenix/parse/InListParseNode.java  | 4 ++--
 src/main/java/org/apache/phoenix/parse/InParseNode.java      | 4 ++--
 .../java/org/apache/phoenix/parse/IndexKeyConstraint.java    | 2 +-
 src/main/java/org/apache/phoenix/parse/IsNullParseNode.java  | 4 ++--
 src/main/java/org/apache/phoenix/parse/JoinTableNode.java    | 4 ++--
 .../org/apache/phoenix/parse/LessThanOrEqualParseNode.java   | 4 ++--
 .../java/org/apache/phoenix/parse/LessThanParseNode.java     | 4 ++--
 src/main/java/org/apache/phoenix/parse/LikeParseNode.java    | 4 ++--
 src/main/java/org/apache/phoenix/parse/LimitNode.java        | 2 +-
 src/main/java/org/apache/phoenix/parse/LiteralParseNode.java | 4 ++--
 .../java/org/apache/phoenix/parse/MaxAggregateParseNode.java | 2 +-
 .../java/org/apache/phoenix/parse/MinAggregateParseNode.java | 2 +-
 .../java/org/apache/phoenix/parse/MultiplyParseNode.java     | 4 ++--
 src/main/java/org/apache/phoenix/parse/NamedParseNode.java   | 4 ++--
 src/main/java/org/apache/phoenix/parse/NamedTableNode.java   | 4 ++--
 .../java/org/apache/phoenix/parse/NotEqualParseNode.java     | 4 ++--
 src/main/java/org/apache/phoenix/parse/NotParseNode.java     | 4 ++--
 src/main/java/org/apache/phoenix/parse/OrParseNode.java      | 4 ++--
 src/main/java/org/apache/phoenix/parse/OrderByNode.java      | 4 ++--
 .../java/org/apache/phoenix/parse/OuterJoinParseNode.java    | 4 ++--
 src/main/java/org/apache/phoenix/parse/ParseContext.java     | 2 +-
 src/main/java/org/apache/phoenix/parse/ParseException.java   | 4 ++--
 src/main/java/org/apache/phoenix/parse/ParseNode.java        | 4 ++--
 src/main/java/org/apache/phoenix/parse/ParseNodeFactory.java | 6 +++---
 .../java/org/apache/phoenix/parse/ParseNodeRewriter.java     | 4 ++--
 src/main/java/org/apache/phoenix/parse/ParseNodeVisitor.java | 4 ++--
 .../java/org/apache/phoenix/parse/PrimaryKeyConstraint.java  | 2 +-
 .../apache/phoenix/parse/RowValueConstructorParseNode.java   | 4 ++--
 src/main/java/org/apache/phoenix/parse/SQLParser.java        | 4 ++--
 src/main/java/org/apache/phoenix/parse/SelectStatement.java  | 4 ++--
 .../org/apache/phoenix/parse/SelectStatementRewriter.java    | 4 ++--
 .../org/apache/phoenix/parse/SingleTableSQLStatement.java    | 2 +-
 .../java/org/apache/phoenix/parse/StringConcatParseNode.java | 4 ++--
 .../java/org/apache/phoenix/parse/SubqueryParseNode.java     | 4 ++--
 .../java/org/apache/phoenix/parse/SubtractParseNode.java     | 4 ++--
 .../java/org/apache/phoenix/parse/SumAggregateParseNode.java | 2 +-
 src/main/java/org/apache/phoenix/parse/TableName.java        | 2 +-
 src/main/java/org/apache/phoenix/parse/TableNode.java        | 4 ++--
 src/main/java/org/apache/phoenix/parse/TableNodeVisitor.java | 4 ++--
 .../java/org/apache/phoenix/parse/TerminalParseNode.java     | 4 ++--
 src/main/java/org/apache/phoenix/parse/ToCharParseNode.java  | 2 +-
 src/main/java/org/apache/phoenix/parse/ToDateParseNode.java  | 2 +-
 .../apache/phoenix/parse/TraverseAllParseNodeVisitor.java    | 4 ++--
 .../org/apache/phoenix/parse/TraverseNoParseNodeVisitor.java | 4 ++--
 src/main/java/org/apache/phoenix/parse/UnaryParseNode.java   | 4 ++--
 .../apache/phoenix/parse/UnsupportedAllParseNodeVisitor.java | 4 ++--
 src/main/java/org/apache/phoenix/parse/UpsertStatement.java  | 2 +-
 .../java/org/apache/phoenix/parse/WildcardParseNode.java     | 4 ++--
 .../java/org/apache/phoenix/pig/PhoenixHBaseStorage.java     | 4 ++--
 .../java/org/apache/phoenix/pig/PhoenixPigConfiguration.java | 4 ++--
 src/main/java/org/apache/phoenix/pig/TypeUtil.java           | 2 +-
 .../apache/phoenix/pig/hadoop/PhoenixOutputCommitter.java    | 4 ++--
 .../org/apache/phoenix/pig/hadoop/PhoenixOutputFormat.java   | 4 ++--
 .../java/org/apache/phoenix/pig/hadoop/PhoenixRecord.java    | 4 ++--
 .../org/apache/phoenix/pig/hadoop/PhoenixRecordWriter.java   | 4 ++--
 .../java/org/apache/phoenix/query/BaseQueryServicesImpl.java | 4 ++--
 .../java/org/apache/phoenix/query/ChildQueryServices.java    | 4 ++--
 .../java/org/apache/phoenix/query/ConfigurationFactory.java  | 4 ++--
 .../org/apache/phoenix/query/ConnectionQueryServices.java    | 2 +-
 .../apache/phoenix/query/ConnectionQueryServicesImpl.java    | 2 +-
 .../phoenix/query/ConnectionlessQueryServicesImpl.java       | 4 ++--
 .../java/org/apache/phoenix/query/DegenerateScanner.java     | 2 +-
 .../phoenix/query/DelegateConnectionQueryServices.java       | 2 +-
 .../java/org/apache/phoenix/query/DelegateQueryServices.java | 4 ++--
 src/main/java/org/apache/phoenix/query/DelegateScanner.java  | 2 +-
 .../java/org/apache/phoenix/query/HBaseFactoryProvider.java  | 4 ++--
 src/main/java/org/apache/phoenix/query/HTableFactory.java    | 4 ++--
 src/main/java/org/apache/phoenix/query/KeyRange.java         | 4 ++--
 src/main/java/org/apache/phoenix/query/MetaDataMutated.java  | 4 ++--
 src/main/java/org/apache/phoenix/query/QueryConstants.java   | 4 ++--
 src/main/java/org/apache/phoenix/query/QueryServices.java    | 4 ++--
 .../java/org/apache/phoenix/query/QueryServicesImpl.java     | 4 ++--
 .../java/org/apache/phoenix/query/QueryServicesOptions.java  | 4 ++--
 src/main/java/org/apache/phoenix/query/Scanner.java          | 2 +-
 src/main/java/org/apache/phoenix/query/StatsManager.java     | 4 ++--
 src/main/java/org/apache/phoenix/query/StatsManagerImpl.java | 4 ++--
 src/main/java/org/apache/phoenix/query/WrappedScanner.java   | 4 ++--
 .../org/apache/phoenix/schema/AmbiguousColumnException.java  | 4 ++--
 .../org/apache/phoenix/schema/AmbiguousTableException.java   | 4 ++--
 .../apache/phoenix/schema/ArgumentTypeMismatchException.java | 4 ++--
 .../apache/phoenix/schema/ColumnAlreadyExistsException.java  | 4 ++--
 .../apache/phoenix/schema/ColumnFamilyNotFoundException.java | 4 ++--
 src/main/java/org/apache/phoenix/schema/ColumnModifier.java  | 4 ++--
 .../org/apache/phoenix/schema/ColumnNotFoundException.java   | 4 ++--
 src/main/java/org/apache/phoenix/schema/ColumnRef.java       | 4 ++--
 .../phoenix/schema/ConcurrentTableMutationException.java     | 2 +-
 .../apache/phoenix/schema/ConstraintViolationException.java  | 4 ++--
 src/main/java/org/apache/phoenix/schema/DelegateColumn.java  | 2 +-
 src/main/java/org/apache/phoenix/schema/DelegateDatum.java   | 2 +-
 .../phoenix/schema/ExecuteQueryNotApplicableException.java   | 2 +-
 .../phoenix/schema/ExecuteUpdateNotApplicableException.java  | 2 +-
 .../java/org/apache/phoenix/schema/IllegalDataException.java | 4 ++--
 src/main/java/org/apache/phoenix/schema/KeyValueSchema.java  | 4 ++--
 src/main/java/org/apache/phoenix/schema/MetaDataClient.java  | 2 +-
 .../phoenix/schema/MetaDataEntityNotFoundException.java      | 2 +-
 .../java/org/apache/phoenix/schema/MetaDataSplitPolicy.java  | 2 +-
 .../phoenix/schema/NewerTableAlreadyExistsException.java     | 2 +-
 src/main/java/org/apache/phoenix/schema/PBaseColumn.java     | 4 ++--
 src/main/java/org/apache/phoenix/schema/PColumn.java         | 4 ++--
 src/main/java/org/apache/phoenix/schema/PColumnFamily.java   | 4 ++--
 .../java/org/apache/phoenix/schema/PColumnFamilyImpl.java    | 2 +-
 src/main/java/org/apache/phoenix/schema/PColumnImpl.java     | 2 +-
 src/main/java/org/apache/phoenix/schema/PDataType.java       | 6 +++---
 src/main/java/org/apache/phoenix/schema/PDateColumn.java     | 2 +-
 src/main/java/org/apache/phoenix/schema/PDatum.java          | 2 +-
 src/main/java/org/apache/phoenix/schema/PIndexState.java     | 2 +-
 src/main/java/org/apache/phoenix/schema/PIntegerColumn.java  | 4 ++--
 src/main/java/org/apache/phoenix/schema/PLongColumn.java     | 4 ++--
 src/main/java/org/apache/phoenix/schema/PMetaData.java       | 2 +-
 src/main/java/org/apache/phoenix/schema/PMetaDataImpl.java   | 2 +-
 src/main/java/org/apache/phoenix/schema/PName.java           | 4 ++--
 src/main/java/org/apache/phoenix/schema/PNormalizedName.java | 2 +-
 src/main/java/org/apache/phoenix/schema/PRow.java            | 4 ++--
 src/main/java/org/apache/phoenix/schema/PStringColumn.java   | 4 ++--
 src/main/java/org/apache/phoenix/schema/PTable.java          | 4 ++--
 src/main/java/org/apache/phoenix/schema/PTableImpl.java      | 6 +++---
 src/main/java/org/apache/phoenix/schema/PTableType.java      | 2 +-
 .../org/apache/phoenix/schema/ReadOnlyTableException.java    | 4 ++--
 src/main/java/org/apache/phoenix/schema/RowKeySchema.java    | 4 ++--
 .../java/org/apache/phoenix/schema/RowKeyValueAccessor.java  | 4 ++--
 src/main/java/org/apache/phoenix/schema/SaltingUtil.java     | 2 +-
 .../apache/phoenix/schema/TableAlreadyExistsException.java   | 4 ++--
 .../org/apache/phoenix/schema/TableNotFoundException.java    | 4 ++--
 src/main/java/org/apache/phoenix/schema/TableRef.java        | 2 +-
 .../org/apache/phoenix/schema/TypeMismatchException.java     | 4 ++--
 src/main/java/org/apache/phoenix/schema/ValueBitSet.java     | 4 ++--
 .../java/org/apache/phoenix/schema/ValueRangeExcpetion.java  | 4 ++--
 src/main/java/org/apache/phoenix/schema/ValueSchema.java     | 4 ++--
 .../java/org/apache/phoenix/schema/stat/PTableStats.java     | 2 +-
 .../java/org/apache/phoenix/schema/stat/PTableStatsImpl.java | 2 +-
 .../org/apache/phoenix/schema/tuple/MultiKeyValueTuple.java  | 2 +-
 .../java/org/apache/phoenix/schema/tuple/ResultTuple.java    | 2 +-
 .../org/apache/phoenix/schema/tuple/SingleKeyValueTuple.java | 2 +-
 src/main/java/org/apache/phoenix/schema/tuple/Tuple.java     | 4 ++--
 src/main/java/org/apache/phoenix/util/BigDecimalUtil.java    | 4 ++--
 src/main/java/org/apache/phoenix/util/BitSet.java            | 2 +-
 src/main/java/org/apache/phoenix/util/ByteUtil.java          | 4 ++--
 src/main/java/org/apache/phoenix/util/CSVLoader.java         | 4 ++--
 src/main/java/org/apache/phoenix/util/Closeables.java        | 2 +-
 src/main/java/org/apache/phoenix/util/DateUtil.java          | 2 +-
 src/main/java/org/apache/phoenix/util/IndexUtil.java         | 2 +-
 src/main/java/org/apache/phoenix/util/InstanceResolver.java  | 4 ++--
 src/main/java/org/apache/phoenix/util/JDBCUtil.java          | 4 ++--
 src/main/java/org/apache/phoenix/util/KeyValueUtil.java      | 4 ++--
 src/main/java/org/apache/phoenix/util/MetaDataUtil.java      | 2 +-
 src/main/java/org/apache/phoenix/util/NumberUtil.java        | 4 ++--
 src/main/java/org/apache/phoenix/util/PhoenixRuntime.java    | 4 ++--
 src/main/java/org/apache/phoenix/util/ReadOnlyProps.java     | 2 +-
 src/main/java/org/apache/phoenix/util/ResultUtil.java        | 4 ++--
 src/main/java/org/apache/phoenix/util/SQLCloseable.java      | 4 ++--
 src/main/java/org/apache/phoenix/util/SQLCloseables.java     | 6 +++---
 src/main/java/org/apache/phoenix/util/ScanUtil.java          | 4 ++--
 src/main/java/org/apache/phoenix/util/SchemaUtil.java        | 4 ++--
 src/main/java/org/apache/phoenix/util/ServerUtil.java        | 2 +-
 src/main/java/org/apache/phoenix/util/SizedUtil.java         | 2 +-
 src/main/java/org/apache/phoenix/util/StringUtil.java        | 2 +-
 .../apache/phoenix/util/TrustedByteArrayOutputStream.java    | 4 ++--
 src/main/java/org/apache/phoenix/util/TupleUtil.java         | 4 ++--
 src/test/java/org/apache/hbase/index/IndexTestingUtils.java  | 2 +-
 src/test/java/org/apache/hbase/index/StubAbortable.java      | 2 +-
 src/test/java/org/apache/hbase/index/TableName.java          | 2 +-
 .../hbase/index/TestFailForUnsupportedHBaseVersions.java     | 2 +-
 .../hbase/index/covered/CoveredIndexCodecForTesting.java     | 2 +-
 .../org/apache/hbase/index/covered/TestCoveredColumns.java   | 2 +-
 .../covered/TestEndToEndCoveredColumnsIndexBuilder.java      | 2 +-
 .../org/apache/hbase/index/covered/TestLocalTableState.java  | 2 +-
 .../apache/hbase/index/covered/data/TestIndexMemStore.java   | 2 +-
 .../hbase/index/covered/example/TestColumnTracker.java       | 2 +-
 .../index/covered/example/TestCoveredColumnIndexCodec.java   | 2 +-
 .../covered/example/TestCoveredIndexSpecifierBuilder.java    | 2 +-
 .../index/covered/example/TestEndToEndCoveredIndexing.java   | 2 +-
 .../covered/example/TestEndtoEndIndexingWithCompression.java | 2 +-
 .../hbase/index/covered/example/TestFailWithoutRetries.java  | 2 +-
 .../covered/filter/TestApplyAndFilterDeletesFilter.java      | 2 +-
 .../hbase/index/covered/filter/TestFamilyOnlyFilter.java     | 2 +-
 .../hbase/index/covered/filter/TestNewerTimestampFilter.java | 2 +-
 .../hbase/index/covered/update/TestIndexUpdateManager.java   | 2 +-
 .../apache/hbase/index/parallel/TestThreadPoolBuilder.java   | 2 +-
 .../apache/hbase/index/parallel/TestThreadPoolManager.java   | 2 +-
 .../org/apache/hbase/index/util/TestIndexManagementUtil.java | 2 +-
 .../apache/hbase/index/write/TestCachingHTableFactory.java   | 2 +-
 .../java/org/apache/hbase/index/write/TestIndexWriter.java   | 2 +-
 .../org/apache/hbase/index/write/TestParalleIndexWriter.java | 2 +-
 .../hbase/index/write/TestParalleWriterIndexCommitter.java   | 2 +-
 .../org/apache/hbase/index/write/TestWALRecoveryCaching.java | 2 +-
 .../index/write/recovery/TestPerRegionIndexWriteCache.java   | 2 +-
 .../apache/phoenix/arithmetic/ArithmeticOperationTest.java   | 2 +-
 .../java/org/apache/phoenix/compile/HavingClauseTest.java    | 2 +-
 .../java/org/apache/phoenix/compile/LimitClauseTest.java     | 2 +-
 .../java/org/apache/phoenix/compile/QueryCompileTest.java    | 4 ++--
 .../java/org/apache/phoenix/compile/QueryMetaDataTest.java   | 4 ++--
 src/test/java/org/apache/phoenix/compile/ScanRangesTest.java | 2 +-
 .../apache/phoenix/compile/SelectStatementRewriterTest.java  | 2 +-
 .../phoenix/compile/StatementHintsCompilationTest.java       | 2 +-
 .../org/apache/phoenix/compile/WhereClauseFilterTest.java    | 2 +-
 .../org/apache/phoenix/compile/WhereClauseScanKeyTest.java   | 2 +-
 src/test/java/org/apache/phoenix/end2end/AlterTableTest.java | 2 +-
 .../java/org/apache/phoenix/end2end/ArithmeticQueryTest.java | 2 +-
 src/test/java/org/apache/phoenix/end2end/AutoCommitTest.java | 2 +-
 .../org/apache/phoenix/end2end/BaseClientMangedTimeTest.java | 4 ++--
 .../org/apache/phoenix/end2end/BaseConnectedQueryTest.java   | 4 ++--
 .../org/apache/phoenix/end2end/BaseHBaseManagedTimeTest.java | 4 ++--
 .../java/org/apache/phoenix/end2end/BinaryRowKeyTest.java    | 2 +-
 src/test/java/org/apache/phoenix/end2end/CSVLoaderTest.java  | 2 +-
 .../org/apache/phoenix/end2end/CoalesceFunctionTest.java     | 2 +-
 .../org/apache/phoenix/end2end/CompareDecimalToLongTest.java | 2 +-
 .../phoenix/end2end/ConnectionQueryServicesTestImpl.java     | 4 ++--
 .../java/org/apache/phoenix/end2end/CreateTableTest.java     | 2 +-
 .../org/apache/phoenix/end2end/CustomEntityDataTest.java     | 2 +-
 .../end2end/DefaultParallelIteratorsRegionSplitterTest.java  | 4 ++--
 src/test/java/org/apache/phoenix/end2end/DeleteTest.java     | 2 +-
 .../org/apache/phoenix/end2end/DescColumnSortOrderTest.java  | 4 ++--
 .../java/org/apache/phoenix/end2end/DistinctCountTest.java   | 2 +-
 .../java/org/apache/phoenix/end2end/DynamicColumnTest.java   | 4 ++--
 .../java/org/apache/phoenix/end2end/DynamicFamilyTest.java   | 4 ++--
 .../java/org/apache/phoenix/end2end/DynamicUpsertTest.java   | 4 ++--
 .../org/apache/phoenix/end2end/ExecuteStatementsTest.java    | 2 +-
 .../org/apache/phoenix/end2end/ExtendedQueryExecTest.java    | 2 +-
 src/test/java/org/apache/phoenix/end2end/FunkyNamesTest.java | 2 +-
 .../java/org/apache/phoenix/end2end/GroupByCaseTest.java     | 2 +-
 .../java/org/apache/phoenix/end2end/InMemoryOrderByTest.java | 2 +-
 src/test/java/org/apache/phoenix/end2end/IsNullTest.java     | 2 +-
 src/test/java/org/apache/phoenix/end2end/KeyOnlyTest.java    | 2 +-
 .../java/org/apache/phoenix/end2end/MD5FunctionTest.java     | 2 +-
 .../org/apache/phoenix/end2end/MultiCfQueryExecTest.java     | 2 +-
 .../org/apache/phoenix/end2end/NativeHBaseTypesTest.java     | 4 ++--
 src/test/java/org/apache/phoenix/end2end/OrderByTest.java    | 2 +-
 src/test/java/org/apache/phoenix/end2end/PercentileTest.java | 2 +-
 .../java/org/apache/phoenix/end2end/ProductMetricsTest.java  | 2 +-
 .../apache/phoenix/end2end/QueryDatabaseMetaDataTest.java    | 2 +-
 .../org/apache/phoenix/end2end/QueryExecWithoutSCNTest.java  | 2 +-
 src/test/java/org/apache/phoenix/end2end/QueryPlanTest.java  | 2 +-
 src/test/java/org/apache/phoenix/end2end/QueryTest.java      | 4 ++--
 .../org/apache/phoenix/end2end/ReadIsolationLevelTest.java   | 2 +-
 .../java/org/apache/phoenix/end2end/ReverseFunctionTest.java | 2 +-
 .../org/apache/phoenix/end2end/RowValueConstructorTest.java  | 2 +-
 .../java/org/apache/phoenix/end2end/ServerExceptionTest.java | 2 +-
 .../end2end/SkipRangeParallelIteratorRegionSplitterTest.java | 2 +-
 .../java/org/apache/phoenix/end2end/SkipScanQueryTest.java   | 2 +-
 .../java/org/apache/phoenix/end2end/SpooledOrderByTest.java  | 2 +-
 .../java/org/apache/phoenix/end2end/StatementHintsTest.java  | 2 +-
 src/test/java/org/apache/phoenix/end2end/StddevTest.java     | 2 +-
 .../java/org/apache/phoenix/end2end/ToCharFunctionTest.java  | 4 ++--
 .../org/apache/phoenix/end2end/ToNumberFunctionTest.java     | 4 ++--
 src/test/java/org/apache/phoenix/end2end/TopNTest.java       | 2 +-
 .../java/org/apache/phoenix/end2end/UpsertBigValuesTest.java | 2 +-
 .../apache/phoenix/end2end/UpsertSelectAutoCommitTest.java   | 2 +-
 .../java/org/apache/phoenix/end2end/UpsertSelectTest.java    | 2 +-
 .../java/org/apache/phoenix/end2end/UpsertValuesTest.java    | 2 +-
 .../org/apache/phoenix/end2end/VariableLengthPKTest.java     | 2 +-
 .../apache/phoenix/end2end/index/BaseMutableIndexTest.java   | 2 +-
 .../java/org/apache/phoenix/end2end/index/DropViewTest.java  | 2 +-
 .../org/apache/phoenix/end2end/index/ImmutableIndexTest.java | 2 +-
 .../org/apache/phoenix/end2end/index/IndexMetadataTest.java  | 2 +-
 .../java/org/apache/phoenix/end2end/index/IndexTestUtil.java | 2 +-
 .../phoenix/end2end/index/MutableIndexFailureTest.java       | 4 ++--
 .../org/apache/phoenix/end2end/index/MutableIndexTest.java   | 2 +-
 .../apache/phoenix/end2end/index/MutableSaltedIndexTest.java | 2 +-
 .../org/apache/phoenix/end2end/salted/SaltedTableTest.java   | 2 +-
 .../org/apache/phoenix/expression/CoerceExpressionTest.java  | 4 ++--
 .../org/apache/phoenix/expression/ColumnExpressionTest.java  | 2 +-
 .../expression/DescColumnSortOrderExpressionTest.java        | 4 ++--
 .../org/apache/phoenix/expression/LikeExpressionTest.java    | 2 +-
 .../apache/phoenix/filter/SkipScanFilterIntersectTest.java   | 2 +-
 .../apache/phoenix/iterate/AggregateResultScannerTest.java   | 2 +-
 .../org/apache/phoenix/iterate/ConcatResultIteratorTest.java | 2 +-
 .../apache/phoenix/iterate/MergeSortResultIteratorTest.java  | 2 +-
 .../apache/phoenix/iterate/SpoolingResultIteratorTest.java   | 2 +-
 src/test/java/org/apache/phoenix/jdbc/PhoenixTestDriver.java | 4 ++--
 src/test/java/org/apache/phoenix/logging/PerformanceLog.java | 4 ++--
 .../java/org/apache/phoenix/memory/MemoryManagerTest.java    | 4 ++--
 src/test/java/org/apache/phoenix/parse/QueryParserTest.java  | 2 +-
 .../apache/phoenix/query/BaseConnectionlessQueryTest.java    | 2 +-
 src/test/java/org/apache/phoenix/query/BaseTest.java         | 2 +-
 .../org/apache/phoenix/query/ConnectionlessUpsertTest.java   | 2 +-
 .../org/apache/phoenix/query/HBaseFactoryProviderTest.java   | 2 +-
 .../java/org/apache/phoenix/query/QueryServicesTestImpl.java | 4 ++--
 src/test/java/org/apache/phoenix/schema/PDataTypeTest.java   | 2 +-
 src/test/java/org/apache/phoenix/schema/SchemaUtilTest.java  | 2 +-
 src/test/java/org/apache/phoenix/schema/ValueBitSetTest.java | 2 +-
 src/test/java/org/apache/phoenix/util/AssertResults.java     | 6 +++---
 src/test/java/org/apache/phoenix/util/ByteUtilTest.java      | 2 +-
 src/test/java/org/apache/phoenix/util/DateUtilTest.java      | 4 ++--
 .../org/apache/phoenix/util/GeneratePerformanceData.java     | 2 +-
 .../java/org/apache/phoenix/util/LikeExpressionTest.java     | 2 +-
 src/test/java/org/apache/phoenix/util/MetaDataUtilTest.java  | 2 +-
 src/test/java/org/apache/phoenix/util/ScanUtilTest.java      | 2 +-
 src/test/java/org/apache/phoenix/util/TestUtil.java          | 2 +-
 647 files changed, 991 insertions(+), 991 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-phoenix/blob/2e4bc61a/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
----------------------------------------------------------------------