Skip to content

sampler returns nulls in CSV #8871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jon-wei merged 6 commits into from
Nov 19, 2019
Merged

sampler returns nulls in CSV #8871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5202e2c
sampler returns nulls in CSV
SEKIRO-J Nov 14, 2019
541e3c9
fixed kafka sampler test
SEKIRO-J Nov 15, 2019
ed88b3b
fix Kinesis test
SEKIRO-J Nov 15, 2019
aa93740
sql compatibility fix
SEKIRO-J Nov 15, 2019
e55d804
remove null to empty string conversion, use null
SEKIRO-J Nov 16, 2019
0f13ecc
fix sql compatibility
SEKIRO-J Nov 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 40 additions & 27 deletions ...-indexing-service/src/test/java/org/apache/druid/indexing/kafka/KafkaSamplerSpecTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@

import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -183,43 +184,55 @@ public void testSample()

Assert.assertEquals(new SamplerResponse.SamplerResponseRow(
"{\"timestamp\":\"2008\",\"dim1\":\"a\",\"dim2\":\"y\",\"dimLong\":\"10\",\"dimFloat\":\"20.0\",\"met1\":\"1.0\"}",
ImmutableMap.<String, Object>builder()
.put("__time", 1199145600000L)
.put("dim1", "a")
.put("dim2", "y")
.put("dimLong", 10L)
.put("dimFloat", 20.0F)
.put("rows", 1L)
.put("met1sum", 1.0)
.build(),
new HashMap<String, Object>()
{
{
put("__time", 1199145600000L);
put("dim1", "a");
put("dim1t", null);
put("dim2", "y");
put("dimLong", 10L);
put("dimFloat", 20.0F);
put("rows", 1L);
put("met1sum", 1.0);
}
},
null,
null
), it.next());
Assert.assertEquals(new SamplerResponse.SamplerResponseRow(
"{\"timestamp\":\"2009\",\"dim1\":\"b\",\"dim2\":\"y\",\"dimLong\":\"10\",\"dimFloat\":\"20.0\",\"met1\":\"1.0\"}",
ImmutableMap.<String, Object>builder()
.put("__time", 1230768000000L)
.put("dim1", "b")
.put("dim2", "y")
.put("dimLong", 10L)
.put("dimFloat", 20.0F)
.put("rows", 1L)
.put("met1sum", 1.0)
.build(),
new HashMap<String, Object>()
{
{
put("__time", 1230768000000L);
put("dim1", "b");
put("dim1t", null);
put("dim2", "y");
put("dimLong", 10L);
put("dimFloat", 20.0F);
put("rows", 1L);
put("met1sum", 1.0);
}
},
null,
null
), it.next());
Assert.assertEquals(new SamplerResponse.SamplerResponseRow(
"{\"timestamp\":\"2010\",\"dim1\":\"c\",\"dim2\":\"y\",\"dimLong\":\"10\",\"dimFloat\":\"20.0\",\"met1\":\"1.0\"}",
ImmutableMap.<String, Object>builder()
.put("__time", 1262304000000L)
.put("dim1", "c")
.put("dim2", "y")
.put("dimLong", 10L)
.put("dimFloat", 20.0F)
.put("rows", 1L)
.put("met1sum", 1.0)
.build(),
new HashMap<String, Object>()
{
{
put("__time", 1262304000000L);
put("dim1", "c");
put("dim1t", null);
put("dim2", "y");
put("dimLong", 10L);
put("dimFloat", 20.0F);
put("rows", 1L);
put("met1sum", 1.0);
}
},
null,
null
), it.next());
Expand Down
67 changes: 40 additions & 27 deletions ...exing-service/src/test/java/org/apache/druid/indexing/kinesis/KinesisSamplerSpecTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -201,43 +202,55 @@ public void testSample() throws Exception

Assert.assertEquals(new SamplerResponse.SamplerResponseRow(
"{\"timestamp\":\"2008\",\"dim1\":\"a\",\"dim2\":\"y\",\"dimLong\":\"10\",\"dimFloat\":\"20.0\",\"met1\":\"1.0\"}",
ImmutableMap.<String, Object>builder()
.put("__time", 1199145600000L)
.put("dim1", "a")
.put("dim2", "y")
.put("dimLong", 10L)
.put("dimFloat", 20.0F)
.put("rows", 1L)
.put("met1sum", 1.0)
.build(),
new HashMap<String, Object>()
{
{
put("__time", 1199145600000L);
put("dim1", "a");
put("dim1t", null);
put("dim2", "y");
put("dimLong", 10L);
put("dimFloat", 20.0F);
put("rows", 1L);
put("met1sum", 1.0);
}
},
null,
null
), it.next());
Assert.assertEquals(new SamplerResponse.SamplerResponseRow(
"{\"timestamp\":\"2009\",\"dim1\":\"b\",\"dim2\":\"y\",\"dimLong\":\"10\",\"dimFloat\":\"20.0\",\"met1\":\"1.0\"}",
ImmutableMap.<String, Object>builder()
.put("__time", 1230768000000L)
.put("dim1", "b")
.put("dim2", "y")
.put("dimLong", 10L)
.put("dimFloat", 20.0F)
.put("rows", 1L)
.put("met1sum", 1.0)
.build(),
new HashMap<String, Object>()
{
{
put("__time", 1230768000000L);
put("dim1", "b");
put("dim1t", null);
put("dim2", "y");
put("dimLong", 10L);
put("dimFloat", 20.0F);
put("rows", 1L);
put("met1sum", 1.0);
}
},
null,
null
), it.next());
Assert.assertEquals(new SamplerResponse.SamplerResponseRow(
"{\"timestamp\":\"2010\",\"dim1\":\"c\",\"dim2\":\"y\",\"dimLong\":\"10\",\"dimFloat\":\"20.0\",\"met1\":\"1.0\"}",
ImmutableMap.<String, Object>builder()
.put("__time", 1262304000000L)
.put("dim1", "c")
.put("dim2", "y")
.put("dimLong", 10L)
.put("dimFloat", 20.0F)
.put("rows", 1L)
.put("met1sum", 1.0)
.build(),
new HashMap<String, Object>()
{
{
put("__time", 1262304000000L);
put("dim1", "c");
put("dim1t", null);
put("dim2", "y");
put("dimLong", 10L);
put("dimFloat", 20.0F);
put("rows", 1L);
put("met1sum", 1.0);
}
},
null,
null
), it.next());
Expand Down
4 changes: 1 addition & 3 deletions ...ing-service/src/main/java/org/apache/druid/indexing/overlord/sampler/FirehoseSampler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,9 +256,7 @@ public SamplerResponse sample(FirehoseFactory firehoseFactory, DataSchema dataSc
Map<String, Object> parsed = new HashMap<>();

columnNames.forEach(k -> {
if (row.getRaw(k) != null) {
parsed.put(k, row.getRaw(k));
}
parsed.put(k, row.getRaw(k));
});
parsed.put(ColumnHolder.TIME_COLUMN_NAME, row.getTimestampFromEpoch());

Expand Down
Loading