You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/07/16 08:01:34 UTC
[01/13] incubator-ignite git commit: # ignite-1095 guard from
concurrent remap
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-1108 03dd16bc9 -> a05ed1253
# ignite-1095 guard from concurrent remap
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b19ed0c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b19ed0c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b19ed0c9
Branch: refs/heads/ignite-1108
Commit: b19ed0c93d2ea2b0d24302f2caa10c4237302170
Parents: d52fe87
Author: sboikov <sb...@gridgain.com>
Authored: Tue Jul 14 15:55:49 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Jul 14 15:55:49 2015 +0300
----------------------------------------------------------------------
.../dht/atomic/GridDhtAtomicCache.java | 4 ++--
.../dht/atomic/GridNearAtomicUpdateFuture.java | 20 +++++++++++++++-----
...eAtomicInvalidPartitionHandlingSelfTest.java | 2 +-
...acheAtomicReplicatedNodeRestartSelfTest.java | 15 ---------------
4 files changed, 18 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b19ed0c9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 1670994..96e6edc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -142,7 +142,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
}
// Request should be for primary keys only in PRIMARY ordering mode.
- assert req.hasPrimary();
+ assert req.hasPrimary() : req;
if (req.writeSynchronizationMode() != FULL_ASYNC)
sendNearUpdateReply(res.nodeId(), res);
@@ -2158,7 +2158,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> {
*/
private void unlockEntries(Collection<GridDhtCacheEntry> locked, AffinityTopologyVersion topVer) {
// Process deleted entries before locks release.
- assert ctx.deferredDelete();
+ assert ctx.deferredDelete() : this;
// Entries to skip eviction manager notification for.
// Enqueue entries while holding locks.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b19ed0c9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
index 41cc400..751c9ba 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
@@ -358,8 +358,10 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object>
* @param failed Keys to remap.
*/
private void remap(Collection<?> failed) {
- if (futVer != null)
- cctx.mvcc().removeAtomicFuture(version());
+ GridCacheVersion futVer0 = futVer;
+
+ if (futVer0 == null || cctx.mvcc().removeAtomicFuture(futVer0) == null)
+ return;
Collection<Object> remapKeys = new ArrayList<>(failed.size());
Collection<Object> remapVals = vals != null ? new ArrayList<>(failed.size()) : null;
@@ -444,6 +446,7 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object>
if (err != null && X.hasCause(err, CachePartialUpdateCheckedException.class) &&
X.hasCause(err, ClusterTopologyCheckedException.class) &&
+ storeFuture() &&
remapCnt.decrementAndGet() > 0) {
CachePartialUpdateCheckedException cause = X.cause(err, CachePartialUpdateCheckedException.class);
@@ -646,6 +649,13 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object>
}
/**
+ * @return {@code True} future is stored by {@link GridCacheMvccManager#addAtomicFuture}.
+ */
+ private boolean storeFuture() {
+ return cctx.config().getAtomicWriteOrderMode() == CLOCK || syncMode != FULL_ASYNC;
+ }
+
+ /**
* @param topVer Topology version.
* @param remapKeys Keys to remap or {@code null} to map all keys.
* @param remap Flag indicating if this is partial remap for this future.
@@ -671,7 +681,7 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object>
// Assign future version in topology read lock before first exception may be thrown.
futVer = cctx.versions().next(topVer);
- if (!remap && (cctx.config().getAtomicWriteOrderMode() == CLOCK || syncMode != FULL_ASYNC))
+ if (!remap && storeFuture())
cctx.mvcc().addAtomicFuture(version(), this);
CacheConfiguration ccfg = cctx.config();
@@ -998,7 +1008,7 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object>
new CI2<GridNearAtomicUpdateRequest, GridNearAtomicUpdateResponse>() {
@Override public void apply(GridNearAtomicUpdateRequest req,
GridNearAtomicUpdateResponse res) {
- assert res.futureVersion().equals(futVer);
+ assert res.futureVersion().equals(futVer) : futVer;
onResult(res.nodeId(), res);
}
@@ -1065,7 +1075,7 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object>
new CI2<GridNearAtomicUpdateRequest, GridNearAtomicUpdateResponse>() {
@Override public void apply(GridNearAtomicUpdateRequest req,
GridNearAtomicUpdateResponse res) {
- assert res.futureVersion().equals(futVer);
+ assert res.futureVersion().equals(futVer) : futVer;
onResult(res.nodeId(), res);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b19ed0c9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
index 8e69853..d3bcf67 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
@@ -269,7 +269,7 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA
return null;
}
- }, 4);
+ }, 4, "putAll-thread");
Random rnd = new Random();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b19ed0c9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheAtomicReplicatedNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheAtomicReplicatedNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheAtomicReplicatedNodeRestartSelfTest.java
index b4ed18d..f556023 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheAtomicReplicatedNodeRestartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheAtomicReplicatedNodeRestartSelfTest.java
@@ -26,21 +26,6 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
*/
public class IgniteCacheAtomicReplicatedNodeRestartSelfTest extends GridCacheReplicatedNodeRestartSelfTest {
/** {@inheritDoc} */
- @Override public void testRestartWithPutSixNodesTwoBackups() throws Throwable {
- fail("https://issues.apache.org/jira/browse/IGNITE-1095");
- }
-
- /** {@inheritDoc} */
- @Override public void testRestartWithPutEightNodesTwoBackups() throws Throwable {
- fail("https://issues.apache.org/jira/browse/IGNITE-1095");
- }
-
- /** {@inheritDoc} */
- @Override public void testRestartWithPutTenNodesTwoBackups() throws Throwable {
- fail("https://issues.apache.org/jira/browse/IGNITE-1095");
- }
-
- /** {@inheritDoc} */
@Override protected CacheAtomicityMode atomicityMode() {
return ATOMIC;
}
[07/13] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-mys-26'
Posted by vo...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-mys-26'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7147f3d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7147f3d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7147f3d8
Branch: refs/heads/ignite-1108
Commit: 7147f3d8ec736e013e6b2945f3ad6359d01c6ea7
Parents: de7e06f 322e5df
Author: Denis Magda <dm...@gridgain.com>
Authored: Wed Jul 15 09:18:51 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Wed Jul 15 09:18:51 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/query/GridQueryProcessor.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[10/13] incubator-ignite git commit: Minor fixes in Spring Caching
Posted by vo...@apache.org.
Minor fixes in Spring Caching
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d38a70d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d38a70d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d38a70d2
Branch: refs/heads/ignite-1108
Commit: d38a70d2c12c640624c70bd0cb5634bb65b6d041
Parents: de7e06f
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Wed Jul 15 20:04:45 2015 -0700
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Wed Jul 15 20:04:45 2015 -0700
----------------------------------------------------------------------
.../apache/ignite/cache/spring/SpringCache.java | 2 +-
.../ignite/cache/spring/SpringCacheManager.java | 22 +++++++++++---------
2 files changed, 13 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d38a70d2/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCache.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCache.java b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCache.java
index 7651fbe..08aa38b 100644
--- a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCache.java
+++ b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCache.java
@@ -48,7 +48,7 @@ class SpringCache implements Cache {
}
/** {@inheritDoc} */
- @Override public Cache.ValueWrapper get(Object key) {
+ @Override public ValueWrapper get(Object key) {
Object val = cache.get(key);
return val != null ? new SimpleValueWrapper(val) : null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d38a70d2/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
----------------------------------------------------------------------
diff --git a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
index afadaee..260026e 100644
--- a/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
+++ b/modules/spring/src/main/java/org/apache/ignite/cache/spring/SpringCacheManager.java
@@ -41,15 +41,17 @@ import java.util.concurrent.*;
* you will need to do the following:
* <ul>
* <li>
- * Start a Ignite node with configured cache in the same JVM
- * where you application is running.
+ * Start an Ignite node with proper configuration in embedded mode
+ * (i.e., in the same JVM where the application is running). It can
+ * already have predefined caches, but it's not required - caches
+ * will be created automatically on first access if needed.
* </li>
* <li>
- * Configure {@code GridSpringCacheManager} as a cache provider
- * in Spring application context.
+ * Configure {@code SpringCacheManager} as a cache provider
+ * in the Spring application context.
* </li>
* </ul>
- * {@code GridSpringCacheManager} can start a node itself on its startup
+ * {@code SpringCacheManager} can start a node itself on its startup
* based on provided Ignite configuration. You can provide path to a
* Spring configuration XML file, like below (path can be absolute or
* relative to {@code IGNITE_HOME}):
@@ -61,9 +63,9 @@ import java.util.concurrent.*;
* http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
* http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd">
* <-- Provide configuration file path. -->
- * <bean id="cacheManager" class="org.apache.ignite.cache.spring.GridSpringCacheManager">
+ * <bean id="cacheManager" class="org.apache.ignite.cache.spring.SpringCacheManager">
* <property name="configurationPath" value="examples/config/spring-cache.xml"/>
- * </bean>
+ * </bean>
*
* <-- Use annotation-driven caching configuration. -->
* <cache:annotation-driven/>
@@ -78,7 +80,7 @@ import java.util.concurrent.*;
* http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
* http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd">
* <-- Provide configuration bean. -->
- * <bean id="cacheManager" class="org.apache.ignite.cache.spring.GridSpringCacheManager">
+ * <bean id="cacheManager" class="org.apache.ignite.cache.spring.SpringCacheManager">
* <property name="configuration">
* <bean id="gridCfg" class="org.apache.ignite.configuration.IgniteConfiguration">
* ...
@@ -104,7 +106,7 @@ import java.util.concurrent.*;
* http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
* http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache.xsd">
* <-- Provide Grid name. -->
- * <bean id="cacheManager" class="org.apache.ignite.cache.spring.GridSpringCacheManager">
+ * <bean id="cacheManager" class="org.apache.ignite.cache.spring.SpringCacheManager">
* <property name="gridName" value="myGrid"/>
* </bean>
*
@@ -247,7 +249,7 @@ public class SpringCacheManager implements CacheManager, InitializingBean {
if (cfgPath != null && cfg != null) {
throw new IllegalArgumentException("Both 'configurationPath' and 'configuration' are " +
"provided. Set only one of these properties if you need to start a Ignite node inside of " +
- "GridSpringCacheManager. If you already have a node running, omit both of them and set" +
+ "SpringCacheManager. If you already have a node running, omit both of them and set" +
"'gridName' property.");
}
[09/13] incubator-ignite git commit: # master minor
Posted by vo...@apache.org.
# master minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bdd17626
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bdd17626
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bdd17626
Branch: refs/heads/ignite-1108
Commit: bdd176267f4085acce5ac3c51b5ac2787bd9ace7
Parents: a6d33b1
Author: sboikov <sb...@gridgain.com>
Authored: Wed Jul 15 15:34:43 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Jul 15 15:34:43 2015 +0300
----------------------------------------------------------------------
.../GridCacheAbstractNodeRestartSelfTest.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bdd17626/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
index 7e65f23..ec1a12c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractNodeRestartSelfTest.java
@@ -505,7 +505,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
try {
barrier.await();
- info("Starting put thread...");
+ info("Starting put thread: " + gridIdx);
IgniteCache<Integer, String> cache = grid(gridIdx).cache(CACHE_NAME);
@@ -546,7 +546,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
try {
barrier.await();
- info("Starting restart thread...");
+ info("Starting restart thread: " + gridIdx);
int cnt = 0;
@@ -624,7 +624,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
try {
barrier.await();
- info("Starting put thread...");
+ info("Starting put thread: " + gridIdx);
Ignite ignite = grid(gridIdx);
@@ -705,7 +705,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
try {
barrier.await();
- info("Starting restart thread...");
+ info("Starting restart thread: " + gridIdx);
int cnt = 0;
@@ -780,7 +780,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
try {
barrier.await();
- info("Starting put thread...");
+ info("Starting put thread: " + gridIdx);
Ignite ignite = grid(gridIdx);
@@ -849,7 +849,7 @@ public abstract class GridCacheAbstractNodeRestartSelfTest extends GridCommonAbs
try {
barrier.await();
- info("Starting restart thread...");
+ info("Starting restart thread: " + gridIdx);
int cnt = 0;
[12/13] incubator-ignite git commit: Merge branch 'master' into
ignite-1108
Posted by vo...@apache.org.
Merge branch 'master' into ignite-1108
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fbbc3032
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fbbc3032
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fbbc3032
Branch: refs/heads/ignite-1108
Commit: fbbc3032e87764ee7128b33d47f6eec14acf2b01
Parents: 03dd16b cd3a9b6
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Jul 16 08:07:56 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Jul 16 08:07:56 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/cache/CacheTypeMetadata.java | 53 ++++++++++----------
.../dht/atomic/GridDhtAtomicCache.java | 4 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 20 ++++++--
.../processors/query/GridQueryProcessor.java | 4 +-
.../GridCacheAbstractNodeRestartSelfTest.java | 12 ++---
...eAtomicInvalidPartitionHandlingSelfTest.java | 2 +-
...acheAtomicReplicatedNodeRestartSelfTest.java | 14 +-----
.../apache/ignite/cache/spring/SpringCache.java | 2 +-
.../ignite/cache/spring/SpringCacheManager.java | 22 ++++----
9 files changed, 69 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
[13/13] incubator-ignite git commit: GG-1108: Review.
Posted by vo...@apache.org.
GG-1108: 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/a05ed125
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a05ed125
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a05ed125
Branch: refs/heads/ignite-1108
Commit: a05ed125331e44c2a1ef29cb218d3ed1a53ea12c
Parents: fbbc303
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Jul 16 08:24:00 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Jul 16 08:24:00 2015 +0300
----------------------------------------------------------------------
.../core/src/main/java/org/apache/ignite/internal/IgniteKernal.java | 1 +
.../ignite/internal/processors/plugin/IgnitePluginProcessor.java | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a05ed125/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 36b14f6..5eced59 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -1801,6 +1801,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable {
}
}
+ // TODO: This should be inside IgnitePluginProcessor.stop() I think.
// Invoke callback on plugins.
if (ctx.plugins() != null && ctx.plugins().allProviders() != null) {
for (PluginProvider plugin : ctx.plugins().allProviders()) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a05ed125/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
index f8d65c2..fe551b5 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/plugin/IgnitePluginProcessor.java
@@ -133,6 +133,7 @@ public class IgnitePluginProcessor extends GridProcessorAdapter {
/** {@inheritDoc} */
@Override public void start() throws IgniteCheckedException {
for (PluginProvider plugin : plugins.values())
+ // TODO: Why not passing PluginContext here? We already have it at that point.
plugin.onBeforeStart();
ackPluginsInfo();
[04/13] incubator-ignite git commit: # master - javadoc fix.
Posted by vo...@apache.org.
# master - javadoc fix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d2a1c3c3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d2a1c3c3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d2a1c3c3
Branch: refs/heads/ignite-1108
Commit: d2a1c3c3a1d8cb775ef3967c4d290d927f2a311c
Parents: bc036fe
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Tue Jul 14 16:31:36 2015 -0700
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Tue Jul 14 16:31:36 2015 -0700
----------------------------------------------------------------------
.../apache/ignite/cache/CacheTypeMetadata.java | 30 ++++++++++----------
1 file changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d2a1c3c3/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java
index 1090b0b..ebe7db7 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java
@@ -51,15 +51,15 @@ public class CacheTypeMetadata implements Serializable {
@GridToStringInclude
private Collection<CacheTypeFieldMetadata> valFields;
- /** Fields to be queried, in addition to indexed fields. */
+ /** Field name-to-type map to be queried, in addition to indexed fields. */
@GridToStringInclude
private Map<String, Class<?>> qryFlds;
- /** Fields to index in ascending order. */
+ /** Field name-to-type map to index in ascending order. */
@GridToStringInclude
private Map<String, Class<?>> ascFlds;
- /** Fields to index in descending order. */
+ /** Field name-to-type map to index in descending order. */
@GridToStringInclude
private Map<String, Class<?>> descFlds;
@@ -244,54 +244,54 @@ public class CacheTypeMetadata implements Serializable {
}
/**
- * Gets query-enabled fields.
+ * Gets name-to-type map for query-enabled fields.
*
- * @return Collection of fields available for query.
+ * @return Name-to-type map for query-enabled fields.
*/
public Map<String, Class<?>> getQueryFields() {
return qryFlds;
}
/**
- * Sets query fields map.
+ * Sets name-to-type map for query-enabled fields.
*
- * @param qryFlds Query fields.
+ * @param qryFlds Name-to-type map for query-enabled fields.
*/
public void setQueryFields(Map<String, Class<?>> qryFlds) {
this.qryFlds = qryFlds;
}
/**
- * Gets ascending-indexed fields.
+ * Gets name-to-type map for ascending-indexed fields.
*
- * @return Map of ascending-indexed fields.
+ * @return Name-to-type map for ascending-indexed fields.
*/
public Map<String, Class<?>> getAscendingFields() {
return ascFlds;
}
/**
- * Sets ascending-indexed fields.
+ * Sets name-to-type map for ascending-indexed fields.
*
- * @param ascFlds Map of ascending-indexed fields.
+ * @param ascFlds Name-to-type map for ascending-indexed fields.
*/
public void setAscendingFields(Map<String, Class<?>> ascFlds) {
this.ascFlds = ascFlds;
}
/**
- * Gets descending-indexed fields.
+ * Gets name-to-type map for descending-indexed fields.
*
- * @return Map of descending-indexed fields.
+ * @return Name-to-type map of descending-indexed fields.
*/
public Map<String, Class<?>> getDescendingFields() {
return descFlds;
}
/**
- * Sets descending-indexed fields.
+ * Sets name-to-type map for descending-indexed fields.
*
- * @param descFlds Map of descending-indexed fields.
+ * @param descFlds Name-to-type map of descending-indexed fields.
*/
public void setDescendingFields(Map<String, Class<?>> descFlds) {
this.descFlds = descFlds;
[08/13] incubator-ignite git commit: disable hanging test
Posted by vo...@apache.org.
disable hanging test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a6d33b14
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a6d33b14
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a6d33b14
Branch: refs/heads/ignite-1108
Commit: a6d33b143a46f1d0884ee2d88d5d8edf098b1879
Parents: 7147f3d
Author: Denis Magda <dm...@gridgain.com>
Authored: Wed Jul 15 14:13:00 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Wed Jul 15 14:13:00 2015 +0300
----------------------------------------------------------------------
.../IgniteCacheAtomicReplicatedNodeRestartSelfTest.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a6d33b14/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheAtomicReplicatedNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheAtomicReplicatedNodeRestartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheAtomicReplicatedNodeRestartSelfTest.java
index f556023..68c7fbb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheAtomicReplicatedNodeRestartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/IgniteCacheAtomicReplicatedNodeRestartSelfTest.java
@@ -26,6 +26,11 @@ import static org.apache.ignite.cache.CacheAtomicityMode.*;
*/
public class IgniteCacheAtomicReplicatedNodeRestartSelfTest extends GridCacheReplicatedNodeRestartSelfTest {
/** {@inheritDoc} */
+ @Override protected void beforeTestsStarted() throws Exception {
+ fail("https://issues.apache.org/jira/browse/IGNITE-1124");
+ }
+
+ /** {@inheritDoc} */
@Override protected CacheAtomicityMode atomicityMode() {
return ATOMIC;
}
[11/13] incubator-ignite git commit: Merge remote-tracking branch
'origin/master'
Posted by vo...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cd3a9b61
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cd3a9b61
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cd3a9b61
Branch: refs/heads/ignite-1108
Commit: cd3a9b61bbad20dc0cd2ba239de6399aa2754dc3
Parents: d38a70d bdd1762
Author: Valentin Kulichenko <vk...@gridgain.com>
Authored: Wed Jul 15 20:04:53 2015 -0700
Committer: Valentin Kulichenko <vk...@gridgain.com>
Committed: Wed Jul 15 20:04:53 2015 -0700
----------------------------------------------------------------------
.../internal/processors/query/GridQueryProcessor.java | 4 +++-
.../GridCacheAbstractNodeRestartSelfTest.java | 12 ++++++------
.../IgniteCacheAtomicReplicatedNodeRestartSelfTest.java | 5 +++++
3 files changed, 14 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[06/13] incubator-ignite git commit: # master - javadoc fix.
Posted by vo...@apache.org.
# master - javadoc fix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/de7e06f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/de7e06f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/de7e06f3
Branch: refs/heads/ignite-1108
Commit: de7e06f3f873428ae8db8cf1dcc3a72d9f433e5b
Parents: b464548
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Tue Jul 14 16:44:13 2015 -0700
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Tue Jul 14 16:44:13 2015 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/de7e06f3/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java
index 608cc39..93ce9dd 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java
@@ -26,7 +26,7 @@ import java.io.*;
import java.util.*;
/**
- * Type metadata.
+ * Cache type metadata need for configuration of indexes or automatic persistence.
*/
public class CacheTypeMetadata implements Serializable {
/** */
[03/13] incubator-ignite git commit: # master - javadoc fix.
Posted by vo...@apache.org.
# master - javadoc fix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bc036fe5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bc036fe5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bc036fe5
Branch: refs/heads/ignite-1108
Commit: bc036fe507e189ede3c0a5cd3d3fdbcaa17b30fe
Parents: b19ed0c
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Tue Jul 14 16:24:58 2015 -0700
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Tue Jul 14 16:24:58 2015 -0700
----------------------------------------------------------------------
.../apache/ignite/cache/CacheTypeMetadata.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bc036fe5/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java
index 20129b7..1090b0b 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java
@@ -43,11 +43,11 @@ public class CacheTypeMetadata implements Serializable {
/** Value class used to store value in cache. */
private String valType;
- /** Key fields. */
+ /** Persistent key fields. */
@GridToStringInclude
private Collection<CacheTypeFieldMetadata> keyFields;
- /** Value fields . */
+ /** Persistent value fields . */
@GridToStringInclude
private Collection<CacheTypeFieldMetadata> valFields;
@@ -208,36 +208,36 @@ public class CacheTypeMetadata implements Serializable {
}
/**
- * Gets key fields.
+ * Gets persistent key fields.
*
- * @return Key fields.
+ * @return Persistent key fields.
*/
public Collection<CacheTypeFieldMetadata> getKeyFields() {
return keyFields;
}
/**
- * Sets key fields.
+ * Sets persistent key fields.
*
- * @param keyFields New key fields.
+ * @param keyFields Persistent key fields.
*/
public void setKeyFields(Collection<CacheTypeFieldMetadata> keyFields) {
this.keyFields = keyFields;
}
/**
- * Gets value fields.
+ * Gets persistent value fields.
*
- * @return Value fields.
+ * @return Persistent value fields.
*/
public Collection<CacheTypeFieldMetadata> getValueFields() {
return valFields;
}
/**
- * Sets value fields.
+ * Sets persistent value fields.
*
- * @param valFields New value fields.
+ * @param valFields Persistent value fields.
*/
public void setValueFields(Collection<CacheTypeFieldMetadata> valFields) {
this.valFields = valFields;
[05/13] incubator-ignite git commit: # master - javadoc fix.
Posted by vo...@apache.org.
# master - javadoc fix.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b464548d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b464548d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b464548d
Branch: refs/heads/ignite-1108
Commit: b464548dc7a29f7349a0935a5ee54c5380d91d5b
Parents: d2a1c3c
Author: Dmitiry Setrakyan <ds...@gridgain.com>
Authored: Tue Jul 14 16:35:42 2015 -0700
Committer: Dmitiry Setrakyan <ds...@gridgain.com>
Committed: Tue Jul 14 16:35:42 2015 -0700
----------------------------------------------------------------------
.../org/apache/ignite/cache/CacheTypeMetadata.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b464548d/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java
index ebe7db7..608cc39 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java
@@ -17,6 +17,7 @@
package org.apache.ignite.cache;
+import org.apache.ignite.cache.store.jdbc.*;
import org.apache.ignite.internal.util.tostring.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
@@ -43,11 +44,11 @@ public class CacheTypeMetadata implements Serializable {
/** Value class used to store value in cache. */
private String valType;
- /** Persistent key fields. */
+ /** Optional persistent key fields (needed only if {@link CacheJdbcPojoStore} is used). */
@GridToStringInclude
private Collection<CacheTypeFieldMetadata> keyFields;
- /** Persistent value fields . */
+ /** Optional persistent value fields (needed only if {@link CacheJdbcPojoStore} is used). */
@GridToStringInclude
private Collection<CacheTypeFieldMetadata> valFields;
@@ -208,7 +209,7 @@ public class CacheTypeMetadata implements Serializable {
}
/**
- * Gets persistent key fields.
+ * Gets optional persistent key fields (needed only if {@link CacheJdbcPojoStore} is used).
*
* @return Persistent key fields.
*/
@@ -217,7 +218,7 @@ public class CacheTypeMetadata implements Serializable {
}
/**
- * Sets persistent key fields.
+ * Sets optional persistent key fields (needed only if {@link CacheJdbcPojoStore} is used).
*
* @param keyFields Persistent key fields.
*/
@@ -226,7 +227,7 @@ public class CacheTypeMetadata implements Serializable {
}
/**
- * Gets persistent value fields.
+ * Gets optional persistent value fields (needed only if {@link CacheJdbcPojoStore} is used).
*
* @return Persistent value fields.
*/
@@ -235,7 +236,7 @@ public class CacheTypeMetadata implements Serializable {
}
/**
- * Sets persistent value fields.
+ * Sets optional persistent value fields (needed only if {@link CacheJdbcPojoStore} is used).
*
* @param valFields Persistent value fields.
*/
[02/13] incubator-ignite git commit: ignite-mys-26: fixed queries on
local nodes when keepPortable is set
Posted by vo...@apache.org.
ignite-mys-26: fixed queries on local nodes when keepPortable is set
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/322e5df8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/322e5df8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/322e5df8
Branch: refs/heads/ignite-1108
Commit: 322e5df8e28b5b1d36bf04afc25fd5845f3115b7
Parents: b19ed0c
Author: Denis Magda <dm...@gridgain.com>
Authored: Tue Jul 14 17:45:53 2015 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Tue Jul 14 17:45:53 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/query/GridQueryProcessor.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/322e5df8/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index 6af0f40..1ba1fae 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -737,6 +737,8 @@ public class GridQueryProcessor extends GridProcessorAdapter {
throw new IllegalStateException("Failed to execute query (grid is stopping).");
try {
+ final boolean keepPortable = cctx.keepPortable();
+
return executeQuery(cctx, new IgniteOutClosureX<QueryCursor<List<?>>>() {
@Override public QueryCursor<List<?>> applyx() throws IgniteCheckedException {
String space = cctx.name();
@@ -750,7 +752,7 @@ public class GridQueryProcessor extends GridProcessorAdapter {
QueryCursorImpl<List<?>> cursor = new QueryCursorImpl<>(new Iterable<List<?>>() {
@Override public Iterator<List<?>> iterator() {
- return new GridQueryCacheObjectsIterator(res.iterator(), cctx, cctx.keepPortable());
+ return new GridQueryCacheObjectsIterator(res.iterator(), cctx, keepPortable);
}
});