srowen closed pull request #23420: [SPARK-26508][Core][SQL] Address warning
messages in Java reported at lgtm.com
URL: https://github.com/apache/spark/pull/23420
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/common/network-common/src/main/java/org/apache/spark/network/util/ByteUnit.java
b/common/network-common/src/main/java/org/apache/spark/network/util/ByteUnit.java
index 984575acaf511..6f7925c26094d 100644
---
a/common/network-common/src/main/java/org/apache/spark/network/util/ByteUnit.java
+++
b/common/network-common/src/main/java/org/apache/spark/network/util/ByteUnit.java
@@ -18,11 +18,11 @@
public enum ByteUnit {
BYTE(1),
- KiB(1024L),
- MiB((long) Math.pow(1024L, 2L)),
- GiB((long) Math.pow(1024L, 3L)),
- TiB((long) Math.pow(1024L, 4L)),
- PiB((long) Math.pow(1024L, 5L));
+ KiB(1L << 10),
+ MiB(1L << 20),
+ GiB(1L << 30),
+ TiB(1L << 40),
+ PiB(1L << 50);
ByteUnit(long multiplier) {
this.multiplier = multiplier;
@@ -50,7 +50,7 @@ public long convertTo(long d, ByteUnit u) {
}
}
- public double toBytes(long d) {
+ public long toBytes(long d) {
if (d < 0) {
throw new IllegalArgumentException("Negative size value. Size must be
positive: " + d);
}
diff --git
a/common/network-common/src/main/java/org/apache/spark/network/util/TransportConf.java
b/common/network-common/src/main/java/org/apache/spark/network/util/TransportConf.java
index 43a6bc7dc3d06..201628b04fbef 100644
---
a/common/network-common/src/main/java/org/apache/spark/network/util/TransportConf.java
+++
b/common/network-common/src/main/java/org/apache/spark/network/util/TransportConf.java
@@ -309,8 +309,8 @@ public int chunkFetchHandlerThreads() {
}
int chunkFetchHandlerThreadsPercent =
conf.getInt("spark.shuffle.server.chunkFetchHandlerThreadsPercent", 100);
- return (int)Math.ceil(
- (this.serverThreads() > 0 ? this.serverThreads() : 2 *
NettyRuntime.availableProcessors()) *
- chunkFetchHandlerThreadsPercent/(double)100);
+ int threads =
+ this.serverThreads() > 0 ? this.serverThreads() : 2 *
NettyRuntime.availableProcessors();
+ return (int) Math.ceil(threads * (chunkFetchHandlerThreadsPercent /
100.0));
}
}
diff --git
a/core/src/main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java
b/core/src/main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java
index 7df8aafb2b674..2ff98a69ee1f4 100644
--- a/core/src/main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java
+++ b/core/src/main/java/org/apache/spark/unsafe/map/BytesToBytesMap.java
@@ -712,7 +712,7 @@ public boolean append(Object kbase, long koff, int klen,
Object vbase, long voff
final long recordOffset = offset;
UnsafeAlignedOffset.putSize(base, offset, klen + vlen + uaoSize);
UnsafeAlignedOffset.putSize(base, offset + uaoSize, klen);
- offset += (2 * uaoSize);
+ offset += (2L * uaoSize);
Platform.copyMemory(kbase, koff, base, offset, klen);
offset += klen;
Platform.copyMemory(vbase, voff, base, offset, vlen);
@@ -780,7 +780,7 @@ private void allocate(int capacity) {
assert (capacity >= 0);
capacity = Math.max((int) Math.min(MAX_CAPACITY,
ByteArrayMethods.nextPowerOf2(capacity)), 64);
assert (capacity <= MAX_CAPACITY);
- longArray = allocateArray(capacity * 2);
+ longArray = allocateArray(capacity * 2L);
longArray.zeroOut();
this.growthThreshold = (int) (capacity * loadFactor);
diff --git a/examples/src/main/java/org/apache/spark/examples/JavaTC.java
b/examples/src/main/java/org/apache/spark/examples/JavaTC.java
index c9ca9c9b3a412..7e8df69e7e8da 100644
--- a/examples/src/main/java/org/apache/spark/examples/JavaTC.java
+++ b/examples/src/main/java/org/apache/spark/examples/JavaTC.java
@@ -71,7 +71,7 @@ public static void main(String[] args) {
JavaSparkContext jsc = new JavaSparkContext(spark.sparkContext());
- Integer slices = (args.length > 0) ? Integer.parseInt(args[0]): 2;
+ int slices = (args.length > 0) ? Integer.parseInt(args[0]): 2;
JavaPairRDD<Integer, Integer> tc = jsc.parallelizePairs(generateGraph(),
slices).cache();
// Linear transitive closure: each round grows paths by one edge,
diff --git
a/examples/src/main/java/org/apache/spark/examples/ml/JavaALSExample.java
b/examples/src/main/java/org/apache/spark/examples/ml/JavaALSExample.java
index 27052be87b82e..b8d2c9f6a6584 100644
--- a/examples/src/main/java/org/apache/spark/examples/ml/JavaALSExample.java
+++ b/examples/src/main/java/org/apache/spark/examples/ml/JavaALSExample.java
@@ -111,7 +111,7 @@ public static void main(String[] args) {
.setMetricName("rmse")
.setLabelCol("rating")
.setPredictionCol("prediction");
- Double rmse = evaluator.evaluate(predictions);
+ double rmse = evaluator.evaluate(predictions);
System.out.println("Root-mean-square error = " + rmse);
// Generate top 10 movie recommendations for each user
diff --git
a/examples/src/main/java/org/apache/spark/examples/mllib/JavaCorrelationsExample.java
b/examples/src/main/java/org/apache/spark/examples/mllib/JavaCorrelationsExample.java
index c0fa0b3cac1e9..9bd858b598905 100644
---
a/examples/src/main/java/org/apache/spark/examples/mllib/JavaCorrelationsExample.java
+++
b/examples/src/main/java/org/apache/spark/examples/mllib/JavaCorrelationsExample.java
@@ -46,7 +46,7 @@ public static void main(String[] args) {
// compute the correlation using Pearson's method. Enter "spearman" for
Spearman's method.
// If a method is not specified, Pearson's method will be used by default.
- Double correlation = Statistics.corr(seriesX.srdd(), seriesY.srdd(),
"pearson");
+ double correlation = Statistics.corr(seriesX.srdd(), seriesY.srdd(),
"pearson");
System.out.println("Correlation is: " + correlation);
// note that each Vector is a row and not a column
diff --git
a/examples/src/main/java/org/apache/spark/examples/mllib/JavaRandomForestClassificationExample.java
b/examples/src/main/java/org/apache/spark/examples/mllib/JavaRandomForestClassificationExample.java
index 6998ce2156c25..0707db8d3e839 100644
---
a/examples/src/main/java/org/apache/spark/examples/mllib/JavaRandomForestClassificationExample.java
+++
b/examples/src/main/java/org/apache/spark/examples/mllib/JavaRandomForestClassificationExample.java
@@ -48,14 +48,14 @@ public static void main(String[] args) {
// Train a RandomForest model.
// Empty categoricalFeaturesInfo indicates all features are continuous.
- Integer numClasses = 2;
+ int numClasses = 2;
Map<Integer, Integer> categoricalFeaturesInfo = new HashMap<>();
Integer numTrees = 3; // Use more in practice.
String featureSubsetStrategy = "auto"; // Let the algorithm choose.
String impurity = "gini";
- Integer maxDepth = 5;
- Integer maxBins = 32;
- Integer seed = 12345;
+ int maxDepth = 5;
+ int maxBins = 32;
+ int seed = 12345;
RandomForestModel model = RandomForest.trainClassifier(trainingData,
numClasses,
categoricalFeaturesInfo, numTrees, featureSubsetStrategy, impurity,
maxDepth, maxBins,
diff --git
a/launcher/src/main/java/org/apache/spark/launcher/LauncherServer.java
b/launcher/src/main/java/org/apache/spark/launcher/LauncherServer.java
index 607879fd02ea9..3ff77878f68a8 100644
--- a/launcher/src/main/java/org/apache/spark/launcher/LauncherServer.java
+++ b/launcher/src/main/java/org/apache/spark/launcher/LauncherServer.java
@@ -318,9 +318,9 @@ protected void handle(Message msg) throws IOException {
throw new IllegalArgumentException("Received Hello for unknown
client.");
}
} else {
+ String msgClassName = msg != null ? msg.getClass().getName() : "no
message";
if (handle == null) {
- throw new IllegalArgumentException("Expected hello, got: " +
- msg != null ? msg.getClass().getName() : null);
+ throw new IllegalArgumentException("Expected hello, got: " +
msgClassName);
}
if (msg instanceof SetAppId) {
SetAppId set = (SetAppId) msg;
@@ -328,8 +328,7 @@ protected void handle(Message msg) throws IOException {
} else if (msg instanceof SetState) {
handle.setState(((SetState)msg).state);
} else {
- throw new IllegalArgumentException("Invalid message: " +
- msg != null ? msg.getClass().getName() : null);
+ throw new IllegalArgumentException("Invalid message: " +
msgClassName);
}
}
} catch (Exception e) {
diff --git
a/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/codegen/UnsafeArrayWriter.java
b/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/codegen/UnsafeArrayWriter.java
index a78dd970d23e4..997eecd839d85 100644
---
a/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/codegen/UnsafeArrayWriter.java
+++
b/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/codegen/UnsafeArrayWriter.java
@@ -74,7 +74,7 @@ public void initialize(int numElements) {
}
private long getElementOffset(int ordinal) {
- return startingOffset + headerInBytes + ordinal * elementSize;
+ return startingOffset + headerInBytes + ordinal * (long) elementSize;
}
private void setNullBit(int ordinal) {
diff --git
a/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/codegen/UnsafeRowWriter.java
b/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/codegen/UnsafeRowWriter.java
index 3960d6d520476..d2298aa263646 100644
---
a/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/codegen/UnsafeRowWriter.java
+++
b/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/codegen/UnsafeRowWriter.java
@@ -132,7 +132,7 @@ public void setNull8Bytes(int ordinal) {
}
public long getFieldOffset(int ordinal) {
- return startingOffset + nullBitsSize + 8 * ordinal;
+ return startingOffset + nullBitsSize + 8L * ordinal;
}
public void write(int ordinal, boolean value) {
diff --git
a/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/xml/UDFXPathUtil.java
b/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/xml/UDFXPathUtil.java
index 023ec139652c5..e9f18229b54c2 100644
---
a/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/xml/UDFXPathUtil.java
+++
b/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/xml/UDFXPathUtil.java
@@ -180,7 +180,7 @@ public long skip(long ns) throws IOException {
return 0;
}
// Bound skip by beginning and end of the source
- long n = Math.min(length - next, ns);
+ int n = (int) Math.min(length - next, ns);
n = Math.max(-next, n);
next += n;
return n;
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
