rohangarg commented on a change in pull request #11293:
URL: https://github.com/apache/druid/pull/11293#discussion_r644723381
##########
File path:
extensions-core/protobuf-extensions/src/test/java/org/apache/druid/data/input/protobuf/ProtobufInputRowParserTest.java
##########
@@ -183,6 +199,46 @@ public void testParseFlatData() throws Exception
Assert.assertEquals(816.0F, row.getMetric("someLongColumn").floatValue(),
0.0);
}
+ @Test
+ public void testParseFlatDataWithComplexTimestamp() throws Exception
+ {
+ ProtobufInputRowParser parser = new
ProtobufInputRowParser(flatParseSpecWithComplexTimestamp, decoder, null, null);
+
+ //create binary of proto test event
+ DateTime dateTime = new DateTime(2012, 7, 12, 9, 30,
ISOChronology.getInstanceUTC());
+ Timestamp timestamp =
Timestamp.newBuilder().setSeconds(dateTime.getMillis() / 1000).setNanos((int)
((dateTime.getMillis() % 1000) * 1000 * 1000)).build();
+ ProtoTestEventWrapper.ProtoTestEvent event =
ProtoTestEventWrapper.ProtoTestEvent.newBuilder()
+ .setDescription("description")
+
.setEventType(ProtoTestEventWrapper.ProtoTestEvent.EventCategory.CATEGORY_ONE)
+ .setId(4711L)
+ .setIsValid(true)
+ .setSomeOtherId(4712)
+ .setOtherTimestamp(timestamp)
+ .setTimestamp("unused")
+ .setSomeFloatColumn(47.11F)
+ .setSomeIntColumn(815)
+ .setSomeLongColumn(816L)
+ .build();
+
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ event.writeTo(out);
+
+ InputRow row =
parser.parseBatch(ByteBuffer.wrap(out.toByteArray())).get(0);
+ System.out.println(row);
Review comment:
remove this
##########
File path:
extensions-core/protobuf-extensions/src/test/java/org/apache/druid/data/input/protobuf/ProtobufReaderTest.java
##########
@@ -0,0 +1,216 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.data.input.protobuf;
+
+import com.google.common.collect.Lists;
+import com.google.protobuf.Timestamp;
+import org.apache.druid.data.input.InputRow;
+import org.apache.druid.data.input.InputRowSchema;
+import org.apache.druid.data.input.impl.DimensionsSpec;
+import org.apache.druid.data.input.impl.StringDimensionSchema;
+import org.apache.druid.data.input.impl.TimestampSpec;
+import org.apache.druid.java.util.common.parsers.JSONPathFieldSpec;
+import org.apache.druid.java.util.common.parsers.JSONPathFieldType;
+import org.apache.druid.java.util.common.parsers.JSONPathSpec;
+import org.joda.time.DateTime;
+import org.joda.time.chrono.ISOChronology;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import java.io.ByteArrayOutputStream;
+import java.nio.ByteBuffer;
+import java.util.List;
+
+public class ProtobufReaderTest
+{
+ @Rule
+ public ExpectedException expectedException = ExpectedException.none();
+
+ private InputRowSchema inputRowSchema;
+ private InputRowSchema inputRowSchemaWithComplexTimestamp;
+ private JSONPathSpec flattenSpec;
+ private FileBasedProtobufBytesDecoder decoder;
+
+ @Before
+ public void setUp()
+ {
+ TimestampSpec timestampSpec = new TimestampSpec("timestamp", "iso", null);
+ DimensionsSpec dimensionsSpec = new DimensionsSpec(Lists.newArrayList(
+ new StringDimensionSchema("event"),
+ new StringDimensionSchema("id"),
+ new StringDimensionSchema("someOtherId"),
+ new StringDimensionSchema("isValid")
+ ), null, null);
+ flattenSpec = new JSONPathSpec(
+ true,
+ Lists.newArrayList(
+ new JSONPathFieldSpec(JSONPathFieldType.ROOT, "eventType",
"eventType"),
+ new JSONPathFieldSpec(JSONPathFieldType.PATH, "foobar",
"$.foo.bar"),
+ new JSONPathFieldSpec(JSONPathFieldType.PATH, "bar0",
"$.bar[0].bar")
+ )
+ );
+
+ inputRowSchema = new InputRowSchema(timestampSpec, dimensionsSpec, null);
+ inputRowSchemaWithComplexTimestamp = new InputRowSchema(
+ new TimestampSpec("otherTimestamp", "iso", null),
+ dimensionsSpec,
+ null
+ );
+ decoder = new FileBasedProtobufBytesDecoder("prototest.desc",
"ProtoTestEvent");
+ }
+
+ @Test
+ public void testParseNestedData() throws Exception
+ {
+ ProtobufReader reader = new ProtobufReader(inputRowSchema, null, decoder,
flattenSpec);
+
+ //create binary of proto test event
+ DateTime dateTime = new DateTime(2012, 7, 12, 9, 30,
ISOChronology.getInstanceUTC());
+ ProtoTestEventWrapper.ProtoTestEvent event =
ProtoTestEventWrapper.ProtoTestEvent.newBuilder()
Review comment:
<nit> can probably create a template event builder and a template
assertion block to avoid so much duplication
##########
File path:
extensions-core/protobuf-extensions/src/main/java/org/apache/druid/data/input/protobuf/ProtobufInputRowSchema.java
##########
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.data.input.protobuf;
+
+import com.google.protobuf.InvalidProtocolBufferException;
+import com.google.protobuf.Message;
+import com.google.protobuf.Timestamp;
+import com.google.protobuf.util.JsonFormat;
+import org.apache.druid.data.input.InputRowSchema;
+import org.apache.druid.data.input.impl.TimestampSpec;
+import org.apache.druid.java.util.common.parsers.ParseException;
+import org.joda.time.DateTime;
+
+import javax.annotation.Nullable;
+
+import java.util.Map;
+
+/**
+ * Extension of {@link InputRowSchema} with a custom {@link TimestampSpec} to
support timestamp extraction for
+ * complex timestamp types
+ */
+public class ProtobufInputRowSchema extends InputRowSchema
+{
+ public ProtobufInputRowSchema(InputRowSchema inputRowSchema)
+ {
+ super(new ProtobufTimestampSpec(inputRowSchema.getTimestampSpec()),
inputRowSchema.getDimensionsSpec(), inputRowSchema.getColumnsFilter());
+ }
+
+ public static class ProtobufTimestampSpec extends TimestampSpec
Review comment:
change from `public`
##########
File path:
extensions-core/protobuf-extensions/src/test/java/org/apache/druid/data/input/protobuf/ProtobufReaderTest.java
##########
@@ -0,0 +1,216 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.druid.data.input.protobuf;
+
+import com.google.common.collect.Lists;
+import com.google.protobuf.Timestamp;
+import org.apache.druid.data.input.InputRow;
+import org.apache.druid.data.input.InputRowSchema;
+import org.apache.druid.data.input.impl.DimensionsSpec;
+import org.apache.druid.data.input.impl.StringDimensionSchema;
+import org.apache.druid.data.input.impl.TimestampSpec;
+import org.apache.druid.java.util.common.parsers.JSONPathFieldSpec;
+import org.apache.druid.java.util.common.parsers.JSONPathFieldType;
+import org.apache.druid.java.util.common.parsers.JSONPathSpec;
+import org.joda.time.DateTime;
+import org.joda.time.chrono.ISOChronology;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+
+import java.io.ByteArrayOutputStream;
+import java.nio.ByteBuffer;
+import java.util.List;
+
+public class ProtobufReaderTest
+{
+ @Rule
+ public ExpectedException expectedException = ExpectedException.none();
+
+ private InputRowSchema inputRowSchema;
+ private InputRowSchema inputRowSchemaWithComplexTimestamp;
+ private JSONPathSpec flattenSpec;
+ private FileBasedProtobufBytesDecoder decoder;
+
+ @Before
+ public void setUp()
+ {
+ TimestampSpec timestampSpec = new TimestampSpec("timestamp", "iso", null);
+ DimensionsSpec dimensionsSpec = new DimensionsSpec(Lists.newArrayList(
+ new StringDimensionSchema("event"),
+ new StringDimensionSchema("id"),
+ new StringDimensionSchema("someOtherId"),
+ new StringDimensionSchema("isValid")
+ ), null, null);
+ flattenSpec = new JSONPathSpec(
+ true,
+ Lists.newArrayList(
+ new JSONPathFieldSpec(JSONPathFieldType.ROOT, "eventType",
"eventType"),
+ new JSONPathFieldSpec(JSONPathFieldType.PATH, "foobar",
"$.foo.bar"),
+ new JSONPathFieldSpec(JSONPathFieldType.PATH, "bar0",
"$.bar[0].bar")
+ )
+ );
+
+ inputRowSchema = new InputRowSchema(timestampSpec, dimensionsSpec, null);
+ inputRowSchemaWithComplexTimestamp = new InputRowSchema(
+ new TimestampSpec("otherTimestamp", "iso", null),
+ dimensionsSpec,
+ null
+ );
+ decoder = new FileBasedProtobufBytesDecoder("prototest.desc",
"ProtoTestEvent");
+ }
+
+ @Test
+ public void testParseNestedData() throws Exception
+ {
+ ProtobufReader reader = new ProtobufReader(inputRowSchema, null, decoder,
flattenSpec);
+
+ //create binary of proto test event
+ DateTime dateTime = new DateTime(2012, 7, 12, 9, 30,
ISOChronology.getInstanceUTC());
+ ProtoTestEventWrapper.ProtoTestEvent event =
ProtoTestEventWrapper.ProtoTestEvent.newBuilder()
+ .setDescription("description")
+
.setEventType(ProtoTestEventWrapper.ProtoTestEvent.EventCategory.CATEGORY_ONE)
+ .setId(4711L)
+ .setIsValid(true)
+ .setSomeOtherId(4712)
+ .setTimestamp(dateTime.toString())
+ .setSomeFloatColumn(47.11F)
+ .setSomeIntColumn(815)
+ .setSomeLongColumn(816L)
+ .setFoo(ProtoTestEventWrapper.ProtoTestEvent.Foo
+ .newBuilder()
+ .setBar("baz"))
+ .addBar(ProtoTestEventWrapper.ProtoTestEvent.Foo
+ .newBuilder()
+ .setBar("bar0"))
+ .addBar(ProtoTestEventWrapper.ProtoTestEvent.Foo
+ .newBuilder()
+ .setBar("bar1"))
+ .build();
+
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ event.writeTo(out);
+
+ InputRow row =
reader.parseInputRows(decoder.parse(ByteBuffer.wrap(out.toByteArray()))).get(0);
+
+ Assert.assertEquals(dateTime.getMillis(), row.getTimestampFromEpoch());
+
+ assertDimensionEquals(row, "id", "4711");
+ assertDimensionEquals(row, "isValid", "true");
+ assertDimensionEquals(row, "someOtherId", "4712");
+ assertDimensionEquals(row, "description", "description");
+
+ assertDimensionEquals(row, "eventType",
ProtoTestEventWrapper.ProtoTestEvent.EventCategory.CATEGORY_ONE.name());
+ assertDimensionEquals(row, "foobar", "baz");
+ assertDimensionEquals(row, "bar0", "bar0");
+
+
+ Assert.assertEquals(47.11F, row.getMetric("someFloatColumn").floatValue(),
0.0);
+ Assert.assertEquals(815.0F, row.getMetric("someIntColumn").floatValue(),
0.0);
+ Assert.assertEquals(816.0F, row.getMetric("someLongColumn").floatValue(),
0.0);
+ }
+
+ @Test
+ public void testParseFlatData() throws Exception
+ {
+ ProtobufReader reader = new ProtobufReader(inputRowSchema, null, decoder,
null);
+
+ //create binary of proto test event
+ DateTime dateTime = new DateTime(2012, 7, 12, 9, 30,
ISOChronology.getInstanceUTC());
+ ProtoTestEventWrapper.ProtoTestEvent event =
ProtoTestEventWrapper.ProtoTestEvent.newBuilder()
+ .setDescription("description")
+
.setEventType(ProtoTestEventWrapper.ProtoTestEvent.EventCategory.CATEGORY_ONE)
+ .setId(4711L)
+ .setIsValid(true)
+ .setSomeOtherId(4712)
+ .setTimestamp(dateTime.toString())
+ .setSomeFloatColumn(47.11F)
+ .setSomeIntColumn(815)
+ .setSomeLongColumn(816L)
+ .build();
+
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ event.writeTo(out);
+
+ InputRow row =
reader.parseInputRows(decoder.parse(ByteBuffer.wrap(out.toByteArray()))).get(0);
+ System.out.println(row);
Review comment:
remove all the sys outs
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
