Skip to content

Commit

Permalink
fix mima conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Peng, Meng committed Sep 20, 2016
2 parents 88d2143 + d5ec5db commit 24f26f2
Show file tree
Hide file tree
Showing 34 changed files with 1,854 additions and 2,123 deletions.
8 changes: 6 additions & 2 deletions R/pkg/R/functions.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2713,11 +2713,15 @@ setMethod("from_unixtime", signature(x = "Column"),
#' @param x a time Column. Must be of TimestampType.
#' @param windowDuration a string specifying the width of the window, e.g. '1 second',
#' '1 day 12 hours', '2 minutes'. Valid interval strings are 'week',
#' 'day', 'hour', 'minute', 'second', 'millisecond', 'microsecond'.
#' 'day', 'hour', 'minute', 'second', 'millisecond', 'microsecond'. Note that
#' the duration is a fixed length of time, and does not vary over time
#' according to a calendar. For example, '1 day' always means 86,400,000
#' milliseconds, not a calendar day.
#' @param slideDuration a string specifying the sliding interval of the window. Same format as
#' \code{windowDuration}. A new window will be generated every
#' \code{slideDuration}. Must be less than or equal to
#' the \code{windowDuration}.
#' the \code{windowDuration}. This duration is likewise absolute, and does not
#' vary according to a calendar.
#' @param startTime the offset with respect to 1970-01-01 00:00:00 UTC with which to start
#' window intervals. For example, in order to have hourly tumbling windows
#' that start 15 minutes past the hour, e.g. 12:15-13:15, 13:15-14:15... provide
Expand Down
12 changes: 11 additions & 1 deletion core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import scala.xml.Node
import org.apache.spark.deploy.DeployMessages.{MasterStateResponse, RequestMasterState}
import org.apache.spark.deploy.ExecutorState
import org.apache.spark.deploy.master.ExecutorDesc
import org.apache.spark.ui.{UIUtils, WebUIPage}
import org.apache.spark.ui.{ToolTips, UIUtils, WebUIPage}
import org.apache.spark.util.Utils

private[ui] class ApplicationPage(parent: MasterWebUI) extends WebUIPage("app") {
Expand Down Expand Up @@ -69,6 +69,16 @@ private[ui] class ApplicationPage(parent: MasterWebUI) extends WebUIPage("app")
}
}
</li>
<li>
<span data-toggle="tooltip" title={ToolTips.APPLICATION_EXECUTOR_LIMIT}
data-placement="right">
<strong>Executor Limit: </strong>
{
if (app.executorLimit == Int.MaxValue) "Unlimited" else app.executorLimit
}
({app.executors.size} granted)
</span>
</li>
<li>
<strong>Executor Memory:</strong>
{Utils.megabytesToString(app.desc.memoryPerExecutorMB)}
Expand Down
6 changes: 6 additions & 0 deletions core/src/main/scala/org/apache/spark/ui/ToolTips.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,10 @@ private[spark] object ToolTips {

val TASK_TIME =
"Shaded red when garbage collection (GC) time is over 10% of task time"

val APPLICATION_EXECUTOR_LIMIT =
"""Maximum number of executors that this application will use. This limit is finite only when
dynamic allocation is enabled. The number of granted executors may exceed the limit
ephemerally when executors are being killed.
"""
}
68 changes: 0 additions & 68 deletions external/docker-integration-tests/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,38 +49,7 @@
<dependency>
<groupId>com.spotify</groupId>
<artifactId>docker-client</artifactId>
<classifier>shaded</classifier>
<scope>test</scope>
<!--
See https://github.com/spotify/docker-client/pull/272#issuecomment-155249101
for an explanation of why these exclusions are (necessarily) a mess.
-->
<exclusions>
<exclusion>
<groupId>com.fasterxml.jackson.jaxrs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-guava</artifactId>
</exclusion>
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.jersey.connectors</groupId>
<artifactId>jersey-apache-connector</artifactId>
</exclusion>
<exclusion>
<groupId>org.glassfish.jersey.media</groupId>
<artifactId>jersey-media-json-jackson</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Expand Down Expand Up @@ -152,43 +121,6 @@
<scope>test</scope>
</dependency>

<!-- Jersey dependencies, used to override version.
See https://github.com/apache/spark/pull/9503#issuecomment-154369560 for
background on why we need to use a newer Jersey only in this test module;
we can remove this once https://github.com/spotify/docker-client/pull/272 is
merged and a new docker-client release is published. -->
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
<version>1.19</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
<version>1.19</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-servlet</artifactId>
<version>1.19</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
<version>1.19</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- End Jersey dependencies -->

<!-- DB2 JCC driver manual installation instructions
You can build this datasource if you:
Expand Down
Loading

0 comments on commit 24f26f2

Please sign in to comment.