Skip to content

making it build in intellij #5

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

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

making it build in intellij #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 2 additions & 21 deletions .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

64 changes: 32 additions & 32 deletions flink-connectors/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,27 +35,27 @@ under the License.
<packaging>pom</packaging>

<modules>
<module>flink-hadoop-compatibility</module>
<module>flink-hcatalog</module>
<module>flink-connector-elasticsearch-base</module>
<module>flink-connector-elasticsearch6</module>
<module>flink-connector-elasticsearch7</module>
<module>flink-connector-hbase-base</module>
<module>flink-connector-hbase-1.4</module>
<module>flink-connector-hbase-2.2</module>
<module>flink-connector-hive</module>
<module>flink-connector-jdbc</module>
<module>flink-connector-rabbitmq</module>
<module>flink-connector-cassandra</module>
<module>flink-connector-kafka</module>
<module>flink-connector-gcp-pubsub</module>
<module>flink-connector-aws-base</module>
<module>flink-connector-kinesis</module>
<module>flink-connector-aws-kinesis-streams</module>
<module>flink-connector-aws-kinesis-firehose</module>
<module>flink-connector-base</module>
<module>flink-file-sink-common</module>
<module>flink-connector-files</module>
<!-- <module>flink-hadoop-compatibility</module>-->
<!-- <module>flink-hcatalog</module>-->
<!-- <module>flink-connector-elasticsearch-base</module>-->
<!-- <module>flink-connector-elasticsearch6</module>-->
<!-- <module>flink-connector-elasticsearch7</module>-->
<!-- <module>flink-connector-hbase-base</module>-->
<!-- <module>flink-connector-hbase-1.4</module>-->
<!-- <module>flink-connector-hbase-2.2</module>-->
<!-- <module>flink-connector-hive</module>-->
<!-- <module>flink-connector-jdbc</module>-->
<!-- <module>flink-connector-rabbitmq</module>-->
<!-- <module>flink-connector-cassandra</module>-->
<!-- <module>flink-connector-kafka</module>-->
<!-- <module>flink-connector-gcp-pubsub</module>-->
<!-- <module>flink-connector-aws-base</module>-->
<!-- <module>flink-connector-kinesis</module>-->
<!-- <module>flink-connector-aws-kinesis-streams</module>-->
<!-- <module>flink-connector-aws-kinesis-firehose</module>-->
<!-- <module>flink-connector-base</module>-->
<!-- <module>flink-file-sink-common</module>-->
<!-- <module>flink-connector-files</module>-->
<module>flink-connector-pulsar</module>
</modules>

Expand Down Expand Up @@ -93,18 +93,18 @@ under the License.
</property>
</activation>
<modules>
<module>flink-sql-connector-elasticsearch6</module>
<module>flink-sql-connector-elasticsearch7</module>
<module>flink-sql-connector-hbase-1.4</module>
<module>flink-sql-connector-hbase-2.2</module>
<module>flink-sql-connector-hive-2.3.9</module>
<module>flink-sql-connector-hive-3.1.2</module>
<module>flink-sql-connector-kafka</module>
<module>flink-sql-connector-aws-kinesis-streams</module>
<module>flink-sql-connector-aws-kinesis-firehose</module>
<module>flink-sql-connector-kinesis</module>
<!-- <module>flink-sql-connector-elasticsearch6</module>-->
<!-- <module>flink-sql-connector-elasticsearch7</module>-->
<!-- <module>flink-sql-connector-hbase-1.4</module>-->
<!-- <module>flink-sql-connector-hbase-2.2</module>-->
<!-- <module>flink-sql-connector-hive-2.3.9</module>-->
<!-- <module>flink-sql-connector-hive-3.1.2</module>-->
<!-- <module>flink-sql-connector-kafka</module>-->
<!-- <module>flink-sql-connector-aws-kinesis-streams</module>-->
<!-- <module>flink-sql-connector-aws-kinesis-firehose</module>-->
<!-- <module>flink-sql-connector-kinesis</module>-->
<module>flink-sql-connector-pulsar</module>
<module>flink-sql-connector-rabbitmq</module>
<!-- <module>flink-sql-connector-rabbitmq</module>-->
</modules>
</profile>
</profiles>
Expand Down
2 changes: 1 addition & 1 deletion flink-core/src/main/java/org/apache/flink/core/memory/DataInputDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ public int getPosition() {
// ------------------------------------------------------------------------

@SuppressWarnings("restriction")
private static final sun.misc.Unsafe UNSAFE = MemoryUtils.UNSAFE;
private static final jdk.internal.misc.Unsafe UNSAFE = MemoryUtils.UNSAFE;

@SuppressWarnings("restriction")
private static final long BASE_OFFSET = UNSAFE.arrayBaseOffset(byte[].class);
Expand Down
2 changes: 1 addition & 1 deletion flink-core/src/main/java/org/apache/flink/core/memory/DataOutputSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ public void setPositionUnsafe(int position) {
// ------------------------------------------------------------------------

@SuppressWarnings("restriction")
private static final sun.misc.Unsafe UNSAFE = MemoryUtils.UNSAFE;
private static final jdk.internal.misc.Unsafe UNSAFE = MemoryUtils.UNSAFE;

@SuppressWarnings("restriction")
private static final long BASE_OFFSET = UNSAFE.arrayBaseOffset(byte[].class);
Expand Down
2 changes: 1 addition & 1 deletion flink-core/src/main/java/org/apache/flink/core/memory/MemorySegment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public final class MemorySegment {

/** The unsafe handle for transparent memory copied (heap / off-heap). */
@SuppressWarnings("restriction")
private static final sun.misc.Unsafe UNSAFE = MemoryUtils.UNSAFE;
private static final jdk.internal.misc.Unsafe UNSAFE = MemoryUtils.UNSAFE;

/** The beginning of the byte array contents, relative to the byte array object. */
@SuppressWarnings("restriction")
Expand Down
24 changes: 3 additions & 21 deletions flink-core/src/main/java/org/apache/flink/core/memory/MemoryUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import org.apache.flink.annotation.Internal;
import org.apache.flink.util.Preconditions;

import java.lang.reflect.Field;
import java.nio.Buffer;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
Expand All @@ -32,7 +31,7 @@ public class MemoryUtils {

/** The "unsafe", which can be used to perform native memory accesses. */
@SuppressWarnings({"restriction", "UseOfSunClasses"})
public static final sun.misc.Unsafe UNSAFE = getUnsafe();
public static final jdk.internal.misc.Unsafe UNSAFE = getUnsafe();

/** The native byte order of the platform on which the system currently runs. */
public static final ByteOrder NATIVE_BYTE_ORDER = ByteOrder.nativeOrder();
Expand All @@ -45,25 +44,8 @@ public class MemoryUtils {
getClassByName("java.nio.DirectByteBuffer");

@SuppressWarnings("restriction")
private static sun.misc.Unsafe getUnsafe() {
try {
Field unsafeField = sun.misc.Unsafe.class.getDeclaredField("theUnsafe");
unsafeField.setAccessible(true);
return (sun.misc.Unsafe) unsafeField.get(null);
} catch (SecurityException e) {
throw new Error(
"Could not access the sun.misc.Unsafe handle, permission denied by security manager.",
e);
} catch (NoSuchFieldException e) {
throw new Error("The static handle field in sun.misc.Unsafe was not found.", e);
} catch (IllegalArgumentException e) {
throw new Error("Bug: Illegal argument reflection access for static field.", e);
} catch (IllegalAccessException e) {
throw new Error("Access to sun.misc.Unsafe is forbidden by the runtime.", e);
} catch (Throwable t) {
throw new Error(
"Unclassified error while trying to access the sun.misc.Unsafe handle.", t);
}
private static jdk.internal.misc.Unsafe getUnsafe() {
return jdk.internal.misc.Unsafe.getUnsafe();
}

private static long getClassFieldOffset(
Expand Down
2 changes: 1 addition & 1 deletion flink-core/src/main/java/org/apache/flink/types/Record.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1815,7 +1815,7 @@ private void resize(int minCapacityAdd) throws IOException {
}

@SuppressWarnings("restriction")
private static final sun.misc.Unsafe UNSAFE = MemoryUtils.UNSAFE;
private static final jdk.internal.misc.Unsafe UNSAFE = MemoryUtils.UNSAFE;

@SuppressWarnings("restriction")
private static final long BASE_OFFSET = UNSAFE.arrayBaseOffset(byte[].class);
Expand Down
2 changes: 1 addition & 1 deletion ...e/src/test/java/org/apache/flink/api/java/typeutils/runtime/TestDataOutputSerializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ private void resize(int minCapacityAdd) throws IOException {
}

@SuppressWarnings("restriction")
private static final sun.misc.Unsafe UNSAFE = MemoryUtils.UNSAFE;
private static final jdk.internal.misc.Unsafe UNSAFE = MemoryUtils.UNSAFE;

@SuppressWarnings("restriction")
private static final long BASE_OFFSET = UNSAFE.arrayBaseOffset(byte[].class);
Expand Down
116 changes: 58 additions & 58 deletions flink-end-to-end-tests/flink-end-to-end-tests-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,64 +69,64 @@ under the License.
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
</dependency>
<dependency>
<!-- To ensure that flink-dist is built beforehand -->
<groupId>org.apache.flink</groupId>
<artifactId>flink-dist_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
<exclusions>
<!-- needed for dependency convergence -->
<exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-xc</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
<exclusion>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
</exclusion>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
</exclusion>
<exclusion>
<groupId>com.nimbusds</groupId>
<artifactId>nimbus-jose-jwt</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.inject.extensions</groupId>
<artifactId>guice-servlet</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- <dependency>-->
<!-- &lt;!&ndash; To ensure that flink-dist is built beforehand &ndash;&gt;-->
<!-- <groupId>org.apache.flink</groupId>-->
<!-- <artifactId>flink-dist_${scala.binary.version}</artifactId>-->
<!-- <version>${project.version}</version>-->
<!-- <scope>provided</scope>-->
<!-- <exclusions>-->
<!-- &lt;!&ndash; needed for dependency convergence &ndash;&gt;-->
<!-- <exclusion>-->
<!-- <groupId>commons-beanutils</groupId>-->
<!-- <artifactId>commons-beanutils</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <groupId>org.codehaus.jackson</groupId>-->
<!-- <artifactId>jackson-core-asl</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <groupId>org.codehaus.jackson</groupId>-->
<!-- <artifactId>jackson-mapper-asl</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <groupId>org.codehaus.jackson</groupId>-->
<!-- <artifactId>jackson-xc</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <groupId>org.codehaus.jackson</groupId>-->
<!-- <artifactId>jackson-jaxrs</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <groupId>com.google.guava</groupId>-->
<!-- <artifactId>guava</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <groupId>com.squareup.okio</groupId>-->
<!-- <artifactId>okio</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <groupId>javax.servlet</groupId>-->
<!-- <artifactId>servlet-api</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <groupId>com.nimbusds</groupId>-->
<!-- <artifactId>nimbus-jose-jwt</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <groupId>com.nimbusds</groupId>-->
<!-- <artifactId>nimbus-jose-jwt</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <groupId>com.google.inject</groupId>-->
<!-- <artifactId>guice</artifactId>-->
<!-- </exclusion>-->
<!-- <exclusion>-->
<!-- <groupId>com.google.inject.extensions</groupId>-->
<!-- <artifactId>guice-servlet</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
<!-- </dependency>-->
</dependencies>

<build>
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/org/apache/flink/streaming/tests/NettyShuffleMemoryControlTestProgram.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

import org.apache.flink.shaded.netty4.io.netty.util.internal.OutOfDirectMemoryError;

import sun.misc.Unsafe;
import jdk.internal.misc.Unsafe;

import static org.apache.flink.util.Preconditions.checkArgument;

Expand Down
Loading