Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

a few slight tweaks and bumping up curator version

This commit is contained in:
fjy 2014-07-25 16:07:40 -07:00
parent 7e0fa6fe06
commit 45e443bedb
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/content/Broker-Config.md
View File

@ -12,10 +12,10 @@ The broker module uses several of the default modules in [Configuration](Configu
|Property|Possible Values|Description|Default| |Property|Possible Values|Description|Default|
|--------|---------------|-----------|-------| |--------|---------------|-----------|-------|
|`druid.broker.cache.type`|`local`, `memcached`|The type of cache to use for queries.|`local`|
|`druid.broker.balancer.type`|`random`, `connectionCount`|Determines how the broker balances connections to historical nodes. `random` choose randomly, `connectionCount` picks the node with the fewest number of active connections to|`random`| |`druid.broker.balancer.type`|`random`, `connectionCount`|Determines how the broker balances connections to historical nodes. `random` choose randomly, `connectionCount` picks the node with the fewest number of active connections to|`random`|
|`druid.broker.select.tier`|`highestPriority`, `lowestPriority`, `custom`|If segments are cross-replicated across tiers in a cluster, you can tell the broker to prefer to select segments in a tier with a certain priority.|`highestPriority`| |`druid.broker.select.tier`|`highestPriority`, `lowestPriority`, `custom`|If segments are cross-replicated across tiers in a cluster, you can tell the broker to prefer to select segments in a tier with a certain priority.|`highestPriority`|
|`druid.broker.select.tier.custom.priorities`|`An array of integer priorities.`|Select servers in tiers with a custom priority list.|None| |`druid.broker.select.tier.custom.priorities`|`An array of integer priorities.`|Select servers in tiers with a custom priority list.|None|
|`druid.broker.cache.type`|`local`, `memcached`|The type of cache to use for queries.|`local`|
#### Local Cache #### Local Cache

2
pom.xml
View File

@ -40,7 +40,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<metamx.java-util.version>0.26.6</metamx.java-util.version> <metamx.java-util.version>0.26.6</metamx.java-util.version>
<apache.curator.version>2.5.0</apache.curator.version> <apache.curator.version>2.6.0</apache.curator.version>
<druid.api.version>0.2.7</druid.api.version> <druid.api.version>0.2.7</druid.api.version>
</properties> </properties>

9
processing/src/test/java/io/druid/query/aggregation/hyperloglog/HyperLogLogCollectorTest.java
View File

@ -90,7 +90,8 @@ public class HyperLogLogCollectorTest
* with 100 values, requiring a floating max as described in * with 100 values, requiring a floating max as described in
* http://druid.io/blog/2014/02/18/hyperloglog-optimizations-for-real-world-systems.html * http://druid.io/blog/2014/02/18/hyperloglog-optimizations-for-real-world-systems.html
*/ */
@Ignore @Test @Ignore
@Test
public void testHighCardinalityRollingFold() throws Exception public void testHighCardinalityRollingFold() throws Exception
{ {
final HyperLogLogCollector rolling = HyperLogLogCollector.makeLatestCollector(); final HyperLogLogCollector rolling = HyperLogLogCollector.makeLatestCollector();
@ -130,7 +131,8 @@ public class HyperLogLogCollectorTest
Assert.assertEquals(n, rolling.estimateCardinality(), n * 0.05); Assert.assertEquals(n, rolling.estimateCardinality(), n * 0.05);
} }
@Ignore @Test @Ignore
@Test
public void testHighCardinalityRollingFold2() throws Exception public void testHighCardinalityRollingFold2() throws Exception
{ {
final HyperLogLogCollector rolling = HyperLogLogCollector.makeLatestCollector(); final HyperLogLogCollector rolling = HyperLogLogCollector.makeLatestCollector();
@ -876,7 +878,8 @@ public class HyperLogLogCollectorTest
} }
// Provides a nice printout of error rates as a function of cardinality // Provides a nice printout of error rates as a function of cardinality
@Ignore @Test @Ignore
@Test
public void showErrorRate() throws Exception public void showErrorRate() throws Exception
{ {
HashFunction fn = Hashing.murmur3_128(); HashFunction fn = Hashing.murmur3_128();

1
server/src/main/java/io/druid/server/QueryResource.java
View File

@ -148,7 +148,6 @@ public class QueryResource
); );
} }
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("Got query [%s]", query); log.debug("Got query [%s]", query);
} }