Skip to content

[SPARK-10399][SPARK-23879][HotFix] Fix Java lint errors #20991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kiszk wants to merge 2 commits into from
Closed

[SPARK-10399][SPARK-23879][HotFix] Fix Java lint errors #20991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25904bb
Fix java lint errors
kiszk Apr 6, 2018
3315036
address review comment
kiszk Apr 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion common/unsafe/src/main/java/org/apache/spark/sql/catalyst/expressions/HiveHasher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

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

import org.apache.spark.unsafe.Platform;
import org.apache.spark.unsafe.memory.MemoryBlock;

/**
Expand Down
4 changes: 2 additions & 2 deletions common/unsafe/src/main/java/org/apache/spark/unsafe/array/ByteArrayMethods.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public static int roundNumberOfBytesToNearestWord(int numBytes) {
* @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) {
Copy link
Member

@ueshin ueshin Apr 6, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we can remove final from L67 as well?

return arrayEquals(leftBase.getBaseObject(), leftBase.getBaseOffset() + leftOffset,
rightBase.getBaseObject(), rightBase.getBaseOffset() + rightOffset, length);
}
Expand All @@ -64,7 +64,7 @@ public static boolean arrayEqualsBlock(
* @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
Expand Down
28 changes: 14 additions & 14 deletions common/unsafe/src/main/java/org/apache/spark/unsafe/memory/ByteArrayMemoryBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,72 +57,72 @@ public static ByteArrayMemoryBlock fromArray(final byte[] array) {
}

@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 changes: 0 additions & 2 deletions common/unsafe/src/main/java/org/apache/spark/unsafe/memory/HeapMemoryAllocator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
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.
*/
Expand Down
2 changes: 1 addition & 1 deletion common/unsafe/src/main/java/org/apache/spark/unsafe/memory/MemoryBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public final void fill(byte value) {
/**
* 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;
Expand Down
2 changes: 1 addition & 1 deletion common/unsafe/src/main/java/org/apache/spark/unsafe/memory/OffHeapMemoryBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
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);
Expand Down
28 changes: 14 additions & 14 deletions common/unsafe/src/main/java/org/apache/spark/unsafe/memory/OnHeapMemoryBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,72 +61,72 @@ public static OnHeapMemoryBlock fromArray(final long[] array, long size) {
}

@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 changes: 3 additions & 3 deletions common/unsafe/src/test/java/org/apache/spark/unsafe/memory/MemoryBlockSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ private void check(MemoryBlock memory, Object obj, long offset, int length) {
}

@Test
public void ByteArrayMemoryBlockTest() {
public void testByteArrayMemoryBlock() {
byte[] obj = new byte[56];
long offset = Platform.BYTE_ARRAY_OFFSET;
int length = obj.length;
Expand All @@ -140,7 +140,7 @@ public void ByteArrayMemoryBlockTest() {
}

@Test
public void OnHeapMemoryBlockTest() {
public void testOnHeapMemoryBlock() {
long[] obj = new long[7];
long offset = Platform.LONG_ARRAY_OFFSET;
int length = obj.length * 8;
Expand All @@ -157,7 +157,7 @@ public void OnHeapMemoryBlockTest() {
}

@Test
public void OffHeapArrayMemoryBlockTest() {
public void testOffHeapArrayMemoryBlock() {
MemoryAllocator memoryAllocator = new UnsafeMemoryAllocator();
MemoryBlock memory = memoryAllocator.allocate(56);
Object obj = memory.getBaseObject();
Expand Down
1 change: 0 additions & 1 deletion common/unsafe/src/test/java/org/apache/spark/unsafe/types/UTF8StringSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
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;

Expand Down
3 changes: 0 additions & 3 deletions sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/XXH64.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion sql/catalyst/src/test/java/org/apache/spark/sql/catalyst/expressions/HiveHasherSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down