Merge pull request #1932 from gianm/data-schema-exclude-metric-names

DataSchema: Exclude metric names from dimension list.
apache · Nov 7, 2015 · fe6efb6 · fe6efb6
2 parents 61139b9 + 6b908a5
commit fe6efb6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/server/src/main/java/io/druid/segment/indexing/DataSchema.java b/server/src/main/java/io/druid/segment/indexing/DataSchema.java
@@ -101,6 +101,7 @@ public InputRowParser getParser()
     final Set<String> dimensionExclusions = Sets.newHashSet();
     for (AggregatorFactory aggregator : aggregators) {
       dimensionExclusions.addAll(aggregator.requiredFields());
+      dimensionExclusions.add(aggregator.getName());
     }
 
     if (inputRowParser.getParseSpec() != null) {

diff --git a/server/src/test/java/io/druid/segment/indexing/DataSchemaTest.java b/server/src/test/java/io/druid/segment/indexing/DataSchemaTest.java
@@ -72,7 +72,7 @@ public void testDefaultExclusions() throws Exception
     );
 
     Assert.assertEquals(
-        ImmutableSet.of("time", "col1", "col2"),
+        ImmutableSet.of("time", "col1", "col2", "metric1", "metric2"),
         schema.getParser().getParseSpec().getDimensionsSpec().getDimensionExclusions()
     );
   }
@@ -101,7 +101,7 @@ public void testExplicitInclude() throws Exception
     );
 
     Assert.assertEquals(
-        ImmutableSet.of("dimC", "col1"),
+        ImmutableSet.of("dimC", "col1", "metric1", "metric2"),
         schema.getParser().getParseSpec().getDimensionsSpec().getDimensionExclusions()
     );
   }