Skip to content

Commit 64f86ac

Browse files
kiszkRobert Kruszewski
kiszk
authored and
Robert Kruszewski
committed
[SPARK-10399][SPARK-23879][HOTFIX] Fix Java lint errors
## 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 apache#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 <[email protected]> Closes apache#20991 from kiszk/SPARK-10399-jlint.
1 parent 9983670 commit 64f86ac

File tree

11 files changed

+35
-43
lines changed

11 files changed

+35
-43
lines changed

‎common/unsafe/src/main/java/org/apache/spark/sql/catalyst/expressions/HiveHasher.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
package org.apache.spark.sql.catalyst.expressions;
1919

20-
import org.apache.spark.unsafe.Platform;
2120
import org.apache.spark.unsafe.memory.MemoryBlock;
2221

2322
/**

‎common/unsafe/src/main/java/org/apache/spark/unsafe/array/ByteArrayMethods.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public static int roundNumberOfBytesToNearestWord(int numBytes) {
5454
* @return true if the arrays are equal, false otherwise
5555
*/
5656
public static boolean arrayEqualsBlock(
57-
MemoryBlock leftBase, long leftOffset, MemoryBlock rightBase, long rightOffset, final long length) {
57+
MemoryBlock leftBase, long leftOffset, MemoryBlock rightBase, long rightOffset, long length) {
5858
return arrayEquals(leftBase.getBaseObject(), leftBase.getBaseOffset() + leftOffset,
5959
rightBase.getBaseObject(), rightBase.getBaseOffset() + rightOffset, length);
6060
}
@@ -64,7 +64,7 @@ public static boolean arrayEqualsBlock(
6464
* @return true if the arrays are equal, false otherwise
6565
*/
6666
public static boolean arrayEquals(
67-
Object leftBase, long leftOffset, Object rightBase, long rightOffset, final long length) {
67+
Object leftBase, long leftOffset, Object rightBase, long rightOffset, long length) {
6868
int i = 0;
6969

7070
// check if starts align and we can get both offsets to be aligned

‎common/unsafe/src/main/java/org/apache/spark/unsafe/memory/ByteArrayMemoryBlock.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -57,72 +57,72 @@ public static ByteArrayMemoryBlock fromArray(final byte[] array) {
5757
}
5858

5959
@Override
60-
public final int getInt(long offset) {
60+
public int getInt(long offset) {
6161
return Platform.getInt(array, this.offset + offset);
6262
}
6363

6464
@Override
65-
public final void putInt(long offset, int value) {
65+
public void putInt(long offset, int value) {
6666
Platform.putInt(array, this.offset + offset, value);
6767
}
6868

6969
@Override
70-
public final boolean getBoolean(long offset) {
70+
public boolean getBoolean(long offset) {
7171
return Platform.getBoolean(array, this.offset + offset);
7272
}
7373

7474
@Override
75-
public final void putBoolean(long offset, boolean value) {
75+
public void putBoolean(long offset, boolean value) {
7676
Platform.putBoolean(array, this.offset + offset, value);
7777
}
7878

7979
@Override
80-
public final byte getByte(long offset) {
80+
public byte getByte(long offset) {
8181
return array[(int)(this.offset + offset - Platform.BYTE_ARRAY_OFFSET)];
8282
}
8383

8484
@Override
85-
public final void putByte(long offset, byte value) {
85+
public void putByte(long offset, byte value) {
8686
array[(int)(this.offset + offset - Platform.BYTE_ARRAY_OFFSET)] = value;
8787
}
8888

8989
@Override
90-
public final short getShort(long offset) {
90+
public short getShort(long offset) {
9191
return Platform.getShort(array, this.offset + offset);
9292
}
9393

9494
@Override
95-
public final void putShort(long offset, short value) {
95+
public void putShort(long offset, short value) {
9696
Platform.putShort(array, this.offset + offset, value);
9797
}
9898

9999
@Override
100-
public final long getLong(long offset) {
100+
public long getLong(long offset) {
101101
return Platform.getLong(array, this.offset + offset);
102102
}
103103

104104
@Override
105-
public final void putLong(long offset, long value) {
105+
public void putLong(long offset, long value) {
106106
Platform.putLong(array, this.offset + offset, value);
107107
}
108108

109109
@Override
110-
public final float getFloat(long offset) {
110+
public float getFloat(long offset) {
111111
return Platform.getFloat(array, this.offset + offset);
112112
}
113113

114114
@Override
115-
public final void putFloat(long offset, float value) {
115+
public void putFloat(long offset, float value) {
116116
Platform.putFloat(array, this.offset + offset, value);
117117
}
118118

119119
@Override
120-
public final double getDouble(long offset) {
120+
public double getDouble(long offset) {
121121
return Platform.getDouble(array, this.offset + offset);
122122
}
123123

124124
@Override
125-
public final void putDouble(long offset, double value) {
125+
public void putDouble(long offset, double value) {
126126
Platform.putDouble(array, this.offset + offset, value);
127127
}
128128
}

‎common/unsafe/src/main/java/org/apache/spark/unsafe/memory/HeapMemoryAllocator.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
2323
import java.util.LinkedList;
2424
import java.util.Map;
2525

26-
import org.apache.spark.unsafe.Platform;
27-
2826
/**
2927
* A simple {@link MemoryAllocator} that can allocate up to 16GB using a JVM long primitive array.
3028
*/

‎common/unsafe/src/main/java/org/apache/spark/unsafe/memory/MemoryBlock.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public final void fill(byte value) {
111111
/**
112112
* Instantiate MemoryBlock for given object type with new offset
113113
*/
114-
public final static MemoryBlock allocateFromObject(Object obj, long offset, long length) {
114+
public static final MemoryBlock allocateFromObject(Object obj, long offset, long length) {
115115
MemoryBlock mb = null;
116116
if (obj instanceof byte[]) {
117117
byte[] array = (byte[])obj;

‎common/unsafe/src/main/java/org/apache/spark/unsafe/memory/OffHeapMemoryBlock.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import org.apache.spark.unsafe.Platform;
2121

2222
public class OffHeapMemoryBlock extends MemoryBlock {
23-
static public final OffHeapMemoryBlock NULL = new OffHeapMemoryBlock(0, 0);
23+
public static final OffHeapMemoryBlock NULL = new OffHeapMemoryBlock(0, 0);
2424

2525
public OffHeapMemoryBlock(long address, long size) {
2626
super(null, address, size);

‎common/unsafe/src/main/java/org/apache/spark/unsafe/memory/OnHeapMemoryBlock.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -61,72 +61,72 @@ public static OnHeapMemoryBlock fromArray(final long[] array, long size) {
6161
}
6262

6363
@Override
64-
public final int getInt(long offset) {
64+
public int getInt(long offset) {
6565
return Platform.getInt(array, this.offset + offset);
6666
}
6767

6868
@Override
69-
public final void putInt(long offset, int value) {
69+
public void putInt(long offset, int value) {
7070
Platform.putInt(array, this.offset + offset, value);
7171
}
7272

7373
@Override
74-
public final boolean getBoolean(long offset) {
74+
public boolean getBoolean(long offset) {
7575
return Platform.getBoolean(array, this.offset + offset);
7676
}
7777

7878
@Override
79-
public final void putBoolean(long offset, boolean value) {
79+
public void putBoolean(long offset, boolean value) {
8080
Platform.putBoolean(array, this.offset + offset, value);
8181
}
8282

8383
@Override
84-
public final byte getByte(long offset) {
84+
public byte getByte(long offset) {
8585
return Platform.getByte(array, this.offset + offset);
8686
}
8787

8888
@Override
89-
public final void putByte(long offset, byte value) {
89+
public void putByte(long offset, byte value) {
9090
Platform.putByte(array, this.offset + offset, value);
9191
}
9292

9393
@Override
94-
public final short getShort(long offset) {
94+
public short getShort(long offset) {
9595
return Platform.getShort(array, this.offset + offset);
9696
}
9797

9898
@Override
99-
public final void putShort(long offset, short value) {
99+
public void putShort(long offset, short value) {
100100
Platform.putShort(array, this.offset + offset, value);
101101
}
102102

103103
@Override
104-
public final long getLong(long offset) {
104+
public long getLong(long offset) {
105105
return Platform.getLong(array, this.offset + offset);
106106
}
107107

108108
@Override
109-
public final void putLong(long offset, long value) {
109+
public void putLong(long offset, long value) {
110110
Platform.putLong(array, this.offset + offset, value);
111111
}
112112

113113
@Override
114-
public final float getFloat(long offset) {
114+
public float getFloat(long offset) {
115115
return Platform.getFloat(array, this.offset + offset);
116116
}
117117

118118
@Override
119-
public final void putFloat(long offset, float value) {
119+
public void putFloat(long offset, float value) {
120120
Platform.putFloat(array, this.offset + offset, value);
121121
}
122122

123123
@Override
124-
public final double getDouble(long offset) {
124+
public double getDouble(long offset) {
125125
return Platform.getDouble(array, this.offset + offset);
126126
}
127127

128128
@Override
129-
public final void putDouble(long offset, double value) {
129+
public void putDouble(long offset, double value) {
130130
Platform.putDouble(array, this.offset + offset, value);
131131
}
132132
}

‎common/unsafe/src/test/java/org/apache/spark/unsafe/memory/MemoryBlockSuite.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ private void check(MemoryBlock memory, Object obj, long offset, int length) {
123123
}
124124

125125
@Test
126-
public void ByteArrayMemoryBlockTest() {
126+
public void testByteArrayMemoryBlock() {
127127
byte[] obj = new byte[56];
128128
long offset = Platform.BYTE_ARRAY_OFFSET;
129129
int length = obj.length;
@@ -140,7 +140,7 @@ public void ByteArrayMemoryBlockTest() {
140140
}
141141

142142
@Test
143-
public void OnHeapMemoryBlockTest() {
143+
public void testOnHeapMemoryBlock() {
144144
long[] obj = new long[7];
145145
long offset = Platform.LONG_ARRAY_OFFSET;
146146
int length = obj.length * 8;
@@ -157,7 +157,7 @@ public void OnHeapMemoryBlockTest() {
157157
}
158158

159159
@Test
160-
public void OffHeapArrayMemoryBlockTest() {
160+
public void testOffHeapArrayMemoryBlock() {
161161
MemoryAllocator memoryAllocator = new UnsafeMemoryAllocator();
162162
MemoryBlock memory = memoryAllocator.allocate(56);
163163
Object obj = memory.getBaseObject();

‎common/unsafe/src/test/java/org/apache/spark/unsafe/types/UTF8StringSuite.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import com.google.common.collect.ImmutableMap;
2828
import org.apache.spark.unsafe.Platform;
2929
import org.apache.spark.unsafe.memory.ByteArrayMemoryBlock;
30-
import org.apache.spark.unsafe.memory.MemoryBlock;
3130
import org.apache.spark.unsafe.memory.OnHeapMemoryBlock;
3231
import org.junit.Test;
3332

‎sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/XXH64.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
*/
1717
package org.apache.spark.sql.catalyst.expressions;
1818

19-
import com.google.common.primitives.Ints;
20-
21-
import org.apache.spark.unsafe.Platform;
2219
import org.apache.spark.unsafe.memory.MemoryBlock;
2320

2421
// scalastyle: off

0 commit comments

Comments
 (0)