Skip to content

Commit 24f26f2

Browse files
author
Peng, Meng
committed
fix mima conflict
2 parents 88d2143 + d5ec5db commit 24f26f2

File tree

34 files changed

+1854
-2123
lines changed

34 files changed

+1854
-2123
lines changed

‎R/pkg/R/functions.R‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2713,11 +2713,15 @@ setMethod("from_unixtime", signature(x = "Column"),
27132713
#' @param x a time Column. Must be of TimestampType.
27142714
#' @param windowDuration a string specifying the width of the window, e.g. '1 second',
27152715
#' '1 day 12 hours', '2 minutes'. Valid interval strings are 'week',
2716-
#' 'day', 'hour', 'minute', 'second', 'millisecond', 'microsecond'.
2716+
#' 'day', 'hour', 'minute', 'second', 'millisecond', 'microsecond'. Note that
2717+
#' the duration is a fixed length of time, and does not vary over time
2718+
#' according to a calendar. For example, '1 day' always means 86,400,000
2719+
#' milliseconds, not a calendar day.
27172720
#' @param slideDuration a string specifying the sliding interval of the window. Same format as
27182721
#' \code{windowDuration}. A new window will be generated every
27192722
#' \code{slideDuration}. Must be less than or equal to
2720-
#' the \code{windowDuration}.
2723+
#' the \code{windowDuration}. This duration is likewise absolute, and does not
2724+
#' vary according to a calendar.
27212725
#' @param startTime the offset with respect to 1970-01-01 00:00:00 UTC with which to start
27222726
#' window intervals. For example, in order to have hourly tumbling windows
27232727
#' that start 15 minutes past the hour, e.g. 12:15-13:15, 13:15-14:15... provide

‎core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import scala.xml.Node
2424
import org.apache.spark.deploy.DeployMessages.{MasterStateResponse, RequestMasterState}
2525
import org.apache.spark.deploy.ExecutorState
2626
import org.apache.spark.deploy.master.ExecutorDesc
27-
import org.apache.spark.ui.{UIUtils, WebUIPage}
27+
import org.apache.spark.ui.{ToolTips, UIUtils, WebUIPage}
2828
import org.apache.spark.util.Utils
2929

3030
private[ui] class ApplicationPage(parent: MasterWebUI) extends WebUIPage("app") {
@@ -69,6 +69,16 @@ private[ui] class ApplicationPage(parent: MasterWebUI) extends WebUIPage("app")
6969
}
7070
}
7171
</li>
72+
<li>
73+
<span data-toggle="tooltip" title={ToolTips.APPLICATION_EXECUTOR_LIMIT}
74+
data-placement="right">
75+
<strong>Executor Limit: </strong>
76+
{
77+
if (app.executorLimit == Int.MaxValue) "Unlimited" else app.executorLimit
78+
}
79+
({app.executors.size} granted)
80+
</span>
81+
</li>
7282
<li>
7383
<strong>Executor Memory:</strong>
7484
{Utils.megabytesToString(app.desc.memoryPerExecutorMB)}

‎core/src/main/scala/org/apache/spark/ui/ToolTips.scala‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,10 @@ private[spark] object ToolTips {
9090

9191
val TASK_TIME =
9292
"Shaded red when garbage collection (GC) time is over 10% of task time"
93+
94+
val APPLICATION_EXECUTOR_LIMIT =
95+
"""Maximum number of executors that this application will use. This limit is finite only when
96+
dynamic allocation is enabled. The number of granted executors may exceed the limit
97+
ephemerally when executors are being killed.
98+
"""
9399
}

‎external/docker-integration-tests/pom.xml‎

Lines changed: 0 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -49,38 +49,7 @@
4949
<dependency>
5050
<groupId>com.spotify</groupId>
5151
<artifactId>docker-client</artifactId>
52-
<classifier>shaded</classifier>
5352
<scope>test</scope>
54-
<!--
55-
See https://github.com/spotify/docker-client/pull/272#issuecomment-155249101
56-
for an explanation of why these exclusions are (necessarily) a mess.
57-
-->
58-
<exclusions>
59-
<exclusion>
60-
<groupId>com.fasterxml.jackson.jaxrs</groupId>
61-
<artifactId>jackson-jaxrs-json-provider</artifactId>
62-
</exclusion>
63-
<exclusion>
64-
<groupId>com.fasterxml.jackson.datatype</groupId>
65-
<artifactId>jackson-datatype-guava</artifactId>
66-
</exclusion>
67-
<exclusion>
68-
<groupId>com.fasterxml.jackson.core</groupId>
69-
<artifactId>jackson-databind</artifactId>
70-
</exclusion>
71-
<exclusion>
72-
<groupId>org.glassfish.jersey.core</groupId>
73-
<artifactId>jersey-client</artifactId>
74-
</exclusion>
75-
<exclusion>
76-
<groupId>org.glassfish.jersey.connectors</groupId>
77-
<artifactId>jersey-apache-connector</artifactId>
78-
</exclusion>
79-
<exclusion>
80-
<groupId>org.glassfish.jersey.media</groupId>
81-
<artifactId>jersey-media-json-jackson</artifactId>
82-
</exclusion>
83-
</exclusions>
8453
</dependency>
8554
<dependency>
8655
<groupId>org.apache.httpcomponents</groupId>
@@ -152,43 +121,6 @@
152121
<scope>test</scope>
153122
</dependency>
154123

155-
<!-- Jersey dependencies, used to override version.
156-
See https://github.com/apache/spark/pull/9503#issuecomment-154369560 for
157-
background on why we need to use a newer Jersey only in this test module;
158-
we can remove this once https://github.com/spotify/docker-client/pull/272 is
159-
merged and a new docker-client release is published. -->
160-
<dependency>
161-
<groupId>com.sun.jersey</groupId>
162-
<artifactId>jersey-server</artifactId>
163-
<version>1.19</version>
164-
<scope>test</scope>
165-
</dependency>
166-
<dependency>
167-
<groupId>com.sun.jersey</groupId>
168-
<artifactId>jersey-core</artifactId>
169-
<version>1.19</version>
170-
<scope>test</scope>
171-
</dependency>
172-
<dependency>
173-
<groupId>com.sun.jersey</groupId>
174-
<artifactId>jersey-servlet</artifactId>
175-
<version>1.19</version>
176-
<scope>test</scope>
177-
</dependency>
178-
<dependency>
179-
<groupId>com.sun.jersey</groupId>
180-
<artifactId>jersey-json</artifactId>
181-
<version>1.19</version>
182-
<scope>test</scope>
183-
<exclusions>
184-
<exclusion>
185-
<groupId>stax</groupId>
186-
<artifactId>stax-api</artifactId>
187-
</exclusion>
188-
</exclusions>
189-
</dependency>
190-
<!-- End Jersey dependencies -->
191-
192124
<!-- DB2 JCC driver manual installation instructions
193125
194126
You can build this datasource if you:

0 commit comments

Comments
 (0)