Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 ea65e5998 -> 9ab519a3d
http://git-wip-us.apache.org/repos/asf/phoenix/blob/9ab519a3/phoenix-core/src/test/java/org/apache/phoenix/iterate/AggregateResultScannerTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/iterate/AggregateResultScannerTest.java b/phoenix-core/src/test/java/org/apache/phoenix/iterate/AggregateResultScannerTest.java index b6371f1..f53e871 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/iterate/AggregateResultScannerTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/iterate/AggregateResultScannerTest.java @@ -133,6 +133,10 @@ public class AggregateResultScannerTest extends BaseConnectionlessQueryTest { public boolean isRowTimestamp() { return false; } + @Override + public boolean isDynamic() { + return false; + } })), null); aggregationManager.setAggregators(new ClientAggregators(Collections.<SingleAggregateFunction>singletonList(func), 1)); ResultIterators iterators = new ResultIterators() { http://git-wip-us.apache.org/repos/asf/phoenix/blob/9ab519a3/phoenix-core/src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java b/phoenix-core/src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java index 59c8b02..29a7001 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/query/QueryServicesTestImpl.java @@ -62,6 +62,7 @@ public final class QueryServicesTestImpl extends BaseQueryServicesImpl { public static final int DEFAULT_HCONNECTION_POOL_CORE_SIZE = 10; public static final int DEFAULT_HCONNECTION_POOL_MAX_SIZE = 10; public static final int DEFAULT_HTABLE_MAX_THREADS = 10; + public static final long DEFAULT_INDEX_POPULATION_WAIT_TIME = 0; /** @@ -107,7 +108,8 @@ public final class QueryServicesTestImpl extends BaseQueryServicesImpl { .setMetadataHandlerCount(DEFAULT_METADATA_HANDLER_COUNT) .setHConnectionPoolCoreSize(DEFAULT_HCONNECTION_POOL_CORE_SIZE) .setHConnectionPoolMaxSize(DEFAULT_HCONNECTION_POOL_MAX_SIZE) - .setMaxThreadsPerHTable(DEFAULT_HTABLE_MAX_THREADS); + .setMaxThreadsPerHTable(DEFAULT_HTABLE_MAX_THREADS) + .setDefaultIndexPopulationWaitTime(DEFAULT_INDEX_POPULATION_WAIT_TIME); } public QueryServicesTestImpl(ReadOnlyProps defaultProps, ReadOnlyProps overrideProps) { http://git-wip-us.apache.org/repos/asf/phoenix/blob/9ab519a3/phoenix-protocol/src/main/MetaDataService.proto ---------------------------------------------------------------------- diff --git a/phoenix-protocol/src/main/MetaDataService.proto b/phoenix-protocol/src/main/MetaDataService.proto index c631512..a5a3934 100644 --- a/phoenix-protocol/src/main/MetaDataService.proto +++ b/phoenix-protocol/src/main/MetaDataService.proto @@ -61,7 +61,7 @@ message GetTableRequest { required bytes tableName = 3; required int64 tableTimestamp = 4; required int64 clientTimestamp = 5; - optional int32 clientVersion = 6; + optional int32 clientVersion = 6; } message GetFunctionsRequest { http://git-wip-us.apache.org/repos/asf/phoenix/blob/9ab519a3/phoenix-protocol/src/main/PTable.proto ---------------------------------------------------------------------- diff --git a/phoenix-protocol/src/main/PTable.proto b/phoenix-protocol/src/main/PTable.proto index 485dd11..8bdb57f 100644 --- a/phoenix-protocol/src/main/PTable.proto +++ b/phoenix-protocol/src/main/PTable.proto @@ -48,6 +48,7 @@ message PColumn { optional bool viewReferenced = 11; optional string expression = 12; optional bool isRowTimestamp = 13; + optional bool isDynamic = 14; } message PTableStats {
