Michael Blow has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/2696
Change subject: [ASTERIXDB-2397][*DB] Enable build on Java 10
......................................................................
[ASTERIXDB-2397][*DB] Enable build on Java 10
Change-Id: I5ceccc0d3b0d5c508f4777d3cde5753099661322
---
M asterixdb/pom.xml
M
hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/utils/HttpUtil.java
A
hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/http/HttpTestUtil.java
M
hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/http/servlet/ChattyServlet.java
M
hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/http/test/HttpServerTest.java
M hyracks-fullstack/pom.xml
6 files changed, 126 insertions(+), 79 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/96/2696/1
diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml
index 74e6c0c..5a09874 100644
--- a/asterixdb/pom.xml
+++ b/asterixdb/pom.xml
@@ -528,7 +528,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>3.0.0-M1</version>
+ <version>3.0.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -543,7 +543,7 @@
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
- <version>0.13.2</version>
+ <version>0.14.0</version>
</plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
@@ -688,15 +688,6 @@
</plugin>
</plugins>
</build>
- </profile>
- <profile>
- <id>java8</id>
- <activation>
- <jdk>1.8</jdk>
- </activation>
- <properties>
- <jdk.version>1.8</jdk.version>
- </properties>
</profile>
<profile>
<id>coverage</id>
@@ -1190,7 +1181,7 @@
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
- <version>2.2.12</version>
+ <version>2.3.0</version>
</dependency>
<dependency>
<groupId>org.codehaus.mojo.appassembler</groupId>
@@ -1213,6 +1204,31 @@
<artifactId>fastutil</artifactId>
<version>8.1.1</version>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.activation</groupId>
+ <artifactId>javax.activation-api</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>3.3.9</version>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git
a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/utils/HttpUtil.java
b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/utils/HttpUtil.java
index bdd312d..fb30bf8 100644
---
a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/utils/HttpUtil.java
+++
b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/utils/HttpUtil.java
@@ -48,7 +48,6 @@
private static final Logger LOGGER = LogManager.getLogger();
private static final Pattern PARENT_DIR =
Pattern.compile("/[^./]+/\\.\\./");
- private static long maxMemUsage = 0L;
private HttpUtil() {
}
@@ -167,53 +166,4 @@
return clusterURL;
}
- @SuppressWarnings("restriction")
- public static synchronized void printMemUsage() {
- StringBuilder report = new StringBuilder();
- report.append("sun.misc.VM.maxDirectMemory: ");
- report.append(sun.misc.VM.maxDirectMemory());
- report.append('\n');
-
report.append("sun.misc.SharedSecrets.getJavaNioAccess().getDirectBufferPool().getMemoryUsed():
");
-
report.append(sun.misc.SharedSecrets.getJavaNioAccess().getDirectBufferPool().getMemoryUsed());
- report.append('\n');
-
report.append("sun.misc.SharedSecrets.getJavaNioAccess().getDirectBufferPool().getTotalCapacity():
");
-
report.append(sun.misc.SharedSecrets.getJavaNioAccess().getDirectBufferPool().getTotalCapacity());
- report.append('\n');
-
report.append("ManagementFactory.getMemoryMXBean().getNonHeapMemoryUsage(): ");
-
report.append(ManagementFactory.getMemoryMXBean().getNonHeapMemoryUsage());
- report.append('\n');
- report.append("---------------------------- Beans
----------------------------");
- report.append('\n');
- List<MemoryPoolMXBean> memPoolBeans =
ManagementFactory.getMemoryPoolMXBeans();
- for (MemoryPoolMXBean bean : memPoolBeans) {
- if (bean.isValid() && bean.getType() == MemoryType.NON_HEAP) {
- report.append(bean.getName());
- report.append(": ");
- report.append(bean.getUsage());
- report.append('\n');
- }
- }
- report.append("---------------------------- Netty
----------------------------");
- report.append('\n');
- try {
- Field field =
PlatformDependent.class.getDeclaredField("DIRECT_MEMORY_COUNTER");
- field.setAccessible(true);
- AtomicLong usedDirectMemory = (AtomicLong) field.get(null);
- long used = usedDirectMemory.get();
- report.append("Current PlatformDependent.DIRECT_MEMORY_COUNTER: ");
- report.append(used);
- report.append('\n');
- report.append("Maximum PlatformDependent.DIRECT_MEMORY_COUNTER: ");
- maxMemUsage = Math.max(maxMemUsage, used);
- report.append(maxMemUsage);
- report.append('\n');
- report.append('\n');
- } catch (Throwable th) { // NOSONAR
- LOGGER.log(Level.WARN, "Failed to access
PlatformDependent.DIRECT_MEMORY_COUNTER", th);
- return;
- }
- report.append("--------------- PooledByteBufAllocator.DEFAULT
----------------");
- report.append(PooledByteBufAllocator.DEFAULT.dumpStats());
- LOGGER.log(Level.INFO, report.toString());
- }
}
diff --git
a/hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/http/HttpTestUtil.java
b/hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/http/HttpTestUtil.java
new file mode 100644
index 0000000..16efc07
--- /dev/null
+++
b/hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/http/HttpTestUtil.java
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.hyracks.http;
+
+import java.lang.management.ManagementFactory;
+import java.lang.management.MemoryPoolMXBean;
+import java.lang.management.MemoryType;
+import java.lang.reflect.Field;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import io.netty.buffer.PooledByteBufAllocator;
+import io.netty.util.internal.PlatformDependent;
+
+public class HttpTestUtil {
+ private static final Logger LOGGER = LogManager.getLogger();
+ private static long maxMemUsage = 0L;
+
+ public static synchronized void printMemUsage() {
+ StringBuilder report = new StringBuilder();
+ /* TODO: unsupported APIs after java 8
+ report.append("sun.misc.VM.maxDirectMemory: ");
+ report.append(sun.misc.VM.maxDirectMemory());
+ report.append('\n');
+
report.append("sun.misc.SharedSecrets.getJavaNioAccess().getDirectBufferPool().getMemoryUsed():
");
+
report.append(sun.misc.SharedSecrets.getJavaNioAccess().getDirectBufferPool().getMemoryUsed());
+ report.append('\n');
+
report.append("sun.misc.SharedSecrets.getJavaNioAccess().getDirectBufferPool().getTotalCapacity():
");
+
report.append(sun.misc.SharedSecrets.getJavaNioAccess().getDirectBufferPool().getTotalCapacity());
+ */
+ report.append('\n');
+
report.append("ManagementFactory.getMemoryMXBean().getNonHeapMemoryUsage(): ");
+
report.append(ManagementFactory.getMemoryMXBean().getNonHeapMemoryUsage());
+ report.append('\n');
+ report.append("---------------------------- Beans
----------------------------");
+ report.append('\n');
+ List<MemoryPoolMXBean> memPoolBeans =
ManagementFactory.getMemoryPoolMXBeans();
+ for (MemoryPoolMXBean bean : memPoolBeans) {
+ if (bean.isValid() && bean.getType() == MemoryType.NON_HEAP) {
+ report.append(bean.getName());
+ report.append(": ");
+ report.append(bean.getUsage());
+ report.append('\n');
+ }
+ }
+ report.append("---------------------------- Netty
----------------------------");
+ report.append('\n');
+ try {
+ Field field =
PlatformDependent.class.getDeclaredField("DIRECT_MEMORY_COUNTER");
+ field.setAccessible(true);
+ AtomicLong usedDirectMemory = (AtomicLong) field.get(null);
+ long used = usedDirectMemory.get();
+ report.append("Current PlatformDependent.DIRECT_MEMORY_COUNTER: ");
+ report.append(used);
+ report.append('\n');
+ report.append("Maximum PlatformDependent.DIRECT_MEMORY_COUNTER: ");
+ maxMemUsage = Math.max(maxMemUsage, used);
+ report.append(maxMemUsage);
+ report.append('\n');
+ report.append('\n');
+ } catch (Throwable th) { // NOSONAR
+ LOGGER.log(Level.WARN, "Failed to access
PlatformDependent.DIRECT_MEMORY_COUNTER", th);
+ return;
+ }
+ report.append("--------------- PooledByteBufAllocator.DEFAULT
----------------");
+ report.append(PooledByteBufAllocator.DEFAULT.dumpStats());
+ LOGGER.log(Level.INFO, report.toString());
+ }
+}
diff --git
a/hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/http/servlet/ChattyServlet.java
b/hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/http/servlet/ChattyServlet.java
index e6aedb9..54bb756 100644
---
a/hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/http/servlet/ChattyServlet.java
+++
b/hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/http/servlet/ChattyServlet.java
@@ -20,6 +20,7 @@
import java.util.concurrent.ConcurrentMap;
+import org.apache.hyracks.http.HttpTestUtil;
import org.apache.hyracks.http.api.IServletRequest;
import org.apache.hyracks.http.api.IServletResponse;
import org.apache.hyracks.http.server.AbstractServlet;
@@ -58,6 +59,6 @@
for (int i = 0; i < 100; i++) {
response.outputStream().write(bytes);
}
- HttpUtil.printMemUsage();
+ HttpTestUtil.printMemUsage();
}
}
\ No newline at end of file
diff --git
a/hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/http/test/HttpServerTest.java
b/hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/http/test/HttpServerTest.java
index 71e84e5..b39a141 100644
---
a/hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/http/test/HttpServerTest.java
+++
b/hyracks-fullstack/hyracks/hyracks-http/src/test/java/org/apache/hyracks/http/test/HttpServerTest.java
@@ -32,10 +32,10 @@
import java.util.concurrent.Future;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.hyracks.http.HttpTestUtil;
import org.apache.hyracks.http.server.HttpServer;
import org.apache.hyracks.http.server.InterruptOnCloseHandler;
import org.apache.hyracks.http.server.WebManager;
-import org.apache.hyracks.http.server.utils.HttpUtil;
import org.apache.hyracks.http.servlet.ChattyServlet;
import org.apache.hyracks.http.servlet.SleepyServlet;
import org.apache.logging.log4j.Level;
@@ -147,7 +147,7 @@
try {
try {
for (int i = 0; i < numPatches; i++) {
- HttpUtil.printMemUsage();
+ HttpTestUtil.printMemUsage();
request(numRequests);
for (Future<Void> f : FUTURES) {
f.get();
@@ -155,7 +155,7 @@
FUTURES.clear();
}
} finally {
- HttpUtil.printMemUsage();
+ HttpTestUtil.printMemUsage();
servlet.wakeUp();
for (Future<Void> f : stuck) {
f.get();
@@ -165,7 +165,7 @@
System.err.println("Number of rejections: " +
UNAVAILABLE_COUNT.get());
System.err.println("Number of exceptions: " +
EXCEPTION_COUNT.get());
webMgr.stop();
- HttpUtil.printMemUsage();
+ HttpTestUtil.printMemUsage();
}
}
@@ -180,7 +180,7 @@
int numRequests = 48;
int numExecutors = 24;
int serverQueueSize = 24;
- HttpUtil.printMemUsage();
+ HttpTestUtil.printMemUsage();
WebManager webMgr = new WebManager();
HttpServer server =
new HttpServer(webMgr.getBosses(), webMgr.getWorkers(), PORT,
numExecutors, serverQueueSize);
@@ -197,9 +197,9 @@
Assert.assertEquals(0, UNAVAILABLE_COUNT.get());
Assert.assertEquals(0, OTHER_COUNT.get());
} finally {
- HttpUtil.printMemUsage();
+ HttpTestUtil.printMemUsage();
webMgr.stop();
- HttpUtil.printMemUsage();
+ HttpTestUtil.printMemUsage();
}
}
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index 95e1779..978b143 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -677,15 +677,6 @@
</properties>
</profile>
<profile>
- <id>java8</id>
- <activation>
- <jdk>1.8</jdk>
- </activation>
- <properties>
- <jdk.version>1.8</jdk.version>
- </properties>
- </profile>
- <profile>
<id>integration-tests-only</id>
<properties>
<test.includes/>
--
To view, visit https://asterix-gerrit.ics.uci.edu/2696
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ceccc0d3b0d5c508f4777d3cde5753099661322
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Michael Blow <[email protected]>
