>From Wail Alkowaileet <wael....@gmail.com>: Wail Alkowaileet has submitted this change. ( https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18262 )
Change subject: [NO ISSUE][OTH] Change mvn Java ver. to 17 ...................................................................... [NO ISSUE][OTH] Change mvn Java ver. to 17 - user model changes: no - storage format changes: no - interface changes: no Details: The change of parameter/variable names is to avoid 'cannot be used as an identifier as it is a keyword' being thrown by impsort-maven-plugin. Change-Id: I13ec2c1063754b93d8fce551362934d0d1c593d5 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18262 Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Contrib: Michael Blow <mb...@apache.org> Reviewed-by: Michael Blow <mb...@apache.org> --- M asterixdb/asterix-app/pom.xml M hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/IRateLimiter.java M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/impl/TestLsmBtree.java M asterixdb/pom.xml M hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/NoOpRateLimiter.java M hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/SleepRateLimiter.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/TestPrimaryIndexOperationTrackerFactory.java M hyracks-fullstack/pom.xml M hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreePageWriteCallbackTest.java 9 files changed, 40 insertions(+), 27 deletions(-) Approvals: Michael Blow: Looks good to me, approved; No violations found Jenkins: Verified diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml index ca5908a..b7e3b94 100644 --- a/asterixdb/asterix-app/pom.xml +++ b/asterixdb/asterix-app/pom.xml @@ -409,6 +409,7 @@ -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8000,suspend=${debug.suspend.flag} -Xloggc:"${project.build.directory}/surefire-reports/SqlppExecutionTest-%p-gc.log" -XX:+PrintGC -XX:+PrintGCDateStamps -XX:GCLogFileSize=10M + --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED </argLine> </configuration> <goals> diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/TestPrimaryIndexOperationTrackerFactory.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/TestPrimaryIndexOperationTrackerFactory.java index c4390fa..38fdf56 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/TestPrimaryIndexOperationTrackerFactory.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/TestPrimaryIndexOperationTrackerFactory.java @@ -19,7 +19,6 @@ package org.apache.asterix.test.dataflow; import java.lang.reflect.Field; -import java.lang.reflect.Modifier; import java.util.Map; import org.apache.asterix.common.api.INcApplicationContext; @@ -70,20 +69,10 @@ } } - static void setFinal(Field field, Object obj, Object newValue) throws Exception { - field.setAccessible(true); - Field modifiersField = Field.class.getDeclaredField("modifiers"); - modifiersField.setAccessible(true); - modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL); - field.set(obj, newValue); - } - @SuppressWarnings({ "rawtypes", "unchecked" }) static void replaceMapEntry(Field field, Object obj, Object key, Object value) throws Exception, IllegalAccessException { field.setAccessible(true); - Field modifiersField = Field.class.getDeclaredField("modifiers"); - modifiersField.setAccessible(true); Map map = (Map) field.get(obj); map.put(key, value); } diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index 93a4edb..2c24162 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -146,6 +146,7 @@ -DrunSlowAQLTests=${runSlowAQLTests} -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8000,suspend=${debug.suspend.flag} + --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED ${coverageArgLine} ${extraSurefireArgLine} </argLine> diff --git a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/IRateLimiter.java b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/IRateLimiter.java index b7433ae..163cbaf 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/IRateLimiter.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/IRateLimiter.java @@ -24,5 +24,5 @@ void setRate(double ratePerSecond); - void request(int permits) throws HyracksDataException; + void request(int numOfPermits) throws HyracksDataException; } diff --git a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/NoOpRateLimiter.java b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/NoOpRateLimiter.java index ac0a1a9..a0660f6 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/NoOpRateLimiter.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/NoOpRateLimiter.java @@ -33,7 +33,7 @@ } @Override - public void request(int tokens) throws HyracksDataException { + public void request(int numOfPermits) throws HyracksDataException { // no op } diff --git a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/SleepRateLimiter.java b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/SleepRateLimiter.java index 4d0ca92..3dcbfb8 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/SleepRateLimiter.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/SleepRateLimiter.java @@ -26,7 +26,6 @@ /** * A wrapper of the RateLimiter implementation from {@link RateLimiter} - * */ public class SleepRateLimiter implements IRateLimiter { /** @@ -55,8 +54,8 @@ } @Override - public void request(int permits) throws HyracksDataException { - rateLimiterImpl.acquire(permits); + public void request(int numOfPermits) throws HyracksDataException { + rateLimiterImpl.acquire(numOfPermits); } } diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreePageWriteCallbackTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreePageWriteCallbackTest.java index 4e59ab0..cf3b3a9 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreePageWriteCallbackTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreePageWriteCallbackTest.java @@ -68,8 +68,8 @@ } @Override - public void request(int permits) throws HyracksDataException { - limiter.request(permits); + public void request(int numOfPermits) throws HyracksDataException { + limiter.request(numOfPermits); pageCounter++; } }; diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/impl/TestLsmBtree.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/impl/TestLsmBtree.java index 2d0f079..10bd594 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/impl/TestLsmBtree.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/impl/TestLsmBtree.java @@ -183,20 +183,20 @@ } } - public void allowModify(int permits) { - modifySemaphore.release(permits); + public void allowModify(int numOfPermits) { + modifySemaphore.release(numOfPermits); } - public void allowSearch(int permits) { - searchSemaphore.release(permits); + public void allowSearch(int numOfPermits) { + searchSemaphore.release(numOfPermits); } - public void allowFlush(int permits) { - flushSemaphore.release(permits); + public void allowFlush(int numOfPermits) { + flushSemaphore.release(numOfPermits); } - public void allowMerge(int permits) { - mergeSemaphore.release(permits); + public void allowMerge(int numOfPermits) { + mergeSemaphore.release(numOfPermits); } @Override diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index 9fecea1..fce8c39 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -49,7 +49,7 @@ <root.dir>${basedir}</root.dir> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <file.encoding>UTF-8</file.encoding> - <maven.compiler.release>11</maven.compiler.release> + <maven.compiler.release>17</maven.compiler.release> <javac.xlint.value>all</javac.xlint.value> <jvm.extraargs /> <sonar.jacoco.reportPath>${env.PWD}/target/jacoco-merged.exec</sonar.jacoco.reportPath> @@ -544,6 +544,7 @@ <reuseForks>false</reuseForks> <argLine>-enableassertions -Xmx2048m -Dfile.encoding=UTF-8 -Xdebug -Xrunjdwp:transport=dt_socket,server=y,address=8000,suspend=n ${coverageArgLine} + --add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED --add-opens=java.management/sun.management=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED </argLine> <systemPropertyVariables> <log4j.configurationFile>${testLog4jConfigFile}</log4j.configurationFile> -- To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18262 To unsubscribe, or for help writing mail filters, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-Project: asterixdb Gerrit-Branch: trinity Gerrit-Change-Id: I13ec2c1063754b93d8fce551362934d0d1c593d5 Gerrit-Change-Number: 18262 Gerrit-PatchSet: 8 Gerrit-Owner: Wail Alkowaileet <wael....@gmail.com> Gerrit-Reviewer: Anon. E. Moose #1000171 Gerrit-Reviewer: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Gerrit-Reviewer: Michael Blow <mb...@apache.org> Gerrit-Reviewer: Wail Alkowaileet <wael....@gmail.com> Gerrit-MessageType: merged
