Fix java benchmark to use parser, fix cpp benchmark new arena to use Reset, format some files

2 files changed, 11 insertions, 17 deletions

diff --git a/benchmarks/java/pom.xml b/benchmarks/java/pom.xml
index f82f911b..c2cd78a1 100755
--- a/benchmarks/java/pom.xml
+++ b/benchmarks/java/pom.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" 
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  
+
   <modelVersion>4.0.0</modelVersion>
   <artifactId>protobuf-java-benchmark</artifactId>
   <groupId>com.google.protobuf</groupId>
   <version>1.0.0</version>
   <name>Protocol Buffers [Benchmark]</name>
   <description>The benchmark tools for Protobuf Java.</description>
-  
+
   <dependencies>
     <dependency>
       <groupId>com.google.protobuf</groupId>
@@ -22,7 +22,7 @@
       <version>1.0-beta-2</version>
     </dependency>
   </dependencies>
-  
+
   <build>
     <pluginManagement>
       <plugins>
diff --git a/benchmarks/java/src/main/java/com/google/protobuf/ProtoBenchCaliper.java b/benchmarks/java/src/main/java/com/google/protobuf/ProtoBenchCaliper.java
index 88d2a83d..a7027586 100755
--- a/benchmarks/java/src/main/java/com/google/protobuf/ProtoBenchCaliper.java
+++ b/benchmarks/java/src/main/java/com/google/protobuf/ProtoBenchCaliper.java
@@ -153,10 +153,8 @@ public class ProtoBenchCaliper {
   @Benchmark
   void deserializeFromByteString(int reps) throws IOException {
     for (int i = 0; i < reps; i++) {
-      defaultMessage
-        .newBuilderForType()
-        .mergeFrom(inputStringList.get((int) (counter % inputStringList.size())), extensions)
-        .build();
+      benchmarkMessageType.getDefaultInstance().getParserForType().parseFrom(
+          inputStringList.get((int) (counter % inputStringList.size())), extensions);
       counter++;
     }
   }
@@ -164,10 +162,8 @@ public class ProtoBenchCaliper {
   @Benchmark
   void deserializeFromByteArray(int reps) throws IOException {
     for (int i = 0; i < reps; i++) {
-      defaultMessage
-        .newBuilderForType()
-        .mergeFrom(inputDataList.get((int) (counter % inputDataList.size())), extensions)
-        .build();
+      benchmarkMessageType.getDefaultInstance().getParserForType().parseFrom(
+          inputDataList.get((int) (counter % inputDataList.size())), extensions);
       counter++;
     }
   }
@@ -175,10 +171,8 @@ public class ProtoBenchCaliper {
   @Benchmark
   void deserializeFromMemoryStream(int reps) throws IOException {
     for (int i = 0; i < reps; i++) {
-      defaultMessage
-        .newBuilderForType()
-        .mergeFrom(inputStreamList.get((int) (counter % inputStreamList.size())), extensions)
-        .build();
+      benchmarkMessageType.getDefaultInstance().getParserForType().parseFrom(
+          inputStreamList.get((int) (counter % inputStreamList.size())), extensions);
       inputStreamList.get((int) (counter % inputStreamList.size())).reset();
       counter++;
     }