bug fixes

indexing-service/src/main/java/com/metamx/druid/indexing/coordinator/http/IndexerCoordinatorResource.java

@@ -77,8 +77,12 @@ public class IndexerCoordinatorResource
           return new ImmutableMap.Builder<String, Object>()
               .put("id", input.getTask().getId())
               .put("dataSource", input.getTask().getDataSource())
-              .put("interval", input.getTask().getImplicitLockInterval())
-              .put("nodeType", input.getTask().getNodeType())
+              .put("interval",
+                   input.getTask().getImplicitLockInterval().get() == null
+                   ? ""
+                   : input.getTask().getImplicitLockInterval().get()
+              )
+              .put("nodeType", input.getTask().getNodeType() == null ? "" : input.getTask().getNodeType())
               .put("createdTime", input.getCreatedTime())
               .put("queueInsertionTime", input.getQueueInsertionTime())
               .build();

server/pom.xml

@@ -23,7 +23,7 @@
     <groupId>com.metamx.druid</groupId>
     <artifactId>druid-server</artifactId>
     <name>druid-server</name>
-    <description>druid-server</description>
+    <description>Druid Server</description>
 
     <parent>
         <groupId>com.metamx</groupId>

server/src/test/java/com/metamx/druid/index/v1/IndexMergerTest.java

@@ -42,6 +42,7 @@ public class IndexMergerTest
   public void testPersistCaseInsensitive() throws Exception
   {
     final long timestamp = System.currentTimeMillis();
+
     IncrementalIndex toPersist = IncrementalIndexTest.createCaseInsensitiveIndex(timestamp);
 
     final File tempDir = Files.createTempDir();

server/src/test/java/com/metamx/druid/query/group/GroupByQueryRunnerTest.java

@@ -43,6 +43,7 @@ import com.metamx.druid.query.QueryRunner;
 import com.metamx.druid.query.QueryRunnerTestHelper;
 import com.metamx.druid.query.dimension.DefaultDimensionSpec;
 import com.metamx.druid.query.dimension.DimensionSpec;
+import com.metamx.druid.query.filter.RegexDimFilter;
 import com.metamx.druid.query.group.having.EqualToHavingSpec;
 import com.metamx.druid.query.group.having.GreaterThanHavingSpec;
 import com.metamx.druid.query.group.having.OrHavingSpec;
@@ -633,6 +634,32 @@ public class GroupByQueryRunnerTest
     TestHelper.assertExpectedObjects(expectedResults, mergedRunner.run(fullQuery), "merged");
   }
 
+  @Test
+  public void testGroupByWithRegEx() throws Exception
+  {
+    GroupByQuery.Builder builder = GroupByQuery
+        .builder()
+        .setDataSource(QueryRunnerTestHelper.dataSource)
+        .setInterval("2011-04-02/2011-04-04")
+        .setDimFilter(new RegexDimFilter("quality", "auto.*"))
+        .setDimensions(Lists.<DimensionSpec>newArrayList(new DefaultDimensionSpec("quality", "quality")))
+        .setAggregatorSpecs(
+            Arrays.<AggregatorFactory>asList(
+                QueryRunnerTestHelper.rowsCount
+            )
+        )
+        .setGranularity(new PeriodGranularity(new Period("P1M"), null, null));
+
+    final GroupByQuery query = builder.build();
+
+    List<Row> expectedResults = Arrays.asList(
+        createExpectedRow("2011-04-01", "quality", "automotive", "rows", 2L)
+  );
+
+    QueryRunner<Row> mergeRunner = new GroupByQueryQueryToolChest().mergeResults(runner);
+    TestHelper.assertExpectedObjects(expectedResults, mergeRunner.run(query), "no-limit");
+  }
+
   private Row createExpectedRow(final String timestamp, Object... vals)
   {
     return createExpectedRow(new DateTime(timestamp), vals);