>From Wail Alkowaileet <wael....@gmail.com>: Wail Alkowaileet has uploaded this change for review. ( 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 --- 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 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 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 6 files changed, 33 insertions(+), 16 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/62/18262/1 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 cdf1500..100139a 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 @@ -70,8 +70,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 94d3447..8107827 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 c38d7df..091bada 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> -- 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: master Gerrit-Change-Id: I13ec2c1063754b93d8fce551362934d0d1c593d5 Gerrit-Change-Number: 18262 Gerrit-PatchSet: 1 Gerrit-Owner: Wail Alkowaileet <wael....@gmail.com> Gerrit-MessageType: newchange