Merge branch 'master' into fix-datasource-doc

docs/content/Router.md

@@ -119,15 +119,15 @@ Including this strategy means all timeBoundary queries are always routed to the
 
 Queries with a priority set to less than minPriority are routed to the lowest priority broker. Queries with priority set to greater than maxPriority are routed to the highest priority broker. By default, minPriority is 0 and maxPriority is 1. Using these default values, if a query with priority 0 (the default query priority is 0) is sent, the query skips the priority selection logic. 
 
-### javascript
+### JavaScript
 
 Allows defining arbitrary routing rules using a JavaScript function. The function is passed the configuration and the query to be executed, and returns the tier it should be routed to, or null for the default tier.
 
-*Example*: a function that return the highest priority broker unless the given query has more than two aggregators.
+*Example*: a function that sends queries containing more than three aggregators to the lowest priority broker.
 
 ```json
 {
   "type" : "javascript",
-  "function" : "function (config, query) { if (config.getTierToBrokerMap().values().size() > 0 && query.getAggregatorSpecs && query.getAggregatorSpecs().size() <= 2) { return config.getTierToBrokerMap().values().toArray()[0] } else { return config.getDefaultBrokerServiceName() } }"
+  "function" : "function (config, query) { if (query.getAggregatorSpecs && query.getAggregatorSpecs().size() >= 3) { var size = config.getTierToBrokerMap().values().size(); if (size > 0) { return config.getTierToBrokerMap().values().toArray()[size-1] } else { return config.getDefaultBrokerServiceName() } } else { return null } }"
 }
 ```

processing/src/main/java/io/druid/query/search/search/LexicographicSearchSortSpec.java

@@ -41,7 +41,11 @@ public class LexicographicSearchSortSpec implements SearchSortSpec
       @Override
       public int compare(SearchHit searchHit, SearchHit searchHit1)
       {
-        return searchHit.getValue().compareTo(searchHit1.getValue());
+        int retVal = searchHit.getValue().compareTo(searchHit1.getValue());
+        if (retVal == 0) {
+          retVal = searchHit.getDimension().compareTo(searchHit1.getDimension());
+        }
+        return retVal;
       }
     };
   }

processing/src/test/java/io/druid/query/search/SearchQueryRunnerTest.java

@@ -87,12 +87,35 @@ public class SearchQueryRunnerTest
         QueryRunnerTestHelper.qualityDimension,
         Sets.newHashSet("automotive", "mezzanine", "travel", "health", "entertainment")
     );
-    expectedResults.put(QueryRunnerTestHelper.providerDimension.toLowerCase(), Sets.newHashSet("total_market"));
+    expectedResults.put(QueryRunnerTestHelper.providerDimension, Sets.newHashSet("total_market"));
     expectedResults.put(QueryRunnerTestHelper.placementishDimension, Sets.newHashSet("a"));
 
     checkSearchQuery(searchQuery, expectedResults);
   }
 
+  @Test
+  public void testSearchSameValueInMultiDims()
+  {
+    SearchQuery searchQuery = Druids.newSearchQueryBuilder()
+                                    .dataSource(QueryRunnerTestHelper.dataSource)
+                                    .granularity(QueryRunnerTestHelper.allGran)
+                                    .intervals(QueryRunnerTestHelper.fullOnInterval)
+                                    .dimensions(
+                                        Arrays.asList(
+                                            QueryRunnerTestHelper.placementDimension,
+                                            QueryRunnerTestHelper.placementishDimension
+                                        )
+                                    )
+                                    .query("e")
+                                    .build();
+
+    Map<String, Set<String>> expectedResults = Maps.newTreeMap(String.CASE_INSENSITIVE_ORDER);
+    expectedResults.put(QueryRunnerTestHelper.placementDimension, Sets.newHashSet("preferred"));
+    expectedResults.put(QueryRunnerTestHelper.placementishDimension, Sets.newHashSet("e", "preferred"));
+
+    checkSearchQuery(searchQuery, expectedResults);
+  }
+
   @Test
   public void testFragmentSearch()
   {

server/src/test/java/io/druid/server/router/JavaScriptTieredBrokerSelectorStrategyTest.java

@@ -28,6 +28,7 @@ import io.druid.query.aggregation.AggregatorFactory;
 import io.druid.query.aggregation.CountAggregatorFactory;
 import io.druid.query.aggregation.DoubleSumAggregatorFactory;
 import io.druid.query.aggregation.LongSumAggregatorFactory;
+import io.druid.query.topn.TopNQueryBuilder;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -36,7 +37,7 @@ import java.util.LinkedHashMap;
 public class JavaScriptTieredBrokerSelectorStrategyTest
 {
   final TieredBrokerSelectorStrategy jsStrategy = new JavaScriptTieredBrokerSelectorStrategy(
-      "function (config, query) { if (config.getTierToBrokerMap().values().size() > 0 && query.getAggregatorSpecs && query.getAggregatorSpecs().size() <= 2) { return config.getTierToBrokerMap().values().toArray()[0] } else { return config.getDefaultBrokerServiceName() } }"
+      "function (config, query) { if (query.getAggregatorSpecs && query.getDimensionSpec && query.getDimensionSpec().getDimension() == 'bigdim' && query.getAggregatorSpecs().size() >= 3) { var size = config.getTierToBrokerMap().values().size(); if (size > 0) { return config.getTierToBrokerMap().values().toArray()[size-1] } else { return config.getDefaultBrokerServiceName() } } else { return null } }"
   );
 
   @Test
@@ -57,7 +58,8 @@ public class JavaScriptTieredBrokerSelectorStrategyTest
   {
     final LinkedHashMap<String, String> tierBrokerMap = new LinkedHashMap<>();
     tierBrokerMap.put("fast", "druid/fastBroker");
-    tierBrokerMap.put("slow", "druid/broker");
+    tierBrokerMap.put("fast", "druid/broker");
+    tierBrokerMap.put("slow", "druid/slowBroker");
 
     final TieredBrokerConfig tieredBrokerConfig = new TieredBrokerConfig()
     {
@@ -74,8 +76,11 @@ public class JavaScriptTieredBrokerSelectorStrategyTest
       }
     };
 
-    final Druids.TimeseriesQueryBuilder queryBuilder = Druids.newTimeseriesQueryBuilder().dataSource("test")
+    final TopNQueryBuilder queryBuilder = new TopNQueryBuilder().dataSource("test")
                                         .intervals("2014/2015")
+                                        .dimension("bigdim")
+                                        .metric("count")
+                                        .threshold(1)
                                         .aggregators(
                                             ImmutableList.<AggregatorFactory>of(
                                                 new CountAggregatorFactory("count")
@@ -83,7 +88,7 @@ public class JavaScriptTieredBrokerSelectorStrategyTest
                                         );
 
     Assert.assertEquals(
-        Optional.of("druid/fastBroker"),
+        Optional.absent(),
         jsStrategy.getBrokerServiceName(
             tieredBrokerConfig,
             queryBuilder.build()
@@ -92,13 +97,29 @@ public class JavaScriptTieredBrokerSelectorStrategyTest
 
 
     Assert.assertEquals(
-        Optional.of("druid/broker"),
+        Optional.absent(),
         jsStrategy.getBrokerServiceName(
             tieredBrokerConfig,
             Druids.newTimeBoundaryQueryBuilder().dataSource("test").bound("maxTime").build()
         )
     );
 
+    Assert.assertEquals(
+        Optional.of("druid/slowBroker"),
+        jsStrategy.getBrokerServiceName(
+            tieredBrokerConfig,
+            queryBuilder.aggregators(
+                ImmutableList.of(
+                    new CountAggregatorFactory("count"),
+                    new LongSumAggregatorFactory("longSum", "a"),
+                    new DoubleSumAggregatorFactory("doubleSum", "b")
+                )
+            ).build()
+        )
+    );
+
+    // in absence of tiers, expect the default
+    tierBrokerMap.clear();
     Assert.assertEquals(
         Optional.of("druid/broker"),
         jsStrategy.getBrokerServiceName(