Repository: phoenix Updated Branches: refs/heads/4.0 757738397 -> 53e2195dd
PHOENIX-1285 Override default for histogram depth in QueryServicesTestImpl Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/768b9d22 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/768b9d22 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/768b9d22 Branch: refs/heads/4.0 Commit: 768b9d22304dac02ed1ae0476bfbfdac9a9a9a78 Parents: 7577383 Author: James Taylor <jtay...@salesforce.com> Authored: Tue Sep 23 01:35:46 2014 -0700 Committer: James Taylor <jtay...@salesforce.com> Committed: Tue Sep 23 01:35:46 2014 -0700 ---------------------------------------------------------------------- .../java/org/apache/phoenix/end2end/BaseQueryIT.java | 1 - .../org/apache/phoenix/end2end/StatsCollectorIT.java | 2 +- .../iterate/DefaultParallelIteratorRegionSplitter.java | 2 +- .../java/org/apache/phoenix/query/QueryServices.java | 2 +- .../org/apache/phoenix/query/QueryServicesOptions.java | 13 ++++++------- .../phoenix/schema/stat/StatisticsCollector.java | 2 +- .../test/java/org/apache/phoenix/query/BaseTest.java | 2 +- .../apache/phoenix/query/QueryServicesTestImpl.java | 3 +++ 8 files changed, 14 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/768b9d22/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java index 9a66499..eb10512 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java @@ -75,7 +75,6 @@ public abstract class BaseQueryIT extends BaseClientManagedTimeIT { props.put(IndexWriterUtils.HTABLE_THREAD_KEY, Integer.toString(100)); // Make a small batch size to test multiple calls to reserve sequences props.put(QueryServices.SEQUENCE_CACHE_SIZE_ATTRIB, Long.toString(BATCH_SIZE)); - props.put(QueryServices.HISTOGRAM_BYTE_DEPTH_CONF_KEY, Integer.toString(20)); // Must update config before starting server setUpTestDriver(getUrl(), new ReadOnlyProps(props.entrySet().iterator())); } http://git-wip-us.apache.org/repos/asf/phoenix/blob/768b9d22/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java index 407c128..a38abea 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java @@ -50,7 +50,7 @@ public class StatsCollectorIT extends BaseHBaseManagedTimeIT { + JDBC_PROTOCOL_TERMINATOR + PHOENIX_TEST_DRIVER_URL_PARAM; int histogramDepth = 60; Map<String, String> props = Maps.newHashMapWithExpectedSize(3); - props.put(QueryServices.HISTOGRAM_BYTE_DEPTH_CONF_KEY, Integer.toString(histogramDepth)); + props.put(QueryServices.HISTOGRAM_BYTE_DEPTH_ATTRIB, Integer.toString(histogramDepth)); props.put(QueryServices.STATS_UPDATE_FREQ_MS_ATTRIB, Integer.toString(frequency)); driver = initAndRegisterDriver(url, new ReadOnlyProps(props.entrySet().iterator())); } http://git-wip-us.apache.org/repos/asf/phoenix/blob/768b9d22/phoenix-core/src/main/java/org/apache/phoenix/iterate/DefaultParallelIteratorRegionSplitter.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/iterate/DefaultParallelIteratorRegionSplitter.java b/phoenix-core/src/main/java/org/apache/phoenix/iterate/DefaultParallelIteratorRegionSplitter.java index 2f568db..227163e 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/iterate/DefaultParallelIteratorRegionSplitter.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/iterate/DefaultParallelIteratorRegionSplitter.java @@ -64,7 +64,7 @@ public class DefaultParallelIteratorRegionSplitter implements ParallelIteratorRe this.context = context; this.tableRef = table; ReadOnlyProps props = context.getConnection().getQueryServices().getProps(); - this.guidePostsDepth = props.getLong(QueryServices.HISTOGRAM_BYTE_DEPTH_CONF_KEY, + this.guidePostsDepth = props.getLong(QueryServices.HISTOGRAM_BYTE_DEPTH_ATTRIB, QueryServicesOptions.DEFAULT_HISTOGRAM_BYTE_DEPTH); } http://git-wip-us.apache.org/repos/asf/phoenix/blob/768b9d22/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java index 2da52d3..cc2c7a3 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java @@ -132,7 +132,7 @@ public interface QueryServices extends SQLCloseable { public static final String USE_REVERSE_SCAN_ATTRIB = "phoenix.query.useReverseScan"; - public static final String HISTOGRAM_BYTE_DEPTH_CONF_KEY = "phoenix.guidepost.width"; + public static final String HISTOGRAM_BYTE_DEPTH_ATTRIB = "phoenix.guidepost.width"; /** * Get executor service used for parallel scans http://git-wip-us.apache.org/repos/asf/phoenix/blob/768b9d22/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java index a0bc4da..e3fefa8 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java @@ -24,7 +24,7 @@ import static org.apache.phoenix.query.QueryServices.DROP_METADATA_ATTRIB; import static org.apache.phoenix.query.QueryServices.GROUPBY_MAX_CACHE_SIZE_ATTRIB; import static org.apache.phoenix.query.QueryServices.GROUPBY_SPILLABLE_ATTRIB; import static org.apache.phoenix.query.QueryServices.GROUPBY_SPILL_FILES_ATTRIB; -import static org.apache.phoenix.query.QueryServices.HISTOGRAM_BYTE_DEPTH_CONF_KEY; +import static org.apache.phoenix.query.QueryServices.HISTOGRAM_BYTE_DEPTH_ATTRIB; import static org.apache.phoenix.query.QueryServices.IMMUTABLE_ROWS_ATTRIB; import static org.apache.phoenix.query.QueryServices.INDEX_MUTATE_BATCH_SIZE_THRESHOLD_ATTRIB; import static org.apache.phoenix.query.QueryServices.KEEP_ALIVE_MS_ATTRIB; @@ -144,7 +144,7 @@ public class QueryServicesOptions { public static final String DEFAULT_TRACING_STATS_TABLE_NAME = "SYSTEM.TRACING_STATS"; public static final String DEFAULT_TRACING_FREQ = Tracing.Frequency.NEVER.getKey(); public static final double DEFAULT_TRACING_PROBABILITY_THRESHOLD = 0.05; - public static final long DEFAULT_HISTOGRAM_BYTE_DEPTH = 1024 * 1024; + public static final long DEFAULT_HISTOGRAM_BYTE_DEPTH = 1024 * 1024 * 30; public static final boolean DEFAULT_USE_REVERSE_SCAN = true; @@ -201,7 +201,7 @@ public class QueryServicesOptions { .setIfUnset(GROUPBY_SPILL_FILES_ATTRIB, DEFAULT_GROUPBY_SPILL_FILES) .setIfUnset(SEQUENCE_CACHE_SIZE_ATTRIB, DEFAULT_SEQUENCE_CACHE_SIZE) .setIfUnset(SCAN_RESULT_CHUNK_SIZE, DEFAULT_SCAN_RESULT_CHUNK_SIZE) - .setIfUnset(HISTOGRAM_BYTE_DEPTH_CONF_KEY, DEFAULT_HISTOGRAM_BYTE_DEPTH); + .setIfUnset(HISTOGRAM_BYTE_DEPTH_ATTRIB, DEFAULT_HISTOGRAM_BYTE_DEPTH); ; // HBase sets this to 1, so we reset it to something more appropriate. // Hopefully HBase will change this, because we can't know if a user set @@ -300,10 +300,6 @@ public class QueryServicesOptions { return set(STATS_UPDATE_FREQ_MS_ATTRIB, frequencyMs); } - public QueryServicesOptions setHistogramDepthBytes(int depth) { - return set(HISTOGRAM_BYTE_DEPTH_CONF_KEY, depth); - } - public QueryServicesOptions setCallQueueRoundRobin(boolean isRoundRobin) { return set(CALL_QUEUE_PRODUCER_ATTRIB_NAME, isRoundRobin); } @@ -441,4 +437,7 @@ public class QueryServicesOptions { return set(WALCellCodec.WAL_CELL_CODEC_CLASS_KEY, walEditCodec); } + public QueryServicesOptions setHistogramByteDepth(long byteDepth) { + return set(HISTOGRAM_BYTE_DEPTH_ATTRIB, byteDepth); + } } http://git-wip-us.apache.org/repos/asf/phoenix/blob/768b9d22/phoenix-core/src/main/java/org/apache/phoenix/schema/stat/StatisticsCollector.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/stat/StatisticsCollector.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/stat/StatisticsCollector.java index 17b5825..7552698 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/stat/StatisticsCollector.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/stat/StatisticsCollector.java @@ -235,7 +235,7 @@ public class StatisticsCollector extends BaseRegionObserver implements Coprocess // Get the stats table associated with the current table on which the CP is // triggered stats = StatisticsTable.getStatisticsTableForCoprocessor(env, desc.getName()); - guidepostDepth = env.getConfiguration().getLong(QueryServices.HISTOGRAM_BYTE_DEPTH_CONF_KEY, + guidepostDepth = env.getConfiguration().getLong(QueryServices.HISTOGRAM_BYTE_DEPTH_ATTRIB, QueryServicesOptions.DEFAULT_HISTOGRAM_BYTE_DEPTH); } http://git-wip-us.apache.org/repos/asf/phoenix/blob/768b9d22/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java index 45dbb39..ab193f1 100644 --- a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java +++ b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java @@ -551,7 +551,7 @@ public abstract class BaseTest { conf.setInt("hbase.hlog.asyncer.number", 2); conf.setInt("hbase.assignment.zkevent.workers", 5); conf.setInt("hbase.assignment.threads.max", 5); - conf.setInt(QueryServices.HISTOGRAM_BYTE_DEPTH_CONF_KEY, 20); + conf.setInt(QueryServices.HISTOGRAM_BYTE_DEPTH_ATTRIB, 20); return conf; } http://git-wip-us.apache.org/repos/asf/phoenix/blob/768b9d22/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 2e3c8f7..a65ca77 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 @@ -51,6 +51,8 @@ public final class QueryServicesTestImpl extends BaseQueryServicesImpl { private static final String DEFAULT_WAL_EDIT_CODEC = IndexedWALEditCodec.class.getName(); public static final long DEFAULT_MAX_SERVER_METADATA_CACHE_SIZE = 1024L*1024L*4L; // 4 Mb public static final long DEFAULT_MAX_CLIENT_METADATA_CACHE_SIZE = 1024L*1024L*2L; // 2 Mb + public static final long DEFAULT_HISTOGRAM_BYTE_DEPTH = 20; + public QueryServicesTestImpl(ReadOnlyProps defaultProps) { this(defaultProps, ReadOnlyProps.EMPTY_PROPS); @@ -58,6 +60,7 @@ public final class QueryServicesTestImpl extends BaseQueryServicesImpl { private static QueryServicesOptions getDefaultServicesOptions() { return withDefaults() + .setHistogramByteDepth(DEFAULT_HISTOGRAM_BYTE_DEPTH) .setThreadPoolSize(DEFAULT_THREAD_POOL_SIZE) .setQueueSize(DEFAULT_QUEUE_SIZE) .setMaxMemoryPerc(DEFAULT_MAX_MEMORY_PERC)
