Repository: ignite
Updated Branches:
  refs/heads/ignite-5375 f027c00b1 -> 4a1571aae


Renamed Page Memory to Ignite Virtual Memory


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4a1571aa
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4a1571aa
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4a1571aa

Branch: refs/heads/ignite-5375
Commit: 4a1571aae72f198ebf543f411f868c409a45217f
Parents: f027c00
Author: Denis Magda <dma...@gridgain.com>
Authored: Thu Jun 8 14:50:53 2017 -0700
Committer: Denis Magda <dma...@gridgain.com>
Committed: Thu Jun 8 14:50:53 2017 -0700

----------------------------------------------------------------------
 .../examples/datagrid/MemoryPoliciesExample.java  |  2 +-
 .../java/org/apache/ignite/MemoryMetrics.java     |  8 +++++---
 .../org/apache/ignite/PersistenceMetrics.java     | 18 +++++++++++-------
 .../ignite/configuration/IgniteConfiguration.java |  6 +++---
 .../ignite/configuration/MemoryConfiguration.java |  8 ++++----
 .../configuration/MemoryPolicyConfiguration.java  |  4 ++--
 .../PersistentStoreConfiguration.java             |  2 +-
 7 files changed, 27 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/4a1571aa/examples/src/main/java/org/apache/ignite/examples/datagrid/MemoryPoliciesExample.java
----------------------------------------------------------------------
diff --git 
a/examples/src/main/java/org/apache/ignite/examples/datagrid/MemoryPoliciesExample.java
 
b/examples/src/main/java/org/apache/ignite/examples/datagrid/MemoryPoliciesExample.java
index 045f88b..f73e65d 100644
--- 
a/examples/src/main/java/org/apache/ignite/examples/datagrid/MemoryPoliciesExample.java
+++ 
b/examples/src/main/java/org/apache/ignite/examples/datagrid/MemoryPoliciesExample.java
@@ -29,7 +29,7 @@ import 
org.apache.ignite.configuration.MemoryPolicyConfiguration;
 import org.apache.ignite.examples.ExampleNodeStartup;
 
 /**
- * This example demonstrates how to tweak particular settings of Apache Ignite 
page memory using
+ * This example demonstrates how to tweak particular settings of Apache Ignite 
Virtual Memory using
  * {@link MemoryConfiguration} and set up several memory policies for 
different caches with
  * {@link MemoryPolicyConfiguration}.
  * <p>

http://git-wip-us.apache.org/repos/asf/ignite/blob/4a1571aa/modules/core/src/main/java/org/apache/ignite/MemoryMetrics.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/MemoryMetrics.java 
b/modules/core/src/main/java/org/apache/ignite/MemoryMetrics.java
index 21dad20..eb4d16c 100644
--- a/modules/core/src/main/java/org/apache/ignite/MemoryMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/MemoryMetrics.java
@@ -22,11 +22,13 @@ import 
org.apache.ignite.configuration.MemoryPolicyConfiguration;
 import org.apache.ignite.mxbean.MemoryMetricsMXBean;
 
 /**
- * This interface provides page memory related metrics of a specific Apache 
Ignite node. The overall page memory
- * architecture is covered in {@link MemoryConfiguration}.
+ * This interface provides Ignite Virtual Memory related metrics of a specific 
Apache Ignite node.
+ * The overall virtual memory architecture is covered in {@link 
MemoryConfiguration}.
  * <p>
  * Since there are can be several memory regions configured with {@link 
MemoryPolicyConfiguration} on an individual
- * Apache Ignite node, the metrics for every region will be collected and 
obtained separately.
+ * Apache Ignite node, the metrics for every region will be collected and 
obtained separately. In addition, some
+ * metrics of this interface are accumulated and provided only when Ignite 
Persistent Store is enabled and used as a
+ * secondary storage by the virtual memory.
  * <p>
  * There are two ways to get the metrics of an Apache Ignite node.
  * <ol>

http://git-wip-us.apache.org/repos/asf/ignite/blob/4a1571aa/modules/core/src/main/java/org/apache/ignite/PersistenceMetrics.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/PersistenceMetrics.java 
b/modules/core/src/main/java/org/apache/ignite/PersistenceMetrics.java
index 3f00b01..2b2256a 100644
--- a/modules/core/src/main/java/org/apache/ignite/PersistenceMetrics.java
+++ b/modules/core/src/main/java/org/apache/ignite/PersistenceMetrics.java
@@ -19,15 +19,17 @@ package org.apache.ignite;
 import org.apache.ignite.configuration.PersistentStoreConfiguration;
 
 /**
- *
+ * This interface provides Ignite Persistent Store related metrics that is 
used as a secondary storage by
+ * Ignite Virtual Memory.
  */
 public interface PersistenceMetrics {
     /**
      * Gets the average number of WAL records per second written during the 
last time interval.
      * <p>
      * The length of time interval is configured via {@link 
PersistentStoreConfiguration#setRateTimeInterval(long)}
-     * configurartion property.
-     * The number of subintervals is configured via {@link 
PersistentStoreConfiguration#setSubIntervals(int)}
+     * configuration property.
+     *
+     * The number of sub-intervals is configured via {@link 
PersistentStoreConfiguration#setSubIntervals(int)}
      * configuration property.
      */
     public float getWalLoggingRate();
@@ -35,8 +37,9 @@ public interface PersistenceMetrics {
     /**
      * Gets the average number of bytes per second written during the last 
time interval.
      * The length of time interval is configured via {@link 
PersistentStoreConfiguration#setRateTimeInterval(long)}
-     * configurartion property.
-     * The number of subintervals is configured via {@link 
PersistentStoreConfiguration#setSubIntervals(int)}
+     * configuration property.
+     *
+     * The number of sub-intervals is configured via {@link 
PersistentStoreConfiguration#setSubIntervals(int)}
      * configuration property.
      */
     public float getWalWritingRate();
@@ -50,8 +53,9 @@ public interface PersistenceMetrics {
      * Gets the average WAL fsync duration in microseconds over the last time 
interval.
      * <p>
      * The length of time interval is configured via {@link 
PersistentStoreConfiguration#setRateTimeInterval(long)}
-     * configurartion property.
-     * The number of subintervals is configured via {@link 
PersistentStoreConfiguration#setSubIntervals(int)}
+     * configuration property.
+     *
+     * The number of sub-intervals is configured via {@link 
PersistentStoreConfiguration#setSubIntervals(int)}
      * configuration property.
      */
     public float getWalFsyncTimeAverage();

http://git-wip-us.apache.org/repos/asf/ignite/blob/4a1571aa/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 37a0618..af3e7b5 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
@@ -454,7 +454,7 @@ public class IgniteConfiguration {
     /** */
     private boolean lateAffAssignment = DFLT_LATE_AFF_ASSIGNMENT;
 
-    /** Page memory configuration. */
+    /** Ignite Virtual Memory configuration. */
     private MemoryConfiguration memCfg;
 
     /** Persistence store configuration. */
@@ -2133,7 +2133,7 @@ public class IgniteConfiguration {
     }
 
     /**
-     * Gets page memory configuration.
+     * Gets Ignite Virtual Memory configuration.
      *
      * @return Memory configuration.
      */
@@ -2142,7 +2142,7 @@ public class IgniteConfiguration {
     }
 
     /**
-     * Sets page memory configuration.
+     * Sets Ignite Virtual Memory memory configuration.
      *
      * @param memCfg Memory configuration.
      * @return {@code this} for chaining.

http://git-wip-us.apache.org/repos/asf/ignite/blob/4a1571aa/modules/core/src/main/java/org/apache/ignite/configuration/MemoryConfiguration.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/configuration/MemoryConfiguration.java
 
b/modules/core/src/main/java/org/apache/ignite/configuration/MemoryConfiguration.java
index 2d71e99..ba12197 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/configuration/MemoryConfiguration.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/configuration/MemoryConfiguration.java
@@ -22,12 +22,12 @@ import org.apache.ignite.internal.util.typedef.internal.A;
 import org.apache.ignite.internal.util.typedef.internal.U;
 
 /**
- * A page memory configuration for an Apache Ignite node. The page memory is a 
manageable off-heap based memory
- * architecture that divides all expandable memory regions into pages of fixed 
size
+ * Ignite Virtual Memory configuration for an Apache Ignite node. The virtual 
memory is a manageable off-heap
+ * based memory architecture that divides all expandable memory regions into 
pages of fixed size
  * (see {@link MemoryConfiguration#getPageSize()}. An individual page can 
store one or many cache key-value entries
  * that allows reusing the memory in the most efficient way and avoid memory 
fragmentation issues.
  * <p>
- * By default, the page memory allocates a single expandable memory region 
using settings of
+ * By default, the virtual memory allocates a single expandable memory region 
using settings of
  * {@link MemoryConfiguration#createDefaultPolicyConfig()}. All the caches 
that will be configured in an application
  * will be mapped to this memory region by default, thus, all the cache data 
will reside in that memory region.
  * <p>
@@ -159,7 +159,7 @@ public class MemoryConfiguration implements Serializable {
     }
 
     /**
-     * The pages memory consists of one or more expandable memory regions 
defined by {@link MemoryPolicyConfiguration}.
+     * Ignite Virtaul Memory consists of one or more expandable memory regions 
defined by {@link MemoryPolicyConfiguration}.
      * Every memory region is split on pages of fixed size that store actual 
cache entries.
      *
      * @return Page size in bytes.

http://git-wip-us.apache.org/repos/asf/ignite/blob/4a1571aa/modules/core/src/main/java/org/apache/ignite/configuration/MemoryPolicyConfiguration.java
----------------------------------------------------------------------
diff --git 
a/modules/core/src/main/java/org/apache/ignite/configuration/MemoryPolicyConfiguration.java
 
b/modules/core/src/main/java/org/apache/ignite/configuration/MemoryPolicyConfiguration.java
index b496901..b517209 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/configuration/MemoryPolicyConfiguration.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/configuration/MemoryPolicyConfiguration.java
@@ -25,7 +25,7 @@ import static 
org.apache.ignite.configuration.MemoryConfiguration.DFLT_MEM_PLC_D
 
 /**
  * This class allows defining custom memory policies' configurations with 
various parameters for Apache Ignite
- * page memory (see {@link MemoryConfiguration}. For each configured memory 
policy Apache Ignite instantiates
+ * Virtual Memory (see {@link MemoryConfiguration}. For each configured memory 
policy Apache Ignite instantiates
  * respective memory regions with different parameters like maximum size, 
eviction policy, swapping options, etc.
  * An Apache Ignite cache can be mapped to a particular policy using
  * {@link CacheConfiguration#setMemoryPolicyName(String)} method.
@@ -237,7 +237,7 @@ public final class MemoryPolicyConfiguration implements 
Serializable {
 
     /**
      * Gets a threshold for memory pages eviction initiation. For instance, if 
the threshold is 0.9 it means that the
-     * page memory will start the eviction only after 90% of the memory region 
(defined by this policy) is occupied.
+     * virtual memory will start the eviction only after 90% of the memory 
region (defined by this policy) is occupied.
      *
      * @return Memory pages eviction threshold.
      */

http://git-wip-us.apache.org/repos/asf/ignite/blob/4a1571aa/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
index b9b4420..720bfba 100644
--- 
a/modules/core/src/main/java/org/apache/ignite/configuration/PersistentStoreConfiguration.java
+++ 
b/modules/core/src/main/java/org/apache/ignite/configuration/PersistentStoreConfiguration.java
@@ -19,7 +19,7 @@ package org.apache.ignite.configuration;
 import java.io.Serializable;
 
 /**
- * Configures Apache Ignite Persistent store.
+ * Configures Apache Ignite Persistent store that is used as a secondary 
storage by Ignite Virtual Memory.
  */
 public class PersistentStoreConfiguration implements Serializable {
     /** */

Reply via email to