You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ma...@apache.org on 2016/09/20 18:06:10 UTC
[47/47] phoenix git commit: Fix sync conflicts
Fix sync conflicts
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/b612f169
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/b612f169
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/b612f169
Branch: refs/heads/calcite
Commit: b612f16964e80b7ca97441e9b7183c80853bea01
Parents: b8c8a4f 7601d59
Author: maryannxue <ma...@gmail.com>
Authored: Tue Sep 20 11:05:09 2016 -0700
Committer: maryannxue <ma...@gmail.com>
Committed: Tue Sep 20 11:05:09 2016 -0700
----------------------------------------------------------------------
.../phoenix/end2end/AbsFunctionEnd2EndIT.java | 2 +-
.../phoenix/end2end/AggregateQueryIT.java | 36 +
.../AlterMultiTenantTableWithViewsIT.java | 2 +-
.../apache/phoenix/end2end/AlterSessionIT.java | 2 +-
.../apache/phoenix/end2end/AlterTableIT.java | 705 +++----
.../phoenix/end2end/AlterTableWithViewsIT.java | 6 +-
.../phoenix/end2end/AppendOnlySchemaIT.java | 2 +-
.../phoenix/end2end/ArithmeticQueryIT.java | 2 +-
.../phoenix/end2end/ArrayAppendFunctionIT.java | 2 +-
.../phoenix/end2end/ArrayConcatFunctionIT.java | 2 +-
.../phoenix/end2end/ArrayFillFunctionIT.java | 2 +-
.../phoenix/end2end/ArrayPrependFunctionIT.java | 2 +-
.../end2end/ArrayToStringFunctionIT.java | 80 +-
.../phoenix/end2end/ArraysWithNullsIT.java | 2 +-
.../apache/phoenix/end2end/AutoCommitIT.java | 2 +-
.../phoenix/end2end/AutoPartitionViewsIT.java | 4 +-
.../BaseHBaseManagedTimeTableReuseIT.java | 73 -
.../apache/phoenix/end2end/BaseParallelIT.java | 69 +
.../end2end/BaseTenantSpecificViewIndexIT.java | 2 +-
.../org/apache/phoenix/end2end/BaseViewIT.java | 1 -
.../apache/phoenix/end2end/BinaryRowKeyIT.java | 2 +-
.../phoenix/end2end/CSVCommonsLoaderIT.java | 2 +-
.../apache/phoenix/end2end/CaseStatementIT.java | 2 +-
.../apache/phoenix/end2end/CastAndCoerceIT.java | 2 +-
.../phoenix/end2end/CbrtFunctionEnd2EndIT.java | 2 +-
.../end2end/ClientTimeArithmeticQueryIT.java | 2 +-
.../phoenix/end2end/CoalesceFunctionIT.java | 2 +-
.../ConnectionQueryServicesTestImpl.java | 33 +-
.../end2end/ConvertTimezoneFunctionIT.java | 2 +-
.../phoenix/end2end/CsvBulkLoadToolIT.java | 6 +-
.../org/apache/phoenix/end2end/DateTimeIT.java | 761 ++++++-
.../phoenix/end2end/DecodeFunctionIT.java | 2 +-
.../org/apache/phoenix/end2end/DeleteIT.java | 12 +-
.../apache/phoenix/end2end/DerivedTableIT.java | 15 +-
.../phoenix/end2end/DisableLocalIndexIT.java | 4 +-
.../phoenix/end2end/DistinctPrefixFilterIT.java | 4 +-
.../apache/phoenix/end2end/DropSchemaIT.java | 2 +-
.../apache/phoenix/end2end/DynamicColumnIT.java | 2 +-
.../apache/phoenix/end2end/DynamicFamilyIT.java | 2 +-
.../apache/phoenix/end2end/DynamicUpsertIT.java | 33 +-
.../phoenix/end2end/EncodeFunctionIT.java | 2 +-
.../phoenix/end2end/EvaluationOfORIT.java | 2 +-
.../phoenix/end2end/ExecuteStatementsIT.java | 2 +-
.../phoenix/end2end/ExpFunctionEnd2EndIT.java | 2 +-
.../phoenix/end2end/FirstValueFunctionIT.java | 2 +-
.../end2end/GetSetByteBitFunctionEnd2EndIT.java | 2 +-
.../apache/phoenix/end2end/GroupByCaseIT.java | 29 +-
.../org/apache/phoenix/end2end/GroupByIT.java | 5 +-
.../end2end/HBaseManagedTimeTableReuseTest.java | 47 -
.../phoenix/end2end/HBaseManagedTimeTest.java | 2 +-
.../apache/phoenix/end2end/HashJoinMoreIT.java | 18 +-
.../org/apache/phoenix/end2end/InListIT.java | 2 +-
.../phoenix/end2end/InMemoryOrderByIT.java | 2 +-
.../apache/phoenix/end2end/IndexExtendedIT.java | 578 ++++++
.../org/apache/phoenix/end2end/IndexToolIT.java | 257 ---
.../apache/phoenix/end2end/InstrFunctionIT.java | 2 +-
.../org/apache/phoenix/end2end/IsNullIT.java | 2 +-
.../org/apache/phoenix/end2end/KeyOnlyIT.java | 5 +-
.../phoenix/end2end/LastValueFunctionIT.java | 2 +-
.../phoenix/end2end/LikeExpressionIT.java | 125 +-
.../phoenix/end2end/LnLogFunctionEnd2EndIT.java | 2 +-
.../apache/phoenix/end2end/MD5FunctionIT.java | 2 +-
.../org/apache/phoenix/end2end/MapReduceIT.java | 2 +-
.../phoenix/end2end/MappingTableDataTypeIT.java | 2 +-
.../end2end/MinMaxAggregateFunctionIT.java | 2 +-
.../phoenix/end2end/ModulusExpressionIT.java | 2 +-
.../phoenix/end2end/MultiCfQueryExecIT.java | 1 -
.../phoenix/end2end/MutableIndexToolIT.java | 129 --
.../end2end/NamespaceSchemaMappingIT.java | 2 +-
.../org/apache/phoenix/end2end/NotQueryIT.java | 2 +-
.../phoenix/end2end/NthValueFunctionIT.java | 2 +-
.../end2end/OctetLengthFunctionEnd2EndIT.java | 2 +-
.../org/apache/phoenix/end2end/OrderByIT.java | 2 +-
.../end2end/ParallelStatsDisabledIT.java | 30 +
.../end2end/ParallelStatsDisabledTest.java | 45 +
.../phoenix/end2end/ParallelStatsEnabledIT.java | 31 +
.../end2end/ParallelStatsEnabledTest.java | 45 +
.../apache/phoenix/end2end/PercentileIT.java | 31 +-
.../phoenix/end2end/PhoenixRuntimeIT.java | 50 +-
.../phoenix/end2end/PowerFunctionEnd2EndIT.java | 2 +-
.../apache/phoenix/end2end/PrimitiveTypeIT.java | 62 +-
.../end2end/QueryDatabaseMetaDataIT.java | 9 +-
.../phoenix/end2end/QueryExecWithoutSCNIT.java | 2 +-
.../org/apache/phoenix/end2end/QueryMoreIT.java | 8 +-
.../apache/phoenix/end2end/RTrimFunctionIT.java | 2 +-
.../org/apache/phoenix/end2end/ReadOnlyIT.java | 2 +-
.../end2end/RegexpReplaceFunctionIT.java | 6 +-
.../phoenix/end2end/RegexpSplitFunctionIT.java | 54 +-
.../phoenix/end2end/RegexpSubstrFunctionIT.java | 6 +-
.../phoenix/end2end/ReverseFunctionIT.java | 2 +-
.../apache/phoenix/end2end/ReverseScanIT.java | 2 +-
.../phoenix/end2end/RoundFloorCeilFuncIT.java | 683 +++++++
.../RoundFloorCeilFunctionsEnd2EndIT.java | 686 -------
.../org/apache/phoenix/end2end/ScanQueryIT.java | 2 +-
.../end2end/SequenceBulkAllocationIT.java | 2 +-
.../phoenix/end2end/SerialIteratorsIT.java | 2 +-
.../phoenix/end2end/ServerExceptionIT.java | 2 +-
.../phoenix/end2end/SignFunctionEnd2EndIT.java | 2 +-
.../end2end/SkipScanAfterManualSplitIT.java | 4 +-
.../apache/phoenix/end2end/SkipScanQueryIT.java | 4 +-
.../phoenix/end2end/SortMergeJoinMoreIT.java | 4 +-
.../org/apache/phoenix/end2end/SortOrderIT.java | 11 +-
.../phoenix/end2end/SpillableGroupByIT.java | 21 +-
.../phoenix/end2end/SpooledTmpFileDeleteIT.java | 2 +-
.../phoenix/end2end/SqrtFunctionEnd2EndIT.java | 2 +-
.../phoenix/end2end/StatementHintsIT.java | 2 +-
.../org/apache/phoenix/end2end/StddevIT.java | 2 +-
.../apache/phoenix/end2end/StoreNullsIT.java | 92 +-
.../org/apache/phoenix/end2end/StringIT.java | 2 +-
.../end2end/StringToArrayFunctionIT.java | 2 +-
.../apache/phoenix/end2end/TenantIdTypeIT.java | 14 +-
.../end2end/TimezoneOffsetFunctionIT.java | 2 +-
.../phoenix/end2end/ToCharFunctionIT.java | 13 +-
.../phoenix/end2end/ToDateFunctionIT.java | 2 +-
.../phoenix/end2end/TransactionalViewIT.java | 5 +-
.../org/apache/phoenix/end2end/UnionAllIT.java | 288 +--
.../org/apache/phoenix/end2end/UpgradeIT.java | 156 +-
.../phoenix/end2end/UpsertBigValuesIT.java | 2 +-
.../end2end/UpsertSelectAutoCommitIT.java | 2 +-
.../org/apache/phoenix/end2end/UseSchemaIT.java | 2 +-
.../end2end/index/AsyncImmutableIndexIT.java | 114 --
.../end2end/index/AsyncIndexDisabledIT.java | 4 +-
.../index/ChildViewsUseParentViewIndexIT.java | 254 +++
.../phoenix/end2end/index/DropMetadataIT.java | 6 +-
.../index/GlobalIndexOptimizationIT.java | 21 +-
.../phoenix/end2end/index/ImmutableIndexIT.java | 10 +-
.../index/ImmutableIndexWithStatsIT.java | 5 +-
.../end2end/index/IndexExpressionIT.java | 51 +-
.../apache/phoenix/end2end/index/IndexIT.java | 1147 +++++------
.../phoenix/end2end/index/IndexMetadataIT.java | 30 +-
.../phoenix/end2end/index/LocalIndexIT.java | 219 +--
.../end2end/index/MutableIndexFailureIT.java | 271 ++-
.../phoenix/end2end/index/MutableIndexIT.java | 12 +-
.../end2end/index/ReadOnlyIndexFailureIT.java | 2 +-
.../phoenix/end2end/index/SaltedIndexIT.java | 6 +-
.../phoenix/end2end/index/ViewIndexIT.java | 72 +-
.../end2end/index/txn/MutableRollbackIT.java | 8 +-
.../phoenix/end2end/index/txn/RollbackIT.java | 8 +-
.../end2end/index/txn/TxWriteFailureIT.java | 2 +-
.../salted/SaltedTableUpsertSelectIT.java | 4 +-
.../salted/SaltedTableVarLengthRowKeyIT.java | 4 +-
.../apache/phoenix/execute/PartialCommitIT.java | 5 +-
.../phoenix/iterate/PhoenixQueryTimeoutIT.java | 4 +-
.../iterate/RoundRobinResultIteratorIT.java | 6 +-
.../org/apache/phoenix/rpc/UpdateCacheIT.java | 15 +-
.../phoenix/rpc/UpdateCacheWithScnIT.java | 12 +-
.../apache/phoenix/trace/BaseTracingTestIT.java | 4 +-
.../trace/PhoenixTableMetricsWriterIT.java | 22 +-
.../phoenix/trace/PhoenixTraceReaderIT.java | 16 +-
.../phoenix/trace/PhoenixTracingEndToEndIT.java | 50 +-
.../org/apache/phoenix/tx/TransactionIT.java | 87 +-
.../org/apache/phoenix/tx/TxCheckpointIT.java | 11 +-
phoenix-core/src/main/antlr3/PhoenixSQL.g | 15 +-
.../phoenix/compile/ExpressionCompiler.java | 26 +-
.../coprocessor/MetaDataEndpointImpl.java | 30 +-
.../phoenix/coprocessor/MetaDataProtocol.java | 23 +-
.../coprocessor/MetaDataRegionObserver.java | 216 +-
.../phoenix/exception/SQLExceptionCode.java | 3 +
.../exception/UpgradeInProgressException.java | 28 +
.../exception/UpgradeNotRequiredException.java | 27 +
.../exception/UpgradeRequiredException.java | 29 +
.../apache/phoenix/execute/BaseQueryPlan.java | 23 +-
.../phoenix/execute/ClientAggregatePlan.java | 7 +-
.../phoenix/execute/ClientProcessingPlan.java | 9 -
.../apache/phoenix/execute/ClientScanPlan.java | 4 -
.../apache/phoenix/execute/CorrelatePlan.java | 15 +-
.../phoenix/execute/DelegateQueryPlan.java | 13 +
.../apache/phoenix/execute/HashJoinPlan.java | 15 +-
.../phoenix/execute/TupleProjectionPlan.java | 11 -
.../org/apache/phoenix/execute/UnionPlan.java | 21 +-
.../apache/phoenix/execute/UnnestArrayPlan.java | 11 -
.../phoenix/expression/ExpressionType.java | 9 +-
.../expression/function/CeilDateExpression.java | 3 +
.../function/CeilTimestampExpression.java | 3 +
.../expression/function/DateScalarFunction.java | 54 +
.../expression/function/DayOfMonthFunction.java | 4 +-
.../expression/function/DayOfWeekFunction.java | 86 +
.../expression/function/DayOfYearFunction.java | 78 +
.../expression/function/HourFunction.java | 4 +-
.../expression/function/MinuteFunction.java | 4 +-
.../expression/function/MonthFunction.java | 4 +-
.../function/RoundDateExpression.java | 3 +
.../function/RoundDecimalExpression.java | 2 +-
.../function/RoundJodaDateExpression.java | 3 +
.../expression/function/SecondFunction.java | 4 +-
.../expression/function/ToDateFunction.java | 10 +-
.../expression/function/WeekFunction.java | 4 +-
.../expression/function/YearFunction.java | 4 +-
.../hbase/index/covered/NonTxIndexBuilder.java | 4 +-
.../hbase/index/covered/data/IndexMemStore.java | 10 +-
.../covered/update/IndexUpdateManager.java | 4 +-
.../apache/phoenix/index/IndexMaintainer.java | 16 +-
.../index/PhoenixIndexFailurePolicy.java | 5 +-
.../phoenix/iterate/BaseResultIterators.java | 6 +-
.../iterate/MergeSortResultIterator.java | 2 +-
.../phoenix/iterate/UnionResultIterators.java | 4 +-
.../apache/phoenix/jdbc/PhoenixConnection.java | 27 +-
.../phoenix/jdbc/PhoenixDatabaseMetaData.java | 2 +-
.../phoenix/jdbc/PhoenixPreparedStatement.java | 26 +-
.../apache/phoenix/jdbc/PhoenixStatement.java | 78 +-
.../mapreduce/FormatToBytesWritableMapper.java | 3 +-
.../index/automation/PhoenixMRJobSubmitter.java | 4 +
.../phoenix/parse/ExecuteUpgradeStatement.java | 34 +
.../apache/phoenix/parse/ParseNodeFactory.java | 4 +
.../org/apache/phoenix/parse/SQLParser.java | 2 +-
.../phoenix/query/ConnectionQueryServices.java | 3 +
.../query/ConnectionQueryServicesImpl.java | 1849 ++++++++++--------
.../query/ConnectionlessQueryServicesImpl.java | 8 +
.../query/DelegateConnectionQueryServices.java | 10 +
.../apache/phoenix/query/QueryConstants.java | 7 +
.../org/apache/phoenix/query/QueryServices.java | 2 +-
.../phoenix/query/QueryServicesOptions.java | 6 +-
.../apache/phoenix/schema/MetaDataClient.java | 647 +++---
.../apache/phoenix/schema/PMetaDataImpl.java | 2 +-
.../java/org/apache/phoenix/schema/PTable.java | 20 +-
.../org/apache/phoenix/schema/PTableImpl.java | 54 +-
.../org/apache/phoenix/schema/SortOrder.java | 11 +
.../phoenix/schema/stats/StatisticsScanner.java | 72 +-
.../apache/phoenix/schema/types/PDataType.java | 19 +-
.../org/apache/phoenix/schema/types/PDate.java | 283 +--
.../apache/phoenix/schema/types/PDecimal.java | 6 +-
.../org/apache/phoenix/schema/types/PLong.java | 519 ++---
.../org/apache/phoenix/schema/types/PTime.java | 2 +-
.../apache/phoenix/schema/types/PTimestamp.java | 42 +-
.../phoenix/schema/types/PUnsignedDate.java | 259 ++-
.../phoenix/schema/types/PUnsignedLong.java | 317 +--
.../phoenix/schema/types/PUnsignedTime.java | 2 +-
.../schema/types/PUnsignedTimestamp.java | 152 +-
.../phoenix/trace/PhoenixMetricsSink.java | 42 +-
.../org/apache/phoenix/trace/TraceReader.java | 12 +-
.../apache/phoenix/util/CSVCommonsLoader.java | 2 +-
.../java/org/apache/phoenix/util/DateUtil.java | 23 +-
.../org/apache/phoenix/util/ExpressionUtil.java | 15 +-
.../phoenix/util/PhoenixContextExecutor.java | 6 +-
.../org/apache/phoenix/util/PhoenixRuntime.java | 2 +-
.../java/org/apache/phoenix/util/QueryUtil.java | 6 +-
.../org/apache/phoenix/util/UpgradeUtil.java | 24 +-
.../phoenix/util/csv/CsvUpsertExecutor.java | 8 +-
.../phoenix/expression/LikeExpressionTest.java | 6 +
.../RoundFloorCeilExpressionsTest.java | 14 +
.../apache/phoenix/jdbc/PhoenixTestDriver.java | 2 +-
.../apache/phoenix/parse/QueryParserTest.java | 10 +
.../java/org/apache/phoenix/query/BaseTest.java | 83 +-
.../phoenix/query/QueryServicesTestImpl.java | 4 +-
.../schema/stats/StatisticsScannerTest.java | 144 ++
.../phoenix/schema/types/PDataTypeTest.java | 18 +
.../java/org/apache/phoenix/util/TestUtil.java | 29 +
.../org/apache/phoenix/flume/PhoenixSinkIT.java | 4 +-
.../phoenix/flume/RegexEventSerializerIT.java | 4 +-
.../apache/phoenix/pherf/ResultBaseTestIT.java | 4 +-
.../apache/phoenix/pherf/SchemaReaderIT.java | 4 +-
.../java/org/apache/phoenix/pig/BasePigIT.java | 6 +-
.../phoenix/end2end/QueryServerBasicsIT.java | 2 +-
.../apache/phoenix/queryserver/server/Main.java | 4 -
pom.xml | 86 +-
255 files changed, 8201 insertions(+), 5705 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b612f169/phoenix-core/src/main/java/org/apache/phoenix/execute/BaseQueryPlan.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b612f169/phoenix-core/src/main/java/org/apache/phoenix/execute/ClientAggregatePlan.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b612f169/phoenix-core/src/main/java/org/apache/phoenix/execute/ClientScanPlan.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b612f169/phoenix-core/src/main/java/org/apache/phoenix/execute/CorrelatePlan.java
----------------------------------------------------------------------
diff --cc phoenix-core/src/main/java/org/apache/phoenix/execute/CorrelatePlan.java
index 9e6dad3,b1d00ab..be0c7c0
--- a/phoenix-core/src/main/java/org/apache/phoenix/execute/CorrelatePlan.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/CorrelatePlan.java
@@@ -28,9 -27,7 +28,8 @@@ import org.apache.phoenix.compile.Order
import org.apache.phoenix.compile.QueryPlan;
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.exception.SQLExceptionInfo;
+import org.apache.phoenix.execute.RuntimeContext.CorrelateVariable;
import org.apache.phoenix.execute.TupleProjector.ProjectedValueTuple;
- import org.apache.phoenix.iterate.DefaultParallelScanGrouper;
import org.apache.phoenix.iterate.ParallelScanGrouper;
import org.apache.phoenix.iterate.ResultIterator;
import org.apache.phoenix.parse.JoinTableNode.JoinType;
@@@ -101,20 -98,9 +100,10 @@@ public class CorrelatePlan extends Dele
}
@Override
- public ResultIterator iterator() throws SQLException {
- return iterator(DefaultParallelScanGrouper.getInstance());
- }
-
- @Override
- public ResultIterator iterator(ParallelScanGrouper scanGrouper)
- throws SQLException {
- return iterator(scanGrouper, null);
- }
- @Override
- public ResultIterator iterator(ParallelScanGrouper scanGrouper, Scan scan)
+ public ResultIterator iterator(final ParallelScanGrouper scanGrouper, final Scan scan)
throws SQLException {
return new ResultIterator() {
+ private final CorrelateVariable variable = runtimeContext.getCorrelateVariable(variableId);
private final ValueBitSet destBitSet = ValueBitSet.newInstance(joinedSchema);
private final ValueBitSet lhsBitSet = ValueBitSet.newInstance(lhsSchema);
private final ValueBitSet rhsBitSet =
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b612f169/phoenix-core/src/main/java/org/apache/phoenix/execute/DelegateQueryPlan.java
----------------------------------------------------------------------
diff --cc phoenix-core/src/main/java/org/apache/phoenix/execute/DelegateQueryPlan.java
index c1d893d,46eec91..3f120fd
--- a/phoenix-core/src/main/java/org/apache/phoenix/execute/DelegateQueryPlan.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/DelegateQueryPlan.java
@@@ -128,4 -127,14 +131,14 @@@ public abstract class DelegateQueryPla
public Integer getOffset() {
return delegate.getOffset();
}
+
- @Override
- public ResultIterator iterator() throws SQLException {
- return iterator(DefaultParallelScanGrouper.getInstance());
- }
++ @Override
++ public ResultIterator iterator() throws SQLException {
++ return iterator(DefaultParallelScanGrouper.getInstance());
++ }
+
- @Override
- public ResultIterator iterator(ParallelScanGrouper scanGrouper) throws SQLException {
- return iterator(scanGrouper, null);
- }
-}
++ @Override
++ public ResultIterator iterator(ParallelScanGrouper scanGrouper) throws SQLException {
++ return iterator(scanGrouper, null);
++ }
+}
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b612f169/phoenix-core/src/main/java/org/apache/phoenix/execute/HashJoinPlan.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b612f169/phoenix-core/src/main/java/org/apache/phoenix/execute/TupleProjectionPlan.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b612f169/phoenix-core/src/main/java/org/apache/phoenix/execute/UnionPlan.java
----------------------------------------------------------------------
diff --cc phoenix-core/src/main/java/org/apache/phoenix/execute/UnionPlan.java
index 56c8340,e2c18b1..1467824
--- a/phoenix-core/src/main/java/org/apache/phoenix/execute/UnionPlan.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/UnionPlan.java
@@@ -30,8 -29,10 +29,9 @@@ import org.apache.phoenix.compile.Group
import org.apache.phoenix.compile.OrderByCompiler.OrderBy;
import org.apache.phoenix.compile.QueryPlan;
import org.apache.phoenix.compile.RowProjector;
-import org.apache.phoenix.compile.ScanRanges;
import org.apache.phoenix.compile.StatementContext;
import org.apache.phoenix.iterate.ConcatResultIterator;
+ import org.apache.phoenix.iterate.DefaultParallelScanGrouper;
import org.apache.phoenix.iterate.LimitingResultIterator;
import org.apache.phoenix.iterate.MergeSortTopNResultIterator;
import org.apache.phoenix.iterate.OffsetResultIterator;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b612f169/phoenix-core/src/main/java/org/apache/phoenix/execute/UnnestArrayPlan.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b612f169/phoenix-core/src/main/java/org/apache/phoenix/expression/ExpressionType.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b612f169/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b612f169/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixDatabaseMetaData.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b612f169/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixStatement.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b612f169/phoenix-core/src/main/java/org/apache/phoenix/util/PhoenixRuntime.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b612f169/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b612f169/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixTestDriver.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b612f169/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
----------------------------------------------------------------------
diff --cc phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
index e064dc9,57df138..7dfa9cc
--- a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
@@@ -141,9 -136,7 +136,8 @@@ import org.apache.phoenix.end2end.BaseH
import org.apache.phoenix.exception.SQLExceptionCode;
import org.apache.phoenix.exception.SQLExceptionInfo;
import org.apache.phoenix.jdbc.PhoenixConnection;
+import org.apache.phoenix.jdbc.PhoenixCalciteTestDriver;
import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
- import org.apache.phoenix.jdbc.PhoenixDriver;
import org.apache.phoenix.jdbc.PhoenixEmbeddedDriver;
import org.apache.phoenix.jdbc.PhoenixEmbeddedDriver.ConnectionInfo;
import org.apache.phoenix.jdbc.PhoenixTestDriver;
@@@ -504,9 -489,7 +491,8 @@@ public abstract class BaseTest
}
protected static String url;
+ protected static String calciteUrl;
protected static PhoenixTestDriver driver;
- protected static PhoenixDriver realDriver;
protected static boolean clusterInitialized = false;
private static HBaseTestingUtility utility;
protected static final Configuration config = HBaseConfiguration.create();
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b612f169/phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/b612f169/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 49af7f2,3c000e2..d871784
--- a/pom.xml
+++ b/pom.xml
@@@ -97,9 -97,8 +97,9 @@@
<jodatime.version>1.6</jodatime.version>
<joni.version>2.1.2</joni.version>
<avatica.version>1.8.0</avatica.version>
+ <calcite.version>1.9.0-SNAPSHOT</calcite.version>
<jettyVersion>8.1.7.v20120910</jettyVersion>
- <tephra.version>0.8.0-incubating</tephra.version>
+ <tephra.version>0.9.0-incubating</tephra.version>
<spark.version>1.6.1</spark.version>
<scala.version>2.10.4</scala.version>
<scala.binary.version>2.10</scala.binary.version>