You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ni...@apache.org on 2025/04/21 12:01:12 UTC
(ignite) branch master updated: IGNITE-25132 Move BinaryUtils#typeId and BinaryUtils#binaryMetaFileName to NodeFileTree (#12004)
This is an automated email from the ASF dual-hosted git repository.
nizhikov 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 21a13369691 IGNITE-25132 Move BinaryUtils#typeId and BinaryUtils#binaryMetaFileName to NodeFileTree (#12004)
21a13369691 is described below
commit 21a1336969111558fec922fee3a4a9308097f74f
Author: Maksim Davydov <70...@users.noreply.github.com>
AuthorDate: Mon Apr 21 15:01:05 2025 +0300
IGNITE-25132 Move BinaryUtils#typeId and BinaryUtils#binaryMetaFileName to NodeFileTree (#12004)
---
.../apache/ignite/internal/binary/BinaryUtils.java | 20 --------------------
.../java/org/apache/ignite/internal/cdc/CdcMain.java | 2 +-
.../internal/management/meta/MetaRemoveCommand.java | 4 ++--
.../cache/binary/BinaryMetadataFileStore.java | 8 ++++----
.../cache/persistence/filename/NodeFileTree.java | 18 ++++++++++++++++++
.../IgnitePdsBinaryMetadataOnClusterRestartTest.java | 4 ++--
6 files changed, 27 insertions(+), 29 deletions(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
index bdad148abd3..5f8d2012a67 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
@@ -71,7 +71,6 @@ import org.apache.ignite.binary.Binarylizable;
import org.apache.ignite.internal.binary.builder.BinaryLazyValue;
import org.apache.ignite.internal.binary.streams.BinaryInputStream;
import org.apache.ignite.internal.processors.cache.CacheObject;
-import org.apache.ignite.internal.processors.cache.persistence.filename.NodeFileTree;
import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.internal.util.MutableSingletonList;
import org.apache.ignite.internal.util.typedef.F;
@@ -83,7 +82,6 @@ import org.jetbrains.annotations.Nullable;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_BINARY_MARSHALLER_USE_STRING_SERIALIZATION_VER_2;
-import static org.apache.ignite.internal.processors.cache.persistence.filename.NodeFileTree.FILE_SUFFIX;
import static org.apache.ignite.internal.util.GridUnsafe.align;
/**
@@ -2556,14 +2554,6 @@ public class BinaryUtils {
return ctx.metadata(obj.typeId());
}
- /**
- * @param typeId Type id.
- * @return Binary metadata file name.
- */
- public static String binaryMetaFileName(int typeId) {
- return typeId + FILE_SUFFIX;
- }
-
/** @param fileName Name of file with marshaller mapping information. */
public static int mappedTypeId(String fileName) {
try {
@@ -2612,16 +2602,6 @@ public class BinaryUtils {
return typeId + MAPPING_FILE_EXTENSION + platformId;
}
- /**
- * @param fileName File name.
- * @return Type id
- * @see #binaryMetaFileName(int)
- * @see NodeFileTree#FILE_SUFFIX
- */
- public static int typeId(String fileName) {
- return Integer.parseInt(fileName.substring(0, fileName.length() - FILE_SUFFIX.length()));
- }
-
/**
* Get predefined write-replacer associated with class.
*
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/cdc/CdcMain.java b/modules/core/src/main/java/org/apache/ignite/internal/cdc/CdcMain.java
index 02d1313fa5c..09c528350d1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cdc/CdcMain.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cdc/CdcMain.java
@@ -678,7 +678,7 @@ public class CdcMain implements Runnable {
Iterator<BinaryType> changedTypes = Arrays.stream(files)
.filter(NodeFileTree::binFile)
.map(f -> {
- int typeId = BinaryUtils.typeId(f.getName());
+ int typeId = NodeFileTree.typeId(f.getName());
long lastModified = f.lastModified();
// Filter out files already in `typesState` with the same last modify date.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaRemoveCommand.java b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaRemoveCommand.java
index 13c1b9f9cac..6e063da6906 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaRemoveCommand.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/management/meta/MetaRemoveCommand.java
@@ -24,8 +24,8 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.util.function.Consumer;
import org.apache.ignite.internal.binary.BinaryMetadata;
-import org.apache.ignite.internal.binary.BinaryUtils;
import org.apache.ignite.internal.management.api.ComputeCommand;
+import org.apache.ignite.internal.processors.cache.persistence.filename.NodeFileTree;
import org.apache.ignite.lang.IgniteExperimental;
/** */
@@ -58,7 +58,7 @@ public class MetaRemoveCommand implements ComputeCommand<MetaRemoveCommandArg, M
Path outFile = FileSystems.getDefault().getPath(arg.out() != null
? arg.out()
- : BinaryUtils.binaryMetaFileName(m.typeId())
+ : NodeFileTree.binaryMetaFileName(m.typeId())
);
try (OutputStream os = Files.newOutputStream(outFile)) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataFileStore.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataFileStore.java
index a7f5daa4b9c..4546b4d53c6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataFileStore.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataFileStore.java
@@ -143,7 +143,7 @@ class BinaryMetadataFileStore {
return;
try {
- File file = new File(metadataDir, BinaryUtils.binaryMetaFileName(binMeta.typeId()));
+ File file = new File(metadataDir, NodeFileTree.binaryMetaFileName(binMeta.typeId()));
File tmpFile = new File(file.getAbsolutePath() + TMP_SUFFIX);
// TODO: delete it on Ignite start. https://issues.apache.org/jira/browse/IGNITE-20897
@@ -187,7 +187,7 @@ class BinaryMetadataFileStore {
ctx.marshallerContext().unregisterClassNameLocally(typeId);
- File file = new File(metadataDir, BinaryUtils.binaryMetaFileName(typeId));
+ File file = new File(metadataDir, NodeFileTree.binaryMetaFileName(typeId));
if (!file.delete()) {
final String msg = "Failed to remove metadata for typeId: " + typeId;
@@ -221,7 +221,7 @@ class BinaryMetadataFileStore {
* @param typeId Type identifier.
*/
void restoreMetadata(int typeId) {
- restoreMetadata(new File(metadataDir, BinaryUtils.binaryMetaFileName(typeId)));
+ restoreMetadata(new File(metadataDir, NodeFileTree.binaryMetaFileName(typeId)));
}
/** */
@@ -261,7 +261,7 @@ class BinaryMetadataFileStore {
* @param typeId typeId of BinaryMetadata to be read.
*/
private BinaryMetadata readMetadata(int typeId) {
- File file = new File(metadataDir, BinaryUtils.binaryMetaFileName(typeId));
+ File file = new File(metadataDir, NodeFileTree.binaryMetaFileName(typeId));
if (!file.exists())
return null;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/filename/NodeFileTree.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/filename/NodeFileTree.java
index 488cb6258b9..301b472a128 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/filename/NodeFileTree.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/filename/NodeFileTree.java
@@ -879,6 +879,24 @@ public class NodeFileTree extends SharedFileTree {
return Paths.get(root.getAbsolutePath(), path, folderName).toFile();
}
+ /**
+ * @param typeId Type id.
+ * @return Binary metadata file name.
+ */
+ public static String binaryMetaFileName(int typeId) {
+ return typeId + FILE_SUFFIX;
+ }
+
+ /**
+ * @param fileName File name.
+ * @return Type id
+ * @see #binaryMetaFileName(int)
+ * @see NodeFileTree#FILE_SUFFIX
+ */
+ public static int typeId(String fileName) {
+ return Integer.parseInt(fileName.substring(0, fileName.length() - FILE_SUFFIX.length()));
+ }
+
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(NodeFileTree.class, this);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java
index 4bfb8ad8fee..4d2550ab7cf 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsBinaryMetadataOnClusterRestartTest.java
@@ -40,7 +40,7 @@ import org.apache.ignite.configuration.DataStorageConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.configuration.WALMode;
import org.apache.ignite.internal.IgniteEx;
-import org.apache.ignite.internal.binary.BinaryUtils;
+import org.apache.ignite.internal.processors.cache.persistence.filename.NodeFileTree;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.testframework.GridTestUtils;
@@ -326,7 +326,7 @@ public class IgnitePdsBinaryMetadataOnClusterRestartTest extends GridCommonAbstr
stopAllGrids();
- String fileName = BinaryUtils.binaryMetaFileName(DYNAMIC_TYPE_NAME.toLowerCase().hashCode());
+ String fileName = NodeFileTree.binaryMetaFileName(DYNAMIC_TYPE_NAME.toLowerCase().hashCode());
Files.copy(
new File(igniteC.context().pdsFolderResolver().fileTree().binaryMeta(), fileName).toPath(),