You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/06/04 11:19:02 UTC
[16/16] incubator-ignite git commit: # ignite-990 review
# ignite-990 review
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c28d7551
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c28d7551
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c28d7551
Branch: refs/heads/ignite-990
Commit: c28d7551835cb81e20e567d7137607e4ad86669b
Parents: b0fbfc1
Author: sboikov <sb...@gridgain.com>
Authored: Thu Jun 4 12:10:37 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Jun 4 12:10:37 2015 +0300
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/IgniteCache.java | 5 +++--
.../internal/processors/cache/GridCacheAdapter.java | 14 +++++++++-----
.../processors/cache/IgniteInternalCache.java | 4 ++--
3 files changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c28d7551/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index 2578a7c..798b1d6 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -315,8 +315,8 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS
* Gets values from cache. Will bypass started transaction, if any, i.e. will not enlist entries
* and will not lock any keys if pessimistic transaction is started by thread.
*
- * @param keys Keys to get values for.
- * @return Value.
+ * @param keys The keys whose associated values are to be returned.
+ * @return A map of entries that were found for the given keys.
* @throws IgniteCheckedException If failed.
*/
@IgniteAsyncSupported
@@ -326,6 +326,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS
@IgniteAsyncSupported
@Override public boolean containsKey(K key);
+ /** {@inheritDoc} */
@IgniteAsyncSupported
public boolean containsKeys(Set<? extends K> keys);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c28d7551/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 3267438..56b5c15 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -1221,17 +1221,21 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
/** {@inheritDoc} */
@Nullable @Override public Map<K, V> getAllOutTx(Set<? extends K> keys) throws IgniteCheckedException {
- String taskName = ctx.kernalContext().job().currentTaskName();
-
- return getAllAsync(keys, !ctx.config().isReadFromBackup(), /*skip tx*/true, null, null, taskName, true, false)
- .get();
+ return getAllOutTxAsync(keys).get();
}
/** {@inheritDoc} */
@Override public IgniteInternalFuture<Map<K, V>> getAllOutTxAsync(Set<? extends K> keys) {
String taskName = ctx.kernalContext().job().currentTaskName();
- return getAllAsync(keys, !ctx.config().isReadFromBackup(), /*skip tx*/true, null, null, taskName, true, false);
+ return getAllAsync(keys,
+ !ctx.config().isReadFromBackup(),
+ /*skip tx*/true,
+ null,
+ null,
+ taskName,
+ !ctx.keepPortable(),
+ false);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c28d7551/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java
index e291f45..5cf669a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java
@@ -1623,7 +1623,7 @@ public interface IgniteInternalCache<K, V> extends Iterable<Cache.Entry<K, V>> {
* @return Value.
* @throws IgniteCheckedException If failed.
*/
- @Nullable public Map<K, V> getAllOutTx(Set<? extends K> keys) throws IgniteCheckedException;
+ public Map<K, V> getAllOutTx(Set<? extends K> keys) throws IgniteCheckedException;
/**
* Gets values from cache. Will bypass started transaction, if any, i.e. will not enlist entries
@@ -1633,7 +1633,7 @@ public interface IgniteInternalCache<K, V> extends Iterable<Cache.Entry<K, V>> {
* @return Future for getAllOutTx operation.
* @throws IgniteCheckedException If failed.
*/
- @Nullable IgniteInternalFuture<Map<K, V>> getAllOutTxAsync(Set<? extends K> keys) throws IgniteCheckedException;
+ public IgniteInternalFuture<Map<K, V>> getAllOutTxAsync(Set<? extends K> keys) throws IgniteCheckedException;
/**
* Checks whether this cache is IGFS data cache.