fix coments / renaming

andreitokar · andreitokar · commit 1fbf7355c10e · 2023-08-22T09:38:40.000-04:00
diff --git a/h2/src/main/org/h2/mvstore/FileStore.java b/h2/src/main/org/h2/mvstore/FileStore.java
@@ -242,9 +242,9 @@ protected FileStore(Map<String, Object> config) {
         // Make sure pages will fit into cache
         if (cache != null) {
             maxPageSize = 16 * 1024;
-            int maxCachableSize = (int) (cache.getMaxItemSize() >> 4);
-            if (maxPageSize > maxCachableSize) {
-                maxPageSize = maxCachableSize;
+            int maxCacheableSize = (int) (cache.getMaxItemSize() >> 4);
+            if (maxPageSize > maxCacheableSize) {
+                maxPageSize = maxCacheableSize;
             }
         }
         this.maxPageSize = maxPageSize;
@@ -820,7 +820,6 @@ protected void writeCleanShutdown() {
      *
      * @param chunk to save
      */
-    @SuppressWarnings("ThreadPriorityCheck")
     public void saveChunkMetadataChanges(C chunk) {
         assert serializationLock.isHeldByCurrentThread();
         // chunk's location has to be determined before
@@ -987,7 +986,7 @@ protected final C discoverChunk(long block) {
     protected final boolean findLastChunkWithCompleteValidChunkSet(Comparator<C> chunkComparator,
             Map<Long, C> validChunksByLocation, boolean afterFullScan) {
         // this collection will hold potential candidates for lastChunk to fall back to,
-        // in order from the most to least likely
+        // in order from the most to the least likely
         C[] array = createChunksArray(validChunksByLocation.size());
         C[] lastChunkCandidates = validChunksByLocation.values().toArray(array);
         Arrays.sort(lastChunkCandidates, chunkComparator);
@@ -1491,7 +1490,7 @@ private void serializeToBuffer(WriteBuffer buff, ArrayList<Page<?, ?>> changed,
 
         // last allocated map id should be captured after the meta map was saved, because
         // this will ensure that concurrently created map, which made it into meta before save,
-        // will have it's id reflected in mapid header field of the currently written chunk
+        // will have its id reflected in "map" header field of the currently written chunk
         c.mapId = mvStore.getLastMapId();
 
         c.tocPos = buff.position();
@@ -1874,7 +1873,7 @@ private static <C extends Chunk<C>> HashSet<Integer> createIdSet(Iterable<C> toC
         return set;
     }
 
-    public void executeFilestoreOperation(Runnable operation) {
+    public void executeFileStoreOperation(Runnable operation) {
         // because serializationExecutor is a single-threaded one and
         // all task submissions to it are done under storeLock,
         // it is guaranteed, that upon this dummy task completion
diff --git a/h2/src/main/org/h2/mvstore/MVStore.java b/h2/src/main/org/h2/mvstore/MVStore.java
@@ -795,7 +795,6 @@ private long store(boolean syncWrite) {
         assert storeLock.isHeldByCurrentThread();
         if (isOpenOrStopping() && hasUnsavedChanges() && storeOperationInProgress.compareAndSet(false, true)) {
             try {
-                storeOperationInProgress.compareAndSet(false, true);
                 @SuppressWarnings({"NonAtomicVolatileUpdate", "NonAtomicOperationOnVolatileField"})
                 long result = ++currentVersion;
                 if (fileStore == null) {
@@ -920,7 +919,7 @@ public void executeFilestoreOperation(Runnable operation) {
         storeLock.lock();
         try {
             checkNotClosed();
-            fileStore.executeFilestoreOperation(operation);
+            fileStore.executeFileStoreOperation(operation);
         } catch (MVStoreException e) {
             panic(e);
         } catch (Throwable e) {
