Upgrade Avro to latest version (#14440)

Upgraded Avro to 1.11.1
This commit is contained in:
Tejaswini Bandlamudi 2023-06-24 14:51:30 +05:30 committed by GitHub
parent 970288067a
commit 72cf91fbc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 12 additions and 12 deletions

View File

@ -141,7 +141,11 @@ public class AvroFlattenerMaker implements ObjectFlatteners.FlattenerMaker<Gener
@Override
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

View File

@ -349,6 +349,10 @@ public class AvroFlattenerMakerTest
list,
flattener.getRootField(record, "someRecordArray")
);
Assert.assertEquals(
null,
flattener.getRootField(record, "invalidField")
);
}
private void makeJsonPathExtractor_common(final SomeAvroDatum record, final AvroFlattenerMaker flattener)

View File

@ -3645,7 +3645,7 @@ libraries:
---
name: Apache Velocity Engine
version: 2.2
version: 2.3
license_category: binary
module: extensions/druid-avro-extensions
license_name: Apache License version 2.0
@ -3663,7 +3663,7 @@ name: Apache Avro
license_category: binary
module: extensions/druid-avro-extensions
license_name: Apache License version 2.0
version: 1.9.2
version: 1.11.1
libraries:
- org.apache.avro: avro
- org.apache.avro: avro-mapred

View File

@ -472,14 +472,6 @@
<cve>CVE-2020-13949</cve>
</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>
<!-- (ranger, ambari, and aliyun-oss) these vulnerabilities are legit, but their latest releases still use the vulnerable jackson version -->
<notes><![CDATA[

View File

@ -81,7 +81,7 @@
<apache.ranger.gson.version>2.2.4</apache.ranger.gson.version>
<scala.library.version>2.13.9</scala.library.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
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