You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by yz...@apache.org on 2015/09/15 15:55:27 UTC
[1/2] ignite git commit: fixed javadoc ignite-1.4
Repository: ignite
Updated Branches:
refs/heads/ignite-1.4 dcd8b42aa -> 6bd0f8f40
fixed javadoc ignite-1.4
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/72e270c6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/72e270c6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/72e270c6
Branch: refs/heads/ignite-1.4
Commit: 72e270c63e99ac17a077b26fb39302f603d15188
Parents: 3f75c1c
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Tue Sep 15 16:55:00 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Tue Sep 15 16:55:00 2015 +0300
----------------------------------------------------------------------
.../configuration/NearCacheConfiguration.java | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/72e270c6/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java
index bbaa030..3c59bd6 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java
@@ -25,7 +25,12 @@ import org.apache.ignite.internal.util.typedef.internal.S;
import static org.apache.ignite.configuration.CacheConfiguration.DFLT_NEAR_START_SIZE;
/**
- * Client cache configuration.
+ * Client (near) cache configuration.
+ * <p>
+ * Distributed cache can also be fronted by a Near cache,
+ * which is a smaller local cache that stores most recently
+ * or most frequently accessed data. Just like with a partitioned cache,
+ * the user can control the size of the near cache and its eviction policies.
*/
public class NearCacheConfiguration<K, V> extends MutableConfiguration<K, V> {
/** */
@@ -45,6 +50,8 @@ public class NearCacheConfiguration<K, V> extends MutableConfiguration<K, V> {
}
/**
+ * Creates near cache configuration copying properties from passed in configuration.
+ *
* @param ccfg Configuration to copy.
*/
public NearCacheConfiguration(NearCacheConfiguration<K, V> ccfg) {
@@ -55,13 +62,20 @@ public class NearCacheConfiguration<K, V> extends MutableConfiguration<K, V> {
}
/**
+ * Gets near eviction policy. By default, returns {@code null}
+ * which means that evictions are disabled for near cache.
+ *
* @return Near eviction policy.
+ * @see CacheConfiguration#getEvictionPolicy()
+ * @see CacheConfiguration#isEvictSynchronized()
*/
public EvictionPolicy<K, V> getNearEvictionPolicy() {
return nearEvictPlc;
}
/**
+ * Sets near eviction policy.
+ *
* @param nearEvictPlc Near eviction policy.
* @return {@code this} for chaining.
*/
@@ -97,4 +111,4 @@ public class NearCacheConfiguration<K, V> extends MutableConfiguration<K, V> {
@Override public String toString() {
return S.toString(NearCacheConfiguration.class, this, super.toString());
}
-}
\ No newline at end of file
+}
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-1.4' into ignite-1.4
Posted by yz...@apache.org.
Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6bd0f8f4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6bd0f8f4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6bd0f8f4
Branch: refs/heads/ignite-1.4
Commit: 6bd0f8f405268214c62e2289a0081a238053fc11
Parents: 72e270c dcd8b42
Author: Yakov Zhdanov <yz...@gridgain.com>
Authored: Tue Sep 15 16:55:19 2015 +0300
Committer: Yakov Zhdanov <yz...@gridgain.com>
Committed: Tue Sep 15 16:55:19 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheProcessor.java | 10 +-
.../dht/GridClientPartitionTopology.java | 104 +++++++++++--------
.../dht/GridDhtPartitionTopology.java | 4 +-
.../dht/GridDhtPartitionTopologyImpl.java | 7 +-
.../cache/transactions/IgniteTxHandler.java | 2 +-
.../ignite/internal/util/IgniteUtils.java | 16 +++
.../processors/igfs/IgfsAbstractSelfTest.java | 3 +-
.../testsuites/IgniteHadoopTestSuite.java | 6 +-
...CacheScanPartitionQueryFallbackSelfTest.java | 54 ++++------
9 files changed, 114 insertions(+), 92 deletions(-)
----------------------------------------------------------------------