[parquet-mr] branch master updated: PARQUET-2070: replace deprecated syntax in ProtoWriteSupport.java (#919)

[gabor]

This is an automated email from the ASF dual-hosted git repository.

gabor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/parquet-mr.git


The following commit(s) were added to refs/heads/master by this push:
     new 18df2ca  PARQUET-2070: replace deprecated syntax in 
ProtoWriteSupport.java (#919)
18df2ca is described below

commit 18df2ca255ccafa189dc70fa194214cab926a919
Author: Svend Vanderveken <1214071+sv3...@users.noreply.github.com>
AuthorDate: Wed Aug 4 08:59:55 2021 +0200

    PARQUET-2070: replace deprecated syntax in ProtoWriteSupport.java (#919)
---
 README.md                                                         | 3 +++
 .../src/main/java/org/apache/parquet/proto/ProtoWriteSupport.java | 8 +-------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 5ad4570..2ce4b0f 100644
--- a/README.md
+++ b/README.md
@@ -97,6 +97,9 @@ Thrift integration is provided by the 
[parquet-thrift](https://github.com/apache
 ### Avro
 Avro conversion is implemented via the 
[parquet-avro](https://github.com/apache/parquet-mr/tree/master/parquet-avro) 
sub-project.
 
+### Protobuf
+Protobuf conversion is implemented via the 
[parquet-protobuf](https://github.com/apache/parquet-mr/tree/master/parquet-protobuf)
 sub-project.
+
 ### Create your own objects
 * The ParquetOutputFormat can be provided a WriteSupport to write your own 
objects to an event based RecordConsumer.
 * the ParquetInputFormat can be provided a ReadSupport to materialize your own 
objects by implementing a RecordMaterializer
diff --git 
a/parquet-protobuf/src/main/java/org/apache/parquet/proto/ProtoWriteSupport.java
 
b/parquet-protobuf/src/main/java/org/apache/parquet/proto/ProtoWriteSupport.java
index b0a0e50..846b90a 100644
--- 
a/parquet-protobuf/src/main/java/org/apache/parquet/proto/ProtoWriteSupport.java
+++ 
b/parquet-protobuf/src/main/java/org/apache/parquet/proto/ProtoWriteSupport.java
@@ -135,7 +135,7 @@ public class ProtoWriteSupport<T extends MessageOrBuilder> 
extends WriteSupport<
 
     Map<String, String> extraMetaData = new HashMap<>();
     extraMetaData.put(ProtoReadSupport.PB_CLASS, protoMessage.getName());
-    extraMetaData.put(ProtoReadSupport.PB_DESCRIPTOR, 
serializeDescriptor(protoMessage));
+    extraMetaData.put(ProtoReadSupport.PB_DESCRIPTOR, 
messageDescriptor.toProto().toString());
     extraMetaData.put(PB_SPECS_COMPLIANT_WRITE, 
String.valueOf(writeSpecsCompliant));
     return new WriteContext(rootSchema, extraMetaData);
   }
@@ -563,10 +563,4 @@ public class ProtoWriteSupport<T extends MessageOrBuilder> 
extends WriteSupport<
     throw new InvalidRecordException(exceptionMsg);
   }
 
-  /** Returns message descriptor as JSON String*/
-  private String serializeDescriptor(Class<? extends Message> protoClass) {
-    Descriptor descriptor = Protobufs.getMessageDescriptor(protoClass);
-    DescriptorProtos.DescriptorProto asProto = descriptor.toProto();
-    return TextFormat.printToString(asProto);
-  }
 }