mirror of https://github.com/apache/druid.git
parent
970288067a
commit
72cf91fbc0
|
@ -141,7 +141,11 @@ public class AvroFlattenerMaker implements ObjectFlatteners.FlattenerMaker<Gener
|
||||||
@Override
|
@Override
|
||||||
public Object getRootField(final GenericRecord record, final String key)
|
public Object getRootField(final GenericRecord record, final String key)
|
||||||
{
|
{
|
||||||
return transformValue(record.get(key));
|
if (record.getSchema().getField(key) != null) {
|
||||||
|
return transformValue(record.get(key));
|
||||||
|
} else {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -349,6 +349,10 @@ public class AvroFlattenerMakerTest
|
||||||
list,
|
list,
|
||||||
flattener.getRootField(record, "someRecordArray")
|
flattener.getRootField(record, "someRecordArray")
|
||||||
);
|
);
|
||||||
|
Assert.assertEquals(
|
||||||
|
null,
|
||||||
|
flattener.getRootField(record, "invalidField")
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void makeJsonPathExtractor_common(final SomeAvroDatum record, final AvroFlattenerMaker flattener)
|
private void makeJsonPathExtractor_common(final SomeAvroDatum record, final AvroFlattenerMaker flattener)
|
||||||
|
|
|
@ -3645,7 +3645,7 @@ libraries:
|
||||||
---
|
---
|
||||||
|
|
||||||
name: Apache Velocity Engine
|
name: Apache Velocity Engine
|
||||||
version: 2.2
|
version: 2.3
|
||||||
license_category: binary
|
license_category: binary
|
||||||
module: extensions/druid-avro-extensions
|
module: extensions/druid-avro-extensions
|
||||||
license_name: Apache License version 2.0
|
license_name: Apache License version 2.0
|
||||||
|
@ -3663,7 +3663,7 @@ name: Apache Avro
|
||||||
license_category: binary
|
license_category: binary
|
||||||
module: extensions/druid-avro-extensions
|
module: extensions/druid-avro-extensions
|
||||||
license_name: Apache License version 2.0
|
license_name: Apache License version 2.0
|
||||||
version: 1.9.2
|
version: 1.11.1
|
||||||
libraries:
|
libraries:
|
||||||
- org.apache.avro: avro
|
- org.apache.avro: avro
|
||||||
- org.apache.avro: avro-mapred
|
- org.apache.avro: avro-mapred
|
||||||
|
|
|
@ -472,14 +472,6 @@
|
||||||
<cve>CVE-2020-13949</cve>
|
<cve>CVE-2020-13949</cve>
|
||||||
</suppress>
|
</suppress>
|
||||||
|
|
||||||
<suppress>
|
|
||||||
<!-- (avro, parquet, integration-tests) we don't allow velocity templates to be uploaded by untrusted users -->
|
|
||||||
<notes><![CDATA[
|
|
||||||
file name: velocity-engine-core-2.2.jar:
|
|
||||||
]]></notes>
|
|
||||||
<cve>CVE-2020-13936</cve>
|
|
||||||
</suppress>
|
|
||||||
|
|
||||||
<suppress>
|
<suppress>
|
||||||
<!-- (ranger, ambari, and aliyun-oss) these vulnerabilities are legit, but their latest releases still use the vulnerable jackson version -->
|
<!-- (ranger, ambari, and aliyun-oss) these vulnerabilities are legit, but their latest releases still use the vulnerable jackson version -->
|
||||||
<notes><![CDATA[
|
<notes><![CDATA[
|
||||||
|
|
2
pom.xml
2
pom.xml
|
@ -81,7 +81,7 @@
|
||||||
<apache.ranger.gson.version>2.2.4</apache.ranger.gson.version>
|
<apache.ranger.gson.version>2.2.4</apache.ranger.gson.version>
|
||||||
<scala.library.version>2.13.9</scala.library.version>
|
<scala.library.version>2.13.9</scala.library.version>
|
||||||
<avatica.version>1.17.0</avatica.version>
|
<avatica.version>1.17.0</avatica.version>
|
||||||
<avro.version>1.9.2</avro.version>
|
<avro.version>1.11.1</avro.version>
|
||||||
<!-- sql/src/main/codegen/config.fmpp is based on a file from calcite-core, and needs to be
|
<!-- sql/src/main/codegen/config.fmpp is based on a file from calcite-core, and needs to be
|
||||||
updated when upgrading Calcite. Refer to the top-level comments in that file for details.
|
updated when upgrading Calcite. Refer to the top-level comments in that file for details.
|
||||||
Also, CalcitePlanner is a clone of Calcite's PlannerImpl and may require updates when
|
Also, CalcitePlanner is a clone of Calcite's PlannerImpl and may require updates when
|
||||||
|
|
Loading…
Reference in New Issue