Skip to content

Commit

Permalink
limit mem usage during collect (apache#199)
Browse files Browse the repository at this point in the history
  • Loading branch information
lxian authored Dec 22, 2020
1 parent 2532b59 commit bf28c35
Show file tree
Hide file tree
Showing 39 changed files with 199 additions and 106 deletions.
6 changes: 3 additions & 3 deletions assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<relativePath>../pom.xml</relativePath>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r4</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>spark-assembly_2.12</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions common/kvstore/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<relativePath>../../pom.xml</relativePath>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r4</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>spark-kvstore_2.12</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions common/network-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<relativePath>../../pom.xml</relativePath>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r4</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>spark-network-common_2.12</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions common/network-shuffle/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<relativePath>../../pom.xml</relativePath>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r4</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>spark-network-shuffle_2.12</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions common/network-yarn/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<relativePath>../../pom.xml</relativePath>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r4</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>spark-network-yarn_2.12</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions common/sketch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<relativePath>../../pom.xml</relativePath>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r4</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>spark-sketch_2.12</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions common/tags/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<relativePath>../../pom.xml</relativePath>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r4</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>spark-tags_2.12</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions common/unsafe/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<relativePath>../../pom.xml</relativePath>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r4</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>spark-unsafe_2.12</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<relativePath>../pom.xml</relativePath>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r4</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>spark-core_2.12</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<relativePath>../pom.xml</relativePath>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r4</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>spark-examples_2.12</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions external/avro/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<relativePath>../../pom.xml</relativePath>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r4</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>spark-avro_2.12</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions external/docker-integration-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<relativePath>../../pom.xml</relativePath>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r4</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>spark-docker-integration-tests_2.12</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions external/kafka-0-10-assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<relativePath>../../pom.xml</relativePath>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r4</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>spark-streaming-kafka-0-10-assembly_2.12</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions external/kafka-0-10-sql/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<relativePath>../../pom.xml</relativePath>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r4</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<groupId>org.apache.spark</groupId>
Expand Down
2 changes: 1 addition & 1 deletion external/kafka-0-10-token-provider/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<version>3.0.0-kylin-r4</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
6 changes: 3 additions & 3 deletions external/kafka-0-10/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<relativePath>../../pom.xml</relativePath>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r4</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>spark-streaming-kafka-0-10_2.12</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions external/kinesis-asl-assembly/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<relativePath>../../pom.xml</relativePath>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r4</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>spark-streaming-kinesis-asl-assembly_2.12</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions external/kinesis-asl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<relativePath>../../pom.xml</relativePath>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r4</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<!-- Kinesis integration is not included by default due to ASL-licensed code. -->
Expand Down
6 changes: 3 additions & 3 deletions external/spark-ganglia-lgpl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<relativePath>../../pom.xml</relativePath>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r4</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<!-- Ganglia integration is not included by default due to LGPL-licensed code -->
Expand Down
6 changes: 3 additions & 3 deletions graphx/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<relativePath>../pom.xml</relativePath>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r4</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>spark-graphx_2.12</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions hadoop-cloud/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<relativePath>../pom.xml</relativePath>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r4</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>spark-hadoop-cloud_2.12</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions launcher/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<relativePath>../pom.xml</relativePath>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r4</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>spark-launcher_2.12</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions mllib-local/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<relativePath>../pom.xml</relativePath>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r4</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>spark-mllib-local_2.12</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions mllib/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<relativePath>../pom.xml</relativePath>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r4</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>spark-mllib_2.12</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<version>3.0.0-kylin-r4</version>
<packaging>pom</packaging>
<name>Spark Project Parent POM</name>
<url>http://spark.apache.org/</url>
Expand Down
6 changes: 3 additions & 3 deletions repl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<relativePath>../pom.xml</relativePath>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r4</version>
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>spark-repl_2.12</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions resource-managers/kubernetes/core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<relativePath>../../../pom.xml</relativePath>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r4</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

<artifactId>spark-kubernetes_2.12</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions resource-managers/kubernetes/integration-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<relativePath>../../../pom.xml</relativePath>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r4</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

<artifactId>spark-kubernetes-integration-tests_2.12</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions resource-managers/mesos/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<relativePath>../../pom.xml</relativePath>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r4</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>spark-mesos_2.12</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions resource-managers/yarn/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<relativePath>../../pom.xml</relativePath>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r4</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>spark-yarn_2.12</artifactId>
Expand Down
6 changes: 3 additions & 3 deletions sql/catalyst/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.spark</groupId>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r3</version>
<relativePath>../../pom.xml</relativePath>
<artifactId>spark-parent_2.12</artifactId>
<version>3.0.0-kylin-r4</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>spark-catalyst_2.12</artifactId>
Expand Down
Loading

0 comments on commit bf28c35

Please sign in to comment.