Uptade kafka to version 2.7.2

henrque · May 29, 2023 · fad3893 · fad3893
1 parent 986fde2
commit fad3893
Show file tree

Hide file tree

Showing 11 changed files with 58 additions and 34 deletions.
diff --git a/autogen/pom.xml b/autogen/pom.xml
@@ -263,8 +263,8 @@
     <profile>
       <id>scala2.11</id>
       <properties>
-        <scala.version>2.12.17</scala.version>
-        <scala.binary.version>2.12</scala.binary.version>
+        <scala.version>2.11.8</scala.version>
+        <scala.binary.version>2.11</scala.binary.version>
       </properties>
       <activation>
         <property>

diff --git a/common/pom.xml b/common/pom.xml
@@ -116,7 +116,7 @@
       <id>scala2.10</id>
       <properties>
         <scala.version>2.10.4</scala.version>
-        <scala.binary.version>2.12</scala.binary.version>
+        <scala.binary.version>2.10</scala.binary.version>
       </properties>
       <activation>
         <property>
@@ -129,8 +129,8 @@
     <profile>
       <id>scala2.11</id>
       <properties>
-        <scala.version>2.12.17</scala.version>
-        <scala.binary.version>2.12</scala.binary.version>
+        <scala.version>2.11.8</scala.version>
+        <scala.binary.version>2.11</scala.binary.version>
       </properties>
       <activation>
         <property>

diff --git a/common/src/main/scala/com/intel/hibench/common/streaming/metrics/KafkaCollector.scala b/common/src/main/scala/com/intel/hibench/common/streaming/metrics/KafkaCollector.scala
@@ -114,11 +114,11 @@ class KafkaCollector(
       outputFileWriter.append(header)
     }
     val time = new Date(System.currentTimeMillis()).toString
+    val count = histogram.getCount
     val snapshot = histogram.getSnapshot
-    val countValue = histogram.getCount
-    val throughput = countValue * 1000 / (maxTime - minTime)
+    val throughput = count * 1000 / (maxTime - minTime)
     outputFileWriter.append(
-      s"$time,$countValue,$throughput," +
+      s"$time,$count,$throughput," +
         s"${formatDouble(snapshot.getMax)}," +
         s"${formatDouble(snapshot.getMean)}," +
         s"${formatDouble(snapshot.getMin)}," +

diff --git a/common/src/main/scala/com/intel/hibench/common/streaming/metrics/MetricsUtil.scala b/common/src/main/scala/com/intel/hibench/common/streaming/metrics/MetricsUtil.scala
@@ -1,3 +1,19 @@
+/*
+ * 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 com.intel.hibench.common.streaming.metrics
 
 import com.intel.hibench.common.streaming.Platform

diff --git a/flinkbench/pom.xml b/flinkbench/pom.xml
@@ -43,7 +43,7 @@
     <profile>
       <id>defaultScalaVersion</id>
       <properties>
-        <scala.version>2.12.17</scala.version>
+        <scala.version>2.11.8</scala.version>
         <scala.binary.version>2.11</scala.binary.version>
       </properties>
       <activation>
@@ -70,7 +70,7 @@
     <profile>
       <id>scala2.11</id>
       <properties>
-        <scala.version>2.12.17</scala.version>
+        <scala.version>2.11.8</scala.version>
         <scala.binary.version>2.11</scala.binary.version>
       </properties>
       <activation>

diff --git a/gearpumpbench/pom.xml b/gearpumpbench/pom.xml
@@ -40,7 +40,7 @@
     <profile>
       <id>defaultScalaVersion</id>
       <properties>
-        <scala.version>2.12.17</scala.version>
+        <scala.version>2.11.8</scala.version>
         <scala.binary.version>2.11</scala.binary.version>
       </properties>
       <activation>
@@ -67,7 +67,7 @@
     <profile>
       <id>scala2.11</id>
       <properties>
-        <scala.version>2.12.17</scala.version>
+        <scala.version>2.11.8</scala.version>
         <scala.binary.version>2.11</scala.binary.version>
       </properties>
       <activation>

diff --git a/pom.xml b/pom.xml
@@ -35,11 +35,6 @@
   </properties>
 
   <dependencies>
-	  <dependency>
-<groupId>com.google.guava</groupId>
-<artifactId>guava</artifactId>
-<version>27.0-jre</version>
-</dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -117,19 +112,18 @@
       </modules>
     </profile>
 
-    <!-- <profile>
+    <profile>
       <id>flinkbench</id>
       <modules>
         <module>flinkbench</module>
       </modules>
-    </profile> -->
-
-    <!-- <profile>
+    </profile>
+    <profile>
       <id>gearpumpbench</id>
       <modules>
         <module>gearpumpbench</module>
       </modules>
-    </profile> -->
+    </profile>
 
     <profile>
       <id>hadoopbench</id>
@@ -138,21 +132,21 @@
       </modules>
     </profile>
 
-    <!-- <profile>
+    <profile>
       <id>stormbench</id>
       <modules>
         <module>stormbench</module>
       </modules>
-    </profile> -->
+    </profile>
 
     <profile>
       <id>defaultbench</id>
       <modules>
         <module>sparkbench</module>
-        <!-- <module>flinkbench</module> -->
-        <!-- <module>gearpumpbench</module> -->
+        <module>flinkbench</module>
+        <module>gearpumpbench</module>
         <module>hadoopbench</module>
-        <!-- <module>stormbench</module> -->
+        <module>stormbench</module>
       </modules>
       <activation>
         <property>

diff --git a/sparkbench/pom.xml b/sparkbench/pom.xml
@@ -145,7 +145,7 @@
     <profile>
       <id>spark2.4</id>
       <properties>
-        <spark.version>2.4.3</spark.version>
+        <spark.version>2.4.0</spark.version>
         <spark.bin.version>2.4</spark.bin.version>
       </properties>
       <activation>
@@ -200,8 +200,8 @@
     <profile>
       <id>scala2.11</id>
       <properties>
-        <scala.version>2.12.17</scala.version>
-        <scala.binary.version>2.12</scala.binary.version>
+        <scala.version>2.11.8</scala.version>
+        <scala.binary.version>2.11</scala.binary.version>
       </properties>
       <activation>
         <property>

diff --git a/sparkbench/streaming/src/main/scala/com/intel/hibench/sparkbench/streaming/RunBench.scala b/sparkbench/streaming/src/main/scala/com/intel/hibench/sparkbench/streaming/RunBench.scala
@@ -1,3 +1,19 @@
+/*
+ * 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 com.intel.hibench.sparkbench.streaming
 
 import com.intel.hibench.common.HiBenchConfig

diff --git a/...reaming/src/main/scala/com/intel/hibench/sparkbench/streaming/util/SparkBenchConfig.scala b/...reaming/src/main/scala/com/intel/hibench/sparkbench/streaming/util/SparkBenchConfig.scala
@@ -57,8 +57,6 @@ case class SparkBenchConfig (
     ConsumerConfig.BOOTSTRAP_SERVERS_CONFIG -> brokerList,
     ConsumerConfig.KEY_DESERIALIZER_CLASS_CONFIG -> classOf[StringDeserializer],
     ConsumerConfig.VALUE_DESERIALIZER_CLASS_CONFIG -> classOf[StringDeserializer],
-    ConsumerConfig.AUTO_OFFSET_RESET_CONFIG -> "earliest",
-  // Other Kafka configuration properties...
   ) 
 
   def threadsPerReceiver = coreNumber / receiverNumber

diff --git a/stormbench/pom.xml b/stormbench/pom.xml
@@ -38,7 +38,7 @@
       <profile>
         <id>defaultScalaVersion</id>
         <properties>
-          <scala.version>2.12.17</scala.version>
+          <scala.version>2.11.8</scala.version>
           <scala.binary.version>2.11</scala.binary.version>
         </properties>
         <activation>
@@ -65,7 +65,7 @@
       <profile>
         <id>scala2.11</id>
         <properties>
-          <scala.version>2.12.17</scala.version>
+          <scala.version>2.11.8</scala.version>
           <scala.binary.version>2.11</scala.binary.version>
         </properties>
         <activation>