[03/11] ignite git commit: IGNITE-6030 Allow enabling persistence per data region
http://git-wip-us.apache.org/repos/asf/ignite/blob/74567763/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java
index 6db2784..4a4010a 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java
@@ -45,10 +45,9 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheRebalanceMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.DataStorageConfiguration;
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.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.WALMode;
import org.apache.ignite.events.Event;
import org.apache.ignite.events.EventType;
@@ -130,31 +129,20 @@ public class IgniteWalReaderTest extends
GridCommonAbstractTest {
cfg.setIncludeEventTypes(EventType.EVT_WAL_SEGMENT_ARCHIVED);
-final MemoryConfiguration dbCfg = new MemoryConfiguration();
-
-dbCfg.setPageSize(PAGE_SIZE);
-
-final MemoryPolicyConfiguration memPlcCfg = new
MemoryPolicyConfiguration();
-
-memPlcCfg.setName("dfltMemPlc");
-memPlcCfg.setInitialSize(1024 * 1024 * 1024);
-memPlcCfg.setMaxSize(1024 * 1024 * 1024);
-
-dbCfg.setMemoryPolicies(memPlcCfg);
-dbCfg.setDefaultMemoryPolicyName("dfltMemPlc");
-
-cfg.setMemoryConfiguration(dbCfg);
-
-final PersistentStoreConfiguration pCfg = new
PersistentStoreConfiguration();
-pCfg.setWalHistorySize(1);
-pCfg.setWalSegmentSize(1024 * 1024);
-pCfg.setWalSegments(WAL_SEGMENTS);
-pCfg.setWalMode(customWalMode != null ? customWalMode :
WALMode.BACKGROUND);
+DataStorageConfiguration memCfg = new DataStorageConfiguration()
+.setDefaultDataRegionConfiguration(
+new DataRegionConfiguration().setMaxSize(1024 * 1024 *
1024).setPersistenceEnabled(true))
+.setPageSize(PAGE_SIZE)
+.setWalHistorySize(1)
+.setWalSegmentSize(1024 * 1024)
+.setWalSegments(WAL_SEGMENTS)
+.setWalMode(customWalMode != null ? customWalMode :
WALMode.BACKGROUND);
if (archiveIncompleteSegmentAfterInactivityMs > 0)
-
pCfg.setWalAutoArchiveAfterInactivity(archiveIncompleteSegmentAfterInactivityMs);
+
memCfg.setWalAutoArchiveAfterInactivity(archiveIncompleteSegmentAfterInactivityMs);
+
+cfg.setDataStorageConfiguration(memCfg);
-cfg.setPersistentStoreConfiguration(pCfg);
return cfg;
}
@@ -492,8 +480,8 @@ public class IgniteWalReaderTest extends
GridCommonAbstractTest {
* @param factory WAL iterator factory.
* @param workDir Ignite work directory.
* @param subfolderName DB subfolder name based on consistent ID.
- * @param expCntEntries minimum expected entries count to find.
- * @param expTxCnt minimum expected transaction count to find.
+ * @param minCntEntries minimum expected entries count to find.
+ * @param minTxCnt minimum expected transaction count to find.
* @param objConsumer object handler, called for each object found in
logical data records.
* @param dataRecordHnd data handler record
* @throws IgniteCheckedException if failed.
@@ -502,8 +490,8 @@ public class IgniteWalReaderTest extends
GridCommonAbstractTest {
final IgniteWalIteratorFactory factory,
final String workDir,
final String subfolderName,
-final int expCntEntries,
-final int expTxCnt,
+final int minCntEntries,
+final int minTxCnt,
@Nullable final BiConsumer objConsumer,
@Nullable final Consumer dataRecordHnd) throws
IgniteCheckedException {
@@ -538,8 +526,8 @@ public class IgniteWalReaderTest extends
GridCommonAbstractTest {
final int entriesWork = valuesSum(cntWork.values());
log.info("Archive directory: Tx found " + txCntObservedWork + "
entries " + entriesWork);
-assert entriesArch + entriesWork >= expCntEntries;
-assert txCntObservedWork + txCntObservedArch >= expTxCnt;
+asse
[03/11] ignite git commit: IGNITE-6030 Allow enabling persistence per data region
http://git-wip-us.apache.org/repos/asf/ignite/blob/ec41370c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java
index 79387e3..88eacef 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/wal/reader/IgniteWalReaderTest.java
@@ -45,10 +45,9 @@ import org.apache.ignite.cache.CacheAtomicityMode;
import org.apache.ignite.cache.CacheRebalanceMode;
import org.apache.ignite.cache.affinity.rendezvous.RendezvousAffinityFunction;
import org.apache.ignite.configuration.CacheConfiguration;
+import org.apache.ignite.configuration.DataStorageConfiguration;
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.configuration.DataRegionConfiguration;
import org.apache.ignite.configuration.WALMode;
import org.apache.ignite.events.Event;
import org.apache.ignite.events.EventType;
@@ -131,31 +130,20 @@ public class IgniteWalReaderTest extends
GridCommonAbstractTest {
cfg.setIncludeEventTypes(EventType.EVT_WAL_SEGMENT_ARCHIVED);
-final MemoryConfiguration dbCfg = new MemoryConfiguration();
-
-dbCfg.setPageSize(PAGE_SIZE);
-
-final MemoryPolicyConfiguration memPlcCfg = new
MemoryPolicyConfiguration();
-
-memPlcCfg.setName("dfltMemPlc");
-memPlcCfg.setInitialSize(1024 * 1024 * 1024);
-memPlcCfg.setMaxSize(1024 * 1024 * 1024);
-
-dbCfg.setMemoryPolicies(memPlcCfg);
-dbCfg.setDefaultMemoryPolicyName("dfltMemPlc");
-
-cfg.setMemoryConfiguration(dbCfg);
-
-final PersistentStoreConfiguration pCfg = new
PersistentStoreConfiguration();
-pCfg.setWalHistorySize(1);
-pCfg.setWalSegmentSize(1024 * 1024);
-pCfg.setWalSegments(WAL_SEGMENTS);
-pCfg.setWalMode(customWalMode != null ? customWalMode :
WALMode.BACKGROUND);
+DataStorageConfiguration memCfg = new DataStorageConfiguration()
+.setDefaultDataRegionConfiguration(
+new DataRegionConfiguration().setMaxSize(1024 * 1024 *
1024).setPersistenceEnabled(true))
+.setPageSize(PAGE_SIZE)
+.setWalHistorySize(1)
+.setWalSegmentSize(1024 * 1024)
+.setWalSegments(WAL_SEGMENTS)
+.setWalMode(customWalMode != null ? customWalMode :
WALMode.BACKGROUND);
if (archiveIncompleteSegmentAfterInactivityMs > 0)
-
pCfg.setWalAutoArchiveAfterInactivity(archiveIncompleteSegmentAfterInactivityMs);
+
memCfg.setWalAutoArchiveAfterInactivity(archiveIncompleteSegmentAfterInactivityMs);
+
+cfg.setDataStorageConfiguration(memCfg);
-cfg.setPersistentStoreConfiguration(pCfg);
return cfg;
}
@@ -510,8 +498,8 @@ public class IgniteWalReaderTest extends
GridCommonAbstractTest {
* @param factory WAL iterator factory.
* @param workDir Ignite work directory.
* @param subfolderName DB subfolder name based on consistent ID.
- * @param expCntEntries minimum expected entries count to find.
- * @param expTxCnt minimum expected transaction count to find.
+ * @param minCntEntries minimum expected entries count to find.
+ * @param minTxCnt minimum expected transaction count to find.
* @param objConsumer object handler, called for each object found in
logical data records.
* @param dataRecordHnd data handler record
* @throws IgniteCheckedException if failed.
@@ -520,8 +508,8 @@ public class IgniteWalReaderTest extends
GridCommonAbstractTest {
final IgniteWalIteratorFactory factory,
final String workDir,
final String subfolderName,
-final int expCntEntries,
-final int expTxCnt,
+final int minCntEntries,
+final int minTxCnt,
@Nullable final BiConsumer objConsumer,
@Nullable final Consumer dataRecordHnd) throws
IgniteCheckedException {
@@ -556,8 +544,8 @@ public class IgniteWalReaderTest extends
GridCommonAbstractTest {
final int entriesWork = valuesSum(cntWork.values());
log.info("Archive directory: Tx found " + txCntObservedWork + "
entries " + entriesWork);
-assert entriesArch + entriesWork >= expCntEntries;
-assert txCntObservedWork + txCntObservedArch >= expTxCnt;
+asse
