Renaming Persistence interfaces and methods to PersistentStore
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4608cc92 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4608cc92 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4608cc92 Branch: refs/heads/ignite-5075-pds Commit: 4608cc92b26419263c9b9deea3faa2fbf2b3dd7e Parents: b84df56 Author: Denis Magda <dma...@gridgain.com> Authored: Thu May 25 16:26:40 2017 -0700 Committer: Denis Magda <dma...@gridgain.com> Committed: Thu May 25 16:26:40 2017 -0700 ---------------------------------------------------------------------- .../configuration/IgniteConfiguration.java | 14 +- .../configuration/PersistenceConfiguration.java | 289 ------------------- .../PersistentStoreConfiguration.java | 289 +++++++++++++++++++ .../processors/cache/GridCacheProcessor.java | 4 +- .../GridCacheDatabaseSharedManager.java | 8 +- .../database/file/FilePageStoreManager.java | 12 +- .../database/wal/FileWriteAheadLogManager.java | 12 +- ...istentStoreCacheRebalancingAbstractTest.java | 4 +- ...tNearCachePutGetWithPersistenceSelfTest.java | 4 +- ...ersistentStoreContinuousRestartSelfTest.java | 4 +- .../IgnitePersistentStoreDynamicCacheTest.java | 4 +- ...tentStoreMultiNodePutGetRestartSelfTest.java | 4 +- .../IgnitePersistentStorePageSizesTest.java | 4 +- ...entStoreRecoveryAfterFileCorruptionTest.java | 6 +- ...entStoreRemoveDuringRebalancingSelfTest.java | 4 +- ...toreSingleNodePutGetPersistenceSelfTest.java | 4 +- ...deWithIndexingPutGetPersistenceSelfTest.java | 4 +- .../IgnitePersistentStoreWalTlbSelfTest.java | 8 +- ...ageEvictionDuringPartitionClearSelfTest.java | 4 +- .../IgniteDbMultiNodePutGetRestartSelfTest.java | 4 +- .../db/IgniteDbPageEvictionSelfTest.java | 4 +- .../db/IgniteDbWholeClusterRestartSelfTest.java | 4 +- .../db/RebalancingOnNotStableTopologyTest.java | 6 +- .../cache/database/db/TransactionsHangTest.java | 6 +- ...IgniteCachePageStoreIntegrationSelfTest.java | 4 +- .../file/IgniteNoActualWalHistorySelfTest.java | 6 +- .../IgniteWalDirectoriesConfigurationTest.java | 6 +- .../IgniteWalHistoryReservationsSelfTest.java | 4 +- .../db/file/IgniteWalRecoverySelfTest.java | 7 +- .../IgniteWalRecoverySeveralRestartsTest.java | 6 +- .../PageStoreCheckpointSimulationSelfTest.java | 6 +- .../db/file/PageStoreEvictionSelfTest.java | 4 +- .../file/WalRecoveryTxLogicalRecordsTest.java | 6 +- .../GridChangeGlobalStateAbstractTest.java | 8 +- .../extended/GridActivateExtensionTest.java | 8 +- 35 files changed, 385 insertions(+), 386 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java index 2e3657f..30b2d28 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java @@ -455,7 +455,7 @@ public class IgniteConfiguration { private MemoryConfiguration memCfg; /** Persistence store configuration. */ - private PersistenceConfiguration pstCfg; + private PersistentStoreConfiguration pstCfg; /** Active on start flag. */ private boolean activeOnStart = DFLT_ACTIVE_ON_START; @@ -496,7 +496,7 @@ public class IgniteConfiguration { atomicCfg = cfg.getAtomicConfiguration(); binaryCfg = cfg.getBinaryConfiguration(); memCfg = cfg.getMemoryConfiguration(); - pstCfg = cfg.getPersistenceConfiguration(); + pstCfg = cfg.getPersistentStoreConfiguration(); cacheCfg = cfg.getCacheConfiguration(); cacheKeyCfg = cfg.getCacheKeyConfiguration(); cacheSanityCheckEnabled = cfg.isCacheSanityCheckEnabled(); @@ -2147,28 +2147,28 @@ public class IgniteConfiguration { } /** - * Gets persistence configuration. + * Gets persistence configuration used by Apache Ignite Persistent Store. * * @return Persistence configuration. */ - public PersistenceConfiguration getPersistenceConfiguration() { + public PersistentStoreConfiguration getPersistentStoreConfiguration() { return pstCfg; } /** * @return Flag {@code true} if persistent enable, {@code false} if disable. */ - public boolean isPersistentEnable() { + public boolean isPersistentStoreEnabled() { return pstCfg != null; } /** - * Sets persistence configuration. + * Sets persistence configuration activating Apache Ignite Persistent Store. * * @param pstCfg Persistence configuration. * @return {@code this} for chaining. */ - public IgniteConfiguration setPersistenceConfiguration(PersistenceConfiguration pstCfg) { + public IgniteConfiguration setPersistentStoreConfiguration(PersistentStoreConfiguration pstCfg) { this.pstCfg = pstCfg; return this; http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/core/src/main/java/org/apache/ignite/configuration/PersistenceConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/PersistenceConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/PersistenceConfiguration.java deleted file mode 100644 index 2918d92..0000000 --- a/modules/core/src/main/java/org/apache/ignite/configuration/PersistenceConfiguration.java +++ /dev/null @@ -1,289 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.ignite.configuration; - -import java.io.Serializable; - -/** - * Configures persistence module of Ignite node. - */ -public class PersistenceConfiguration implements Serializable { - /** */ - private static final long serialVersionUID = 0L; - - /** */ - public static final int DFLT_CHECKPOINT_FREQ = 180000; - - /** Lock default wait time, 10 sec. */ - public static final int DFLT_LOCK_WAIT_TIME = 10 * 1000; - - /** */ - @SuppressWarnings("UnnecessaryBoxing") - public static final Long DFLT_CHECKPOINT_PAGE_BUFFER_SIZE = new Long(256L * 1024 * 1024); - - /** Default number of checkpoint threads. */ - public static final int DFLT_CHECKPOINT_THREADS = 1; - - /** */ - private static final int DFLT_WAL_HISTORY_SIZE = 20; - - /** */ - public static final int DFLT_WAL_SEGMENTS = 10; - - /** */ - private static final int DFLT_WAL_SEGMENT_SIZE = 64 * 1024 * 1024; - - /** */ - private String persistenceStorePath; - - /** Checkpoint frequency. */ - private long checkpointFreq = DFLT_CHECKPOINT_FREQ; - - /** Lock wait time. */ - private int lockWaitTime = DFLT_LOCK_WAIT_TIME; - - /** */ - private Long checkpointPageBufSize = DFLT_CHECKPOINT_PAGE_BUFFER_SIZE; - - /** */ - private int checkpointThreads = DFLT_CHECKPOINT_THREADS; - - /** */ - private int walHistSize = DFLT_WAL_HISTORY_SIZE; - - /** Number of work WAL segments. */ - private int walSegments = DFLT_WAL_SEGMENTS; - - /** Number of WAL segments to keep. */ - private int walSegmentSize = DFLT_WAL_SEGMENT_SIZE; - - /** Write-ahead log persistence path. */ - private String walStorePath; - - /** Write-ahead log archive path. */ - private String walArchivePath; - - /** - * - */ - public String getPersistenceStorePath() { - return persistenceStorePath; - } - - /** - * @param persistenceStorePath Persistence store path. - */ - public PersistenceConfiguration setPersistenceStorePath(String persistenceStorePath) { - this.persistenceStorePath = persistenceStorePath; - - return this; - } - - /** - * Gets checkpoint frequency. - * - * @return Checkpoint frequency in milliseconds. - */ - public long getCheckpointFrequency() { - return checkpointFreq <= 0 ? DFLT_CHECKPOINT_FREQ : checkpointFreq; - } - - /** - * Sets checkpoint frequency. This is a minimal interval at which memory state will be written to a disk - * storage. If update rate is high, checkpoints can happen more frequently. - * - * @param checkpointFreq Checkpoint frequency in milliseconds. - * @return {@code this} for chaining. - */ - public PersistenceConfiguration setCheckpointFrequency(long checkpointFreq) { - this.checkpointFreq = checkpointFreq; - - return this; - } - - /** - * Time out in second, while wait and try get file lock for start persist manager. - * - * @return Time for wait. - */ - public int getLockWaitTime() { - return lockWaitTime; - } - - /** - * Time out in milliseconds, while wait and try get file lock for start persist manager. - * - * @param lockWaitTime Lock wait time. - * @return {@code this} for chaining. - */ - public PersistenceConfiguration setLockWaitTime(int lockWaitTime) { - this.lockWaitTime = lockWaitTime; - - return this; - } - - - - /** - * Gets amount of memory allocated for checkpoint temporary buffer. This buffer is used to create temporary - * copies of pages when checkpoint is in progress. - * - * @return Checkpoint page buffer size. - */ - public Long getCheckpointPageBufferSize() { - return checkpointPageBufSize; - } - - /** - * Sets amount of memory allocated for checkpoint temporary buffer. This buffer is used to create temporary - * copies of pages when checkpoint is in progress. - * - * @param checkpointPageBufSize Checkpoint page buffer size. - * @return {@code this} for chaining. - */ - public PersistenceConfiguration setCheckpointPageBufferSize(long checkpointPageBufSize) { - this.checkpointPageBufSize = checkpointPageBufSize; - - return this; - } - - - - /** - * Gets number of checkpoint threads to run. - * - * @return Number of checkpoint threads. - */ - public int getCheckpointThreads() { - return checkpointThreads; - } - - /** - * Sets number of checkpoint threads. - * - * @param checkpointThreads Number of checkpoint threads. - * @return {@code this} for chaining. - */ - public PersistenceConfiguration setCheckpointThreads(int checkpointThreads) { - this.checkpointThreads = checkpointThreads; - - return this; - } - - /** - * Gets the number checkpoints to keep in WAL history. - * - * @return Number of WAL segments to keep after the checkpoint is finished. - */ - public int getWalHistorySize() { - return walHistSize <= 0 ? DFLT_WAL_HISTORY_SIZE : walHistSize; - } - - /** - * Sets the number of checkpoints to keep in WAL history. - * - * @param walHistSize Number of WAL segments to keep after the checkpoint is finished. - * @return {@code this} for chaining. - */ - public PersistenceConfiguration setWalHistorySize(int walHistSize) { - this.walHistSize = walHistSize; - - return this; - } - - /** - * Gets the number of Write Ahead Log segments to work with. Write-ahead log is written over a fixed number - * of preallocated file segments of fixed size. This parameter sets the number of these segments. - * - * @return Number of work WAL segments. - */ - public int getWalSegments() { - return walSegments <= 0 ? DFLT_WAL_SEGMENTS : walSegments; - } - - /** - * Sets then number of work Write Ahead Log segments. - * - * @param walSegments Number of work WAL segments. - * @return {@code this} for chaining. - */ - public PersistenceConfiguration setWalSegments(int walSegments) { - this.walSegments = walSegments; - - return this; - } - - /** - * @return WAL segment size. - */ - public int getWalSegmentSize() { - return walSegmentSize <= 0 ? DFLT_WAL_SEGMENT_SIZE : walSegmentSize; - } - - /** - * @param walSegmentSize WAL segment size. - * @return {@code this} for chaining. - */ - public PersistenceConfiguration setWalSegmentSize(int walSegmentSize) { - this.walSegmentSize = walSegmentSize; - - return this; - } - - /** - * Gets write-ahead log persistence path. If this path is relative, it will be resolved relative to - * Ignite work directory. - * - * @return Write-ahead log persistence path, absolute or relative to Ignite work directory. - */ - public String getWalStorePath() { - return walStorePath; - } - - /** - * Sets write-ahead log persistence path. - * - * @param walStorePath Write-ahead log persistence path, absolute or relative to Ignite work directory. - * @return {@code this} for chaining. - */ - public PersistenceConfiguration setWalStorePath(String walStorePath) { - this.walStorePath = walStorePath; - - return this; - } - - /** - * Gets write-ahead log archive path. Full WAL segments will be copied to this directory before reuse. - * - * @return WAL archive directory. - */ - public String getWalArchivePath() { - return walArchivePath; - } - - /** - * Sets write-ahead log archive path. Full WAL segments will be copied to this directory before reuse. - * - * @param walArchivePath WAL archive directory. - * @return {@code this} for chaining. - */ - public PersistenceConfiguration setWalArchivePath(String walArchivePath) { - this.walArchivePath = walArchivePath; - - return this; - } -} http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/core/src/main/java/org/apache/ignite/configuration/PersistentStoreConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/PersistentStoreConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/PersistentStoreConfiguration.java new file mode 100644 index 0000000..ac1e514 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/configuration/PersistentStoreConfiguration.java @@ -0,0 +1,289 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.ignite.configuration; + +import java.io.Serializable; + +/** + * Configures Apache Ignite Persistent store. + */ +public class PersistentStoreConfiguration implements Serializable { + /** */ + private static final long serialVersionUID = 0L; + + /** */ + public static final int DFLT_CHECKPOINT_FREQ = 180000; + + /** Lock default wait time, 10 sec. */ + public static final int DFLT_LOCK_WAIT_TIME = 10 * 1000; + + /** */ + @SuppressWarnings("UnnecessaryBoxing") + public static final Long DFLT_CHECKPOINT_PAGE_BUFFER_SIZE = new Long(256L * 1024 * 1024); + + /** Default number of checkpoint threads. */ + public static final int DFLT_CHECKPOINT_THREADS = 1; + + /** */ + private static final int DFLT_WAL_HISTORY_SIZE = 20; + + /** */ + public static final int DFLT_WAL_SEGMENTS = 10; + + /** */ + private static final int DFLT_WAL_SEGMENT_SIZE = 64 * 1024 * 1024; + + /** */ + private String persistenteStorePath; + + /** Checkpoint frequency. */ + private long checkpointFreq = DFLT_CHECKPOINT_FREQ; + + /** Lock wait time. */ + private int lockWaitTime = DFLT_LOCK_WAIT_TIME; + + /** */ + private Long checkpointPageBufSize = DFLT_CHECKPOINT_PAGE_BUFFER_SIZE; + + /** */ + private int checkpointThreads = DFLT_CHECKPOINT_THREADS; + + /** */ + private int walHistSize = DFLT_WAL_HISTORY_SIZE; + + /** Number of work WAL segments. */ + private int walSegments = DFLT_WAL_SEGMENTS; + + /** Number of WAL segments to keep. */ + private int walSegmentSize = DFLT_WAL_SEGMENT_SIZE; + + /** Write-ahead log persistence path. */ + private String walStorePath; + + /** Write-ahead log archive path. */ + private String walArchivePath; + + /** + * + */ + public String getPersistentStorePath() { + return persistenteStorePath; + } + + /** + * @param persistenceStorePath Persistence store path. + */ + public PersistentStoreConfiguration setPersistentStorePath(String persistenceStorePath) { + this.persistenteStorePath = persistenceStorePath; + + return this; + } + + /** + * Gets checkpoint frequency. + * + * @return Checkpoint frequency in milliseconds. + */ + public long getCheckpointFrequency() { + return checkpointFreq <= 0 ? DFLT_CHECKPOINT_FREQ : checkpointFreq; + } + + /** + * Sets checkpoint frequency. This is a minimal interval at which memory state will be written to a disk + * storage. If update rate is high, checkpoints can happen more frequently. + * + * @param checkpointFreq Checkpoint frequency in milliseconds. + * @return {@code this} for chaining. + */ + public PersistentStoreConfiguration setCheckpointFrequency(long checkpointFreq) { + this.checkpointFreq = checkpointFreq; + + return this; + } + + /** + * Time out in second, while wait and try get file lock for start persist manager. + * + * @return Time for wait. + */ + public int getLockWaitTime() { + return lockWaitTime; + } + + /** + * Time out in milliseconds, while wait and try get file lock for start persist manager. + * + * @param lockWaitTime Lock wait time. + * @return {@code this} for chaining. + */ + public PersistentStoreConfiguration setLockWaitTime(int lockWaitTime) { + this.lockWaitTime = lockWaitTime; + + return this; + } + + + + /** + * Gets amount of memory allocated for checkpoint temporary buffer. This buffer is used to create temporary + * copies of pages when checkpoint is in progress. + * + * @return Checkpoint page buffer size. + */ + public Long getCheckpointPageBufferSize() { + return checkpointPageBufSize; + } + + /** + * Sets amount of memory allocated for checkpoint temporary buffer. This buffer is used to create temporary + * copies of pages when checkpoint is in progress. + * + * @param checkpointPageBufSize Checkpoint page buffer size. + * @return {@code this} for chaining. + */ + public PersistentStoreConfiguration setCheckpointPageBufferSize(long checkpointPageBufSize) { + this.checkpointPageBufSize = checkpointPageBufSize; + + return this; + } + + + + /** + * Gets number of checkpoint threads to run. + * + * @return Number of checkpoint threads. + */ + public int getCheckpointThreads() { + return checkpointThreads; + } + + /** + * Sets number of checkpoint threads. + * + * @param checkpointThreads Number of checkpoint threads. + * @return {@code this} for chaining. + */ + public PersistentStoreConfiguration setCheckpointThreads(int checkpointThreads) { + this.checkpointThreads = checkpointThreads; + + return this; + } + + /** + * Gets the number checkpoints to keep in WAL history. + * + * @return Number of WAL segments to keep after the checkpoint is finished. + */ + public int getWalHistorySize() { + return walHistSize <= 0 ? DFLT_WAL_HISTORY_SIZE : walHistSize; + } + + /** + * Sets the number of checkpoints to keep in WAL history. + * + * @param walHistSize Number of WAL segments to keep after the checkpoint is finished. + * @return {@code this} for chaining. + */ + public PersistentStoreConfiguration setWalHistorySize(int walHistSize) { + this.walHistSize = walHistSize; + + return this; + } + + /** + * Gets the number of Write Ahead Log segments to work with. Write-ahead log is written over a fixed number + * of preallocated file segments of fixed size. This parameter sets the number of these segments. + * + * @return Number of work WAL segments. + */ + public int getWalSegments() { + return walSegments <= 0 ? DFLT_WAL_SEGMENTS : walSegments; + } + + /** + * Sets then number of work Write Ahead Log segments. + * + * @param walSegments Number of work WAL segments. + * @return {@code this} for chaining. + */ + public PersistentStoreConfiguration setWalSegments(int walSegments) { + this.walSegments = walSegments; + + return this; + } + + /** + * @return WAL segment size. + */ + public int getWalSegmentSize() { + return walSegmentSize <= 0 ? DFLT_WAL_SEGMENT_SIZE : walSegmentSize; + } + + /** + * @param walSegmentSize WAL segment size. + * @return {@code this} for chaining. + */ + public PersistentStoreConfiguration setWalSegmentSize(int walSegmentSize) { + this.walSegmentSize = walSegmentSize; + + return this; + } + + /** + * Gets write-ahead log persistence path. If this path is relative, it will be resolved relative to + * Ignite work directory. + * + * @return Write-ahead log persistence path, absolute or relative to Ignite work directory. + */ + public String getWalStorePath() { + return walStorePath; + } + + /** + * Sets write-ahead log persistence path. + * + * @param walStorePath Write-ahead log persistence path, absolute or relative to Ignite work directory. + * @return {@code this} for chaining. + */ + public PersistentStoreConfiguration setWalStorePath(String walStorePath) { + this.walStorePath = walStorePath; + + return this; + } + + /** + * Gets write-ahead log archive path. Full WAL segments will be copied to this directory before reuse. + * + * @return WAL archive directory. + */ + public String getWalArchivePath() { + return walArchivePath; + } + + /** + * Sets write-ahead log archive path. Full WAL segments will be copied to this directory before reuse. + * + * @param walArchivePath WAL archive directory. + * @return {@code this} for chaining. + */ + public PersistentStoreConfiguration setWalArchivePath(String walArchivePath) { + this.walArchivePath = walArchivePath; + + return this; + } +} http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 76ea847..d7c1e3d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@ -1400,7 +1400,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { IgniteCacheOffheapManager offheapMgr; - if (ctx.config().getPersistenceConfiguration() != null) { + if (ctx.config().getPersistentStoreConfiguration() != null) { ClassLoader clsLdr = U.gridClassLoader(); try { @@ -2074,7 +2074,7 @@ public class GridCacheProcessor extends GridProcessorAdapter { IgnitePageStoreManager pageStoreMgr = null; IgniteWriteAheadLogManager walMgr = null; - if (ctx.config().isPersistentEnable()) { + if (ctx.config().isPersistentStoreEnabled()) { dbMgr = IgniteComponentType.DATABASE_MANAGER.create(ctx, false); pageStoreMgr = IgniteComponentType.PAGE_STORE_MANAGER.create(ctx, false); http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheDatabaseSharedManager.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheDatabaseSharedManager.java b/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheDatabaseSharedManager.java index c1fed9f..45b5abf 100755 --- a/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheDatabaseSharedManager.java +++ b/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/GridCacheDatabaseSharedManager.java @@ -66,7 +66,7 @@ import org.apache.ignite.configuration.DataPageEvictionMode; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.MemoryConfiguration; import org.apache.ignite.configuration.MemoryPolicyConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.events.DiscoveryEvent; import org.apache.ignite.events.EventType; import org.apache.ignite.internal.GridKernalContext; @@ -232,7 +232,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan private volatile boolean printCheckpointStats = true; /** Database configuration. */ - private final PersistenceConfiguration dbCfg; + private final PersistentStoreConfiguration dbCfg; /** */ private final Collection<DbCheckpointListener> lsnrs = new CopyOnWriteArrayList<>(); @@ -273,7 +273,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan public GridCacheDatabaseSharedManager(GridKernalContext ctx) { IgniteConfiguration cfg = ctx.config(); - dbCfg = cfg.getPersistenceConfiguration(); + dbCfg = cfg.getPersistentStoreConfiguration(); assert dbCfg != null : "PageStore should not be created if persistence is disabled."; @@ -356,7 +356,7 @@ public class GridCacheDatabaseSharedManager extends IgniteCacheDatabaseSharedMan // Intentionally use identity comparison to check if configuration default has changed. //noinspection NumberEquality - if (cpBufSize == PersistenceConfiguration.DFLT_CHECKPOINT_PAGE_BUFFER_SIZE) { + if (cpBufSize == PersistentStoreConfiguration.DFLT_CHECKPOINT_PAGE_BUFFER_SIZE) { MemoryConfiguration memCfg = cctx.kernalContext().config().getMemoryConfiguration(); // Limit the checkpoint page buffer size by 2GB. http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/file/FilePageStoreManager.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/file/FilePageStoreManager.java b/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/file/FilePageStoreManager.java index 3a5873d..c233b1e 100755 --- a/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/file/FilePageStoreManager.java +++ b/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/file/FilePageStoreManager.java @@ -36,7 +36,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.pagemem.PageIdAllocator; import org.apache.ignite.internal.pagemem.PageIdUtils; @@ -84,7 +84,7 @@ public class FilePageStoreManager extends GridCacheSharedManagerAdapter implemen private final IgniteConfiguration igniteCfg; /** */ - private PersistenceConfiguration pstCfg; + private PersistentStoreConfiguration pstCfg; /** Absolute directory for file page store */ private File storeWorkDir; @@ -101,7 +101,7 @@ public class FilePageStoreManager extends GridCacheSharedManagerAdapter implemen public FilePageStoreManager(GridKernalContext ctx) { igniteCfg = ctx.config(); - PersistenceConfiguration pstCfg = igniteCfg.getPersistenceConfiguration(); + PersistentStoreConfiguration pstCfg = igniteCfg.getPersistentStoreConfiguration(); assert pstCfg != null : "WAL should not be created if persistence is disabled."; @@ -115,13 +115,13 @@ public class FilePageStoreManager extends GridCacheSharedManagerAdapter implemen String consId = U.maskForFileName(cctx.kernalContext().discovery().consistentId().toString()); - if (pstCfg.getPersistenceStorePath() != null) { - File workDir0 = new File(pstCfg.getPersistenceStorePath()); + if (pstCfg.getPersistentStorePath() != null) { + File workDir0 = new File(pstCfg.getPersistentStorePath()); if (!workDir0.isAbsolute()) workDir0 = U.resolveWorkDirectory( igniteCfg.getWorkDirectory(), - pstCfg.getPersistenceStorePath(), + pstCfg.getPersistentStorePath(), false ); http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/wal/FileWriteAheadLogManager.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/wal/FileWriteAheadLogManager.java b/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/wal/FileWriteAheadLogManager.java index a9a482a..f8b18ef 100644 --- a/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/wal/FileWriteAheadLogManager.java +++ b/modules/pds/src/main/java/org/apache/ignite/internal/processors/cache/database/wal/FileWriteAheadLogManager.java @@ -45,7 +45,7 @@ import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.IgniteSystemProperties; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.IgniteInterruptedCheckedException; import org.apache.ignite.internal.pagemem.wal.IgniteWriteAheadLogManager; @@ -133,7 +133,7 @@ public class FileWriteAheadLogManager extends GridCacheSharedManagerAdapter impl private long maxWalSegmentSize; /** */ - private final PersistenceConfiguration dbCfg; + private final PersistentStoreConfiguration dbCfg; /** */ private IgniteConfiguration igCfg; @@ -187,7 +187,7 @@ public class FileWriteAheadLogManager extends GridCacheSharedManagerAdapter impl public FileWriteAheadLogManager(GridKernalContext ctx) { igCfg = ctx.config(); - PersistenceConfiguration dbCfg = igCfg.getPersistenceConfiguration(); + PersistentStoreConfiguration dbCfg = igCfg.getPersistentStoreConfiguration(); assert dbCfg != null : "WAL should not be created if persistence is disabled."; @@ -1154,7 +1154,7 @@ public class FileWriteAheadLogManager extends GridCacheSharedManagerAdapter impl } /** - * Validate files depending on {@link PersistenceConfiguration#getWalSegments()} and create if need. + * Validate files depending on {@link PersistentStoreConfiguration#getWalSegments()} and create if need. * Check end when exit condition return false or all files are passed. * * @param startWith Start with. @@ -1991,7 +1991,7 @@ public class FileWriteAheadLogManager extends GridCacheSharedManagerAdapter impl private final FileArchiver archiver; /** */ - private final PersistenceConfiguration dbCfg; + private final PersistentStoreConfiguration dbCfg; /** */ private final RecordSerializer serializer; @@ -2037,7 +2037,7 @@ public class FileWriteAheadLogManager extends GridCacheSharedManagerAdapter impl File walArchiveDir, FileWALPointer start, FileWALPointer end, - PersistenceConfiguration dbCfg, + PersistentStoreConfiguration dbCfg, RecordSerializer serializer, FileArchiver archiver, IgniteLogger log, http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheRebalancingAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheRebalancingAbstractTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheRebalancingAbstractTest.java index ecb12f5..ddaf368 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheRebalancingAbstractTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreCacheRebalancingAbstractTest.java @@ -37,7 +37,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.MemoryPolicyConfiguration; import org.apache.ignite.configuration.MemoryConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.processors.cache.database.wal.FileWriteAheadLogManager; @@ -110,7 +110,7 @@ public abstract class IgnitePersistentStoreCacheRebalancingAbstractTest extends cfg.setMemoryConfiguration(memCfg); - cfg.setPersistenceConfiguration(new PersistenceConfiguration()); + cfg.setPersistentStoreConfiguration(new PersistentStoreConfiguration()); cfg.setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(IP_FINDER)); http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreClientNearCachePutGetWithPersistenceSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreClientNearCachePutGetWithPersistenceSelfTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreClientNearCachePutGetWithPersistenceSelfTest.java index e002563..0993bf3 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreClientNearCachePutGetWithPersistenceSelfTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreClientNearCachePutGetWithPersistenceSelfTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.cache.database; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.internal.processors.cache.database.wal.FileWriteAheadLogManager; import org.apache.ignite.internal.processors.database.IgniteDbClientNearCachePutGetTest; import org.apache.ignite.internal.util.typedef.internal.U; @@ -31,7 +31,7 @@ public class IgnitePersistentStoreClientNearCachePutGetWithPersistenceSelfTest e @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setPersistenceConfiguration(new PersistenceConfiguration()); + cfg.setPersistentStoreConfiguration(new PersistentStoreConfiguration()); return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreContinuousRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreContinuousRestartSelfTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreContinuousRestartSelfTest.java index f666a23..fa9879b 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreContinuousRestartSelfTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreContinuousRestartSelfTest.java @@ -34,7 +34,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.MemoryConfiguration; import org.apache.ignite.configuration.MemoryPolicyConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.processors.cache.database.wal.FileWriteAheadLogManager; import org.apache.ignite.internal.util.typedef.internal.U; @@ -81,7 +81,7 @@ public class IgnitePersistentStoreContinuousRestartSelfTest extends GridCommonAb cfg.setCacheConfiguration(ccfg1); - cfg.setPersistenceConfiguration(new PersistenceConfiguration()); + cfg.setPersistentStoreConfiguration(new PersistentStoreConfiguration()); return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreDynamicCacheTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreDynamicCacheTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreDynamicCacheTest.java index cda2a4a..96957da 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreDynamicCacheTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreDynamicCacheTest.java @@ -27,7 +27,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.MemoryConfiguration; import org.apache.ignite.configuration.MemoryPolicyConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.internal.processors.cache.database.GridCacheDatabaseSharedManager; import org.apache.ignite.internal.processors.cache.database.wal.FileWriteAheadLogManager; import org.apache.ignite.internal.processors.database.IgniteDbDynamicCacheSelfTest; @@ -81,7 +81,7 @@ public class IgnitePersistentStoreDynamicCacheTest extends IgniteDbDynamicCacheS cfg.setMemoryConfiguration(dbCfg); - cfg.setPersistenceConfiguration(new PersistenceConfiguration()); + cfg.setPersistentStoreConfiguration(new PersistentStoreConfiguration()); if ("client".equals(gridName)) cfg.setClientMode(true); http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreMultiNodePutGetRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreMultiNodePutGetRestartSelfTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreMultiNodePutGetRestartSelfTest.java index d67aafe..46ac5d2 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreMultiNodePutGetRestartSelfTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreMultiNodePutGetRestartSelfTest.java @@ -33,7 +33,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.MemoryConfiguration; import org.apache.ignite.configuration.MemoryPolicyConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; @@ -95,7 +95,7 @@ public class IgnitePersistentStoreMultiNodePutGetRestartSelfTest extends GridCom cfg.setCacheConfiguration(ccfg); - cfg.setPersistenceConfiguration(new PersistenceConfiguration()); + cfg.setPersistentStoreConfiguration(new PersistentStoreConfiguration()); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStorePageSizesTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStorePageSizesTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStorePageSizesTest.java index 697bc49..9616d76 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStorePageSizesTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStorePageSizesTest.java @@ -26,7 +26,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.MemoryConfiguration; import org.apache.ignite.configuration.MemoryPolicyConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.processors.cache.database.wal.FileWriteAheadLogManager; import org.apache.ignite.internal.util.typedef.internal.U; @@ -59,7 +59,7 @@ public class IgnitePersistentStorePageSizesTest extends GridCommonAbstractTest { cfg.setMemoryConfiguration(memCfg); - cfg.setPersistenceConfiguration(new PersistenceConfiguration()); + cfg.setPersistentStoreConfiguration(new PersistentStoreConfiguration()); cfg.setCacheConfiguration( new CacheConfiguration("partitioned") http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreRecoveryAfterFileCorruptionTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreRecoveryAfterFileCorruptionTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreRecoveryAfterFileCorruptionTest.java index fd77996..d22a12f 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreRecoveryAfterFileCorruptionTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreRecoveryAfterFileCorruptionTest.java @@ -30,7 +30,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.MemoryConfiguration; import org.apache.ignite.configuration.MemoryPolicyConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.pagemem.FullPageId; import org.apache.ignite.internal.pagemem.PageIdAllocator; @@ -97,11 +97,11 @@ public class IgnitePersistentStoreRecoveryAfterFileCorruptionTest extends GridCo cfg.setMemoryConfiguration(dbCfg); - PersistenceConfiguration pCfg = new PersistenceConfiguration(); + PersistentStoreConfiguration pCfg = new PersistentStoreConfiguration(); pCfg.setCheckpointFrequency(500); - cfg.setPersistenceConfiguration(pCfg); + cfg.setPersistentStoreConfiguration(pCfg); cfg.setDiscoverySpi(new TcpDiscoverySpi().setIpFinder(ipFinder)); http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreRemoveDuringRebalancingSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreRemoveDuringRebalancingSelfTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreRemoveDuringRebalancingSelfTest.java index 6b37a3a..5544aaf 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreRemoveDuringRebalancingSelfTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreRemoveDuringRebalancingSelfTest.java @@ -28,7 +28,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.MemoryConfiguration; import org.apache.ignite.configuration.MemoryPolicyConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.processors.cache.database.wal.FileWriteAheadLogManager; @@ -72,7 +72,7 @@ public class IgnitePersistentStoreRemoveDuringRebalancingSelfTest extends GridCo cfg.setMemoryConfiguration(dbCfg); - cfg.setPersistenceConfiguration(new PersistenceConfiguration()); + cfg.setPersistentStoreConfiguration(new PersistentStoreConfiguration()); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreSingleNodePutGetPersistenceSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreSingleNodePutGetPersistenceSelfTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreSingleNodePutGetPersistenceSelfTest.java index f3153ea..e1edf8e 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreSingleNodePutGetPersistenceSelfTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreSingleNodePutGetPersistenceSelfTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.cache.database; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.internal.processors.cache.database.wal.FileWriteAheadLogManager; import org.apache.ignite.internal.processors.database.IgniteDbSingleNodePutGetTest; import org.apache.ignite.internal.util.typedef.internal.U; @@ -31,7 +31,7 @@ public class IgnitePersistentStoreSingleNodePutGetPersistenceSelfTest extends Ig @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setPersistenceConfiguration(new PersistenceConfiguration()); + cfg.setPersistentStoreConfiguration(new PersistentStoreConfiguration()); return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreSingleNodeWithIndexingPutGetPersistenceSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreSingleNodeWithIndexingPutGetPersistenceSelfTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreSingleNodeWithIndexingPutGetPersistenceSelfTest.java index 14d6a06..392315c 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreSingleNodeWithIndexingPutGetPersistenceSelfTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreSingleNodeWithIndexingPutGetPersistenceSelfTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.cache.database; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.internal.processors.cache.database.wal.FileWriteAheadLogManager; import org.apache.ignite.internal.processors.database.IgniteDbSingleNodeWithIndexingPutGetTest; import org.apache.ignite.internal.util.typedef.internal.U; @@ -31,7 +31,7 @@ public class IgnitePersistentStoreSingleNodeWithIndexingPutGetPersistenceSelfTes @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setPersistenceConfiguration(new PersistenceConfiguration()); + cfg.setPersistentStoreConfiguration(new PersistentStoreConfiguration()); return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreWalTlbSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreWalTlbSelfTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreWalTlbSelfTest.java index d720e87..db1f644 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreWalTlbSelfTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/IgnitePersistentStoreWalTlbSelfTest.java @@ -23,7 +23,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.MemoryConfiguration; import org.apache.ignite.configuration.MemoryPolicyConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.processors.cache.database.wal.FileWriteAheadLogManager; import org.apache.ignite.internal.util.typedef.internal.U; @@ -32,7 +32,7 @@ import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; -import static org.apache.ignite.configuration.PersistenceConfiguration.DFLT_CHECKPOINT_PAGE_BUFFER_SIZE; +import static org.apache.ignite.configuration.PersistentStoreConfiguration.DFLT_CHECKPOINT_PAGE_BUFFER_SIZE; /** * @@ -65,8 +65,8 @@ public class IgnitePersistentStoreWalTlbSelfTest extends GridCommonAbstractTest cfg.setMemoryConfiguration(memCfg); - cfg.setPersistenceConfiguration( - new PersistenceConfiguration() + cfg.setPersistentStoreConfiguration( + new PersistentStoreConfiguration() .setCheckpointPageBufferSize(DFLT_CHECKPOINT_PAGE_BUFFER_SIZE + 1) ); http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/test/java/org/apache/ignite/cache/database/db/DbPageEvictionDuringPartitionClearSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/DbPageEvictionDuringPartitionClearSelfTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/DbPageEvictionDuringPartitionClearSelfTest.java index 05067bd..1d14c40 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/DbPageEvictionDuringPartitionClearSelfTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/DbPageEvictionDuringPartitionClearSelfTest.java @@ -28,7 +28,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.MemoryConfiguration; import org.apache.ignite.configuration.MemoryPolicyConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.processors.cache.database.GridCacheDatabaseSharedManager; @@ -74,7 +74,7 @@ public class DbPageEvictionDuringPartitionClearSelfTest extends GridCommonAbstra cfg.setMemoryConfiguration(memCfg); - cfg.setPersistenceConfiguration(new PersistenceConfiguration()); + cfg.setPersistentStoreConfiguration(new PersistentStoreConfiguration()); return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/test/java/org/apache/ignite/cache/database/db/IgniteDbMultiNodePutGetRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/IgniteDbMultiNodePutGetRestartSelfTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/IgniteDbMultiNodePutGetRestartSelfTest.java index a0fc4bd..88bdf1e 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/IgniteDbMultiNodePutGetRestartSelfTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/IgniteDbMultiNodePutGetRestartSelfTest.java @@ -32,7 +32,7 @@ import org.apache.ignite.configuration.BinaryConfiguration; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.MemoryPolicyConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; @@ -87,7 +87,7 @@ public class IgniteDbMultiNodePutGetRestartSelfTest extends GridCommonAbstractTe cfg.setCacheConfiguration(ccfg); - cfg.setPersistenceConfiguration(new PersistenceConfiguration()); + cfg.setPersistentStoreConfiguration(new PersistentStoreConfiguration()); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/test/java/org/apache/ignite/cache/database/db/IgniteDbPageEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/IgniteDbPageEvictionSelfTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/IgniteDbPageEvictionSelfTest.java index ed68b64..f962f80 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/IgniteDbPageEvictionSelfTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/IgniteDbPageEvictionSelfTest.java @@ -30,7 +30,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.MemoryConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.MemoryPolicyConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.processors.cache.database.wal.FileWriteAheadLogManager; import org.apache.ignite.internal.util.typedef.internal.S; @@ -83,7 +83,7 @@ public class IgniteDbPageEvictionSelfTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(ccfg); - cfg.setPersistenceConfiguration(new PersistenceConfiguration()); + cfg.setPersistentStoreConfiguration(new PersistentStoreConfiguration()); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/test/java/org/apache/ignite/cache/database/db/IgniteDbWholeClusterRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/IgniteDbWholeClusterRestartSelfTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/IgniteDbWholeClusterRestartSelfTest.java index fa988f2..6032cce 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/IgniteDbWholeClusterRestartSelfTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/IgniteDbWholeClusterRestartSelfTest.java @@ -31,7 +31,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.MemoryConfiguration; import org.apache.ignite.configuration.MemoryPolicyConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.internal.processors.cache.database.wal.FileWriteAheadLogManager; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.spi.checkpoint.noop.NoopCheckpointSpi; @@ -84,7 +84,7 @@ public class IgniteDbWholeClusterRestartSelfTest extends GridCommonAbstractTest cfg.setCacheConfiguration(ccfg1); - cfg.setPersistenceConfiguration(new PersistenceConfiguration()); + cfg.setPersistentStoreConfiguration(new PersistentStoreConfiguration()); cfg.setConsistentId(gridName); http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/test/java/org/apache/ignite/cache/database/db/RebalancingOnNotStableTopologyTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/RebalancingOnNotStableTopologyTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/RebalancingOnNotStableTopologyTest.java index d638570..7f4f287 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/RebalancingOnNotStableTopologyTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/RebalancingOnNotStableTopologyTest.java @@ -31,7 +31,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.MemoryConfiguration; import org.apache.ignite.configuration.MemoryPolicyConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; import org.apache.ignite.testframework.junits.multijvm.IgniteProcessProxy; @@ -165,11 +165,11 @@ public class RebalancingOnNotStableTopologyTest extends GridCommonAbstractTest { cfg.setCacheConfiguration(ccfg); - PersistenceConfiguration pCfg = new PersistenceConfiguration(); + PersistentStoreConfiguration pCfg = new PersistentStoreConfiguration(); pCfg.setCheckpointFrequency(CHECKPOINT_FREQUENCY); - cfg.setPersistenceConfiguration(pCfg); + cfg.setPersistentStoreConfiguration(pCfg); MemoryConfiguration memCfg = new MemoryConfiguration(); http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/test/java/org/apache/ignite/cache/database/db/TransactionsHangTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/TransactionsHangTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/TransactionsHangTest.java index 60d7f70..074b408 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/TransactionsHangTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/TransactionsHangTest.java @@ -35,7 +35,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.MemoryConfiguration; import org.apache.ignite.configuration.MemoryPolicyConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.configuration.TransactionConfiguration; import org.apache.ignite.internal.processors.cache.transactions.IgniteTxManager; import org.apache.ignite.internal.util.typedef.internal.U; @@ -122,12 +122,12 @@ public class TransactionsHangTest extends GridCommonAbstractTest { cfg.setTransactionConfiguration(txCfg); - PersistenceConfiguration pCfg = new PersistenceConfiguration(); + PersistentStoreConfiguration pCfg = new PersistentStoreConfiguration(); pCfg.setWalHistorySize(1); pCfg.setCheckpointFrequency(CHECKPOINT_FREQUENCY); - cfg.setPersistenceConfiguration(pCfg); + cfg.setPersistentStoreConfiguration(pCfg); MemoryConfiguration memCfg = new MemoryConfiguration(); http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteCachePageStoreIntegrationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteCachePageStoreIntegrationSelfTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteCachePageStoreIntegrationSelfTest.java index c0416d9..229c226 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteCachePageStoreIntegrationSelfTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteCachePageStoreIntegrationSelfTest.java @@ -34,7 +34,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.MemoryConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.MemoryPolicyConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.processors.cache.GridCacheAdapter; import org.apache.ignite.internal.processors.cache.database.wal.FileWriteAheadLogManager; @@ -76,7 +76,7 @@ public class IgniteCachePageStoreIntegrationSelfTest extends GridCommonAbstractT dbCfg.setMemoryPolicies(memPlcCfg); dbCfg.setDefaultMemoryPolicyName("dfltMemPlc"); - cfg.setPersistenceConfiguration(new PersistenceConfiguration()); + cfg.setPersistentStoreConfiguration(new PersistentStoreConfiguration()); cfg.setMemoryConfiguration(dbCfg); http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteNoActualWalHistorySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteNoActualWalHistorySelfTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteNoActualWalHistorySelfTest.java index f98bded..1c5024a 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteNoActualWalHistorySelfTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteNoActualWalHistorySelfTest.java @@ -29,7 +29,7 @@ import org.apache.ignite.configuration.BinaryConfiguration; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.MemoryConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.processors.cache.database.GridCacheDatabaseSharedManager; import org.apache.ignite.internal.processors.cache.database.wal.FileWriteAheadLogManager; @@ -63,13 +63,13 @@ public class IgniteNoActualWalHistorySelfTest extends GridCommonAbstractTest { cfg.setMemoryConfiguration(dbCfg); - PersistenceConfiguration pCfg = new PersistenceConfiguration(); + PersistentStoreConfiguration pCfg = new PersistentStoreConfiguration(); pCfg.setWalSegmentSize(4 * 1024 * 1024); pCfg.setWalHistorySize(2); pCfg.setWalSegments(10); - cfg.setPersistenceConfiguration(pCfg); + cfg.setPersistentStoreConfiguration(pCfg); cfg.setMarshaller(null); http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteWalDirectoriesConfigurationTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteWalDirectoriesConfigurationTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteWalDirectoriesConfigurationTest.java index 5160eb4..2e31686 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteWalDirectoriesConfigurationTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteWalDirectoriesConfigurationTest.java @@ -18,7 +18,7 @@ package org.apache.ignite.cache.database.db.file; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; /** @@ -29,11 +29,11 @@ public class IgniteWalDirectoriesConfigurationTest extends GridCommonAbstractTes @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration cfg = super.getConfiguration(gridName); - PersistenceConfiguration pCfg = new PersistenceConfiguration(); + PersistentStoreConfiguration pCfg = new PersistentStoreConfiguration(); pCfg.setWalStorePath("test/db/wal"); - cfg.setPersistenceConfiguration(pCfg); + cfg.setPersistentStoreConfiguration(pCfg); return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteWalHistoryReservationsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteWalHistoryReservationsSelfTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteWalHistoryReservationsSelfTest.java index 73d6feb..77715c3 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteWalHistoryReservationsSelfTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteWalHistoryReservationsSelfTest.java @@ -29,7 +29,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.MemoryConfiguration; import org.apache.ignite.configuration.MemoryPolicyConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.processors.cache.database.GridCacheDatabaseSharedManager; import org.apache.ignite.internal.processors.cache.database.wal.FileWriteAheadLogManager; @@ -73,7 +73,7 @@ public class IgniteWalHistoryReservationsSelfTest extends GridCommonAbstractTest cfg.setCacheConfiguration(ccfg1); - cfg.setPersistenceConfiguration(new PersistenceConfiguration()); + cfg.setPersistentStoreConfiguration(new PersistentStoreConfiguration()); return cfg; } http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteWalRecoverySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteWalRecoverySelfTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteWalRecoverySelfTest.java index b2b0348..bdf333c 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteWalRecoverySelfTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteWalRecoverySelfTest.java @@ -44,7 +44,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.MemoryConfiguration; import org.apache.ignite.configuration.MemoryPolicyConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.IgniteInterruptedCheckedException; @@ -60,7 +60,6 @@ import org.apache.ignite.internal.processors.cache.GridCacheSharedContext; import org.apache.ignite.internal.processors.cache.database.GridCacheDatabaseSharedManager; import org.apache.ignite.internal.processors.cache.database.pagemem.PageMemoryEx; import org.apache.ignite.internal.processors.cache.database.tree.io.TrackingPageIO; -import org.apache.ignite.internal.processors.cache.database.wal.FileWriteAheadLogManager; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.PA; import org.apache.ignite.internal.util.typedef.PAX; @@ -133,12 +132,12 @@ public class IgniteWalRecoverySelfTest extends GridCommonAbstractTest { cfg.setMemoryConfiguration(dbCfg); - PersistenceConfiguration pCfg = new PersistenceConfiguration(); + PersistentStoreConfiguration pCfg = new PersistentStoreConfiguration(); if (walSegmentSize != 0) pCfg.setWalSegmentSize(walSegmentSize); - cfg.setPersistenceConfiguration(pCfg); + cfg.setPersistentStoreConfiguration(pCfg); cfg.setMarshaller(null); http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteWalRecoverySeveralRestartsTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteWalRecoverySeveralRestartsTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteWalRecoverySeveralRestartsTest.java index e5f1ec1..9b0231d 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteWalRecoverySeveralRestartsTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/IgniteWalRecoverySeveralRestartsTest.java @@ -31,7 +31,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.MemoryConfiguration; import org.apache.ignite.configuration.MemoryPolicyConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.processors.cache.database.wal.FileWriteAheadLogManager; import org.apache.ignite.internal.util.typedef.internal.S; @@ -93,9 +93,9 @@ public class IgniteWalRecoverySeveralRestartsTest extends GridCommonAbstractTest cfg.setMemoryConfiguration(dbCfg); - PersistenceConfiguration pCfg = new PersistenceConfiguration(); + PersistentStoreConfiguration pCfg = new PersistentStoreConfiguration(); - cfg.setPersistenceConfiguration(pCfg); + cfg.setPersistentStoreConfiguration(pCfg); cfg.setMarshaller(null); http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreCheckpointSimulationSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreCheckpointSimulationSelfTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreCheckpointSimulationSelfTest.java index 96178ef..92629f7 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreCheckpointSimulationSelfTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreCheckpointSimulationSelfTest.java @@ -39,7 +39,7 @@ import org.apache.ignite.cache.CacheRebalanceMode; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.MemoryConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.pagemem.FullPageId; @@ -104,11 +104,11 @@ public class PageStoreCheckpointSimulationSelfTest extends GridCommonAbstractTes cfg.setMemoryConfiguration(dbCfg); - PersistenceConfiguration pCfg = new PersistenceConfiguration(); + PersistentStoreConfiguration pCfg = new PersistentStoreConfiguration(); pCfg.setCheckpointFrequency(500); - cfg.setPersistenceConfiguration(pCfg); + cfg.setPersistentStoreConfiguration(pCfg); TcpDiscoverySpi discoSpi = new TcpDiscoverySpi(); http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreEvictionSelfTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreEvictionSelfTest.java index cc43613..4205756 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreEvictionSelfTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/PageStoreEvictionSelfTest.java @@ -26,7 +26,7 @@ import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.MemoryConfiguration; import org.apache.ignite.configuration.MemoryPolicyConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.IgniteInternalFuture; import org.apache.ignite.internal.pagemem.FullPageId; @@ -63,7 +63,7 @@ public class PageStoreEvictionSelfTest extends GridCommonAbstractTest { @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { final IgniteConfiguration cfg = super.getConfiguration(gridName); - cfg.setPersistenceConfiguration(new PersistenceConfiguration()); + cfg.setPersistentStoreConfiguration(new PersistentStoreConfiguration()); cfg.setMemoryConfiguration(createDbConfig()); http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/WalRecoveryTxLogicalRecordsTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/WalRecoveryTxLogicalRecordsTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/WalRecoveryTxLogicalRecordsTest.java index 844f2f5..cf0684a 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/WalRecoveryTxLogicalRecordsTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/db/file/WalRecoveryTxLogicalRecordsTest.java @@ -40,7 +40,7 @@ import org.apache.ignite.configuration.BinaryConfiguration; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.MemoryConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.internal.IgniteEx; import org.apache.ignite.internal.pagemem.PageIdAllocator; import org.apache.ignite.internal.pagemem.store.PageStore; @@ -111,14 +111,14 @@ public class WalRecoveryTxLogicalRecordsTest extends GridCommonAbstractTest { cfg.setMemoryConfiguration(dbCfg); - PersistenceConfiguration pCfg = new PersistenceConfiguration(); + PersistentStoreConfiguration pCfg = new PersistentStoreConfiguration(); pCfg.setWalHistorySize(WAL_HIST_SIZE); if (checkpointFreq != null) pCfg.setCheckpointFrequency(checkpointFreq); - cfg.setPersistenceConfiguration(pCfg); + cfg.setPersistentStoreConfiguration(pCfg); cfg.setMarshaller(null); http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/test/java/org/apache/ignite/cache/database/standbycluster/GridChangeGlobalStateAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/standbycluster/GridChangeGlobalStateAbstractTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/standbycluster/GridChangeGlobalStateAbstractTest.java index 801d519..62239ed 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/standbycluster/GridChangeGlobalStateAbstractTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/standbycluster/GridChangeGlobalStateAbstractTest.java @@ -26,7 +26,7 @@ import org.apache.ignite.Ignite; import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.MemoryConfiguration; import org.apache.ignite.configuration.MemoryPolicyConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +import org.apache.ignite.configuration.PersistentStoreConfiguration; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; @@ -330,13 +330,13 @@ public abstract class GridChangeGlobalStateAbstractTest extends GridCommonAbstra @Override protected IgniteConfiguration getConfiguration(final String gridName) throws Exception { final IgniteConfiguration cfg = super.getConfiguration(gridName); - PersistenceConfiguration pCfg = new PersistenceConfiguration(); + PersistentStoreConfiguration pCfg = new PersistentStoreConfiguration(); - pCfg.setPersistenceStorePath(testName() + "/db"); + pCfg.setPersistentStorePath(testName() + "/db"); pCfg.setWalArchivePath(testName() + "/db/wal/archive"); pCfg.setWalStorePath(testName() + "/db/wal"); - cfg.setPersistenceConfiguration(pCfg); + cfg.setPersistentStoreConfiguration(pCfg); final MemoryConfiguration memCfg = new MemoryConfiguration(); http://git-wip-us.apache.org/repos/asf/ignite/blob/4608cc92/modules/pds/src/test/java/org/apache/ignite/cache/database/standbycluster/extended/GridActivateExtensionTest.java ---------------------------------------------------------------------- diff --git a/modules/pds/src/test/java/org/apache/ignite/cache/database/standbycluster/extended/GridActivateExtensionTest.java b/modules/pds/src/test/java/org/apache/ignite/cache/database/standbycluster/extended/GridActivateExtensionTest.java index 02168bc..1baf4a5 100644 --- a/modules/pds/src/test/java/org/apache/ignite/cache/database/standbycluster/extended/GridActivateExtensionTest.java +++ b/modules/pds/src/test/java/org/apache/ignite/cache/database/standbycluster/extended/GridActivateExtensionTest.java @@ -25,7 +25,7 @@ import org.apache.ignite.configuration.IgniteConfiguration; import org.apache.ignite.configuration.MemoryConfiguration; import org.apache.ignite.configuration.MemoryPolicyConfiguration; import org.apache.ignite.configuration.NearCacheConfiguration; -import org.apache.ignite.configuration.PersistenceConfiguration; +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.distributed.near.GridCacheNearOnlyMultiNodeFullApiSelfTest; @@ -61,13 +61,13 @@ public class GridActivateExtensionTest extends GridCacheAbstractFullApiSelfTest cfg.setConsistentId("ConsId" + (condId++)); ((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(primaryIpFinder); - PersistenceConfiguration pCfg = new PersistenceConfiguration(); + PersistentStoreConfiguration pCfg = new PersistentStoreConfiguration(); - pCfg.setPersistenceStorePath(testName + "/db"); + pCfg.setPersistentStorePath(testName + "/db"); pCfg.setWalArchivePath(testName + "/db/wal/archive"); pCfg.setWalStorePath(testName + "/db/wal"); - cfg.setPersistenceConfiguration(pCfg); + cfg.setPersistentStoreConfiguration(pCfg); final MemoryConfiguration memCfg = new MemoryConfiguration();