IGNITE-24617 Move db to the private constants (#11893)

Author: nizhikov

modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAuthenticationAbstractTest.java

@@ -24,7 +24,6 @@
 import org.apache.ignite.configuration.DataStorageConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.internal.processors.authentication.IgniteAccessControlException;
-import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.junit.Test;
 
@@ -43,7 +42,7 @@ public abstract class JettyRestProcessorAuthenticationAbstractTest extends Jetty
 
     /** {@inheritDoc} */
     @Override protected void beforeTestsStarted() throws Exception {
-        U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", true);
+        recreateDefaultDb();
 
         super.beforeTestsStarted();
     }

modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorBaselineSelfTest.java

@@ -30,7 +30,6 @@
 import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.internal.processors.rest.handlers.cluster.GridBaselineCommandResponse;
 import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.internal.util.typedef.internal.U;
 import org.jetbrains.annotations.Nullable;
 import org.junit.Test;
 
@@ -43,7 +42,7 @@
 public class JettyRestProcessorBaselineSelfTest extends JettyRestProcessorCommonSelfTest {
     /** {@inheritDoc} */
     @Override protected void beforeTestsStarted() throws Exception {
-        U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", true);
+        recreateDefaultDb();
 
         super.beforeTestsStarted();
 

modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAuthenticateConnectionSelfTest.java

@@ -25,7 +25,6 @@
 import org.apache.ignite.configuration.DataRegionConfiguration;
 import org.apache.ignite.configuration.DataStorageConfiguration;
 import org.apache.ignite.configuration.IgniteConfiguration;
-import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.testframework.GridTestUtils;
 import org.junit.Test;
 
@@ -61,7 +60,7 @@ public class JdbcThinAuthenticateConnectionSelfTest extends JdbcThinAbstractSelf
     @Override protected void beforeTest() throws Exception {
         super.beforeTest();
 
-        U.resolveWorkDirectory(U.defaultWorkDirectory(), "db", true);
+        recreateDefaultDb();
 
         startGrids(2);
 

modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/FoldersReuseCompatibilityTest.java

@@ -24,15 +24,13 @@
 import java.util.function.Consumer;
 import org.apache.ignite.Ignite;
 import org.apache.ignite.IgniteCache;
-import org.apache.ignite.IgniteCheckedException;
 import org.apache.ignite.compatibility.testframework.junits.SkipTestIfIsJdkNewer;
 import org.apache.ignite.configuration.IgniteConfiguration;
 import org.apache.ignite.configuration.MemoryConfiguration;
 import org.apache.ignite.configuration.MemoryPolicyConfiguration;
 import org.apache.ignite.configuration.PersistentStoreConfiguration;
 import org.apache.ignite.internal.IgniteEx;
 import org.apache.ignite.internal.processors.cache.GridCacheAbstractFullApiSelfTest;
-import org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager;
 import org.apache.ignite.internal.processors.cache.persistence.filename.NodeFileTree;
 import org.apache.ignite.internal.processors.cache.persistence.filename.PdsFolderResolver;
 import org.apache.ignite.internal.util.typedef.internal.U;
@@ -190,18 +188,16 @@ private static void configPersistence(IgniteConfiguration cfg) {
 
     /**
      * @param indexes expected new style node indexes in folders
-     * @throws IgniteCheckedException if failed
      */
-    private void assertNodeIndexesInFolder(Integer... indexes) throws IgniteCheckedException {
+    private void assertNodeIndexesInFolder(Integer... indexes) {
         assertEquals(new TreeSet<>(Arrays.asList(indexes)), getAllNodeIndexesInFolder());
     }
 
     /**
      * @return set of all indexes of nodes found in work folder
-     * @throws IgniteCheckedException if failed.
      */
-    @NotNull private Set<Integer> getAllNodeIndexesInFolder() throws IgniteCheckedException {
-        final File curFolder = new File(U.defaultWorkDirectory(), FilePageStoreManager.DFLT_STORE_DIR);
+    @NotNull private Set<Integer> getAllNodeIndexesInFolder() {
+        final File curFolder = sharedFileTree().db();
         final Set<Integer> indexes = new TreeSet<>();
         final File[] files = curFolder.listFiles(PdsFolderResolver.DB_SUBFOLDERS_NEW_STYLE_FILTER);
 
@@ -220,9 +216,8 @@ private void assertNodeIndexesInFolder(Integer... indexes) throws IgniteCheckedE
      * Checks existence of all storage-related directories
      *
      * @param subDirName sub directories name expected
-     * @throws IgniteCheckedException if IO error occur
      */
-    private void assertPdsDirsDefaultExist(String subDirName) throws IgniteCheckedException {
+    private void assertPdsDirsDefaultExist(String subDirName) {
         NodeFileTree ft = nodeFileTree(subDirName);
 
         Consumer<File> check = dir -> assertTrue(dir.exists() && dir.isDirectory());

modules/compatibility/src/test/java/org/apache/ignite/compatibility/persistence/IgnitePersistenceCompatibilityAbstractTest.java

@@ -20,29 +20,28 @@
 import java.io.File;
 import java.util.Arrays;
 import java.util.List;
+import java.util.function.Consumer;
 import org.apache.ignite.compatibility.testframework.junits.IgniteCompatibilityAbstractTest;
 import org.apache.ignite.compatibility.testframework.util.CompatibilityTestsUtils;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.spi.checkpoint.sharedfs.SharedFsCheckpointSpi;
 
-import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
-import static org.apache.ignite.internal.processors.cache.persistence.filename.SharedFileTree.BINARY_METADATA_DIR;
-import static org.apache.ignite.internal.processors.cache.persistence.filename.SharedFileTree.MARSHALLER_DIR;
-
 /**
  * Super class for all persistence compatibility tests.
  */
 public abstract class IgnitePersistenceCompatibilityAbstractTest extends IgniteCompatibilityAbstractTest {
-    /** Persistence directories. */
-    private static final List<String> PERSISTENCE_DIRS
-        = Arrays.asList(DFLT_STORE_DIR, BINARY_METADATA_DIR, SharedFsCheckpointSpi.DFLT_ROOT, MARSHALLER_DIR);
-
     /** {@inheritDoc} */
     @Override protected void beforeTest() throws Exception {
         super.beforeTest();
 
-        for (String dirName : PERSISTENCE_DIRS) {
-            File dir = U.resolveWorkDirectory(U.defaultWorkDirectory(), dirName, true);
+        Consumer<File> recreate = dir -> {
+            U.delete(dir);
+
+            assertTrue(dir.mkdirs());
+        };
+
+        for (File dir : persistenceDirs()) {
+            recreate.accept(dir);
 
             if (!CompatibilityTestsUtils.isDirectoryEmpty(dir)) {
                 throw new IllegalStateException("Directory is not empty and can't be cleaned: " +
@@ -58,7 +57,16 @@ public abstract class IgnitePersistenceCompatibilityAbstractTest extends IgniteC
         //protection if test failed to finish, e.g. by error
         stopAllGrids();
 
-        for (String dir : PERSISTENCE_DIRS)
-            U.delete(U.resolveWorkDirectory(U.defaultWorkDirectory(), dir, false));
+        persistenceDirs().forEach(U::delete);
+    }
+
+    /** */
+    private List<File> persistenceDirs() {
+        return Arrays.asList(
+            sharedFileTree().db(),
+            sharedFileTree().binaryMetaRoot(),
+            sharedFileTree().marshaller(),
+            new File(sharedFileTree().root(), SharedFsCheckpointSpi.DFLT_ROOT));
+
     }
 }

modules/compress/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCompressionBasicTest.java

@@ -66,7 +66,6 @@
 import static org.apache.ignite.events.EventType.EVTS_CLUSTER_SNAPSHOT;
 import static org.apache.ignite.events.EventType.EVT_CLUSTER_SNAPSHOT_RESTORE_FINISHED;
 import static org.apache.ignite.events.EventType.EVT_CLUSTER_SNAPSHOT_RESTORE_STARTED;
-import static org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager.DFLT_STORE_DIR;
 
 /** */
 public class SnapshotCompressionBasicTest extends AbstractSnapshotSelfTest {
@@ -403,7 +402,7 @@ protected void failCompressionProcessor(Ignite ignite, String... snpNames) {
     /** */
     protected long persistenseSize(Collection<Ignite> grids) {
         return grids.stream()
-            .map(ig -> workingDirectory(ig).resolve(DFLT_STORE_DIR))
+            .map(ig -> ((IgniteEx)ig).context().pdsFolderResolver().fileTree().nodeStorage().toPath())
             .reduce(0L, (acc, p) -> acc + directorySize(p), Long::sum);
     }
 

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/FilePageStoreManager.java

@@ -94,9 +94,6 @@
  */
 public class FilePageStoreManager extends GridCacheSharedManagerAdapter implements IgnitePageStoreManager,
     PageStoreCollection {
-    /** */
-    public static final String DFLT_STORE_DIR = "db";
-
     /** Matcher for searching of *.tmp files. */
     public static final PathMatcher TMP_FILE_MATCHER =
         FileSystems.getDefault().getPathMatcher("glob:**" + TMP_SUFFIX);

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/filename/NodeFileTree.java

@@ -44,7 +44,6 @@
 import static org.apache.ignite.internal.pagemem.PageIdAllocator.INDEX_PARTITION;
 import static org.apache.ignite.internal.pagemem.PageIdAllocator.MAX_PARTITION_ID;
 import static org.apache.ignite.internal.processors.cache.GridCacheUtils.UTILITY_CACHE_NAME;
-import static org.apache.ignite.internal.processors.cache.persistence.filename.PdsFolderResolver.DB_DEFAULT_FOLDER;
 import static org.apache.ignite.internal.processors.cache.persistence.metastorage.MetaStorage.METASTORAGE_CACHE_NAME;
 import static org.apache.ignite.internal.processors.cache.persistence.metastorage.MetaStorage.METASTORAGE_DIR_NAME;
 
@@ -293,7 +292,7 @@ public NodeFileTree(File root, String folderName) {
         wal = rootRelative(DFLT_WAL_PATH);
         walArchive = rootRelative(DFLT_WAL_ARCHIVE_PATH);
         walCdc = rootRelative(DFLT_WAL_CDC_PATH);
-        nodeStorage = rootRelative(DB_DEFAULT_FOLDER);
+        nodeStorage = rootRelative(DB_DIR);
         snpTmpRoot = new File(nodeStorage, SNAPSHOT_TMP_DIR);
         checkpoint = new File(nodeStorage, CHECKPOINT_DIR);
     }
@@ -324,7 +323,7 @@ public NodeFileTree(IgniteConfiguration cfg, String folderName) {
 
         if (CU.isPersistenceEnabled(cfg) || CU.isCdcEnabled(cfg)) {
             nodeStorage = dsCfg.getStoragePath() == null
-                ? rootRelative(DB_DEFAULT_FOLDER)
+                ? rootRelative(DB_DIR)
                 : resolveDirectory(dsCfg.getStoragePath());
             snpTmpRoot = new File(nodeStorage, SNAPSHOT_TMP_DIR);
             checkpoint = new File(nodeStorage, CHECKPOINT_DIR);

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/filename/PdsFolderResolver.java

@@ -47,6 +47,7 @@
 import static java.lang.Boolean.TRUE;
 import static org.apache.ignite.IgniteSystemProperties.IGNITE_DATA_STORAGE_FOLDER_BY_CONSISTENT_ID;
 import static org.apache.ignite.IgniteSystemProperties.getBoolean;
+import static org.apache.ignite.internal.processors.cache.persistence.filename.SharedFileTree.DB_DIR;
 
 /**
  * This class contains logic to resolve and possibly lock PDS folder
@@ -91,9 +92,6 @@ public class PdsFolderResolver<L extends FileLockHolder> {
         }
     };
 
-    /** Database default folder. */
-    static final String DB_DEFAULT_FOLDER = "db";
-
     /** */
     private final IgniteConfiguration cfg;
 
@@ -433,7 +431,7 @@ private static String padStart(String str, int minLength, char padChar) {
 
         return U.resolveWorkDirectory(
             cfg.getWorkDirectory(),
-            pstPath != null ? pstPath : DB_DEFAULT_FOLDER,
+            pstPath != null ? pstPath : DB_DIR,
             false
         );
     }

modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/filename/SharedFileTree.java

@@ -27,7 +27,6 @@
 import org.apache.ignite.internal.util.typedef.internal.U;
 
 import static org.apache.ignite.configuration.IgniteConfiguration.DFLT_SNAPSHOT_DIRECTORY;
-import static org.apache.ignite.internal.processors.cache.persistence.filename.PdsFolderResolver.DB_DEFAULT_FOLDER;
 
 /**
  * Provides access to directories shared between all local nodes.
@@ -37,18 +36,21 @@
  * ├── db                                                                       ← db (shared between all local nodes).
  * │  ├── binary_meta                                                           ← binaryMetaRoot (shared between all local nodes).
  * │  ├── marshaller                                                            ← marshaller (shared between all local nodes).
- * └── snapshots                                                                ← snapshotRoot (shared between all local nodes).
+ * └── snapshots                                                                ← snpsRoot (shared between all local nodes).
  * </pre>
  *
  * @see NodeFileTree
  */
 public class SharedFileTree {
     /** Name of binary metadata folder. */
-    public static final String BINARY_METADATA_DIR = "binary_meta";
+    protected static final String BINARY_METADATA_DIR = "binary_meta";
 
     /** Name of marshaller mappings folder. */
     public static final String MARSHALLER_DIR = "marshaller";
 
+    /** Database default folder. */
+    protected static final String DB_DIR = "db";
+
     /** Root(work) directory. */
     protected final File root;
 
@@ -73,8 +75,8 @@ private SharedFileTree(File root, String snpsRoot) {
 
         String rootStr = root.getAbsolutePath();
 
-        marshaller = Paths.get(rootStr, DB_DEFAULT_FOLDER, MARSHALLER_DIR).toFile();
-        binaryMetaRoot = Paths.get(rootStr, DB_DEFAULT_FOLDER, BINARY_METADATA_DIR).toFile();
+        marshaller = Paths.get(rootStr, DB_DIR, MARSHALLER_DIR).toFile();
+        binaryMetaRoot = Paths.get(rootStr, DB_DIR, BINARY_METADATA_DIR).toFile();
     }
 
     /**
@@ -105,6 +107,13 @@ public File root() {
         return root;
     }
 
+    /**
+     * @return Path to the {@code db} directory inside {@link #root()}.
+     */
+    public File db() {
+        return new File(root, DB_DIR);
+    }
+
     /**
      * @return Path to common binary metadata directory. Note, directory can contain data from several nodes.
      * Each node will create own directory inside this root.