diff --git a/assembly/pom.xml b/assembly/pom.xml index 97af72703f318..325bb73651686 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../pom.xml diff --git a/common/kvstore/pom.xml b/common/kvstore/pom.xml index cd3d8bc07eece..f1c019fb606d0 100644 --- a/common/kvstore/pom.xml +++ b/common/kvstore/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../../pom.xml diff --git a/common/network-common/pom.xml b/common/network-common/pom.xml index 225b86ae83176..ed265a2846c96 100644 --- a/common/network-common/pom.xml +++ b/common/network-common/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../../pom.xml diff --git a/common/network-shuffle/pom.xml b/common/network-shuffle/pom.xml index 017586235215a..c0e7fa6ef4f00 100644 --- a/common/network-shuffle/pom.xml +++ b/common/network-shuffle/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../../pom.xml diff --git a/common/network-yarn/pom.xml b/common/network-yarn/pom.xml index b81d64dbe853c..e6b15a28d1879 100644 --- a/common/network-yarn/pom.xml +++ b/common/network-yarn/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../../pom.xml diff --git a/common/sketch/pom.xml b/common/sketch/pom.xml index 3f185aecbaede..b60ff1dfdb395 100644 --- a/common/sketch/pom.xml +++ b/common/sketch/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../../pom.xml diff --git a/common/tags/pom.xml b/common/tags/pom.xml index c363c653f16ae..b85a4c750c05d 100644 --- a/common/tags/pom.xml +++ b/common/tags/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../../pom.xml diff --git a/common/unsafe/pom.xml b/common/unsafe/pom.xml index 171b986901635..16f0ff1f3811f 100644 --- a/common/unsafe/pom.xml +++ b/common/unsafe/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../../pom.xml diff --git a/core/pom.xml b/core/pom.xml index 73aeb1894dbc1..4ad466e10c889 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../pom.xml diff --git a/core/src/main/scala/org/apache/spark/executor/TaskMetrics.scala b/core/src/main/scala/org/apache/spark/executor/TaskMetrics.scala index 21667b407ee92..481acc2077e8d 100644 --- a/core/src/main/scala/org/apache/spark/executor/TaskMetrics.scala +++ b/core/src/main/scala/org/apache/spark/executor/TaskMetrics.scala @@ -307,7 +307,9 @@ private[spark] object TaskMetrics extends Logging { if (name == UPDATED_BLOCK_STATUSES) { tm.setUpdatedBlockStatuses(value.asInstanceOf[java.util.List[(BlockId, BlockStatus)]]) } else { - tm.nameToAccums.get(name).foreach( + tm.nameToAccums.get(name) + .filter(_.isInstanceOf[LongAccumulator]) + .foreach( _.asInstanceOf[LongAccumulator].setValue(value.asInstanceOf[Long]) ) } diff --git a/examples/pom.xml b/examples/pom.xml index f516f1f95c3b6..67de2fed4cf9b 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../pom.xml diff --git a/external/avro/pom.xml b/external/avro/pom.xml index d3f8fa99bd1ba..14517bab96ab5 100644 --- a/external/avro/pom.xml +++ b/external/avro/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../../pom.xml diff --git a/external/docker-integration-tests/pom.xml b/external/docker-integration-tests/pom.xml index 6e4db357c4c4f..6a21d85e7a81d 100644 --- a/external/docker-integration-tests/pom.xml +++ b/external/docker-integration-tests/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../../pom.xml diff --git a/external/flume-assembly/pom.xml b/external/flume-assembly/pom.xml index ada85dbaef274..128bcb3883ab0 100644 --- a/external/flume-assembly/pom.xml +++ b/external/flume-assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../../pom.xml diff --git a/external/flume-sink/pom.xml b/external/flume-sink/pom.xml index 3edfdbff7502f..06c27393c83cd 100644 --- a/external/flume-sink/pom.xml +++ b/external/flume-sink/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../../pom.xml diff --git a/external/flume/pom.xml b/external/flume/pom.xml index 9bb12e053f9b0..0e077c5757ef5 100644 --- a/external/flume/pom.xml +++ b/external/flume/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../../pom.xml diff --git a/external/kafka-0-10-assembly/pom.xml b/external/kafka-0-10-assembly/pom.xml index 033d413179920..f4df14b566447 100644 --- a/external/kafka-0-10-assembly/pom.xml +++ b/external/kafka-0-10-assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../../pom.xml diff --git a/external/kafka-0-10-sql/pom.xml b/external/kafka-0-10-sql/pom.xml index 4824bce7261ad..4fef9b3695469 100644 --- a/external/kafka-0-10-sql/pom.xml +++ b/external/kafka-0-10-sql/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../../pom.xml diff --git a/external/kafka-0-10/pom.xml b/external/kafka-0-10/pom.xml index 5824b8b4d634a..adb8872429e9a 100644 --- a/external/kafka-0-10/pom.xml +++ b/external/kafka-0-10/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../../pom.xml diff --git a/external/kafka-0-8-assembly/pom.xml b/external/kafka-0-8-assembly/pom.xml index 7190e197780b0..d9150ec66a96a 100644 --- a/external/kafka-0-8-assembly/pom.xml +++ b/external/kafka-0-8-assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../../pom.xml diff --git a/external/kafka-0-8/pom.xml b/external/kafka-0-8/pom.xml index 60b21b27478e5..6ca5389d80961 100644 --- a/external/kafka-0-8/pom.xml +++ b/external/kafka-0-8/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../../pom.xml diff --git a/external/kinesis-asl-assembly/pom.xml b/external/kinesis-asl-assembly/pom.xml index 59f37347e957b..b83c511e40b60 100644 --- a/external/kinesis-asl-assembly/pom.xml +++ b/external/kinesis-asl-assembly/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../../pom.xml diff --git a/external/kinesis-asl/pom.xml b/external/kinesis-asl/pom.xml index 1ce8c01b49328..bb96f77be1b24 100644 --- a/external/kinesis-asl/pom.xml +++ b/external/kinesis-asl/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../../pom.xml diff --git a/external/spark-ganglia-lgpl/pom.xml b/external/spark-ganglia-lgpl/pom.xml index be98a59727565..05cf107ac6f40 100644 --- a/external/spark-ganglia-lgpl/pom.xml +++ b/external/spark-ganglia-lgpl/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../../pom.xml diff --git a/graphx/pom.xml b/graphx/pom.xml index 0972ee0d40af6..cc79cb27fb9fd 100644 --- a/graphx/pom.xml +++ b/graphx/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../pom.xml diff --git a/hadoop-cloud/pom.xml b/hadoop-cloud/pom.xml index 4a44650da1fe6..8f8a2b4dacf34 100644 --- a/hadoop-cloud/pom.xml +++ b/hadoop-cloud/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../pom.xml diff --git a/launcher/pom.xml b/launcher/pom.xml index 014e6215fb2b1..a669b13ca4732 100644 --- a/launcher/pom.xml +++ b/launcher/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../pom.xml diff --git a/mllib-local/pom.xml b/mllib-local/pom.xml index 33cc1ac45beb6..fd87804bdb909 100644 --- a/mllib-local/pom.xml +++ b/mllib-local/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../pom.xml diff --git a/mllib/pom.xml b/mllib/pom.xml index 2d871bd41884d..e3b9713ca4ba2 100644 --- a/mllib/pom.xml +++ b/mllib/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../pom.xml diff --git a/pom.xml b/pom.xml index b7cc77d8a1015..8e403ce81065f 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 pom Spark Project Parent POM http://spark.apache.org/ diff --git a/repl/pom.xml b/repl/pom.xml index 52eb954b95fd8..f54abf8f77c10 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../pom.xml diff --git a/resource-managers/kubernetes/core/pom.xml b/resource-managers/kubernetes/core/pom.xml index 1cea8d8c5cf81..febf3e837b793 100644 --- a/resource-managers/kubernetes/core/pom.xml +++ b/resource-managers/kubernetes/core/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../../../pom.xml diff --git a/resource-managers/kubernetes/integration-tests/pom.xml b/resource-managers/kubernetes/integration-tests/pom.xml index 8a48a05ba0c66..00622aa2be8dd 100644 --- a/resource-managers/kubernetes/integration-tests/pom.xml +++ b/resource-managers/kubernetes/integration-tests/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../../../pom.xml diff --git a/resource-managers/mesos/pom.xml b/resource-managers/mesos/pom.xml index 95ac27048710a..cffe78903c8cc 100644 --- a/resource-managers/mesos/pom.xml +++ b/resource-managers/mesos/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../../pom.xml diff --git a/resource-managers/yarn/pom.xml b/resource-managers/yarn/pom.xml index 072abd3c4f3f4..31fa9040a1327 100644 --- a/resource-managers/yarn/pom.xml +++ b/resource-managers/yarn/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../../pom.xml diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml index 4a41d8c7c6924..7ca414dfbd545 100644 --- a/sql/catalyst/pom.xml +++ b/sql/catalyst/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../../pom.xml diff --git a/sql/core/pom.xml b/sql/core/pom.xml index 213792395b57b..2820ec4353b0b 100644 --- a/sql/core/pom.xml +++ b/sql/core/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../../pom.xml diff --git a/sql/hive-thriftserver/pom.xml b/sql/hive-thriftserver/pom.xml index 7da8af1463b14..2239e30d27140 100644 --- a/sql/hive-thriftserver/pom.xml +++ b/sql/hive-thriftserver/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../../pom.xml diff --git a/sql/hive/pom.xml b/sql/hive/pom.xml index e67e5cb6a080f..af3ab8b5c0c11 100644 --- a/sql/hive/pom.xml +++ b/sql/hive/pom.xml @@ -22,7 +22,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../../pom.xml diff --git a/streaming/pom.xml b/streaming/pom.xml index c4a586764f614..8b3116df3a85f 100644 --- a/streaming/pom.xml +++ b/streaming/pom.xml @@ -21,7 +21,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../pom.xml diff --git a/tools/pom.xml b/tools/pom.xml index 24ddf730f1e26..12fd007788604 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -20,7 +20,7 @@ org.apache.spark spark-parent_2.11 - 2.4.1-kylin-r23 + 2.4.1-kylin-r24 ../pom.xml