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

Don't exclude null dimension values from the map based query response (#9438)

This commit is contained in:
Samarth Jain 2020-03-10 15:06:03 -07:00 committed by GitHub
parent 7401bb3f93
commit c74749f0f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
processing/src/main/java/org/apache/druid/query/groupby/ResultRow.java
View File

@ -163,10 +163,7 @@ public final class ResultRow
for (int i = query.getResultRowDimensionStart(); i < row.length; i++) {
final String columnName = resultRowOrder.get(i);
if (row[i] != null) {
map.put(columnName, row[i]);
}
map.put(columnName, row[i]);
}
return map;

44
processing/src/test/java/org/apache/druid/query/groupby/ResultRowTest.java
View File

@ -20,6 +20,15 @@
package org.apache.druid.query.groupby;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.ImmutableList;
import org.apache.druid.data.input.MapBasedRow;
import org.apache.druid.java.util.common.Intervals;
import org.apache.druid.java.util.common.granularity.Granularities;
import org.apache.druid.query.QueryRunnerTestHelper;
import org.apache.druid.query.TableDataSource;
import org.apache.druid.query.aggregation.CountAggregatorFactory;
import org.apache.druid.query.dimension.DefaultDimensionSpec;
import org.apache.druid.query.spec.MultipleIntervalSegmentSpec;
import org.apache.druid.segment.TestHelper;
import org.junit.Assert;
import org.junit.Test;
@ -34,4 +43,39 @@ public class ResultRowTest
Assert.assertEquals(row, objectMapper.readValue("[1, 2, 3]", ResultRow.class));
Assert.assertEquals(row, objectMapper.readValue(objectMapper.writeValueAsBytes(row), ResultRow.class));
}
@Test
public void testMapBasedRowWithNullValues()
{
GroupByQuery query = new GroupByQuery(
new TableDataSource(QueryRunnerTestHelper.DATA_SOURCE),
new MultipleIntervalSegmentSpec(ImmutableList.of(Intervals.of("2011/2012"))),
null,
null,
Granularities.ALL,
ImmutableList.of(
new DefaultDimensionSpec("dim1", "dim1"),
new DefaultDimensionSpec("dim2", "dim2"),
new DefaultDimensionSpec("dim3", "dim3")
),
ImmutableList.of(new CountAggregatorFactory("count")),
null,
null,
null,
null,
null
);
final ResultRow row = ResultRow.of("1", "2", null);
MapBasedRow mapBasedRow = row.toMapBasedRow(query);
// Let's make sure values are there as expected
Assert.assertEquals("1", mapBasedRow.getRaw("dim1"));
Assert.assertEquals("2", mapBasedRow.getRaw("dim2"));
Assert.assertNull(mapBasedRow.getRaw("dim3"));
// Also, let's make sure that the dimension with null value is actually present in the map
Assert.assertTrue(mapBasedRow.getEvent().containsKey("dim3"));
}
}