Skip to content

Commit 1446667

Browse files
sarutaksarutak
committed
2 parents 0069c8a + 31555f7 commit 1446667

File tree

39 files changed

+1369
-112
lines changed

39 files changed

+1369
-112
lines changed

‎common/network-common/src/main/java/org/apache/spark/network/client/TransportResponseHandler.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ public void handle(ResponseMessage message) throws Exception {
188188
if (listener == null) {
189189
logger.warn("Ignoring response for RPC {} from {} ({} bytes) since it is not outstanding",
190190
resp.requestId, getRemoteAddress(channel), resp.body().size());
191+
resp.body().release();
191192
} else {
192193
outstandingRpcs.remove(resp.requestId);
193194
try {

‎common/network-common/src/test/java/org/apache/spark/network/TestUtils.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@
2222
public class TestUtils {
2323
public static String getLocalHost() {
2424
try {
25-
return InetAddress.getLocalHost().getHostAddress();
25+
return (System.getenv().containsKey("SPARK_LOCAL_IP"))?
26+
System.getenv("SPARK_LOCAL_IP"):
27+
InetAddress.getLocalHost().getHostAddress();
2628
} catch (Exception e) {
2729
throw new RuntimeException(e);
2830
}

‎dev/lint-python‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ FLAKE8_BUILD="flake8"
2121
MINIMUM_FLAKE8="3.5.0"
2222
MYPY_BUILD="mypy"
2323
PYCODESTYLE_BUILD="pycodestyle"
24-
MINIMUM_PYCODESTYLE="2.6.0"
24+
MINIMUM_PYCODESTYLE="2.7.0"
2525

2626
SPHINX_BUILD="sphinx-build"
2727

‎mllib-local/pom.xml‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,13 @@
6868
<scope>test</scope>
6969
</dependency>
7070

71+
<dependency>
72+
<groupId>org.apache.spark</groupId>
73+
<artifactId>spark-core_${scala.binary.version}</artifactId>
74+
<version>${project.version}</version>
75+
<type>test-jar</type>
76+
<scope>test</scope>
77+
</dependency>
7178
</dependencies>
7279
<profiles>
7380
<profile>
@@ -81,6 +88,34 @@
8188
</dependency>
8289
</dependencies>
8390
</profile>
91+
<profile>
92+
<id>jvm-vectorized</id>
93+
<properties>
94+
<extra.source.dir>src/jvm-vectorized/java</extra.source.dir>
95+
</properties>
96+
<build>
97+
<plugins>
98+
<plugin>
99+
<groupId>org.codehaus.mojo</groupId>
100+
<artifactId>build-helper-maven-plugin</artifactId>
101+
<executions>
102+
<execution>
103+
<id>add-vectorized-sources</id>
104+
<phase>generate-sources</phase>
105+
<goals>
106+
<goal>add-source</goal>
107+
</goals>
108+
<configuration>
109+
<sources>
110+
<source>${extra.source.dir}</source>
111+
</sources>
112+
</configuration>
113+
</execution>
114+
</executions>
115+
</plugin>
116+
</plugins>
117+
</build>
118+
</profile>
84119
</profiles>
85120
<build>
86121
<outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>

0 commit comments

Comments
 (0)