(ignite) branch master updated: IGNITE-21042 Move CreateDumpFutureTask#toLong to IgniteUtils (#11048)

[timoninmaxim]

This is an automated email from the ASF dual-hosted git repository.

timoninmaxim pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git


The following commit(s) were added to refs/heads/master by this push:
     new 27d9298de8f IGNITE-21042 Move CreateDumpFutureTask#toLong to 
IgniteUtils (#11048)
27d9298de8f is described below

commit 27d9298de8f2e76a6fdeb7cf5b6d065b1a6c652e
Author: Maksim Timonin <timoninma...@apache.org>
AuthorDate: Fri Dec 8 15:16:57 2023 +0300

    IGNITE-21042 Move CreateDumpFutureTask#toLong to IgniteUtils (#11048)
---
 .../cache/persistence/snapshot/dump/CreateDumpFutureTask.java |  8 ++------
 .../java/org/apache/ignite/internal/util/IgniteUtils.java     | 11 +++++++++++
 .../persistence/snapshot/dump/AbstractCacheDumpTest.java      |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/CreateDumpFutureTask.java
 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/CreateDumpFutureTask.java
index d0654e719b0..3f181b71a97 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/CreateDumpFutureTask.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/CreateDumpFutureTask.java
@@ -75,6 +75,7 @@ import static 
org.apache.ignite.internal.processors.cache.persistence.file.FileP
 import static 
org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.CACHE_GRP_DIR_PREFIX;
 import static 
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotManager.DUMP_LOCK;
 import static 
org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.Dump.dumpPartFileName;
+import static org.apache.ignite.internal.util.IgniteUtils.toLong;
 
 /**
  * Task creates cache group dump.
@@ -111,7 +112,7 @@ public class CreateDumpFutureTask extends 
AbstractCreateSnapshotFutureTask imple
      * Dump contextes.
      * Key is [group_id, partition_id] combined in single long value.
      *
-     * @see #toLong(int, int)
+     * @see IgniteUtils#toLong(int, int)
      */
     private final Map<Long, PartitionDumpContext> dumpCtxs = new 
ConcurrentHashMap<>();
 
@@ -631,11 +632,6 @@ public class CreateDumpFutureTask extends 
AbstractCreateSnapshotFutureTask imple
         }
     }
 
-    /** */
-    public static long toLong(int high, int low) {
-        return (((long)high) << Integer.SIZE) | (low & 0xffffffffL);
-    }
-
     /** */
     private File groupDirectory(CacheGroupContext grpCtx) throws 
IgniteCheckedException {
         return new File(
diff --git 
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java 
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 2f736091ed1..de17a4eea7f 100755
--- 
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -7704,6 +7704,17 @@ public abstract class IgniteUtils {
         return ret;
     }
 
+    /**
+     * Concats two integers to long.
+     *
+     * @param high Highest bits.
+     * @param low Lowest bits.
+     * @return Long.
+     */
+    public static long toLong(int high, int low) {
+        return (((long)high) << Integer.SIZE) | (low & 0xffffffffL);
+    }
+
     /**
      * Copies all elements from collection to array and asserts that
      * array is big enough to hold the collection. This method should
diff --git 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/AbstractCacheDumpTest.java
 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/AbstractCacheDumpTest.java
index 75d9bdda06b..bdcfab73f25 100644
--- 
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/AbstractCacheDumpTest.java
+++ 
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/AbstractCacheDumpTest.java
@@ -79,7 +79,7 @@ import static 
org.apache.ignite.internal.encryption.AbstractEncryptionTest.KEYST
 import static 
org.apache.ignite.internal.encryption.AbstractEncryptionTest.KEYSTORE_PATH;
 import static 
org.apache.ignite.internal.processors.cache.GridCacheUtils.UTILITY_CACHE_NAME;
 import static 
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotManager.SNP_RUNNING_DIR_KEY;
-import static 
org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.CreateDumpFutureTask.toLong;
+import static org.apache.ignite.internal.util.IgniteUtils.toLong;
 import static org.apache.ignite.platform.model.AccessLevel.SUPER;
 import static org.apache.ignite.testframework.GridTestUtils.runAsync;
 import static org.apache.ignite.testframework.GridTestUtils.waitForCondition;