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/02/02 05:00:21 UTC
[47/50] [abbrv] phoenix git commit: Fix merge errors
Fix merge errors
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/beb8b813
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/beb8b813
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/beb8b813
Branch: refs/heads/calcite
Commit: beb8b81341b4d28585c3cca60b9af40f24a00919
Parents: 51431a2 4625096
Author: maryannxue <ma...@gmail.com>
Authored: Fri Jan 29 22:16:50 2016 -0500
Committer: maryannxue <ma...@gmail.com>
Committed: Fri Jan 29 22:16:50 2016 -0500
----------------------------------------------------------------------
bin/performance.py | 36 +-
bin/phoenix_sandbox.py | 2 +-
bin/psql.py | 3 +-
bin/queryserver.py | 2 +-
bin/sqlline-thin.py | 3 +-
bin/sqlline.py | 3 +-
bin/traceserver.py | 3 +-
.../org/apache/phoenix/end2end/BaseViewIT.java | 60 +-
.../org/apache/phoenix/end2end/DateTimeIT.java | 10 +
.../apache/phoenix/end2end/SkipScanQueryIT.java | 22 +
.../apache/phoenix/end2end/UpsertSelectIT.java | 31 +
.../java/org/apache/phoenix/end2end/ViewIT.java | 36 +-
.../index/GlobalIndexOptimizationIT.java | 23 +
.../phoenix/end2end/index/ImmutableIndexIT.java | 239 +++-
.../end2end/index/IndexExpressionIT.java | 16 +-
.../apache/phoenix/end2end/index/IndexIT.java | 4 +-
.../org/apache/phoenix/rpc/UpdateCacheIT.java | 92 +-
.../phoenix/rpc/UpdateCacheWithScnIT.java | 17 +-
.../org/apache/phoenix/tx/TransactionIT.java | 442 +++---
phoenix-core/src/main/antlr3/PhoenixSQL.g | 3 +-
.../apache/phoenix/compile/DeleteCompiler.java | 1 -
.../apache/phoenix/compile/FromCompiler.java | 2 +-
.../apache/phoenix/compile/JoinCompiler.java | 2 +-
.../apache/phoenix/compile/PostDDLCompiler.java | 2 +-
.../phoenix/compile/PostIndexDDLCompiler.java | 2 +-
.../compile/TupleProjectionCompiler.java | 5 +-
.../apache/phoenix/compile/UnionCompiler.java | 2 +-
.../coprocessor/BaseScannerRegionObserver.java | 12 +-
.../coprocessor/MetaDataEndpointImpl.java | 13 +-
.../phoenix/coprocessor/MetaDataProtocol.java | 2 +-
.../coprocessor/MetaDataRegionObserver.java | 71 +-
.../UngroupedAggregateRegionObserver.java | 2 +-
.../generated/PGuidePostsProtos.java | 287 +++-
.../coprocessor/generated/PTableProtos.java | 104 +-
.../generated/StatCollectorProtos.java | 1269 ------------------
.../phoenix/exception/SQLExceptionCode.java | 108 +-
.../apache/phoenix/execute/MutationState.java | 636 +++++----
.../org/apache/phoenix/execute/ScanPlan.java | 2 +-
.../expression/function/CeilFunction.java | 2 +
.../expression/function/FloorFunction.java | 4 +-
.../expression/function/NowFunction.java | 2 +
.../expression/function/RoundFunction.java | 4 +-
.../expression/function/ToCharFunction.java | 4 +
.../expression/function/ToDateFunction.java | 4 +
.../expression/function/ToNumberFunction.java | 4 +
.../expression/function/ToTimeFunction.java | 4 +
.../function/ToTimestampFunction.java | 4 +
.../expression/function/TruncFunction.java | 2 +
.../apache/phoenix/filter/SkipScanFilter.java | 24 +-
.../phoenix/iterate/BaseResultIterators.java | 138 +-
.../apache/phoenix/jdbc/PhoenixConnection.java | 6 +-
.../phoenix/jdbc/PhoenixDatabaseMetaData.java | 3 +
.../apache/phoenix/jdbc/PhoenixStatement.java | 1 +
.../phoenix/mapreduce/PhoenixRecordReader.java | 11 +
.../apache/phoenix/optimize/QueryOptimizer.java | 2 +-
.../query/ConnectionQueryServicesImpl.java | 104 +-
.../query/ConnectionlessQueryServicesImpl.java | 4 +-
.../query/DelegateConnectionQueryServices.java | 4 +-
.../apache/phoenix/query/MetaDataMutated.java | 2 +-
.../apache/phoenix/query/QueryConstants.java | 4 +-
.../apache/phoenix/schema/DelegateTable.java | 6 +
.../apache/phoenix/schema/MetaDataClient.java | 706 +++++-----
.../org/apache/phoenix/schema/PMetaData.java | 3 +-
.../apache/phoenix/schema/PMetaDataImpl.java | 15 +-
.../java/org/apache/phoenix/schema/PTable.java | 1 +
.../org/apache/phoenix/schema/PTableImpl.java | 104 +-
.../org/apache/phoenix/schema/PTableRef.java | 17 +-
.../apache/phoenix/schema/TableProperty.java | 26 +
.../org/apache/phoenix/schema/TableRef.java | 11 +-
.../phoenix/schema/stats/GuidePostsInfo.java | 106 +-
.../schema/stats/GuidePostsInfoBuilder.java | 113 ++
.../phoenix/schema/stats/PTableStatsImpl.java | 45 +-
.../stats/StatisticsCollectionRunTracker.java | 14 +-
.../schema/stats/StatisticsCollector.java | 46 +-
.../phoenix/schema/stats/StatisticsScanner.java | 3 +-
.../phoenix/schema/stats/StatisticsUtil.java | 36 +-
.../phoenix/schema/stats/StatisticsWriter.java | 46 +-
.../java/org/apache/phoenix/util/ByteUtil.java | 2 +
.../apache/phoenix/util/PrefixByteCodec.java | 104 ++
.../apache/phoenix/util/PrefixByteDecoder.java | 90 ++
.../apache/phoenix/util/PrefixByteEncoder.java | 99 ++
.../org/apache/phoenix/util/ReadOnlyProps.java | 40 +-
.../apache/phoenix/util/TransactionUtil.java | 23 +-
.../org/apache/phoenix/util/UpgradeUtil.java | 68 +-
.../phoenix/compile/QueryCompilerTest.java | 14 +-
.../phoenix/execute/CorrelatePlanTest.java | 4 +-
.../BuiltinFunctionConstructorTest.java | 65 +
.../phoenix/filter/SkipScanBigFilterTest.java | 8 +-
.../phoenix/filter/SkipScanFilterTest.java | 65 +-
.../phoenix/jdbc/ReadOnlyPropertiesTest.java | 84 ++
.../java/org/apache/phoenix/query/BaseTest.java | 103 +-
.../phoenix/schema/PMetaDataImplTest.java | 125 +-
.../util/PrefixByteEncoderDecoderTest.java | 96 ++
.../java/org/apache/phoenix/util/TestUtil.java | 2 +-
.../apache/phoenix/pherf/PherfConstants.java | 1 +
.../phoenix/pherf/rules/RulesApplier.java | 3 +-
.../org/apache/phoenix/pherf/ResourceTest.java | 2 +-
.../apache/phoenix/pherf/RuleGeneratorTest.java | 7 +-
phoenix-protocol/src/main/PGuidePosts.proto | 3 +
phoenix-protocol/src/main/PTable.proto | 1 +
pom.xml | 7 +-
101 files changed, 3367 insertions(+), 2853 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/beb8b813/phoenix-core/src/main/java/org/apache/phoenix/compile/TupleProjectionCompiler.java
----------------------------------------------------------------------
diff --cc phoenix-core/src/main/java/org/apache/phoenix/compile/TupleProjectionCompiler.java
index c1fc245,0fc6d74..999c299
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/TupleProjectionCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/TupleProjectionCompiler.java
@@@ -178,8 -178,8 +178,9 @@@ public class TupleProjectionCompiler
null, table.getTimeStamp(), table.getSequenceNumber(), table.getPKName(),
retainPKColumns ? table.getBucketNum() : null, projectedColumns, null,
null, Collections.<PTable>emptyList(), table.isImmutableRows(), Collections.<PName>emptyList(), null, null,
- table.isWALDisabled(), table.isMultiTenant(), table.getStoreNulls(), table.getViewType(), table.getViewIndexId(),
- null, table.rowKeyOrderOptimizable(), table.isTransactional(), table.getUpdateCacheFrequency());
+ table.isWALDisabled(), retainPKColumns ? table.isMultiTenant() : false, table.getStoreNulls(), table.getViewType(),
- retainPKColumns ? table.getViewIndexId() : null, null, table.rowKeyOrderOptimizable(), table.isTransactional());
++ retainPKColumns ? table.getViewIndexId() : null, null, table.rowKeyOrderOptimizable(), table.isTransactional(),
++ table.getUpdateCacheFrequency());
}
// For extracting column references from single select statement
http://git-wip-us.apache.org/repos/asf/phoenix/blob/beb8b813/phoenix-core/src/main/java/org/apache/phoenix/execute/ScanPlan.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/beb8b813/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixStatement.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/beb8b813/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/beb8b813/pom.xml
----------------------------------------------------------------------