ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[SPARK-10399][SPARK-23879][HOTFIX] Fix Java lint errors

Browse source 
## What changes were proposed in this pull request?

This PR fixes the following errors in [Java lint](https://amplab.cs.berkeley.edu/jenkins/view/Spark%20QA%20Compile/job/spark-master-lint/7717/console) after #19222 has been merged. These errors were pointed by ueshin .

```
[ERROR] src/main/java/org/apache/spark/unsafe/array/ByteArrayMethods.java:[57] (sizes) LineLength: Line is longer than 100 characters (found 106).
[ERROR] src/main/java/org/apache/spark/unsafe/memory/HeapMemoryAllocator.java:[26,8] (imports) UnusedImports: Unused import - org.apache.spark.unsafe.Platform.
[ERROR] src/main/java/org/apache/spark/unsafe/memory/OffHeapMemoryBlock.java:[23,10] (modifier) ModifierOrder: 'public' modifier out of order with the JLS suggestions.
[ERROR] src/main/java/org/apache/spark/unsafe/memory/OnHeapMemoryBlock.java:[64,10] (modifier) RedundantModifier: Redundant 'final' modifier.
[ERROR] src/main/java/org/apache/spark/unsafe/memory/OnHeapMemoryBlock.java:[69,10] (modifier) RedundantModifier: Redundant 'final' modifier.
[ERROR] src/main/java/org/apache/spark/unsafe/memory/OnHeapMemoryBlock.java:[74,10] (modifier) RedundantModifier: Redundant 'final' modifier.
[ERROR] src/main/java/org/apache/spark/unsafe/memory/OnHeapMemoryBlock.java:[79,10] (modifier) RedundantModifier: Redundant 'final' modifier.
[ERROR] src/main/java/org/apache/spark/unsafe/memory/OnHeapMemoryBlock.java:[84,10] (modifier) RedundantModifier: Redundant 'final' modifier.
[ERROR] src/main/java/org/apache/spark/unsafe/memory/OnHeapMemoryBlock.java:[89,10] (modifier) RedundantModifier: Redundant 'final' modifier.
[ERROR] src/main/java/org/apache/spark/unsafe/memory/OnHeapMemoryBlock.java:[94,10] (modifier) RedundantModifier: Redundant 'final' modifier.
[ERROR] src/main/java/org/apache/spark/unsafe/memory/OnHeapMemoryBlock.java:[99,10] (modifier) RedundantModifier: Redundant 'final' modifier.
[ERROR] src/main/java/org/apache/spark/unsafe/memory/OnHeapMemoryBlock.java:[104,10] (modifier) RedundantModifier: Redundant 'final' modifier.
[ERROR] src/main/java/org/apache/spark/unsafe/memory/OnHeapMemoryBlock.java:[109,10] (modifier) RedundantModifier: Redundant 'final' modifier.
[ERROR] src/main/java/org/apache/spark/unsafe/memory/OnHeapMemoryBlock.java:[114,10] (modifier) RedundantModifier: Redundant 'final' modifier.
[ERROR] src/main/java/org/apache/spark/unsafe/memory/OnHeapMemoryBlock.java:[119,10] (modifier) RedundantModifier: Redundant 'final' modifier.
[ERROR] src/main/java/org/apache/spark/unsafe/memory/OnHeapMemoryBlock.java:[124,10] (modifier) RedundantModifier: Redundant 'final' modifier.
[ERROR] src/main/java/org/apache/spark/unsafe/memory/OnHeapMemoryBlock.java:[129,10] (modifier) RedundantModifier: Redundant 'final' modifier.
[ERROR] src/main/java/org/apache/spark/unsafe/memory/ByteArrayMemoryBlock.java:[60,10] (modifier) RedundantModifier: Redundant 'final' modifier.
[ERROR] src/main/java/org/apache/spark/unsafe/memory/ByteArrayMemoryBlock.java:[65,10] (modifier) RedundantModifier: Redundant 'final' modifier.
[ERROR] src/main/java/org/apache/spark/unsafe/memory/ByteArrayMemoryBlock.java:[70,10] (modifier) RedundantModifier: Redundant 'final' modifier.
[ERROR] src/main/java/org/apache/spark/unsafe/memory/ByteArrayMemoryBlock.java:[75,10] (modifier) RedundantModifier: Redundant 'final' modifier.
[ERROR] src/main/java/org/apache/spark/unsafe/memory/ByteArrayMemoryBlock.java:[80,10] (modifier) RedundantModifier: Redundant 'final' modifier.
[ERROR] src/main/java/org/apache/spark/unsafe/memory/ByteArrayMemoryBlock.java:[85,10] (modifier) RedundantModifier: Redundant 'final' modifier.
[ERROR] src/main/java/org/apache/spark/unsafe/memory/ByteArrayMemoryBlock.java:[90,10] (modifier) RedundantModifier: Redundant 'final' modifier.
[ERROR] src/main/java/org/apache/spark/unsafe/memory/ByteArrayMemoryBlock.java:[95,10] (modifier) RedundantModifier: Redundant 'final' modifier.
[ERROR] src/main/java/org/apache/spark/unsafe/memory/ByteArrayMemoryBlock.java:[100,10] (modifier) RedundantModifier: Redundant 'final' modifier.
[ERROR] src/main/java/org/apache/spark/unsafe/memory/ByteArrayMemoryBlock.java:[105,10] (modifier) RedundantModifier: Redundant 'final' modifier.
[ERROR] src/main/java/org/apache/spark/unsafe/memory/ByteArrayMemoryBlock.java:[110,10] (modifier) RedundantModifier: Redundant 'final' modifier.
[ERROR] src/main/java/org/apache/spark/unsafe/memory/ByteArrayMemoryBlock.java:[115,10] (modifier) RedundantModifier: Redundant 'final' modifier.
[ERROR] src/main/java/org/apache/spark/unsafe/memory/ByteArrayMemoryBlock.java:[120,10] (modifier) RedundantModifier: Redundant 'final' modifier.
[ERROR] src/main/java/org/apache/spark/unsafe/memory/ByteArrayMemoryBlock.java:[125,10] (modifier) RedundantModifier: Redundant 'final' modifier.
[ERROR] src/main/java/org/apache/spark/unsafe/memory/MemoryBlock.java:[114,16] (modifier) ModifierOrder: 'static' modifier out of order with the JLS suggestions.
[ERROR] src/main/java/org/apache/spark/sql/catalyst/expressions/HiveHasher.java:[20,8] (imports) UnusedImports: Unused import - org.apache.spark.unsafe.Platform.
[ERROR] src/test/java/org/apache/spark/unsafe/types/UTF8StringSuite.java:[30,8] (imports) UnusedImports: Unused import - org.apache.spark.unsafe.memory.MemoryBlock.
[ERROR] src/test/java/org/apache/spark/unsafe/memory/MemoryBlockSuite.java:[126,15] (naming) MethodName: Method name 'ByteArrayMemoryBlockTest' must match pattern '^[a-z][a-z0-9][a-zA-Z0-9_]*$'.
[ERROR] src/test/java/org/apache/spark/unsafe/memory/MemoryBlockSuite.java:[143,15] (naming) MethodName: Method name 'OnHeapMemoryBlockTest' must match pattern '^[a-z][a-z0-9][a-zA-Z0-9_]*$'.
[ERROR] src/test/java/org/apache/spark/unsafe/memory/MemoryBlockSuite.java:[160,15] (naming) MethodName: Method name 'OffHeapArrayMemoryBlockTest' must match pattern '^[a-z][a-z0-9][a-zA-Z0-9_]*$'.
[ERROR] src/main/java/org/apache/spark/sql/catalyst/expressions/XXH64.java:[19,8] (imports) UnusedImports: Unused import - com.google.common.primitives.Ints.
[ERROR] src/main/java/org/apache/spark/sql/catalyst/expressions/XXH64.java:[21,8] (imports) UnusedImports: Unused import - org.apache.spark.unsafe.Platform.
[ERROR] src/test/java/org/apache/spark/sql/catalyst/expressions/HiveHasherSuite.java:[20,8] (imports) UnusedImports: Unused import - org.apache.spark.unsafe.Platform.
```

## How was this patch tested?

Existing UTs

Author: Kazuaki Ishizaki <ishizaki@jp.ibm.com>

Closes #20991 from kiszk/SPARK-10399-jlint.
This commit is contained in:
Kazuaki Ishizaki 2018-04-06 10:23:26 -07:00 committed by Takuya UESHIN
parent d23a805f97
commit b6935ffb4d
11 changed files with 35 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/unsafe/src/main/java/org/apache/spark/sql/catalyst/expressions/HiveHasher.java
View file

@ -17,7 +17,6 @@
package org.apache.spark.sql.catalyst.expressions;
import org.apache.spark.unsafe.Platform;
import org.apache.spark.unsafe.memory.MemoryBlock;
/**

4
common/unsafe/src/main/java/org/apache/spark/unsafe/array/ByteArrayMethods.java
View file

@ -54,7 +54,7 @@ public class ByteArrayMethods {
* @return true if the arrays are equal, false otherwise
*/
public static boolean arrayEqualsBlock(
MemoryBlock leftBase, long leftOffset, MemoryBlock rightBase, long rightOffset, final long length) {
MemoryBlock leftBase, long leftOffset, MemoryBlock rightBase, long rightOffset, long length) {
return arrayEquals(leftBase.getBaseObject(), leftBase.getBaseOffset() + leftOffset,
rightBase.getBaseObject(), rightBase.getBaseOffset() + rightOffset, length);
}
@ -64,7 +64,7 @@ public class ByteArrayMethods {
* @return true if the arrays are equal, false otherwise
*/
public static boolean arrayEquals(
Object leftBase, long leftOffset, Object rightBase, long rightOffset, final long length) {
Object leftBase, long leftOffset, Object rightBase, long rightOffset, long length) {
int i = 0;
// check if starts align and we can get both offsets to be aligned

28
common/unsafe/src/main/java/org/apache/spark/unsafe/memory/ByteArrayMemoryBlock.java
View file

@ -57,72 +57,72 @@ public final class ByteArrayMemoryBlock extends MemoryBlock {
}
@Override
public final int getInt(long offset) {
public int getInt(long offset) {
return Platform.getInt(array, this.offset + offset);
}
@Override
public final void putInt(long offset, int value) {
public void putInt(long offset, int value) {
Platform.putInt(array, this.offset + offset, value);
}
@Override
public final boolean getBoolean(long offset) {
public boolean getBoolean(long offset) {
return Platform.getBoolean(array, this.offset + offset);
}
@Override
public final void putBoolean(long offset, boolean value) {
public void putBoolean(long offset, boolean value) {
Platform.putBoolean(array, this.offset + offset, value);
}
@Override
public final byte getByte(long offset) {
public byte getByte(long offset) {
return array[(int)(this.offset + offset - Platform.BYTE_ARRAY_OFFSET)];
}
@Override
public final void putByte(long offset, byte value) {
public void putByte(long offset, byte value) {
array[(int)(this.offset + offset - Platform.BYTE_ARRAY_OFFSET)] = value;
}
@Override
public final short getShort(long offset) {
public short getShort(long offset) {
return Platform.getShort(array, this.offset + offset);
}
@Override
public final void putShort(long offset, short value) {
public void putShort(long offset, short value) {
Platform.putShort(array, this.offset + offset, value);
}
@Override
public final long getLong(long offset) {
public long getLong(long offset) {
return Platform.getLong(array, this.offset + offset);
}
@Override
public final void putLong(long offset, long value) {
public void putLong(long offset, long value) {
Platform.putLong(array, this.offset + offset, value);
}
@Override
public final float getFloat(long offset) {
public float getFloat(long offset) {
return Platform.getFloat(array, this.offset + offset);
}
@Override
public final void putFloat(long offset, float value) {
public void putFloat(long offset, float value) {
Platform.putFloat(array, this.offset + offset, value);
}
@Override
public final double getDouble(long offset) {
public double getDouble(long offset) {
return Platform.getDouble(array, this.offset + offset);
}
@Override
public final void putDouble(long offset, double value) {
public void putDouble(long offset, double value) {
Platform.putDouble(array, this.offset + offset, value);
}
}

2
common/unsafe/src/main/java/org/apache/spark/unsafe/memory/HeapMemoryAllocator.java
View file

@ -23,8 +23,6 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.Map;
import org.apache.spark.unsafe.Platform;
/**
* A simple {@link MemoryAllocator} that can allocate up to 16GB using a JVM long primitive array.
*/

2
common/unsafe/src/main/java/org/apache/spark/unsafe/memory/MemoryBlock.java
View file

@ -111,7 +111,7 @@ public abstract class MemoryBlock {
/**
* Instantiate MemoryBlock for given object type with new offset
*/
public final static MemoryBlock allocateFromObject(Object obj, long offset, long length) {
public static final MemoryBlock allocateFromObject(Object obj, long offset, long length) {
MemoryBlock mb = null;
if (obj instanceof byte[]) {
byte[] array = (byte[])obj;

2
common/unsafe/src/main/java/org/apache/spark/unsafe/memory/OffHeapMemoryBlock.java
View file

@ -20,7 +20,7 @@ package org.apache.spark.unsafe.memory;
import org.apache.spark.unsafe.Platform;
public class OffHeapMemoryBlock extends MemoryBlock {
static public final OffHeapMemoryBlock NULL = new OffHeapMemoryBlock(0, 0);
public static final OffHeapMemoryBlock NULL = new OffHeapMemoryBlock(0, 0);
public OffHeapMemoryBlock(long address, long size) {
super(null, address, size);

28
common/unsafe/src/main/java/org/apache/spark/unsafe/memory/OnHeapMemoryBlock.java
View file

@ -61,72 +61,72 @@ public final class OnHeapMemoryBlock extends MemoryBlock {
}
@Override
public final int getInt(long offset) {
public int getInt(long offset) {
return Platform.getInt(array, this.offset + offset);
}
@Override
public final void putInt(long offset, int value) {
public void putInt(long offset, int value) {
Platform.putInt(array, this.offset + offset, value);
}
@Override
public final boolean getBoolean(long offset) {
public boolean getBoolean(long offset) {
return Platform.getBoolean(array, this.offset + offset);
}
@Override
public final void putBoolean(long offset, boolean value) {
public void putBoolean(long offset, boolean value) {
Platform.putBoolean(array, this.offset + offset, value);
}
@Override
public final byte getByte(long offset) {
public byte getByte(long offset) {
return Platform.getByte(array, this.offset + offset);
}
@Override
public final void putByte(long offset, byte value) {
public void putByte(long offset, byte value) {
Platform.putByte(array, this.offset + offset, value);
}
@Override
public final short getShort(long offset) {
public short getShort(long offset) {
return Platform.getShort(array, this.offset + offset);
}
@Override
public final void putShort(long offset, short value) {
public void putShort(long offset, short value) {
Platform.putShort(array, this.offset + offset, value);
}
@Override
public final long getLong(long offset) {
public long getLong(long offset) {
return Platform.getLong(array, this.offset + offset);
}
@Override
public final void putLong(long offset, long value) {
public void putLong(long offset, long value) {
Platform.putLong(array, this.offset + offset, value);
}
@Override
public final float getFloat(long offset) {
public float getFloat(long offset) {
return Platform.getFloat(array, this.offset + offset);
}
@Override
public final void putFloat(long offset, float value) {
public void putFloat(long offset, float value) {
Platform.putFloat(array, this.offset + offset, value);
}
@Override
public final double getDouble(long offset) {
public double getDouble(long offset) {
return Platform.getDouble(array, this.offset + offset);
}
@Override
public final void putDouble(long offset, double value) {
public void putDouble(long offset, double value) {
Platform.putDouble(array, this.offset + offset, value);
}
}

6
common/unsafe/src/test/java/org/apache/spark/unsafe/memory/MemoryBlockSuite.java
View file

@ -123,7 +123,7 @@ public class MemoryBlockSuite {
}
@Test
public void ByteArrayMemoryBlockTest() {
public void testByteArrayMemoryBlock() {
byte[] obj = new byte[56];
long offset = Platform.BYTE_ARRAY_OFFSET;
int length = obj.length;
@ -140,7 +140,7 @@ public class MemoryBlockSuite {
}
@Test
public void OnHeapMemoryBlockTest() {
public void testOnHeapMemoryBlock() {
long[] obj = new long[7];
long offset = Platform.LONG_ARRAY_OFFSET;
int length = obj.length * 8;
@ -157,7 +157,7 @@ public class MemoryBlockSuite {
}
@Test
public void OffHeapArrayMemoryBlockTest() {
public void testOffHeapArrayMemoryBlock() {
MemoryAllocator memoryAllocator = new UnsafeMemoryAllocator();
MemoryBlock memory = memoryAllocator.allocate(56);
Object obj = memory.getBaseObject();

1
common/unsafe/src/test/java/org/apache/spark/unsafe/types/UTF8StringSuite.java
View file

@ -27,7 +27,6 @@ import java.util.*;
import com.google.common.collect.ImmutableMap;
import org.apache.spark.unsafe.Platform;
import org.apache.spark.unsafe.memory.ByteArrayMemoryBlock;
import org.apache.spark.unsafe.memory.MemoryBlock;
import org.apache.spark.unsafe.memory.OnHeapMemoryBlock;
import org.junit.Test;

3
sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/XXH64.java
View file

@ -16,9 +16,6 @@
*/
package org.apache.spark.sql.catalyst.expressions;
import com.google.common.primitives.Ints;
import org.apache.spark.unsafe.Platform;
import org.apache.spark.unsafe.memory.MemoryBlock;
// scalastyle: off

1
sql/catalyst/src/test/java/org/apache/spark/sql/catalyst/expressions/HiveHasherSuite.java
View file

@ -17,7 +17,6 @@
package org.apache.spark.sql.catalyst.expressions;
import org.apache.spark.unsafe.Platform;
import org.apache.spark.unsafe.memory.ByteArrayMemoryBlock;
import org.apache.spark.unsafe.memory.MemoryBlock;
import org.apache.spark.unsafe.types.UTF8String;