Skip to content

Commit 0bad052

Browse files
committed
Fix scaladoc faux-error.
Visibility rules for static members are different in Scala and Java, and this case requires an explicit static import. Even though these are Java files, they are run through scaladoc, which enforces Scala rules. Fix SPARK-7726
1 parent df34793 commit 0bad052

File tree

4 files changed

+12
-0
lines changed

4 files changed

+12
-0
lines changed

network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/OpenBlocks.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424

2525
import org.apache.spark.network.protocol.Encoders;
2626

27+
// Needed by ScalaDoc. See SPARK-7726
28+
import static org.apache.spark.network.shuffle.protocol.BlockTransferMessage.Type;
29+
2730
/** Request to read a set of blocks. Returns {@link StreamHandle}. */
2831
public class OpenBlocks extends BlockTransferMessage {
2932
public final String appId;

network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/RegisterExecutor.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222

2323
import org.apache.spark.network.protocol.Encoders;
2424

25+
// Needed by ScalaDoc. See SPARK-7726
26+
import static org.apache.spark.network.shuffle.protocol.BlockTransferMessage.Type;
27+
2528
/**
2629
* Initial registration message between an executor and its local shuffle server.
2730
* Returns nothing (empty bye array).

network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/StreamHandle.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
import com.google.common.base.Objects;
2121
import io.netty.buffer.ByteBuf;
2222

23+
// Needed by ScalaDoc. See SPARK-7726
24+
import static org.apache.spark.network.shuffle.protocol.BlockTransferMessage.Type;
25+
2326
/**
2427
* Identifier for a fixed number of chunks to read from a stream created by an "open blocks"
2528
* message. This is used by {@link org.apache.spark.network.shuffle.OneForOneBlockFetcher}.

network/shuffle/src/main/java/org/apache/spark/network/shuffle/protocol/UploadBlock.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@
2424

2525
import org.apache.spark.network.protocol.Encoders;
2626

27+
// Needed by ScalaDoc. See SPARK-7726
28+
import static org.apache.spark.network.shuffle.protocol.BlockTransferMessage.Type;
29+
2730

2831
/** Request to upload a block with a certain StorageLevel. Returns nothing (empty byte array). */
2932
public class UploadBlock extends BlockTransferMessage {

0 commit comments

Comments
 (0)