Merge branch 'master' into calcite
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/597e0013 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/597e0013 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/597e0013 Branch: refs/heads/calcite Commit: 597e0013cee4285704aecc5c36d6727262ca9885 Parents: 0641043 b38a624 Author: maryannxue <[email protected]> Authored: Mon Jul 20 12:32:48 2015 -0400 Committer: maryannxue <[email protected]> Committed: Mon Jul 20 12:32:48 2015 -0400 ---------------------------------------------------------------------- dev/eclipse_prefs_phoenix.epf | 2 +- .../apache/phoenix/end2end/AlterTableIT.java | 449 +++- .../org/apache/phoenix/end2end/ArrayIT.java | 178 ++ .../end2end/ArrayToStringFunctionIT.java | 654 ++++++ .../org/apache/phoenix/end2end/IsNullIT.java | 52 +- .../apache/phoenix/end2end/LpadFunctionIT.java | 24 + .../apache/phoenix/end2end/MD5FunctionIT.java | 19 + .../apache/phoenix/end2end/ReverseScanIT.java | 59 +- .../phoenix/end2end/RowValueConstructorIT.java | 103 +- .../end2end/SequenceBulkAllocationIT.java | 1286 +++++++++++ .../org/apache/phoenix/end2end/SequenceIT.java | 27 + .../apache/phoenix/end2end/SortOrderFIT.java | 563 ----- .../org/apache/phoenix/end2end/SortOrderIT.java | 572 +++++ .../phoenix/end2end/UserDefinedFunctionsIT.java | 212 +- .../java/org/apache/phoenix/end2end/ViewIT.java | 23 + .../iterate/RoundRobinResultIteratorIT.java | 80 + phoenix-core/src/main/antlr3/PhoenixSQL.g | 35 +- .../phoenix/compile/CreateFunctionCompiler.java | 4 +- .../apache/phoenix/compile/FromCompiler.java | 21 +- .../apache/phoenix/compile/JoinCompiler.java | 8 +- .../phoenix/compile/ListJarsQueryPlan.java | 216 ++ .../apache/phoenix/compile/OrderByCompiler.java | 4 +- .../phoenix/compile/OrderPreservingTracker.java | 7 +- .../phoenix/compile/ProjectionCompiler.java | 2 +- .../apache/phoenix/compile/QueryCompiler.java | 9 +- .../org/apache/phoenix/compile/ScanRanges.java | 5 +- .../apache/phoenix/compile/SequenceManager.java | 70 +- .../compile/SequenceValueExpression.java | 14 +- .../compile/TupleProjectionCompiler.java | 5 +- .../apache/phoenix/compile/UnionCompiler.java | 5 +- .../apache/phoenix/compile/UpsertCompiler.java | 16 +- .../apache/phoenix/compile/WhereOptimizer.java | 53 +- .../coprocessor/BaseScannerRegionObserver.java | 2 + .../coprocessor/MetaDataEndpointImpl.java | 457 +++- .../phoenix/coprocessor/MetaDataProtocol.java | 2 +- .../coprocessor/SequenceRegionObserver.java | 64 +- .../UngroupedAggregateRegionObserver.java | 108 +- .../coprocessor/generated/MetaDataProtos.java | 1243 ++++++++++- .../coprocessor/generated/PFunctionProtos.java | 100 +- .../coprocessor/generated/PTableProtos.java | 105 +- .../phoenix/exception/SQLExceptionCode.java | 4 + .../apache/phoenix/execute/BaseQueryPlan.java | 23 +- .../DescVarLengthFastByteComparisons.java | 219 ++ .../phoenix/execute/EmptyTableQueryPlan.java | 96 + .../org/apache/phoenix/execute/ScanPlan.java | 14 +- .../expression/ArrayConstructorExpression.java | 21 +- .../phoenix/expression/ExpressionType.java | 4 +- .../phoenix/expression/OrderByExpression.java | 13 +- .../RowValueConstructorExpression.java | 8 +- .../aggregator/ServerAggregators.java | 1 + .../function/ArrayConcatFunction.java | 11 +- .../function/ArrayModifierFunction.java | 3 +- .../function/ArrayToStringFunction.java | 84 + .../expression/function/LpadFunction.java | 8 +- .../expression/util/regex/JONIPattern.java | 5 +- .../apache/phoenix/filter/SkipScanFilter.java | 3 +- .../apache/phoenix/index/IndexMaintainer.java | 127 +- .../phoenix/iterate/BaseResultIterators.java | 109 +- .../phoenix/iterate/OrderedResultIterator.java | 52 +- .../iterate/RoundRobinResultIterator.java | 2 +- .../apache/phoenix/jdbc/PhoenixConnection.java | 29 +- .../apache/phoenix/jdbc/PhoenixStatement.java | 213 +- .../phoenix/mapreduce/util/ConnectionUtil.java | 9 +- .../util/PhoenixConfigurationUtil.java | 14 + .../phoenix/monitoring/MetricsStopWatch.java | 8 +- .../apache/phoenix/parse/AddJarsStatement.java | 38 + .../org/apache/phoenix/parse/CastParseNode.java | 2 +- .../phoenix/parse/CreateFunctionStatement.java | 7 +- .../phoenix/parse/DeleteJarStatement.java | 19 + .../apache/phoenix/parse/ListJarsStatement.java | 34 + .../org/apache/phoenix/parse/PFunction.java | 28 +- .../apache/phoenix/parse/ParseNodeFactory.java | 22 +- .../apache/phoenix/parse/SelectStatement.java | 6 +- .../phoenix/parse/SequenceValueParseNode.java | 8 +- .../phoenix/query/ConnectionQueryServices.java | 5 +- .../query/ConnectionQueryServicesImpl.java | 128 +- .../query/ConnectionlessQueryServicesImpl.java | 20 +- .../query/DelegateConnectionQueryServices.java | 13 +- .../java/org/apache/phoenix/query/KeyRange.java | 27 +- .../apache/phoenix/query/QueryConstants.java | 3 + .../phoenix/query/QueryServicesOptions.java | 2 +- .../apache/phoenix/schema/DelegateTable.java | 5 + .../apache/phoenix/schema/MetaDataClient.java | 99 +- .../java/org/apache/phoenix/schema/PTable.java | 9 + .../org/apache/phoenix/schema/PTableImpl.java | 79 +- .../org/apache/phoenix/schema/RowKeySchema.java | 44 +- .../phoenix/schema/RowKeyValueAccessor.java | 12 +- .../org/apache/phoenix/schema/Sequence.java | 107 +- .../phoenix/schema/SequenceAllocation.java | 48 + .../org/apache/phoenix/schema/TableRef.java | 2 + .../org/apache/phoenix/schema/ValueSchema.java | 30 +- .../phoenix/schema/stats/StatisticsUtil.java | 4 +- .../phoenix/schema/types/PArrayDataType.java | 726 ++++--- .../phoenix/schema/types/PBinaryArray.java | 122 +- .../phoenix/schema/types/PBooleanArray.java | 112 +- .../apache/phoenix/schema/types/PCharArray.java | 128 +- .../apache/phoenix/schema/types/PDataType.java | 2037 +++++++++--------- .../apache/phoenix/schema/types/PDateArray.java | 131 +- .../phoenix/schema/types/PDecimalArray.java | 126 +- .../phoenix/schema/types/PDoubleArray.java | 128 +- .../phoenix/schema/types/PFloatArray.java | 130 +- .../phoenix/schema/types/PIntegerArray.java | 130 +- .../apache/phoenix/schema/types/PLongArray.java | 130 +- .../phoenix/schema/types/PSmallintArray.java | 130 +- .../apache/phoenix/schema/types/PTimeArray.java | 133 +- .../phoenix/schema/types/PTimestampArray.java | 132 +- .../phoenix/schema/types/PTinyintArray.java | 130 +- .../schema/types/PUnsignedDateArray.java | 128 +- .../schema/types/PUnsignedDoubleArray.java | 136 +- .../schema/types/PUnsignedFloatArray.java | 130 +- .../phoenix/schema/types/PUnsignedIntArray.java | 130 +- .../schema/types/PUnsignedLongArray.java | 130 +- .../schema/types/PUnsignedSmallintArray.java | 132 +- .../schema/types/PUnsignedTimeArray.java | 132 +- .../schema/types/PUnsignedTimestampArray.java | 134 +- .../schema/types/PUnsignedTinyintArray.java | 132 +- .../phoenix/schema/types/PVarbinaryArray.java | 130 +- .../phoenix/schema/types/PVarcharArray.java | 130 +- .../java/org/apache/phoenix/util/ByteUtil.java | 12 +- .../org/apache/phoenix/util/MetaDataUtil.java | 16 +- .../org/apache/phoenix/util/PhoenixRuntime.java | 153 +- .../apache/phoenix/util/PhoenixStopWatch.java | 81 + .../java/org/apache/phoenix/util/QueryUtil.java | 4 +- .../java/org/apache/phoenix/util/ScanUtil.java | 24 +- .../org/apache/phoenix/util/SchemaUtil.java | 41 +- .../org/apache/phoenix/util/SequenceUtil.java | 47 +- .../java/org/apache/phoenix/util/TupleUtil.java | 7 +- .../org/apache/phoenix/util/UpgradeUtil.java | 730 +++++-- .../phoenix/compile/QueryCompilerTest.java | 156 +- .../expression/ArrayAppendFunctionTest.java | 76 +- .../expression/ArrayConcatFunctionTest.java | 129 ++ .../expression/ArrayPrependFunctionTest.java | 61 + .../expression/ArrayToStringFunctionTest.java | 376 ++++ .../util/PhoenixConfigurationUtilTest.java | 28 +- .../apache/phoenix/parse/CastParseNodeTest.java | 57 + .../apache/phoenix/parse/QueryParserTest.java | 19 +- .../org/apache/phoenix/query/OrderByTest.java | 84 + .../phoenix/schema/SequenceAllocationTest.java | 59 + .../schema/types/PDataTypeForArraysTest.java | 70 +- .../phoenix/schema/types/PDataTypeTest.java | 12 + .../org/apache/phoenix/util/QueryUtilTest.java | 36 +- .../apache/phoenix/util/SequenceUtilTest.java | 54 + phoenix-pherf/config/log4j.properties | 58 + phoenix-pherf/pom.xml | 2 +- .../org/apache/phoenix/pherf/DataIngestIT.java | 8 + .../test/resources/datamodel/test_schema.sql | 2 +- .../phoenix/pig/PhoenixHBaseLoaderIT.java | 141 +- .../phoenix/pig/PhoenixHBaseStorerIT.java | 4 +- .../phoenix/pig/udf/ReserveNSequenceTestIT.java | 262 +++ .../apache/phoenix/pig/PhoenixHBaseStorage.java | 51 +- .../phoenix/pig/udf/ReserveNSequence.java | 88 + phoenix-protocol/src/main/MetaDataService.proto | 14 +- phoenix-protocol/src/main/PFunction.proto | 1 + phoenix-protocol/src/main/PTable.proto | 2 + phoenix-spark/pom.xml | 2 +- phoenix-spark/src/it/resources/setup.sql | 4 +- .../apache/phoenix/spark/PhoenixSparkIT.scala | 58 +- .../org/apache/phoenix/spark/PhoenixRDD.scala | 24 +- .../apache/phoenix/spark/PhoenixRelation.scala | 7 +- 159 files changed, 12789 insertions(+), 4879 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/597e0013/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/597e0013/phoenix-core/src/main/java/org/apache/phoenix/execute/ScanPlan.java ----------------------------------------------------------------------
