[1/2] incubator-ignite git commit: minor - javadoc
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-sprint-3-p1 9934af127 -> 72dfa03b2
minor - javadoc
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2529990f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2529990f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2529990f
Branch: refs/heads/ignite-sprint-3-p1
Commit: 2529990f4ed691b49930a246c51a1a14da0255ce
Parents: 54390af
Author: Yakov Zhdanov
Authored: Sun Apr 19 14:54:00 2015 +0300
Committer: Yakov Zhdanov
Committed: Sun Apr 19 14:54:00 2015 +0300
--
.../apache/ignite/configuration/CacheConfiguration.java | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2529990f/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index 003d27f..71e42e0 100644
---
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -1409,20 +1409,20 @@ public class CacheConfiguration extends
MutableConfiguration {
* for cache operation implying return value. Also if this flag is set
copies are created for values
* passed to {@link CacheInterceptor} and to {@link CacheEntryProcessor}.
*
- * @return Copy on get flag.
+ * @return Copy on read flag.
*/
public boolean isCopyOnRead() {
return cpOnRead;
}
/**
- * Set copy on get flag.
+ * Sets copy on read flag.
*
- * @param cpOnGet Copy on get flag.
+ * @param cpOnRead Copy on get flag.
* @see #isCopyOnRead
*/
-public void setCopyOnRead(boolean cpOnGet) {
-this.cpOnRead = cpOnGet;
+public void setCopyOnRead(boolean cpOnRead) {
+this.cpOnRead = cpOnRead;
}
/**
[2/2] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-3-p1' into ignite-sprint-3-p1
Merge remote-tracking branch 'origin/ignite-sprint-3-p1' into ignite-sprint-3-p1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/72dfa03b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/72dfa03b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/72dfa03b Branch: refs/heads/ignite-sprint-3-p1 Commit: 72dfa03b2406722aa691189b6f18238996fbfaa8 Parents: 2529990 9934af1 Author: Yakov Zhdanov Authored: Sun Apr 19 14:54:14 2015 +0300 Committer: Yakov Zhdanov Committed: Sun Apr 19 14:54:14 2015 +0300 -- .../processors/cache/CacheEntryImpl.java| 29 +++- .../cache/CacheVersionedEntryImpl.java | 29 +++- .../GridCacheQuerySerializationSelfTest.java| 144 +++ .../IgniteCacheQuerySelfTestSuite.java | 2 + 4 files changed, 200 insertions(+), 4 deletions(-) --
[2/2] incubator-ignite git commit: # IGNITE-709 Fix problem in TcpDiscoverySpi.RingMessageWorker#processClientReconnectMessage()
# IGNITE-709 Fix problem in
TcpDiscoverySpi.RingMessageWorker#processClientReconnectMessage()
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/eda676b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/eda676b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/eda676b5
Branch: refs/heads/ignite-709
Commit: eda676b543d80319105e8e75cf1cf34e65ac8c81
Parents: 49a1c7e
Author: sevdokimov
Authored: Sun Apr 19 19:11:14 2015 +0300
Committer: sevdokimov
Committed: Sun Apr 19 19:11:14 2015 +0300
--
.../spi/discovery/tcp/TcpDiscoverySpi.java | 76 +++-
1 file changed, 41 insertions(+), 35 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eda676b5/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
index 5245826..d69ca0c 100644
---
a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
+++
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
@@ -3408,54 +3408,60 @@ public class TcpDiscoverySpi extends
TcpDiscoverySpiAdapter implements TcpDiscov
assert isLocNodeRouter;
msg.verify(locNodeId);
+
+if (ring.hasRemoteNodes()) {
+sendMessageAcrossRing(msg);
+
+return;
+}
}
-else {
-UUID nodeId = msg.creatorNodeId();
-TcpDiscoveryNode node = ring.node(nodeId);
+UUID nodeId = msg.creatorNodeId();
-assert node == null || node.isClient();
+TcpDiscoveryNode node = ring.node(nodeId);
-if (node != null) {
-assert node.isClient();
+assert node == null || node.isClient();
-node.clientRouterNodeId(msg.routerNodeId());
-node.aliveCheck(maxMissedClientHbs);
+if (node != null) {
+assert node.isClient();
-if (isLocalNodeCoordinator()) {
-Collection pending =
-pendingMsgs.messages(msg.lastMessageId());
+node.clientRouterNodeId(msg.routerNodeId());
+node.aliveCheck(maxMissedClientHbs);
-if (pending != null) {
-msg.pendingMessages(pending);
-msg.success(true);
-}
-else {
-if (log.isDebugEnabled())
-log.debug("Failing reconnecting client node
because failed to restore pending " +
-"messages [locNodeId=" + locNodeId + ",
clientNodeId=" + nodeId + ']');
+if (isLocalNodeCoordinator()) {
+Collection pending =
+pendingMsgs.messages(msg.lastMessageId());
-processNodeFailedMessage(new
TcpDiscoveryNodeFailedMessage(locNodeId,
-node.id(), node.internalOrder()));
-}
+if (pending != null) {
+msg.pendingMessages(pending);
+msg.success(true);
}
-}
-else if (log.isDebugEnabled())
-log.debug("Reconnecting client node is already failed
[nodeId=" + nodeId + ']');
-
-if (isLocNodeRouter) {
-ClientMessageWorker wrk = clientMsgWorkers.get(nodeId);
+else {
+if (log.isDebugEnabled())
+log.debug("Failing reconnecting client node
because failed to restore pending " +
+"messages [locNodeId=" + locNodeId + ",
clientNodeId=" + nodeId + ']');
-if (wrk != null)
-wrk.addMessage(msg);
-else if (log.isDebugEnabled())
-log.debug("Failed to reconnect client node
(disconnected during the process) [locNodeId=" +
-locNodeId + ", clientNodeId=" + nodeId + ']');
+processNodeFailedMessage(new
TcpDiscoveryNodeFailedMessage(locNodeId,
+node.id(), node.internalOrder()));
+}
}
}
+else if (log.isDebugEnabled())
+
[1/2] incubator-ignite git commit: # ignite-740 Temporary decrease server node count.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-709 83d1ff4be -> eda676b54
# ignite-740 Temporary decrease server node count.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/49a1c7e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/49a1c7e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/49a1c7e2
Branch: refs/heads/ignite-709
Commit: 49a1c7e26eaa08a46c4202bf7efb9bed6a8f8855
Parents: 83d1ff4
Author: sevdokimov
Authored: Sun Apr 19 18:50:02 2015 +0300
Committer: sevdokimov
Committed: Sun Apr 19 18:50:02 2015 +0300
--
.../cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/49a1c7e2/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java
index 7c6e24d..1abd318 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java
@@ -162,7 +162,7 @@ public class GridCacheTcpClientDiscoveryMultiThreadedTest
extends GridCacheAbstr
* @throws Exception If failed.
*/
public void testCacheWithServerNodesRestart() throws Exception {
-srvNodesCnt = 3;
+srvNodesCnt = 1;
clientNodesCnt = 1;
startServerNodes();
[07/32] incubator-ignite git commit: #ignite-743: add StreamReceiver uses IgniteCacheProxyLockFree.
#ignite-743: add StreamReceiver uses IgniteCacheProxyLockFree.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dbcb60a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dbcb60a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dbcb60a1
Branch: refs/heads/ignite-737
Commit: dbcb60a134d6f919d8b0e95c96a7730705fed75f
Parents: b5d6303
Author: ivasilinets
Authored: Wed Apr 15 11:47:21 2015 +0300
Committer: ivasilinets
Committed: Wed Apr 15 11:47:21 2015 +0300
--
.../datastreamer/DataStreamerCacheUpdaters.java | 2 +-
.../datastreamer/DataStreamerImpl.java | 83 +---
2 files changed, 39 insertions(+), 46 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dbcb60a1/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
index ed51730..fc6783d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
@@ -85,7 +85,7 @@ public class DataStreamerCacheUpdaters {
// Here we assume that there are no key duplicates, so the following
calls are valid.
if (rmvCol != null)
-((IgniteCacheProxyLockFree)cache).removeAll(rmvCol);
+cache.removeAll(rmvCol);
if (putMap != null)
cache.putAll(putMap);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dbcb60a1/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
index a03a925..83fb3cb 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
@@ -1373,69 +1373,62 @@ public class DataStreamerImpl implements
IgniteDataStreamer, Delayed
/** {@inheritDoc} */
@Override public void receive(IgniteCache
cache,
Collection> entries) {
-IgniteCacheProxy proxy =
(IgniteCacheProxy)cache;
+IgniteCacheProxyLockFree proxy =
(IgniteCacheProxyLockFree)cache;
-proxy.gate().enter();
+GridCacheAdapter internalCache =
proxy.context().cache();
-try {
-GridCacheAdapter internalCache =
proxy.context().cache();
-
-if (internalCache.isNear())
-internalCache = internalCache.context().near().dht();
+if (internalCache.isNear())
+internalCache = internalCache.context().near().dht();
-GridCacheContext cctx = internalCache.context();
+GridCacheContext cctx = internalCache.context();
-AffinityTopologyVersion topVer =
cctx.affinity().affinityTopologyVersion();
+AffinityTopologyVersion topVer =
cctx.affinity().affinityTopologyVersion();
-GridCacheVersion ver = cctx.versions().next(topVer);
+GridCacheVersion ver = cctx.versions().next(topVer);
-long ttl = CU.TTL_ETERNAL;
-long expiryTime = CU.EXPIRE_TIME_ETERNAL;
+long ttl = CU.TTL_ETERNAL;
+long expiryTime = CU.EXPIRE_TIME_ETERNAL;
-ExpiryPolicy plc = cctx.expiry();
+ExpiryPolicy plc = cctx.expiry();
-for (Entry e : entries) {
-try {
-e.getKey().finishUnmarshal(cctx.cacheObjectContext(),
cctx.deploy().globalLoader());
+for (Entry e : entries) {
+try {
+e.getKey().finishUnmarshal(cctx.cacheObjectContext(),
cctx.deploy().globalLoader());
-GridCacheEntryEx entry =
internalCache.entryEx(e.getKey(), topVer);
+GridCacheEntryEx entry = internalCache.entryEx(e.getKey(),
topVer);
-entry.unswap(false);
+entry.unswap(false);
-if (plc != null) {
-ttl = CU.t
[12/32] incubator-ignite git commit: #ignite-743: IsolatedUpdater should wait cache started.
#ignite-743: IsolatedUpdater should wait cache started.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ecf963e4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ecf963e4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ecf963e4
Branch: refs/heads/ignite-737
Commit: ecf963e4de1cc508d213170802515a20d7543396
Parents: 8ee275f
Author: ivasilinets
Authored: Wed Apr 15 14:54:48 2015 +0300
Committer: ivasilinets
Committed: Wed Apr 15 14:54:48 2015 +0300
--
.../internal/processors/datastreamer/DataStreamerImpl.java| 7 +++
1 file changed, 7 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ecf963e4/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
index 83fb3cb..0486bed 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
@@ -1375,6 +1375,13 @@ public class DataStreamerImpl implements
IgniteDataStreamer, Delayed
Collection> entries) {
IgniteCacheProxyLockFree proxy =
(IgniteCacheProxyLockFree)cache;
+try {
+proxy.context().awaitStarted();
+}
+catch (IgniteCheckedException e) {
+U.convertException(e);
+}
+
GridCacheAdapter internalCache =
proxy.context().cache();
if (internalCache.isNear())
[09/32] incubator-ignite git commit: #ignite-743: fix marshalling.
#ignite-743: fix marshalling. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a4143aa3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a4143aa3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a4143aa3 Branch: refs/heads/ignite-737 Commit: a4143aa35bf0704e16320d8631820901b151680b Parents: 8f8119e Author: ivasilinets Authored: Wed Apr 15 11:57:47 2015 +0300 Committer: ivasilinets Committed: Wed Apr 15 11:57:47 2015 +0300 -- .../apache/ignite/internal/processors/cache/IgniteCacheProxy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4143aa3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index 3424c2c..2cda18a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@ -827,7 +827,7 @@ public class IgniteCacheProxy extends AsyncSupportAdapter prj0 = new GridCacheProjectionImpl<>( -(CacheProjection)(prj != null ? prj : lockFreeCache), +(CacheProjection)(prj != null ? prj : lockFreeCache.delegate()), (GridCacheContext)context(), prj != null && prj.skipStore(), prj != null ? prj.subjectId() : null,
[05/32] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-743
Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-743 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/66a1b3c8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/66a1b3c8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/66a1b3c8 Branch: refs/heads/ignite-737 Commit: 66a1b3c80dc9742edf4301ae1cb2018896a9eaa7 Parents: bd80bca 9c0ef57 Author: ivasilinets Authored: Tue Apr 14 16:21:57 2015 +0300 Committer: ivasilinets Committed: Tue Apr 14 16:21:57 2015 +0300 -- .../distributed/near/GridNearCacheEntry.java| 6 ++-- .../GridCacheAbstractFailoverSelfTest.java | 37 .../processors/cache/GridCachePutAllTask.java | 23 +--- .../junits/common/GridCommonAbstractTest.java | 36 ++- .../IgniteCacheFailoverTestSuite.java | 2 +- 5 files changed, 90 insertions(+), 14 deletions(-) --
[03/32] incubator-ignite git commit: #ignite-743: Implement IgniteCacheProxyLockFree.
#ignite-743: Implement IgniteCacheProxyLockFree.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a9bd0178
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a9bd0178
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a9bd0178
Branch: refs/heads/ignite-737
Commit: a9bd0178772fbe785da496ea791bfc984b56b9a5
Parents: 56ef269
Author: ivasilinets
Authored: Tue Apr 14 16:18:37 2015 +0300
Committer: ivasilinets
Committed: Tue Apr 14 16:18:37 2015 +0300
--
.../ignite/internal/processors/cache/IgniteCacheProxy.java | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9bd0178/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index dcdf0be..d6f4e85 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -96,7 +96,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter lockFree() {
+public IgniteCacheProxyLockFree lockFree() {
return delegate;
}
@@ -885,8 +885,6 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter extends
AsyncSupportAdapter)in.readObject();
-prj = (GridCacheProjectionImpl)in.readObject();
+prj = (GridCacheProjectionImpl)delegate.delegate();
gate = delegate.context().gate();
}
[08/32] incubator-ignite git commit: #ignite-743: fix marshalling.
#ignite-743: fix marshalling.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8f8119e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8f8119e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8f8119e1
Branch: refs/heads/ignite-737
Commit: 8f8119e1573f93e667b04fade5d4fbe758c6b74e
Parents: dbcb60a
Author: ivasilinets
Authored: Wed Apr 15 11:51:48 2015 +0300
Committer: ivasilinets
Committed: Wed Apr 15 11:51:48 2015 +0300
--
.../ignite/internal/processors/cache/IgniteCacheProxy.java | 2 +-
.../internal/processors/cache/IgniteCacheProxyLockFree.java | 4
2 files changed, 5 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f8119e1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index d72ed5a..3424c2c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -892,7 +892,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter)in.readObject();
-prj = (GridCacheProjectionImpl) lockFreeCache.delegate();
+prj = lockFreeCache.projection();
gate = lockFreeCache.context().gate();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f8119e1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java
index 976eeac..8811b35 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java
@@ -116,6 +116,10 @@ public class IgniteCacheProxyLockFree extends
AsyncSupportAdapter projection() {
+return prj;
+}
+
/** {@inheritDoc} */
@Override public CacheMetrics metrics() {
return ctx.cache().metrics();
[04/32] incubator-ignite git commit: #ignite-743: Implement IgniteCacheProxyLockFree.
#ignite-743: Implement IgniteCacheProxyLockFree.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bd80bca1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bd80bca1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bd80bca1
Branch: refs/heads/ignite-737
Commit: bd80bca168f4468b7302c55f025f47eedfe5a090
Parents: a9bd017
Author: ivasilinets
Authored: Tue Apr 14 16:20:59 2015 +0300
Committer: ivasilinets
Committed: Tue Apr 14 16:20:59 2015 +0300
--
.../processors/cache/IgniteCacheProxy.java | 140 +--
1 file changed, 70 insertions(+), 70 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd80bca1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index d6f4e85..d72ed5a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -48,7 +48,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter delegate;
+private IgniteCacheProxyLockFree lockFreeCache;
/** Projection. */
private GridCacheProjectionImpl prj;
@@ -83,21 +83,21 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter(ctx, delegate, prj,
async);
+lockFreeCache = new IgniteCacheProxyLockFree<>(ctx, delegate, prj,
async);
}
/**
* @return Context.
*/
public GridCacheContext context() {
-return delegate.context();
+return lockFreeCache.context();
}
/**
* @return Lock free instance.
*/
public IgniteCacheProxyLockFree lockFree() {
-return delegate;
+return lockFreeCache;
}
/**
@@ -112,7 +112,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter prev = gate.enter(prj);
try {
-return delegate.metrics();
+return lockFreeCache.metrics();
}
finally {
gate.leave(prev);
@@ -124,7 +124,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter prev = gate.enter(prj);
try {
-return delegate.metrics(grp);
+return lockFreeCache.metrics(grp);
}
finally {
gate.leave(prev);
@@ -136,7 +136,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter prev = gate.enter(prj);
try {
-return delegate.mxBean();
+return lockFreeCache.mxBean();
}
finally {
gate.leave(prev);
@@ -145,7 +145,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter> C
getConfiguration(Class clazz) {
-return delegate.getConfiguration(clazz);
+return lockFreeCache.getConfiguration(clazz);
}
/** {@inheritDoc} */
@@ -153,7 +153,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter prev = gate.enter(prj);
try {
-return delegate.randomEntry();
+return lockFreeCache.randomEntry();
}
finally {
gate.leave(prev);
@@ -165,7 +165,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter prev = gate.enter(prj);
try {
-return delegate.withExpiryPolicy(plc);
+return lockFreeCache.withExpiryPolicy(plc);
}
finally {
gate.leave(prev);
@@ -182,7 +182,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter prev = gate.enter(prj);
try {
-delegate.loadCache(p, args);
+lockFreeCache.loadCache(p, args);
}
finally {
gate.leave(prev);
@@ -194,7 +194,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter prev = gate.enter(prj);
try {
-delegate.localLoadCache(p, args);
+lockFreeCache.localLoadCache(p, args);
}
finally {
gate.leave(prev);
@@ -206,7 +206,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter prev = gate.enter(prj);
try {
-return delegate.getAndPutIfAbsent(key, val);
+return lockFreeCache.getAndPutIfAbsent(key, val);
}
finally {
gate.leave(prev);
@@ -215,17 +215,17 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter keys) {
-return delegate.lockAll(keys);
+return lockFreeCache.lockAll(keys);
}
/** {@inheritDoc} */
@Override public boolean isLocalLoc
[06/32] incubator-ignite git commit: #ignite-743: Implement IgniteCacheProxyLockFree.
#ignite-743: Implement IgniteCacheProxyLockFree.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b5d6303c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b5d6303c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b5d6303c
Branch: refs/heads/ignite-737
Commit: b5d6303cca2d0869ddbc02c93c017661f30750bf
Parents: 66a1b3c
Author: ivasilinets
Authored: Tue Apr 14 16:29:08 2015 +0300
Committer: ivasilinets
Committed: Tue Apr 14 16:29:08 2015 +0300
--
.../processors/datastreamer/DataStreamerCacheUpdaters.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b5d6303c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
index 7f6bb5b..ed51730 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
@@ -85,7 +85,7 @@ public class DataStreamerCacheUpdaters {
// Here we assume that there are no key duplicates, so the following
calls are valid.
if (rmvCol != null)
-((IgniteCacheProxy)cache).removeAll(rmvCol);
+((IgniteCacheProxyLockFree)cache).removeAll(rmvCol);
if (putMap != null)
cache.putAll(putMap);
[17/32] incubator-ignite git commit: ignite-754: implemented
ignite-754: implemented
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bee6ac82
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bee6ac82
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bee6ac82
Branch: refs/heads/ignite-737
Commit: bee6ac82d6ed41dc7e5262c72100c7274a1e7880
Parents: 655514b
Author: Denis Magda
Authored: Thu Apr 16 13:53:51 2015 +0300
Committer: Denis Magda
Committed: Thu Apr 16 13:53:51 2015 +0300
--
.../managers/discovery/GridDiscoveryManager.java| 16
1 file changed, 16 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bee6ac82/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 9f74b83..7b6edc2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -738,11 +738,19 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
Object locMode = locNode.attribute(ATTR_DEPLOYMENT_MODE);
+int locJvmMajVer = nodeJavaMajorVer(locNode);
+
boolean locP2pEnabled = locNode.attribute(ATTR_PEER_CLASSLOADING);
boolean warned = false;
for (ClusterNode n : nodes) {
+int rmtJvmMajVer = nodeJavaMajorVer(n);
+
+if (locJvmMajVer != rmtJvmMajVer)
+throw new IgniteCheckedException("Local node's java major
version = " + locJvmMajVer +
+" is different from remote node's one = " + rmtJvmMajVer);
+
String rmtPreferIpV4 = n.attribute("java.net.preferIPv4Stack");
if (!F.eq(rmtPreferIpV4, locPreferIpV4)) {
@@ -783,6 +791,14 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
log.debug("Finished node attributes consistency check.");
}
+private int nodeJavaMajorVer(ClusterNode node) throws
IgniteCheckedException {
+try {
+return
Integer.parseInt(node.attribute("java.version").split(".")[1]);
+}
+catch (Exception e) {
+throw new IgniteCheckedException("Failed to get java major version
with reason: " + e.getMessage());
+}
+}
/**
* @param nodes Nodes.
* @return Total CPUs.
[01/32] incubator-ignite git commit: #ignite-743: Add class IgniteCacheProxyLockFree.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-737 5b9ffad8f -> b7350431c
#ignite-743: Add class IgniteCacheProxyLockFree.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/196337aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/196337aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/196337aa
Branch: refs/heads/ignite-737
Commit: 196337aaf0ea0fb183bcd8f8ed75559b6ba4c871
Parents: 59b11b4
Author: ivasilinets
Authored: Tue Apr 14 14:49:17 2015 +0300
Committer: ivasilinets
Committed: Tue Apr 14 14:49:17 2015 +0300
--
.../cache/IgniteCacheProxyLockFree.java | 24
.../dr/IgniteDrDataStreamerCacheUpdater.java| 2 --
2 files changed, 24 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/196337aa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java
new file mode 100644
index 000..81e1f24
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+/**
+ * Cache proxy lock free.
+ */
+public class IgniteCacheProxyLockFree {
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/196337aa/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/IgniteDrDataStreamerCacheUpdater.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/IgniteDrDataStreamerCacheUpdater.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/IgniteDrDataStreamerCacheUpdater.java
index 818b99a..c3a8989 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/IgniteDrDataStreamerCacheUpdater.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/IgniteDrDataStreamerCacheUpdater.java
@@ -53,8 +53,6 @@ public class IgniteDrDataStreamerCacheUpdater implements
StreamReceiver
[19/32] incubator-ignite git commit: ignite-754: bug fixed
ignite-754: bug fixed
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f6a08642
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f6a08642
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f6a08642
Branch: refs/heads/ignite-737
Commit: f6a08642a390c46ef69432125790ec2ab3acd8d9
Parents: 0071386
Author: Denis Magda
Authored: Thu Apr 16 14:45:32 2015 +0300
Committer: Denis Magda
Committed: Thu Apr 16 14:45:32 2015 +0300
--
.../ignite/internal/managers/discovery/GridDiscoveryManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f6a08642/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index ff41952..27f62b2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -800,7 +800,7 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
*/
private int nodeJavaMajorVer(ClusterNode node) throws
IgniteCheckedException {
try {
-return
Integer.parseInt(node.attribute("java.version").split(".")[1]);
+return
Integer.parseInt(node.attribute("java.version").split("\\.")[1]);
}
catch (Exception e) {
throw new IgniteCheckedException("Failed to get java major version
with reason: " + e.getMessage());
[16/32] incubator-ignite git commit: # ignite-743
# ignite-743
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/23a41dfd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/23a41dfd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/23a41dfd
Branch: refs/heads/ignite-737
Commit: 23a41dfd2b7904c72a9fdebe35ef00b02ad62b3a
Parents: d6434bb
Author: sboikov
Authored: Thu Apr 16 10:51:10 2015 +0300
Committer: sboikov
Committed: Thu Apr 16 11:03:10 2015 +0300
--
.../processors/cache/GridCacheGateway.java | 67 +-
.../processors/cache/IgniteCacheProxy.java | 129 +++
.../datastreamer/DataStreamerUpdateJob.java | 12 --
3 files changed, 81 insertions(+), 127 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23a41dfd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
index 97fada9..aa73414 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
@@ -66,10 +66,10 @@ public class GridCacheGateway {
/**
* Enter a cache call.
*
- * @return {@code true} if enter successful, {@code false} if the cache or
the node was stopped.
+ * @return {@code True} if enter successful, {@code false} if the cache or
the node was stopped.
*/
public boolean enterIfNotClosed() {
-enterIfNotClosedNoLock();
+onEnter();
// Must unlock in case of unexpected errors to avoid
// deadlocks during kernal stop.
@@ -87,17 +87,16 @@ public class GridCacheGateway {
/**
* Enter a cache call without lock.
*
- * @return {@code true} if enter successful, {@code false} if the cache or
the node was stopped.
+ * @return {@code True} if enter successful, {@code false} if the cache or
the node was stopped.
*/
public boolean enterIfNotClosedNoLock() {
-if (ctx.deploymentEnabled())
-ctx.deploy().onEnter();
+onEnter();
return !stopped;
}
/**
- * Leave a cache call entered by {@link #enter()} method.
+ * Leave a cache call entered by {@link #enterNoLock} method.
*/
public void leaveNoLock() {
ctx.tm().resetContext();
@@ -125,6 +124,22 @@ public class GridCacheGateway {
* @return Previous projection set on this thread.
*/
@Nullable public GridCacheProjectionImpl enter(@Nullable
GridCacheProjectionImpl prj) {
+try {
+GridCacheAdapter cache = ctx.cache();
+
+GridCachePreloader preldr = cache != null ?
cache.preloader() : null;
+
+if (preldr == null)
+throw new IllegalStateException("Grid is in invalid state to
perform this operation. " +
+"It either not started yet or has already being or have
stopped [gridName=" + ctx.gridName() + ']');
+
+preldr.startFuture().get();
+}
+catch (IgniteCheckedException e) {
+throw new IgniteException("Failed to wait for cache preloader
start [cacheName=" +
+ctx.name() + "]", e);
+}
+
onEnter();
rwLock.readLock();
@@ -132,7 +147,7 @@ public class GridCacheGateway {
if (stopped) {
rwLock.readUnlock();
-throw new IllegalStateException("Dynamic cache has been stopped: "
+ ctx.name());
+throw new IllegalStateException("Cache has been stopped: " +
ctx.name());
}
// Must unlock in case of unexpected errors to avoid
@@ -155,38 +170,12 @@ public class GridCacheGateway {
onEnter();
if (stopped)
-throw new IllegalStateException("Dynamic cache has been stopped: "
+ ctx.name());
+throw new IllegalStateException("Cache has been stopped: " +
ctx.name());
return setProjectionPerCall(prj);
}
/**
- * On enter.
- */
-private void onEnter() {
-try {
-ctx.itHolder().checkWeakQueue();
-
-GridCacheAdapter cache = ctx.cache();
-
-GridCachePreloader preldr = cache != null ?
cache.preloader() : null;
-
-if (preldr == null)
-throw new IllegalStateException("Grid is in invalid state to
perform this operation. " +
-"It either not started yet or has already being or have
stopped [gridName=" + ctx.gridName() + ']');
-
-
[15/32] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-743
Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-743 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d6434bb7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d6434bb7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d6434bb7 Branch: refs/heads/ignite-737 Commit: d6434bb7ad13a429fab92ee4416a09b7b08cf3b4 Parents: d0b5d85 a57a520 Author: sboikov Authored: Thu Apr 16 09:51:19 2015 +0300 Committer: sboikov Committed: Thu Apr 16 09:51:19 2015 +0300 -- DEVNOTES.txt| 49 examples/README.txt | 2 +- .../dht/atomic/GridDhtAtomicCache.java | 2 +- .../GridDhtPartitionsExchangeFuture.java| 5 ++ 4 files changed, 56 insertions(+), 2 deletions(-) --
[31/32] incubator-ignite git commit: Merge branch 'ignite-sprint-3-p1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-4
Merge branch 'ignite-sprint-3-p1' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-4
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5049704d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5049704d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5049704d
Branch: refs/heads/ignite-737
Commit: 5049704da5742ab7e4215f66a699dce62df357db
Parents: 11baaa8 9934af1
Author: AKuznetsov
Authored: Fri Apr 17 22:24:38 2015 +0700
Committer: AKuznetsov
Committed: Fri Apr 17 22:24:38 2015 +0700
--
.../discovery/GridDiscoveryManager.java | 18 ++-
.../processors/cache/CacheEntryImpl.java| 29 +++-
.../cache/CacheVersionedEntryImpl.java | 29 +++-
.../processors/cache/GridCacheAdapter.java | 43 +++---
.../GridCacheQuerySerializationSelfTest.java| 144 +++
.../IgniteCacheQuerySelfTestSuite.java | 2 +
6 files changed, 234 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5049704d/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5049704d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 71d3c0d,62dae3c..81cdf02
---
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
@@@ -2020,9 -2102,9 +2020,9 @@@ public abstract class GridCacheAdapter<
validateCacheValue(val);
- return asyncOp(new AsyncOp(key) {
+ return asyncOp(new AsyncOp() {
@Override public IgniteInternalFuture op(IgniteTxLocalAdapter
tx) {
-return tx.putAllAsync(ctx, F.t(key, val), true, entry, ttl,
filter)
+return tx.putAllAsync(ctx, F.t(key, val), true, null, -1,
filter)
.chain((IgniteClosure, V>)RET2VAL);
}
@@@ -2352,9 -2407,9 +2352,9 @@@
validateCacheValue(val);
- return asyncOp(new AsyncOp(key) {
+ return asyncOp(new AsyncOp() {
@Override public IgniteInternalFuture
op(IgniteTxLocalAdapter tx) {
-return tx.putAllAsync(ctx, F.t(key, val), false, entry, ttl,
filter).chain(
+return tx.putAllAsync(ctx, F.t(key, val), false, null, -1,
filter).chain(
(IgniteClosure,
Boolean>) RET2FLAG);
}
@@@ -2739,10 -2818,10 +2739,10 @@@
if (keyCheck)
validateCacheKey(key);
- IgniteInternalFuture fut = asyncOp(new AsyncOp(key) {
+ IgniteInternalFuture fut = asyncOp(new AsyncOp() {
@Override public IgniteInternalFuture op(IgniteTxLocalAdapter
tx) {
// TODO should we invoke interceptor here?
-return tx.removeAllAsync(ctx, Collections.singletonList(key),
null, true, filter)
+return tx.removeAllAsync(ctx, Collections.singletonList(key),
null, true, CU.empty0())
.chain((IgniteClosure, V>) RET2VAL);
}
@@@ -2862,9 -2956,9 +2862,9 @@@
if (keyCheck)
validateCacheKey(key);
- IgniteInternalFuture fut = asyncOp(new AsyncOp(key)
{
+ IgniteInternalFuture fut = asyncOp(new AsyncOp() {
@Override public IgniteInternalFuture
op(IgniteTxLocalAdapter tx) {
-return tx.removeAllAsync(ctx, Collections.singletonList(key),
entry, false, filter).chain(
+return tx.removeAllAsync(ctx, Collections.singletonList(key),
null, false, filter).chain(
(IgniteClosure,
Boolean>)RET2FLAG);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5049704d/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
--
[18/32] incubator-ignite git commit: ignite-754: added missing comments
ignite-754: added missing comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0071386d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0071386d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0071386d
Branch: refs/heads/ignite-737
Commit: 0071386d359fb92af8f4b0cc3d00b537184999a6
Parents: bee6ac8
Author: Denis Magda
Authored: Thu Apr 16 14:39:28 2015 +0300
Committer: Denis Magda
Committed: Thu Apr 16 14:39:28 2015 +0300
--
.../internal/managers/discovery/GridDiscoveryManager.java| 8
1 file changed, 8 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0071386d/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 7b6edc2..ff41952 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -791,6 +791,13 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
log.debug("Finished node attributes consistency check.");
}
+/**
+ * Gets Java major version running on the node.
+ *
+ * @param node Cluster node.
+ * @return Java major version.
+ * @throws IgniteCheckedException If failed to get the version.
+ */
private int nodeJavaMajorVer(ClusterNode node) throws
IgniteCheckedException {
try {
return
Integer.parseInt(node.attribute("java.version").split(".")[1]);
@@ -799,6 +806,7 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
throw new IgniteCheckedException("Failed to get java major version
with reason: " + e.getMessage());
}
}
+
/**
* @param nodes Nodes.
* @return Total CPUs.
[13/32] incubator-ignite git commit: #ignite-743: Revert all.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0b5d850/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java
deleted file mode 100644
index 8811b35..000
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java
+++ /dev/null
@@ -1,1153 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.CacheManager;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.processors.query.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.discovery.tcp.internal.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import javax.cache.configuration.*;
-import javax.cache.expiry.*;
-import javax.cache.integration.*;
-import javax.cache.processor.*;
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.locks.*;
-
-/**
- * Cache proxy lock free.
- */
-public class IgniteCacheProxyLockFree extends
AsyncSupportAdapter>
-implements IgniteCache, Externalizable {
-/** */
-private static final long serialVersionUID = 0L;
-
-/** */
-private static final IgniteBiPredicate ACCEPT_ALL = new
IgniteBiPredicate() {
-@Override public boolean apply(Object k, Object v) {
-return true;
-}
-};
-
-/** Context. */
-private GridCacheContext ctx;
-
-/** Delegate. */
-@GridToStringInclude
-private GridCacheProjectionEx delegate;
-
-/** Projection. */
-private GridCacheProjectionImpl prj;
-
-/** */
-@GridToStringExclude
-private GridCacheProxyImpl legacyProxy;
-
-/** */
-@GridToStringExclude
-private CacheManager cacheMgr;
-
-/**
- * Empty constructor required for {@link Externalizable}.
- */
-public IgniteCacheProxyLockFree() {
-// No-op.
-}
-
-/**
- * @param ctx Context.
- * @param delegate Delegate.
- * @param prj Projection.
- * @param async Async support flag.
- */
-public IgniteCacheProxyLockFree(
-GridCacheContext ctx,
-GridCacheProjectionEx delegate,
-@Nullable GridCacheProjectionImpl prj,
-boolean async
-) {
-super(async);
-
-assert ctx != null;
-assert delegate != null;
-
-this.ctx = ctx;
-this.delegate = delegate;
-this.prj = prj;
-
-legacyProxy = new GridCacheProxyImpl<>(ctx, delegate, prj);
-}
-
-/**
- * @return Context.
- */
-public GridCacheContext context() {
-return ctx;
-}
-
-public GridCacheProjectionImpl projection() {
-return prj;
-}
-
-/** {@inheritDoc} */
-@Override public CacheMetrics metrics() {
-return ctx.cache().metrics();
-}
-
-/** {@inheritDoc} */
-@Override public CacheMetrics metrics(ClusterGroup grp) {
-List metrics = new ArrayList<>(grp.nodes().size());
-
-for (ClusterNode node : grp.nodes()) {
-Map nodeCacheMetrics =
((TcpDiscoveryNode)node).cacheMetrics();
-
-if (nodeCacheMetrics != null) {
-CacheMetrics e = nodeCacheMetrics.get(context().cacheId());
-
-if (e != null)
-metrics.add(e);
-}
-}
-
-return new CacheMetricsSnapsho
[30/32] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-3-p1' into ignite-sprint-3-p1
Merge remote-tracking branch 'origin/ignite-sprint-3-p1' into ignite-sprint-3-p1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9934af12 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9934af12 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9934af12 Branch: refs/heads/ignite-737 Commit: 9934af1278bdda620429b8d278b19e3e144b65aa Parents: 6a6ca1a 54390af Author: AKuznetsov Authored: Fri Apr 17 22:22:02 2015 +0700 Committer: AKuznetsov Committed: Fri Apr 17 22:22:02 2015 +0700 -- .../discovery/GridDiscoveryManager.java | 18 +++- .../processors/cache/GridCacheAdapter.java | 43 2 files changed, 34 insertions(+), 27 deletions(-) --
[25/32] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-743' into ignite-sprint-4
Merge remote-tracking branch 'remotes/origin/ignite-743' into ignite-sprint-4
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/357a7156
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/357a7156
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/357a7156
Branch: refs/heads/ignite-737
Commit: 357a7156baf2f78b070545e4d9be5500ec01cf65
Parents: 122f3ce 23a41df
Author: ivasilinets
Authored: Fri Apr 17 13:59:35 2015 +0300
Committer: ivasilinets
Committed: Fri Apr 17 13:59:35 2015 +0300
--
.../processors/cache/GridCacheGateway.java | 111 --
.../processors/cache/IgniteCacheProxy.java | 353 +++
.../datastreamer/DataStreamerCacheUpdaters.java | 2 +-
.../datastreamer/DataStreamerImpl.java | 81 ++---
.../datastreamer/DataStreamerUpdateJob.java | 16 +-
.../dr/IgniteDrDataStreamerCacheUpdater.java| 2 -
6 files changed, 320 insertions(+), 245 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/357a7156/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index b890407,c1a2d6a..244e200
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@@ -449,11 -485,9 +486,11 @@@ public class IgniteCacheProxy ext
@Override public QueryCursor query(Query qry) {
A.notNull(qry, "qry");
- GridCacheProjectionImpl prev = gate.enter(prj);
+ GridCacheProjectionImpl prev = onEnter(prj);
try {
+ctx.checkSecurity(SecurityPermission.CACHE_READ);
+
validate(qry);
if (qry instanceof ContinuousQuery)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/357a7156/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
--
[32/32] incubator-ignite git commit: Merge branches 'ignite-737' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-737
Merge branches 'ignite-737' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-737 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b7350431 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b7350431 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b7350431 Branch: refs/heads/ignite-737 Commit: b7350431cc495274e5b8ae251a3590d06d9ff4c5 Parents: 5b9ffad 5049704 Author: AKuznetsov Authored: Mon Apr 20 09:09:24 2015 +0700 Committer: AKuznetsov Committed: Mon Apr 20 09:09:24 2015 +0700 -- .../s3/S3CheckpointManagerSelfTest.java | 2 +- .../checkpoint/s3/S3CheckpointSpiSelfTest.java | 2 +- .../s3/S3SessionCheckpointSelfTest.java | 2 +- .../discovery/GridDiscoveryManager.java | 46 ++- .../processors/cache/CacheEntryImpl.java| 29 +- .../cache/CacheVersionedEntryImpl.java | 29 +- .../processors/cache/GridCacheAdapter.java | 43 +-- .../processors/cache/GridCacheGateway.java | 111 -- .../processors/cache/IgniteCacheProxy.java | 353 +++ .../datastreamer/DataStreamerCacheUpdaters.java | 2 +- .../datastreamer/DataStreamerImpl.java | 81 ++--- .../datastreamer/DataStreamerUpdateJob.java | 16 +- .../dr/IgniteDrDataStreamerCacheUpdater.java| 2 - .../GridCacheQuerySerializationSelfTest.java| 144 .../IgniteCacheQuerySelfTestSuite.java | 2 + 15 files changed, 585 insertions(+), 279 deletions(-) --
[20/32] incubator-ignite git commit: sp-3-p1 minor
sp-3-p1 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/63faf7f9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/63faf7f9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/63faf7f9
Branch: refs/heads/ignite-737
Commit: 63faf7f9222411e4a6b24c6624bc9c890e7f31d7
Parents: 30e318b
Author: Yakov Zhdanov
Authored: Thu Apr 16 19:39:27 2015 +0300
Committer: Yakov Zhdanov
Committed: Thu Apr 16 19:39:27 2015 +0300
--
.../processors/cache/GridCacheAdapter.java | 43
1 file changed, 18 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63faf7f9/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 30e3bc7..62dae3c 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
@@ -2102,7 +2102,7 @@ public abstract class GridCacheAdapter implements
GridCache,
validateCacheValue(val);
-return asyncOp(new AsyncOp(key) {
+return asyncOp(new AsyncOp() {
@Override public IgniteInternalFuture op(IgniteTxLocalAdapter
tx) {
return tx.putAllAsync(ctx, F.t(key, val), true, entry, ttl,
filter)
.chain((IgniteClosure, V>)RET2VAL);
@@ -2254,7 +2254,7 @@ public abstract class GridCacheAdapter implements
GridCache,
if (keyCheck)
validateCacheKey(key);
-IgniteInternalFuture fut = asyncOp(new AsyncInOp(key) {
+IgniteInternalFuture fut = asyncOp(new AsyncInOp() {
@Override public IgniteInternalFuture
inOp(IgniteTxLocalAdapter tx) {
Map> invokeMap =
Collections.singletonMap(key, (EntryProcessor) entryProcessor);
@@ -2407,7 +2407,7 @@ public abstract class GridCacheAdapter implements
GridCache,
validateCacheValue(val);
-return asyncOp(new AsyncOp(key) {
+return asyncOp(new AsyncOp() {
@Override public IgniteInternalFuture
op(IgniteTxLocalAdapter tx) {
return tx.putAllAsync(ctx, F.t(key, val), false, entry, ttl,
filter).chain(
(IgniteClosure,
Boolean>) RET2FLAG);
@@ -2466,7 +2466,7 @@ public abstract class GridCacheAdapter implements
GridCache,
validateCacheValue(val);
-IgniteInternalFuture fut = asyncOp(new AsyncOp(key) {
+IgniteInternalFuture fut = asyncOp(new AsyncOp() {
@Override public IgniteInternalFuture op(IgniteTxLocalAdapter
tx) {
return tx.putAllAsync(ctx, F.t(key, val), true, null, -1,
ctx.noValArray())
.chain((IgniteClosure, V>) RET2VAL);
@@ -2525,7 +2525,7 @@ public abstract class GridCacheAdapter implements
GridCache,
validateCacheValue(val);
-IgniteInternalFuture fut = asyncOp(new AsyncOp(key) {
+IgniteInternalFuture fut = asyncOp(new AsyncOp() {
@Override public IgniteInternalFuture
op(IgniteTxLocalAdapter tx) {
return tx.putAllAsync(ctx, F.t(key, val), false, null, -1,
ctx.noValArray()).chain(
(IgniteClosure,
Boolean>)RET2FLAG);
@@ -2575,7 +2575,7 @@ public abstract class GridCacheAdapter implements
GridCache,
validateCacheValue(val);
-IgniteInternalFuture fut = asyncOp(new AsyncOp(key) {
+IgniteInternalFuture fut = asyncOp(new AsyncOp() {
@Override public IgniteInternalFuture op(IgniteTxLocalAdapter
tx) {
return tx.putAllAsync(ctx, F.t(key, val), true, null, -1,
ctx.hasValArray()).chain(
(IgniteClosure,
V>)RET2VAL);
@@ -2621,7 +2621,7 @@ public abstract class GridCacheAdapter implements
GridCache,
validateCacheValue(val);
-return asyncOp(new AsyncOp(key) {
+return asyncOp(new AsyncOp() {
@Override public IgniteInternalFuture
op(IgniteTxLocalAdapter tx) {
return tx.putAllAsync(ctx, F.t(key, val), false, null, -1,
ctx.hasValArray()).chain(
(IgniteClosure,
Boolean>) RET2FLAG);
@@ -2675,7 +2675,7 @@ public abstract class GridCacheAdapter implements
GridCache,
validateCacheValue(newVal);
-IgniteInternalFuture fut = asyncOp(new AsyncOp(key) {
+IgniteInternalFuture fut = asyncOp(new AsyncOp() {
@Override
[24/32] incubator-ignite git commit: Merge branch 'ignite-754' into ignite-sprint-4
Merge branch 'ignite-754' into ignite-sprint-4 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/122f3ce3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/122f3ce3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/122f3ce3 Branch: refs/heads/ignite-737 Commit: 122f3ce3c4b031bd279c9b337721348b330f66c0 Parents: ca6675f 102de7b Author: Denis Magda Authored: Fri Apr 17 11:54:58 2015 +0300 Committer: Denis Magda Committed: Fri Apr 17 11:54:58 2015 +0300 -- .../discovery/GridDiscoveryManager.java | 28 1 file changed, 28 insertions(+) --
[21/32] incubator-ignite git commit: # IGNITE-753 CacheEntryImpl implements Externalizable + test.
# IGNITE-753 CacheEntryImpl implements Externalizable + 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/f2cc14c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f2cc14c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f2cc14c1
Branch: refs/heads/ignite-737
Commit: f2cc14c1ee805f841b41d51d73c2321e9c004226
Parents: 30e318b
Author: AKuznetsov
Authored: Fri Apr 17 07:09:51 2015 +0700
Committer: AKuznetsov
Committed: Fri Apr 17 07:09:51 2015 +0700
--
.../processors/cache/CacheEntryImpl.java| 29 +++-
.../GridCacheQuerySerializationSelfTest.java| 144 +++
.../IgniteCacheQuerySelfTestSuite.java | 2 +
3 files changed, 172 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2cc14c1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
index ebe5f09..3bd7ef4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
@@ -18,16 +18,27 @@
package org.apache.ignite.internal.processors.cache;
import javax.cache.*;
+import java.io.*;
/**
*
*/
-public class CacheEntryImpl implements Cache.Entry {
+public class CacheEntryImpl implements Cache.Entry, Externalizable
{
/** */
-private final K key;
+private static final long serialVersionUID = 0L;
/** */
-private final V val;
+private K key;
+
+/** */
+private V val;
+
+/**
+ * Required by {@link Externalizable}.
+ */
+public CacheEntryImpl() {
+// No-op.
+}
/**
* @param key Key.
@@ -58,6 +69,18 @@ public class CacheEntryImpl implements Cache.Entry {
}
/** {@inheritDoc} */
+@Override public void writeExternal(ObjectOutput out) throws IOException {
+out.writeObject(key);
+out.writeObject(val);
+}
+
+/** {@inheritDoc} */
+@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
+key = (K)in.readObject();
+val = (V)in.readObject();
+}
+
+/** {@inheritDoc} */
public String toString() {
return "Entry [key=" + key + ", val=" + val + ']';
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2cc14c1/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySerializationSelfTest.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySerializationSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySerializationSelfTest.java
new file mode 100644
index 000..d42a440
--- /dev/null
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySerializationSelfTest.java
@@ -0,0 +1,144 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.query.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.resources.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import javax.cache.*;
+import java.util.*;
+
+import static org.apache.ignite.cache.CacheMode.*;
+import st
[29/32] incubator-ignite git commit: #ignite-sprint-4: fix S3CheckpointManagerSelfTest.
#ignite-sprint-4: fix S3CheckpointManagerSelfTest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/11baaa8e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/11baaa8e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/11baaa8e
Branch: refs/heads/ignite-737
Commit: 11baaa8ec1c18aff11d360a846db8c47895c9cfd
Parents: afb553a
Author: ivasilinets
Authored: Fri Apr 17 18:05:44 2015 +0300
Committer: ivasilinets
Committed: Fri Apr 17 18:05:44 2015 +0300
--
.../ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java | 2 +-
.../ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/11baaa8e/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java
--
diff --git
a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java
b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java
index e6a4eec..a354e67 100644
---
a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java
+++
b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java
@@ -39,7 +39,7 @@ public class S3CheckpointManagerSelfTest extends
GridCheckpointManagerAbstractSe
spi.setAwsCredentials(cred);
-spi.setBucketNameSuffix("test");
+spi.setBucketNameSuffix("test-bucket");
cfg.setCheckpointSpi(spi);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/11baaa8e/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java
--
diff --git
a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java
b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java
index 6196d44..56f39de 100644
---
a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java
+++
b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java
@@ -39,7 +39,7 @@ public class S3SessionCheckpointSelfTest extends
GridSessionCheckpointAbstractSe
spi.setAwsCredentials(cred);
-spi.setBucketNameSuffix("test");
+spi.setBucketNameSuffix("test-bucket");
cfg.setCheckpointSpi(spi);
[26/32] incubator-ignite git commit: sp-3-p1 protected ping by busy lock
sp-3-p1 protected ping by busy lock
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ba96cba6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ba96cba6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ba96cba6
Branch: refs/heads/ignite-737
Commit: ba96cba6cd20a03a7659e91748a8ccfa2858773a
Parents: 63faf7f
Author: Yakov Zhdanov
Authored: Fri Apr 17 16:27:34 2015 +0300
Committer: Yakov Zhdanov
Committed: Fri Apr 17 16:27:34 2015 +0300
--
.../managers/discovery/GridDiscoveryManager.java | 15 ++-
1 file changed, 14 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba96cba6/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 9f74b83..3ad1594 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -173,6 +173,9 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
/** Map of dynamic cache filters. */
private Map registeredCaches = new HashMap<>();
+/** */
+private final GridSpinBusyLock busyLock = new GridSpinBusyLock();
+
/** @param ctx Context. */
public GridDiscoveryManager(GridKernalContext ctx) {
super(ctx, ctx.config().getDiscoverySpi());
@@ -914,6 +917,8 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
/** {@inheritDoc} */
@Override public void stop(boolean cancel) throws IgniteCheckedException {
+busyLock.block();
+
// Stop receiving notifications.
getSpi().setListener(null);
@@ -973,7 +978,15 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
public boolean pingNode(UUID nodeId) {
assert nodeId != null;
-return getSpi().pingNode(nodeId);
+if (!busyLock.enterBusy())
+return false;
+
+try {
+return getSpi().pingNode(nodeId);
+}
+finally {
+busyLock.leaveBusy();
+}
}
/**
[10/32] incubator-ignite git commit: #ignite-738: Fix async supported.
#ignite-738: Fix async supported.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/483b6208
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/483b6208
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/483b6208
Branch: refs/heads/ignite-737
Commit: 483b620856d36d482b8c6bbe59af29cd38c79666
Parents: a4143aa
Author: ivasilinets
Authored: Wed Apr 15 12:42:21 2015 +0300
Committer: ivasilinets
Committed: Wed Apr 15 12:42:21 2015 +0300
--
.../processors/cache/IgniteCacheProxy.java | 28 +---
1 file changed, 19 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/483b6208/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 2cda18a..2f2d70c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -41,8 +41,7 @@ import java.util.concurrent.locks.*;
/**
* Cache proxy.
*/
-public class IgniteCacheProxy extends AsyncSupportAdapter>
-implements IgniteCache, Externalizable {
+public class IgniteCacheProxy implements IgniteCache,
Externalizable {
/** */
private static final long serialVersionUID = 0L;
@@ -75,8 +74,6 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter prj,
boolean async
) {
-super(async);
-
assert ctx != null;
gate = ctx.gate();
@@ -144,6 +141,24 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter withAsync() {
+if (isAsync())
+return this;
+
+return new IgniteCacheProxy<>(context(), delegate(), prj, true);
+}
+
+/** {@inheritDoc} */
+@Override public boolean isAsync() {
+return lockFreeCache.isAsync();
+}
+
+/** {@inheritDoc} */
+@Override public IgniteFuture future() {
+return lockFreeCache.future();
+}
+
+/** {@inheritDoc} */
@Override public > C
getConfiguration(Class clazz) {
return lockFreeCache.getConfiguration(clazz);
}
@@ -794,11 +809,6 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter createAsyncInstance() {
-return lockFreeCache.createAsyncInstance();
-}
-
/**
* Creates projection that will operate with portable objects.
Projection returned by this method will force
* cache not to deserialize portable objects, so keys and values will be
returned from cache API methods without
[22/32] incubator-ignite git commit: # IGNITE-753 Fixed build.
# IGNITE-753 Fixed build.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6a6ca1a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6a6ca1a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6a6ca1a8
Branch: refs/heads/ignite-737
Commit: 6a6ca1a89b0de2fca584c3a4478113516c486d1c
Parents: f2cc14c
Author: AKuznetsov
Authored: Fri Apr 17 10:47:52 2015 +0700
Committer: AKuznetsov
Committed: Fri Apr 17 10:47:52 2015 +0700
--
.../cache/CacheVersionedEntryImpl.java | 29 +++-
1 file changed, 28 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6a6ca1a8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheVersionedEntryImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheVersionedEntryImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheVersionedEntryImpl.java
index 1b2fa50..59394f5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheVersionedEntryImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheVersionedEntryImpl.java
@@ -19,12 +19,24 @@ package org.apache.ignite.internal.processors.cache;
import org.jetbrains.annotations.*;
+import java.io.*;
+
/**
*
*/
public class CacheVersionedEntryImpl extends CacheEntryImpl {
+/** */
+private static final long serialVersionUID = 0L;
+
/** Version. */
-private final Object ver;
+private Object ver;
+
+/**
+ * Required by {@link Externalizable}.
+ */
+public CacheVersionedEntryImpl() {
+// No-op.
+}
/**
* @param key Key.
@@ -46,6 +58,21 @@ public class CacheVersionedEntryImpl extends
CacheEntryImpl {
return ver;
}
+
+/** {@inheritDoc} */
+@Override public void writeExternal(ObjectOutput out) throws IOException {
+super.writeExternal(out);
+
+out.writeObject(ver);
+}
+
+/** {@inheritDoc} */
+@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
+super.readExternal(in);
+
+ver = in.readObject();
+}
+
/** {@inheritDoc} */
public String toString() {
return "VersionedEntry [key=" + getKey() + ", val=" + getValue() + ",
ver=" + ver + ']';
[02/32] incubator-ignite git commit: #ignite-743: Implement IgniteCacheProxyLockFree.
#ignite-743: Implement IgniteCacheProxyLockFree.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/56ef2695
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/56ef2695
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/56ef2695
Branch: refs/heads/ignite-737
Commit: 56ef2695a429709388ffb13288524993f4f28d26
Parents: 196337a
Author: ivasilinets
Authored: Tue Apr 14 16:17:24 2015 +0300
Committer: ivasilinets
Committed: Tue Apr 14 16:17:24 2015 +0300
--
.../processors/cache/IgniteCacheProxy.java | 995 +++-
.../cache/IgniteCacheProxyLockFree.java | 1127 +-
.../datastreamer/DataStreamerUpdateJob.java |6 +-
3 files changed, 1304 insertions(+), 824 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/56ef2695/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 44a5dbe..dcdf0be 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -22,18 +22,11 @@ import org.apache.ignite.cache.CacheManager;
import org.apache.ignite.cache.*;
import org.apache.ignite.cache.query.*;
import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.processors.query.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.discovery.tcp.internal.*;
import org.jetbrains.annotations.*;
import javax.cache.*;
@@ -53,33 +46,15 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter ctx;
-
-/** Gateway. */
-private GridCacheGateway gate;
-
/** Delegate. */
@GridToStringInclude
-private GridCacheProjectionEx delegate;
+private IgniteCacheProxyLockFree delegate;
/** Projection. */
private GridCacheProjectionImpl prj;
-/** */
-@GridToStringExclude
-private GridCacheProxyImpl legacyProxy;
-
-/** */
-@GridToStringExclude
-private CacheManager cacheMgr;
+/** Gateway. */
+private GridCacheGateway gate;
/**
* Empty constructor required for {@link Externalizable}.
@@ -103,22 +78,26 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter(ctx, delegate, prj);
+this.prj = prj;
+
+this.delegate = new IgniteCacheProxyLockFree<>(ctx, delegate, prj,
async);
}
/**
* @return Context.
*/
public GridCacheContext context() {
-return ctx;
+return delegate.context();
+}
+
+/**
+ * @return Lock free instance.
+ */
+public IgniteCacheProxyLockFree lockFree() {
+return delegate;
}
/**
@@ -133,7 +112,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter prev = gate.enter(prj);
try {
-return ctx.cache().metrics();
+return delegate.metrics();
}
finally {
gate.leave(prev);
@@ -145,20 +124,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter prev = gate.enter(prj);
try {
-List metrics = new ArrayList<>(grp.nodes().size());
-
-for (ClusterNode node : grp.nodes()) {
-Map nodeCacheMetrics =
((TcpDiscoveryNode)node).cacheMetrics();
-
-if (nodeCacheMetrics != null) {
-CacheMetrics e = nodeCacheMetrics.get(context().cacheId());
-
-if (e != null)
-metrics.add(e);
-}
-}
-
-return new CacheMetricsSnapshot(ctx.cache().metrics(), metrics);
+return delegate.metrics(grp);
}
finally {
gate.leave(prev);
@@ -170,7 +136,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter prev = gate.enter(prj);
try {
-return ctx.cache().mxBean();
+return delegate.mxBean();
}
finally {
gate.leave(prev);
@@ -179,12 +145,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter> C
[14/32] incubator-ignite git commit: #ignite-743: Revert all.
#ignite-743: Revert all.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d0b5d850
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d0b5d850
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d0b5d850
Branch: refs/heads/ignite-737
Commit: d0b5d8502ec7a07a041a31d50e15fc85e68ac679
Parents: ecf963e
Author: ivasilinets
Authored: Wed Apr 15 17:11:04 2015 +0300
Committer: ivasilinets
Committed: Wed Apr 15 17:11:04 2015 +0300
--
.../processors/cache/GridCacheGateway.java | 128 +-
.../processors/cache/IgniteCacheProxy.java | 1217 ++
.../cache/IgniteCacheProxyLockFree.java | 1153 -
.../datastreamer/DataStreamerImpl.java |9 +-
.../datastreamer/DataStreamerUpdateJob.java |4 +-
5 files changed, 1059 insertions(+), 1452 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0b5d850/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
index 4868b3f..97fada9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
@@ -69,8 +69,7 @@ public class GridCacheGateway {
* @return {@code true} if enter successful, {@code false} if the cache or
the node was stopped.
*/
public boolean enterIfNotClosed() {
-if (ctx.deploymentEnabled())
-ctx.deploy().onEnter();
+enterIfNotClosedNoLock();
// Must unlock in case of unexpected errors to avoid
// deadlocks during kernal stop.
@@ -86,16 +85,35 @@ public class GridCacheGateway {
}
/**
+ * Enter a cache call without lock.
+ *
+ * @return {@code true} if enter successful, {@code false} if the cache or
the node was stopped.
+ */
+public boolean enterIfNotClosedNoLock() {
+if (ctx.deploymentEnabled())
+ctx.deploy().onEnter();
+
+return !stopped;
+}
+
+/**
+ * Leave a cache call entered by {@link #enter()} method.
+ */
+public void leaveNoLock() {
+ctx.tm().resetContext();
+ctx.mvcc().contextReset();
+
+// Unwind eviction notifications.
+if (!ctx.shared().closed(ctx))
+CU.unwindEvicts(ctx);
+}
+
+/**
* Leave a cache call entered by {@link #enter()} method.
*/
public void leave() {
try {
-ctx.tm().resetContext();
-ctx.mvcc().contextReset();
-
-// Unwind eviction notifications.
-if (!ctx.shared().closed(ctx))
-CU.unwindEvicts(ctx);
+ leaveNoLock();
}
finally {
rwLock.readUnlock();
@@ -107,6 +125,45 @@ public class GridCacheGateway {
* @return Previous projection set on this thread.
*/
@Nullable public GridCacheProjectionImpl enter(@Nullable
GridCacheProjectionImpl prj) {
+onEnter();
+
+rwLock.readLock();
+
+if (stopped) {
+rwLock.readUnlock();
+
+throw new IllegalStateException("Dynamic cache has been stopped: "
+ ctx.name());
+}
+
+// Must unlock in case of unexpected errors to avoid
+// deadlocks during kernal stop.
+try {
+return setProjectionPerCall(prj);
+}
+catch (RuntimeException e) {
+rwLock.readUnlock();
+
+throw e;
+}
+}
+
+/**
+ * @param prj Projection to guard.
+ * @return Previous projection set on this thread.
+ */
+@Nullable public GridCacheProjectionImpl enterNoLock(@Nullable
GridCacheProjectionImpl prj) {
+onEnter();
+
+if (stopped)
+throw new IllegalStateException("Dynamic cache has been stopped: "
+ ctx.name());
+
+return setProjectionPerCall(prj);
+}
+
+/**
+ * On enter.
+ */
+private void onEnter() {
try {
ctx.itHolder().checkWeakQueue();
@@ -127,50 +184,47 @@ public class GridCacheGateway {
if (ctx.deploymentEnabled())
ctx.deploy().onEnter();
+}
-rwLock.readLock();
+/**
+ * Set thread local projection per call.
+ *
+ * @param prj Projection to guard.
+ * @return Previous projection set on this thread.
+ */
+private GridCacheProjectionImpl setProjectionPerCall(@Nullable
GridCacheProjectionImpl prj) {
+
[23/32] incubator-ignite git commit: ignite-754: minor fixes after the first review round
ignite-754: minor fixes after the first review round
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/102de7b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/102de7b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/102de7b5
Branch: refs/heads/ignite-737
Commit: 102de7b5386a97cf211b100695b30fdcf10d1351
Parents: f6a0864
Author: Denis Magda
Authored: Fri Apr 17 11:53:19 2015 +0300
Committer: Denis Magda
Committed: Fri Apr 17 11:53:19 2015 +0300
--
.../managers/discovery/GridDiscoveryManager.java| 16 ++--
1 file changed, 10 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/102de7b5/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 27f62b2..e7c86f5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -738,18 +738,18 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
Object locMode = locNode.attribute(ATTR_DEPLOYMENT_MODE);
-int locJvmMajVer = nodeJavaMajorVer(locNode);
+int locJvmMajVer = nodeJavaMajorVersion(locNode);
boolean locP2pEnabled = locNode.attribute(ATTR_PEER_CLASSLOADING);
boolean warned = false;
for (ClusterNode n : nodes) {
-int rmtJvmMajVer = nodeJavaMajorVer(n);
+int rmtJvmMajVer = nodeJavaMajorVersion(n);
if (locJvmMajVer != rmtJvmMajVer)
-throw new IgniteCheckedException("Local node's java major
version = " + locJvmMajVer +
-" is different from remote node's one = " + rmtJvmMajVer);
+throw new IgniteCheckedException("Local node's java major
version is different from remote node's one" +
+" [locJvmMajVer=" + locJvmMajVer + ", rmtJvmMajVer=" +
rmtJvmMajVer + "]");
String rmtPreferIpV4 = n.attribute("java.net.preferIPv4Stack");
@@ -798,12 +798,16 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
* @return Java major version.
* @throws IgniteCheckedException If failed to get the version.
*/
-private int nodeJavaMajorVer(ClusterNode node) throws
IgniteCheckedException {
+private int nodeJavaMajorVersion(ClusterNode node) throws
IgniteCheckedException {
try {
+// The format is identical for Oracle JDK, OpenJDK and IBM JDK.
return
Integer.parseInt(node.attribute("java.version").split("\\.")[1]);
}
catch (Exception e) {
-throw new IgniteCheckedException("Failed to get java major version
with reason: " + e.getMessage());
+U.error(log, "Failed to get java major version (unknown
'java.version' format) [ver=" +
+node.attribute("java.version") + "]", e);
+
+return 0;
}
}
[11/32] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-743
Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-743 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8ee275f6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8ee275f6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8ee275f6 Branch: refs/heads/ignite-737 Commit: 8ee275f6904b2b7058eb712da9eb7b7342d7ca51 Parents: 483b620 2b0ec46 Author: ivasilinets Authored: Wed Apr 15 13:19:13 2015 +0300 Committer: ivasilinets Committed: Wed Apr 15 13:19:13 2015 +0300 -- DEVNOTES.txt| 4 +- assembly/dependencies-fabric.xml| 50 + assembly/dependencies-hadoop.xml| 1 - assembly/dependencies-optional-fabric.xml | 82 -- assembly/dependencies-optional-hadoop.xml | 83 -- assembly/release-base.xml | 5 - assembly/release-fabric.xml | 5 + examples/pom.xml| 2 +- .../hibernate/CacheHibernateStoreExample.java | 3 - .../store/jdbc/CacheJdbcStoreExample.java | 3 - modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/codegen/pom.xml | 14 ++- modules/core/pom.xml| 2 +- .../apache/ignite/IgniteSystemProperties.java | 6 - .../internal/managers/GridManagerAdapter.java | 4 + .../discovery/GridDiscoveryManager.java | 14 +++ .../dht/GridPartitionedGetFuture.java | 20 +++- .../distributed/near/GridNearGetFuture.java | 20 +++- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 5 + .../org/apache/ignite/spi/IgniteSpiContext.java | 6 + .../communication/tcp/TcpCommunicationSpi.java | 70 ++-- .../tcp/TcpCommunicationSpiMBean.java | 9 -- .../ignite/spi/discovery/DiscoverySpi.java | 7 ++ .../discovery/tcp/TcpClientDiscoverySpi.java| 12 ++ .../spi/discovery/tcp/TcpDiscoverySpi.java | 32 +- ...ridFailFastNodeFailureDetectionSelfTest.java | 112 +++ .../GridCacheAbstractFailoverSelfTest.java | 7 +- .../cache/GridCachePutAllFailoverSelfTest.java | 2 +- .../processors/cache/GridCachePutAllTask.java | 31 - .../testframework/GridSpiTestContext.java | 5 + .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../testsuites/IgniteCacheRestartTestSuite.java | 2 +- modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml| 2 +- .../processors/query/h2/IgniteH2Indexing.java | 3 +- modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml| 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 43 +++ 58 files changed, 412 insertions(+), 303 deletions(-) --
[27/32] incubator-ignite git commit: sp-3-p1 minor
sp-3-p1 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/54390af4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/54390af4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/54390af4
Branch: refs/heads/ignite-737
Commit: 54390af4d3fdf7941f570e51f0f6d3fa417fa69d
Parents: ba96cba
Author: Yakov Zhdanov
Authored: Fri Apr 17 16:28:12 2015 +0300
Committer: Yakov Zhdanov
Committed: Fri Apr 17 16:28:12 2015 +0300
--
.../ignite/internal/managers/discovery/GridDiscoveryManager.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54390af4/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 3ad1594..1c70fb2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -912,7 +912,8 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
}
if (!locJoinEvt.isDone())
-locJoinEvt.onDone(new IgniteCheckedException("Failed to wait for
local node joined event (grid is stopping)."));
+locJoinEvt.onDone(
+new IgniteCheckedException("Failed to wait for local node
joined event (grid is stopping)."));
}
/** {@inheritDoc} */
[28/32] incubator-ignite git commit: #ignite-sprint-4: fix S3CheckpointSpiSelfTest.
#ignite-sprint-4: fix S3CheckpointSpiSelfTest. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/afb553a6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/afb553a6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/afb553a6 Branch: refs/heads/ignite-737 Commit: afb553a683c0c98ab21754642c4ba92ca6afd9dd Parents: 357a715 Author: ivasilinets Authored: Fri Apr 17 17:45:16 2015 +0300 Committer: ivasilinets Committed: Fri Apr 17 17:45:16 2015 +0300 -- .../apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afb553a6/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java -- diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java index bb92e09..5cf0f2e 100644 --- a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java +++ b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java @@ -48,7 +48,7 @@ public class S3CheckpointSpiSelfTest extends GridSpiAbstractTest
incubator-ignite git commit: #IGNITE-80 Debug
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-80 848a2527e -> e7b162971
#IGNITE-80 Debug
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e7b16297
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e7b16297
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e7b16297
Branch: refs/heads/ignite-80
Commit: e7b162971573bc5b7a888287b663ac32a89c458a
Parents: 848a252
Author: Alexey Goncharuk
Authored: Sun Apr 19 20:13:48 2015 -0700
Committer: Alexey Goncharuk
Committed: Sun Apr 19 20:13:48 2015 -0700
--
.../internal/processors/cache/GridCacheIoManager.java| 11 ---
.../internal/processors/cache/GridCacheProcessor.java| 2 --
.../cache/distributed/dht/GridDhtLockFuture.java | 10 --
.../dht/GridDhtTransactionalCacheAdapter.java| 3 ---
.../dht/colocated/GridDhtColocatedLockFuture.java| 2 --
.../dht/preloader/GridDhtPartitionsExchangeFuture.java | 8
.../cache/distributed/near/GridNearLockFuture.java | 5 -
.../cache/distributed/near/GridNearTxPrepareFuture.java | 3 ---
8 files changed, 44 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e7b16297/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index c395cdd..f10f241 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -95,9 +95,6 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
}
}
else {
-GridDebug.debug("Received unordered cache communication
message [nodeId=" + nodeId +
-", locId=" + cctx.localNodeId() + ", msg=" + msg + ']');
-
AffinityTopologyVersion locAffVer =
cctx.exchange().readyAffinityVersion();
AffinityTopologyVersion rmtAffVer = cacheMsg.topologyVersion();
@@ -107,9 +104,6 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
", locTopVer=" + locAffVer + ", rmtTopVer=" +
rmtAffVer + ']');
fut = cctx.exchange().affinityReadyFuture(rmtAffVer);
-
-GridDebug.debug("Received message has higher affinity
topology version [msg=" + msg +
-", locTopVer=" + locAffVer + ", rmtTopVer=" +
rmtAffVer + ", waitFut=" + fut + ']');
}
}
@@ -148,13 +142,8 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
c = clsHandlers.get(new ListenerKey(cacheMsg.cacheId(),
cacheMsg.getClass()));
if (c == null) {
-if (log.isDebugEnabled())
-log.debug("Received message without registered handler (will
ignore) [msg=" + cacheMsg +
-", nodeId=" + nodeId + ']');
U.warn(log, "Received message without registered handler (will
ignore) [msg=" + cacheMsg +
", nodeId=" + nodeId + ']');
-GridDebug.debug("Received message without registered handler (will
ignore) [msg=" + cacheMsg +
-", nodeId=" + nodeId + ']');
return;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e7b16297/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 1306f59..fb7e0ac 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -907,8 +907,6 @@ public class GridCacheProcessor extends
GridProcessorAdapter {
cacheCtx.onStarted();
-GridDebug.debug("Started cache [locNodeId=" + cacheCtx.localNodeId() +
", cacheId=" + cacheCtx.cacheId() + ']');
-
if (log.isInfoEnabled())
log.info("Started cache [name=" + U.maskName(cfg.getName()) + ",
mode=" + cfg.getCacheMode() + ']');
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e7b16297/modules/c
incubator-ignite git commit: #ignite-758: Fix NPE.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-758 c4b870882 -> 1550bf86e
#ignite-758: Fix NPE.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1550bf86
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1550bf86
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1550bf86
Branch: refs/heads/ignite-758
Commit: 1550bf86e4e0ed6075109d8481cdfa21ace85c21
Parents: c4b8708
Author: ivasilinets
Authored: Mon Apr 20 09:26:58 2015 +0300
Committer: ivasilinets
Committed: Mon Apr 20 09:26:58 2015 +0300
--
.../apache/ignite/internal/processors/cache/GridCacheAdapter.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1550bf86/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 085fc40..a9201d1 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
@@ -3675,7 +3675,8 @@ public abstract class GridCacheAdapter implements
IgniteInternalCache> localIteratorHonorExpirePolicy(final
CacheOperationContext opCtx) {
return F.iterator(iterator(),
new IgniteClosure, Cache.Entry>() {
-private IgniteCacheExpiryPolicy expiryPlc =
ctx.cache().expiryPolicy(opCtx.expiry());
+private IgniteCacheExpiryPolicy expiryPlc =
+ctx.cache().expiryPolicy(opCtx != null ?
opCtx.expiry() : null);
@Override public Cache.Entry apply(Cache.Entry
lazyEntry) {
CacheOperationContext prev = ctx.gate().enter(opCtx);
[02/10] incubator-ignite git commit: # IGNITE-753 CacheEntryImpl implements Externalizable + test.
# IGNITE-753 CacheEntryImpl implements Externalizable + 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/f2cc14c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f2cc14c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f2cc14c1
Branch: refs/heads/ignite-758
Commit: f2cc14c1ee805f841b41d51d73c2321e9c004226
Parents: 30e318b
Author: AKuznetsov
Authored: Fri Apr 17 07:09:51 2015 +0700
Committer: AKuznetsov
Committed: Fri Apr 17 07:09:51 2015 +0700
--
.../processors/cache/CacheEntryImpl.java| 29 +++-
.../GridCacheQuerySerializationSelfTest.java| 144 +++
.../IgniteCacheQuerySelfTestSuite.java | 2 +
3 files changed, 172 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2cc14c1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
index ebe5f09..3bd7ef4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
@@ -18,16 +18,27 @@
package org.apache.ignite.internal.processors.cache;
import javax.cache.*;
+import java.io.*;
/**
*
*/
-public class CacheEntryImpl implements Cache.Entry {
+public class CacheEntryImpl implements Cache.Entry, Externalizable
{
/** */
-private final K key;
+private static final long serialVersionUID = 0L;
/** */
-private final V val;
+private K key;
+
+/** */
+private V val;
+
+/**
+ * Required by {@link Externalizable}.
+ */
+public CacheEntryImpl() {
+// No-op.
+}
/**
* @param key Key.
@@ -58,6 +69,18 @@ public class CacheEntryImpl implements Cache.Entry {
}
/** {@inheritDoc} */
+@Override public void writeExternal(ObjectOutput out) throws IOException {
+out.writeObject(key);
+out.writeObject(val);
+}
+
+/** {@inheritDoc} */
+@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
+key = (K)in.readObject();
+val = (V)in.readObject();
+}
+
+/** {@inheritDoc} */
public String toString() {
return "Entry [key=" + key + ", val=" + val + ']';
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2cc14c1/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySerializationSelfTest.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySerializationSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySerializationSelfTest.java
new file mode 100644
index 000..d42a440
--- /dev/null
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySerializationSelfTest.java
@@ -0,0 +1,144 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.query.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.resources.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import javax.cache.*;
+import java.util.*;
+
+import static org.apache.ignite.cache.CacheMode.*;
+import st
[09/10] incubator-ignite git commit: Merge branch 'ignite-sprint-3-p1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-4
Merge branch 'ignite-sprint-3-p1' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-4
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5049704d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5049704d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5049704d
Branch: refs/heads/ignite-758
Commit: 5049704da5742ab7e4215f66a699dce62df357db
Parents: 11baaa8 9934af1
Author: AKuznetsov
Authored: Fri Apr 17 22:24:38 2015 +0700
Committer: AKuznetsov
Committed: Fri Apr 17 22:24:38 2015 +0700
--
.../discovery/GridDiscoveryManager.java | 18 ++-
.../processors/cache/CacheEntryImpl.java| 29 +++-
.../cache/CacheVersionedEntryImpl.java | 29 +++-
.../processors/cache/GridCacheAdapter.java | 43 +++---
.../GridCacheQuerySerializationSelfTest.java| 144 +++
.../IgniteCacheQuerySelfTestSuite.java | 2 +
6 files changed, 234 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5049704d/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5049704d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 71d3c0d,62dae3c..81cdf02
---
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
@@@ -2020,9 -2102,9 +2020,9 @@@ public abstract class GridCacheAdapter<
validateCacheValue(val);
- return asyncOp(new AsyncOp(key) {
+ return asyncOp(new AsyncOp() {
@Override public IgniteInternalFuture op(IgniteTxLocalAdapter
tx) {
-return tx.putAllAsync(ctx, F.t(key, val), true, entry, ttl,
filter)
+return tx.putAllAsync(ctx, F.t(key, val), true, null, -1,
filter)
.chain((IgniteClosure, V>)RET2VAL);
}
@@@ -2352,9 -2407,9 +2352,9 @@@
validateCacheValue(val);
- return asyncOp(new AsyncOp(key) {
+ return asyncOp(new AsyncOp() {
@Override public IgniteInternalFuture
op(IgniteTxLocalAdapter tx) {
-return tx.putAllAsync(ctx, F.t(key, val), false, entry, ttl,
filter).chain(
+return tx.putAllAsync(ctx, F.t(key, val), false, null, -1,
filter).chain(
(IgniteClosure,
Boolean>) RET2FLAG);
}
@@@ -2739,10 -2818,10 +2739,10 @@@
if (keyCheck)
validateCacheKey(key);
- IgniteInternalFuture fut = asyncOp(new AsyncOp(key) {
+ IgniteInternalFuture fut = asyncOp(new AsyncOp() {
@Override public IgniteInternalFuture op(IgniteTxLocalAdapter
tx) {
// TODO should we invoke interceptor here?
-return tx.removeAllAsync(ctx, Collections.singletonList(key),
null, true, filter)
+return tx.removeAllAsync(ctx, Collections.singletonList(key),
null, true, CU.empty0())
.chain((IgniteClosure, V>) RET2VAL);
}
@@@ -2862,9 -2956,9 +2862,9 @@@
if (keyCheck)
validateCacheKey(key);
- IgniteInternalFuture fut = asyncOp(new AsyncOp(key)
{
+ IgniteInternalFuture fut = asyncOp(new AsyncOp() {
@Override public IgniteInternalFuture
op(IgniteTxLocalAdapter tx) {
-return tx.removeAllAsync(ctx, Collections.singletonList(key),
entry, false, filter).chain(
+return tx.removeAllAsync(ctx, Collections.singletonList(key),
null, false, filter).chain(
(IgniteClosure,
Boolean>)RET2FLAG);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5049704d/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
--
[04/10] incubator-ignite git commit: sp-3-p1 protected ping by busy lock
sp-3-p1 protected ping by busy lock
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ba96cba6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ba96cba6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ba96cba6
Branch: refs/heads/ignite-758
Commit: ba96cba6cd20a03a7659e91748a8ccfa2858773a
Parents: 63faf7f
Author: Yakov Zhdanov
Authored: Fri Apr 17 16:27:34 2015 +0300
Committer: Yakov Zhdanov
Committed: Fri Apr 17 16:27:34 2015 +0300
--
.../managers/discovery/GridDiscoveryManager.java | 15 ++-
1 file changed, 14 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba96cba6/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 9f74b83..3ad1594 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -173,6 +173,9 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
/** Map of dynamic cache filters. */
private Map registeredCaches = new HashMap<>();
+/** */
+private final GridSpinBusyLock busyLock = new GridSpinBusyLock();
+
/** @param ctx Context. */
public GridDiscoveryManager(GridKernalContext ctx) {
super(ctx, ctx.config().getDiscoverySpi());
@@ -914,6 +917,8 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
/** {@inheritDoc} */
@Override public void stop(boolean cancel) throws IgniteCheckedException {
+busyLock.block();
+
// Stop receiving notifications.
getSpi().setListener(null);
@@ -973,7 +978,15 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
public boolean pingNode(UUID nodeId) {
assert nodeId != null;
-return getSpi().pingNode(nodeId);
+if (!busyLock.enterBusy())
+return false;
+
+try {
+return getSpi().pingNode(nodeId);
+}
+finally {
+busyLock.leaveBusy();
+}
}
/**
[10/10] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-758
Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-758 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1b90b4e9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1b90b4e9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1b90b4e9 Branch: refs/heads/ignite-758 Commit: 1b90b4e97084947216f27ee0d347ed37c518f4c8 Parents: 1550bf8 5049704 Author: ivasilinets Authored: Mon Apr 20 09:28:09 2015 +0300 Committer: ivasilinets Committed: Mon Apr 20 09:28:09 2015 +0300 -- .../s3/S3CheckpointManagerSelfTest.java | 2 +- .../checkpoint/s3/S3CheckpointSpiSelfTest.java | 2 +- .../s3/S3SessionCheckpointSelfTest.java | 2 +- .../discovery/GridDiscoveryManager.java | 18 ++- .../processors/cache/CacheEntryImpl.java| 29 +++- .../cache/CacheVersionedEntryImpl.java | 29 +++- .../processors/cache/GridCacheAdapter.java | 43 +++--- .../GridCacheQuerySerializationSelfTest.java| 144 +++ .../IgniteCacheQuerySelfTestSuite.java | 2 + 9 files changed, 237 insertions(+), 34 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1b90b4e9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java --
[08/10] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-3-p1' into ignite-sprint-3-p1
Merge remote-tracking branch 'origin/ignite-sprint-3-p1' into ignite-sprint-3-p1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9934af12 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9934af12 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9934af12 Branch: refs/heads/ignite-758 Commit: 9934af1278bdda620429b8d278b19e3e144b65aa Parents: 6a6ca1a 54390af Author: AKuznetsov Authored: Fri Apr 17 22:22:02 2015 +0700 Committer: AKuznetsov Committed: Fri Apr 17 22:22:02 2015 +0700 -- .../discovery/GridDiscoveryManager.java | 18 +++- .../processors/cache/GridCacheAdapter.java | 43 2 files changed, 34 insertions(+), 27 deletions(-) --
[01/10] incubator-ignite git commit: sp-3-p1 minor
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-758 1550bf86e -> 1b90b4e97
sp-3-p1 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/63faf7f9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/63faf7f9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/63faf7f9
Branch: refs/heads/ignite-758
Commit: 63faf7f9222411e4a6b24c6624bc9c890e7f31d7
Parents: 30e318b
Author: Yakov Zhdanov
Authored: Thu Apr 16 19:39:27 2015 +0300
Committer: Yakov Zhdanov
Committed: Thu Apr 16 19:39:27 2015 +0300
--
.../processors/cache/GridCacheAdapter.java | 43
1 file changed, 18 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63faf7f9/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 30e3bc7..62dae3c 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
@@ -2102,7 +2102,7 @@ public abstract class GridCacheAdapter implements
GridCache,
validateCacheValue(val);
-return asyncOp(new AsyncOp(key) {
+return asyncOp(new AsyncOp() {
@Override public IgniteInternalFuture op(IgniteTxLocalAdapter
tx) {
return tx.putAllAsync(ctx, F.t(key, val), true, entry, ttl,
filter)
.chain((IgniteClosure, V>)RET2VAL);
@@ -2254,7 +2254,7 @@ public abstract class GridCacheAdapter implements
GridCache,
if (keyCheck)
validateCacheKey(key);
-IgniteInternalFuture fut = asyncOp(new AsyncInOp(key) {
+IgniteInternalFuture fut = asyncOp(new AsyncInOp() {
@Override public IgniteInternalFuture
inOp(IgniteTxLocalAdapter tx) {
Map> invokeMap =
Collections.singletonMap(key, (EntryProcessor) entryProcessor);
@@ -2407,7 +2407,7 @@ public abstract class GridCacheAdapter implements
GridCache,
validateCacheValue(val);
-return asyncOp(new AsyncOp(key) {
+return asyncOp(new AsyncOp() {
@Override public IgniteInternalFuture
op(IgniteTxLocalAdapter tx) {
return tx.putAllAsync(ctx, F.t(key, val), false, entry, ttl,
filter).chain(
(IgniteClosure,
Boolean>) RET2FLAG);
@@ -2466,7 +2466,7 @@ public abstract class GridCacheAdapter implements
GridCache,
validateCacheValue(val);
-IgniteInternalFuture fut = asyncOp(new AsyncOp(key) {
+IgniteInternalFuture fut = asyncOp(new AsyncOp() {
@Override public IgniteInternalFuture op(IgniteTxLocalAdapter
tx) {
return tx.putAllAsync(ctx, F.t(key, val), true, null, -1,
ctx.noValArray())
.chain((IgniteClosure, V>) RET2VAL);
@@ -2525,7 +2525,7 @@ public abstract class GridCacheAdapter implements
GridCache,
validateCacheValue(val);
-IgniteInternalFuture fut = asyncOp(new AsyncOp(key) {
+IgniteInternalFuture fut = asyncOp(new AsyncOp() {
@Override public IgniteInternalFuture
op(IgniteTxLocalAdapter tx) {
return tx.putAllAsync(ctx, F.t(key, val), false, null, -1,
ctx.noValArray()).chain(
(IgniteClosure,
Boolean>)RET2FLAG);
@@ -2575,7 +2575,7 @@ public abstract class GridCacheAdapter implements
GridCache,
validateCacheValue(val);
-IgniteInternalFuture fut = asyncOp(new AsyncOp(key) {
+IgniteInternalFuture fut = asyncOp(new AsyncOp() {
@Override public IgniteInternalFuture op(IgniteTxLocalAdapter
tx) {
return tx.putAllAsync(ctx, F.t(key, val), true, null, -1,
ctx.hasValArray()).chain(
(IgniteClosure,
V>)RET2VAL);
@@ -2621,7 +2621,7 @@ public abstract class GridCacheAdapter implements
GridCache,
validateCacheValue(val);
-return asyncOp(new AsyncOp(key) {
+return asyncOp(new AsyncOp() {
@Override public IgniteInternalFuture
op(IgniteTxLocalAdapter tx) {
return tx.putAllAsync(ctx, F.t(key, val), false, null, -1,
ctx.hasValArray()).chain(
(IgniteClosure,
Boolean>) RET2FLAG);
@@ -2675,7 +2675,7 @@ public abstract class GridCacheAdapter implements
GridCache,
validateCacheValue(newVal);
-IgniteInternalFuture fut = asyncOp(new As
[05/10] incubator-ignite git commit: sp-3-p1 minor
sp-3-p1 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/54390af4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/54390af4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/54390af4
Branch: refs/heads/ignite-758
Commit: 54390af4d3fdf7941f570e51f0f6d3fa417fa69d
Parents: ba96cba
Author: Yakov Zhdanov
Authored: Fri Apr 17 16:28:12 2015 +0300
Committer: Yakov Zhdanov
Committed: Fri Apr 17 16:28:12 2015 +0300
--
.../ignite/internal/managers/discovery/GridDiscoveryManager.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54390af4/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 3ad1594..1c70fb2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -912,7 +912,8 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
}
if (!locJoinEvt.isDone())
-locJoinEvt.onDone(new IgniteCheckedException("Failed to wait for
local node joined event (grid is stopping)."));
+locJoinEvt.onDone(
+new IgniteCheckedException("Failed to wait for local node
joined event (grid is stopping)."));
}
/** {@inheritDoc} */
[07/10] incubator-ignite git commit: #ignite-sprint-4: fix S3CheckpointManagerSelfTest.
#ignite-sprint-4: fix S3CheckpointManagerSelfTest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/11baaa8e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/11baaa8e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/11baaa8e
Branch: refs/heads/ignite-758
Commit: 11baaa8ec1c18aff11d360a846db8c47895c9cfd
Parents: afb553a
Author: ivasilinets
Authored: Fri Apr 17 18:05:44 2015 +0300
Committer: ivasilinets
Committed: Fri Apr 17 18:05:44 2015 +0300
--
.../ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java | 2 +-
.../ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/11baaa8e/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java
--
diff --git
a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java
b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java
index e6a4eec..a354e67 100644
---
a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java
+++
b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java
@@ -39,7 +39,7 @@ public class S3CheckpointManagerSelfTest extends
GridCheckpointManagerAbstractSe
spi.setAwsCredentials(cred);
-spi.setBucketNameSuffix("test");
+spi.setBucketNameSuffix("test-bucket");
cfg.setCheckpointSpi(spi);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/11baaa8e/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java
--
diff --git
a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java
b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java
index 6196d44..56f39de 100644
---
a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java
+++
b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java
@@ -39,7 +39,7 @@ public class S3SessionCheckpointSelfTest extends
GridSessionCheckpointAbstractSe
spi.setAwsCredentials(cred);
-spi.setBucketNameSuffix("test");
+spi.setBucketNameSuffix("test-bucket");
cfg.setCheckpointSpi(spi);
[03/10] incubator-ignite git commit: # IGNITE-753 Fixed build.
# IGNITE-753 Fixed build.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6a6ca1a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6a6ca1a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6a6ca1a8
Branch: refs/heads/ignite-758
Commit: 6a6ca1a89b0de2fca584c3a4478113516c486d1c
Parents: f2cc14c
Author: AKuznetsov
Authored: Fri Apr 17 10:47:52 2015 +0700
Committer: AKuznetsov
Committed: Fri Apr 17 10:47:52 2015 +0700
--
.../cache/CacheVersionedEntryImpl.java | 29 +++-
1 file changed, 28 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6a6ca1a8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheVersionedEntryImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheVersionedEntryImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheVersionedEntryImpl.java
index 1b2fa50..59394f5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheVersionedEntryImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheVersionedEntryImpl.java
@@ -19,12 +19,24 @@ package org.apache.ignite.internal.processors.cache;
import org.jetbrains.annotations.*;
+import java.io.*;
+
/**
*
*/
public class CacheVersionedEntryImpl extends CacheEntryImpl {
+/** */
+private static final long serialVersionUID = 0L;
+
/** Version. */
-private final Object ver;
+private Object ver;
+
+/**
+ * Required by {@link Externalizable}.
+ */
+public CacheVersionedEntryImpl() {
+// No-op.
+}
/**
* @param key Key.
@@ -46,6 +58,21 @@ public class CacheVersionedEntryImpl extends
CacheEntryImpl {
return ver;
}
+
+/** {@inheritDoc} */
+@Override public void writeExternal(ObjectOutput out) throws IOException {
+super.writeExternal(out);
+
+out.writeObject(ver);
+}
+
+/** {@inheritDoc} */
+@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
+super.readExternal(in);
+
+ver = in.readObject();
+}
+
/** {@inheritDoc} */
public String toString() {
return "VersionedEntry [key=" + getKey() + ", val=" + getValue() + ",
ver=" + ver + ']';
[06/10] incubator-ignite git commit: #ignite-sprint-4: fix S3CheckpointSpiSelfTest.
#ignite-sprint-4: fix S3CheckpointSpiSelfTest. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/afb553a6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/afb553a6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/afb553a6 Branch: refs/heads/ignite-758 Commit: afb553a683c0c98ab21754642c4ba92ca6afd9dd Parents: 357a715 Author: ivasilinets Authored: Fri Apr 17 17:45:16 2015 +0300 Committer: ivasilinets Committed: Fri Apr 17 17:45:16 2015 +0300 -- .../apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afb553a6/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java -- diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java index bb92e09..5cf0f2e 100644 --- a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java +++ b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java @@ -48,7 +48,7 @@ public class S3CheckpointSpiSelfTest extends GridSpiAbstractTest
[31/42] incubator-ignite git commit: Merge branch 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-4
Merge branch 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-4 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ca6675f4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ca6675f4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ca6675f4 Branch: refs/heads/ignite-gg-9613 Commit: ca6675f4d0ee1a65b21bce835ff38b631188808a Parents: ffddb3e 338e803 Author: S.Vladykin Authored: Fri Apr 17 11:33:02 2015 +0300 Committer: S.Vladykin Committed: Fri Apr 17 11:33:02 2015 +0300 -- .../apache/ignite/cache/query/QueryMetrics.java | 4 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/GridCacheAtomicFuture.java | 7 - .../cache/GridCacheProjectionImpl.java | 4 +- .../processors/cache/GridCacheProxyImpl.java| 4 +- .../processors/cache/IgniteCacheProxy.java | 5 +- .../dht/atomic/GridDhtAtomicCache.java | 51 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 19 - .../dht/atomic/GridNearAtomicUpdateFuture.java | 14 - .../processors/cache/query/CacheQueries.java| 98 ++-- .../cache/query/CacheQueriesImpl.java | 142 ++ .../cache/query/CacheQueriesProxy.java | 200 .../processors/cache/query/CacheQuery.java | 7 +- .../cache/query/GridCacheQueriesEx.java | 68 --- .../cache/query/GridCacheQueriesImpl.java | 217 - .../cache/query/GridCacheQueriesProxy.java | 285 --- .../jdbc/GridCacheQueryJdbcMetadataTask.java| 2 +- .../datastreamer/DataStreamerCacheUpdaters.java | 12 +- .../processors/rest/GridRestCommand.java| 11 +- .../processors/rest/GridRestProcessor.java | 9 - .../message/GridClientCacheQueryRequest.java| 366 -- .../cache/GridCacheClientQueryResult.java | 97 .../cache/GridCacheQueryCommandHandler.java | 480 --- .../protocols/tcp/GridTcpRestNioListener.java | 24 - .../rest/request/GridRestCacheQueryRequest.java | 143 -- .../visor/cache/VisorCacheMetadataTask.java | 2 +- .../internal/GridLifecycleBeanSelfTest.java | 36 ++ ...CacheFullTextQueryMultithreadedSelfTest.java | 2 +- .../cache/IgniteTxMultiNodeAbstractTest.java| 31 +- .../GridCacheAtomicTimeoutSelfTest.java | 314 .../IgniteCacheAtomicMessageRecoveryTest.java | 32 ++ .../IgniteCacheMessageRecoveryAbstractTest.java | 175 +++ .../IgniteCacheTxMessageRecoveryTest.java | 32 ++ ...eAtomicInvalidPartitionHandlingSelfTest.java | 14 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 3 +- .../query/h2/GridH2IndexingGeoSelfTest.java | 52 +- .../GridCacheAbstractFieldsQuerySelfTest.java | 29 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 10 +- .../cache/GridCacheQueryMetricsSelfTest.java| 32 +- ...idCacheReduceQueryMultithreadedSelfTest.java | 9 +- .../cache/GridIndexingWithNoopSwapSelfTest.java | 17 +- ...cheReduceFieldsQueryPartitionedSelfTest.java | 5 +- .../query/h2/GridH2IndexRebuildTest.java| 18 +- .../IgniteCacheQuerySelfTestSuite.java | 2 + modules/visor-console/pom.xml | 4 +- .../ignite/visor/commands/VisorConsole.scala| 20 +- 46 files changed, 795 insertions(+), 2315 deletions(-) --
[29/42] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-746-1' into ignite-sprint-4
Merge remote-tracking branch 'remotes/origin/ignite-746-1' into ignite-sprint-4 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/338e803f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/338e803f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/338e803f Branch: refs/heads/ignite-gg-9613 Commit: 338e803f01fcfb16decf8c7406f9329e9b7f8737 Parents: 655514b 197885d Author: sboikov Authored: Fri Apr 17 11:12:11 2015 +0300 Committer: sboikov Committed: Fri Apr 17 11:12:11 2015 +0300 -- .../processors/cache/GridCacheAtomicFuture.java | 7 - .../dht/atomic/GridDhtAtomicCache.java | 51 +-- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 19 -- .../dht/atomic/GridNearAtomicUpdateFuture.java | 14 - .../internal/GridLifecycleBeanSelfTest.java | 36 +++ .../GridCacheAtomicTimeoutSelfTest.java | 314 --- .../IgniteCacheAtomicMessageRecoveryTest.java | 32 ++ .../IgniteCacheMessageRecoveryAbstractTest.java | 175 +++ .../IgniteCacheTxMessageRecoveryTest.java | 32 ++ ...eAtomicInvalidPartitionHandlingSelfTest.java | 14 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 3 +- 11 files changed, 290 insertions(+), 407 deletions(-) --
[16/42] incubator-ignite git commit: # ignite-743
# ignite-743
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/23a41dfd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/23a41dfd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/23a41dfd
Branch: refs/heads/ignite-gg-9613
Commit: 23a41dfd2b7904c72a9fdebe35ef00b02ad62b3a
Parents: d6434bb
Author: sboikov
Authored: Thu Apr 16 10:51:10 2015 +0300
Committer: sboikov
Committed: Thu Apr 16 11:03:10 2015 +0300
--
.../processors/cache/GridCacheGateway.java | 67 +-
.../processors/cache/IgniteCacheProxy.java | 129 +++
.../datastreamer/DataStreamerUpdateJob.java | 12 --
3 files changed, 81 insertions(+), 127 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/23a41dfd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
index 97fada9..aa73414 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
@@ -66,10 +66,10 @@ public class GridCacheGateway {
/**
* Enter a cache call.
*
- * @return {@code true} if enter successful, {@code false} if the cache or
the node was stopped.
+ * @return {@code True} if enter successful, {@code false} if the cache or
the node was stopped.
*/
public boolean enterIfNotClosed() {
-enterIfNotClosedNoLock();
+onEnter();
// Must unlock in case of unexpected errors to avoid
// deadlocks during kernal stop.
@@ -87,17 +87,16 @@ public class GridCacheGateway {
/**
* Enter a cache call without lock.
*
- * @return {@code true} if enter successful, {@code false} if the cache or
the node was stopped.
+ * @return {@code True} if enter successful, {@code false} if the cache or
the node was stopped.
*/
public boolean enterIfNotClosedNoLock() {
-if (ctx.deploymentEnabled())
-ctx.deploy().onEnter();
+onEnter();
return !stopped;
}
/**
- * Leave a cache call entered by {@link #enter()} method.
+ * Leave a cache call entered by {@link #enterNoLock} method.
*/
public void leaveNoLock() {
ctx.tm().resetContext();
@@ -125,6 +124,22 @@ public class GridCacheGateway {
* @return Previous projection set on this thread.
*/
@Nullable public GridCacheProjectionImpl enter(@Nullable
GridCacheProjectionImpl prj) {
+try {
+GridCacheAdapter cache = ctx.cache();
+
+GridCachePreloader preldr = cache != null ?
cache.preloader() : null;
+
+if (preldr == null)
+throw new IllegalStateException("Grid is in invalid state to
perform this operation. " +
+"It either not started yet or has already being or have
stopped [gridName=" + ctx.gridName() + ']');
+
+preldr.startFuture().get();
+}
+catch (IgniteCheckedException e) {
+throw new IgniteException("Failed to wait for cache preloader
start [cacheName=" +
+ctx.name() + "]", e);
+}
+
onEnter();
rwLock.readLock();
@@ -132,7 +147,7 @@ public class GridCacheGateway {
if (stopped) {
rwLock.readUnlock();
-throw new IllegalStateException("Dynamic cache has been stopped: "
+ ctx.name());
+throw new IllegalStateException("Cache has been stopped: " +
ctx.name());
}
// Must unlock in case of unexpected errors to avoid
@@ -155,38 +170,12 @@ public class GridCacheGateway {
onEnter();
if (stopped)
-throw new IllegalStateException("Dynamic cache has been stopped: "
+ ctx.name());
+throw new IllegalStateException("Cache has been stopped: " +
ctx.name());
return setProjectionPerCall(prj);
}
/**
- * On enter.
- */
-private void onEnter() {
-try {
-ctx.itHolder().checkWeakQueue();
-
-GridCacheAdapter cache = ctx.cache();
-
-GridCachePreloader preldr = cache != null ?
cache.preloader() : null;
-
-if (preldr == null)
-throw new IllegalStateException("Grid is in invalid state to
perform this operation. " +
-"It either not started yet or has already being or have
stopped [gridName=" + ctx.gridName() + ']');
[03/42] incubator-ignite git commit: #ignite-743: Implement IgniteCacheProxyLockFree.
#ignite-743: Implement IgniteCacheProxyLockFree.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a9bd0178
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a9bd0178
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a9bd0178
Branch: refs/heads/ignite-gg-9613
Commit: a9bd0178772fbe785da496ea791bfc984b56b9a5
Parents: 56ef269
Author: ivasilinets
Authored: Tue Apr 14 16:18:37 2015 +0300
Committer: ivasilinets
Committed: Tue Apr 14 16:18:37 2015 +0300
--
.../ignite/internal/processors/cache/IgniteCacheProxy.java | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9bd0178/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index dcdf0be..d6f4e85 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -96,7 +96,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter lockFree() {
+public IgniteCacheProxyLockFree lockFree() {
return delegate;
}
@@ -885,8 +885,6 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter extends
AsyncSupportAdapter)in.readObject();
-prj = (GridCacheProjectionImpl)in.readObject();
+prj = (GridCacheProjectionImpl)delegate.delegate();
gate = delegate.context().gate();
}
[30/42] incubator-ignite git commit: ignite-sprint-4 - big query fix
ignite-sprint-4 - big query 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/ffddb3e9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ffddb3e9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ffddb3e9
Branch: refs/heads/ignite-gg-9613
Commit: ffddb3e9176331e99ccfb44db251f46ae1303334
Parents: a57a520
Author: S.Vladykin
Authored: Fri Apr 17 11:32:06 2015 +0300
Committer: S.Vladykin
Committed: Fri Apr 17 11:32:06 2015 +0300
--
.../query/h2/sql/GridSqlFunction.java | 6 +--
.../query/h2/sql/GridSqlPlaceholder.java| 51
.../query/h2/sql/GridSqlQueryParser.java| 6 +--
.../h2/sql/AbstractH2CompareQueryTest.java | 49 ++-
.../query/h2/sql/GridQueryParsingTest.java | 9
.../query/h2/sql/H2CompareBigQueryTest.java | 2 +-
.../processors/query/h2/sql/bigQuery.sql| 2 +-
7 files changed, 104 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ffddb3e9/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlFunction.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlFunction.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlFunction.java
index 37ed59b..9479538 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlFunction.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlFunction.java
@@ -105,14 +105,14 @@ public class GridSqlFunction extends GridSqlElement {
buff.append(Parser.quoteIdentifier(name));
if (type == CASE) {
-if (!children.isEmpty())
-buff.append(" ").append(child().getSQL());
+buff.append(' ').append(child().getSQL());
for (int i = 1, len = children.size() - 1; i < len; i += 2) {
buff.append(" WHEN ").append(child(i).getSQL());
buff.append(" THEN ").append(child(i + 1).getSQL());
}
-if (children.size() % 2 == 0)
+
+if ((children.size() & 1) == 0)
buff.append(" ELSE ").append(child(children.size() -
1).getSQL());
return buff.append(" END").toString();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ffddb3e9/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlPlaceholder.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlPlaceholder.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlPlaceholder.java
new file mode 100644
index 000..02fa7d7
--- /dev/null
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlPlaceholder.java
@@ -0,0 +1,51 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.query.h2.sql;
+
+/**
+ * Placeholder.
+ */
+public class GridSqlPlaceholder extends GridSqlElement {
+/** */
+public static final GridSqlPlaceholder EMPTY = new GridSqlPlaceholder("");
+
+/** */
+private final String sql;
+
+/**
+ * @param sql SQL.
+ */
+public GridSqlPlaceholder(String sql) {
+this.sql = sql;
+}
+
+/** {@inheritDoc} */
+@Override public String getSQL() {
+return sql;
+}
+
+/** {@inheritDoc} */
+@Override public GridSqlElement addChild(GridSqlElement expr) {
+throw new IllegalStateException();
+}
+
+/** {@inheritDoc} */
+@Override public GridSqlElement child(int idx) {
+throw new IllegalStateException();
+}
+}
http://git-wip-us.apache.org/repos/asf
[06/42] incubator-ignite git commit: #ignite-743: Implement IgniteCacheProxyLockFree.
#ignite-743: Implement IgniteCacheProxyLockFree.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b5d6303c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b5d6303c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b5d6303c
Branch: refs/heads/ignite-gg-9613
Commit: b5d6303cca2d0869ddbc02c93c017661f30750bf
Parents: 66a1b3c
Author: ivasilinets
Authored: Tue Apr 14 16:29:08 2015 +0300
Committer: ivasilinets
Committed: Tue Apr 14 16:29:08 2015 +0300
--
.../processors/datastreamer/DataStreamerCacheUpdaters.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b5d6303c/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
index 7f6bb5b..ed51730 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
@@ -85,7 +85,7 @@ public class DataStreamerCacheUpdaters {
// Here we assume that there are no key duplicates, so the following
calls are valid.
if (rmvCol != null)
-((IgniteCacheProxy)cache).removeAll(rmvCol);
+((IgniteCacheProxyLockFree)cache).removeAll(rmvCol);
if (putMap != null)
cache.putAll(putMap);
[02/42] incubator-ignite git commit: #ignite-743: Implement IgniteCacheProxyLockFree.
#ignite-743: Implement IgniteCacheProxyLockFree.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/56ef2695
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/56ef2695
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/56ef2695
Branch: refs/heads/ignite-gg-9613
Commit: 56ef2695a429709388ffb13288524993f4f28d26
Parents: 196337a
Author: ivasilinets
Authored: Tue Apr 14 16:17:24 2015 +0300
Committer: ivasilinets
Committed: Tue Apr 14 16:17:24 2015 +0300
--
.../processors/cache/IgniteCacheProxy.java | 995 +++-
.../cache/IgniteCacheProxyLockFree.java | 1127 +-
.../datastreamer/DataStreamerUpdateJob.java |6 +-
3 files changed, 1304 insertions(+), 824 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/56ef2695/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 44a5dbe..dcdf0be 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -22,18 +22,11 @@ import org.apache.ignite.cache.CacheManager;
import org.apache.ignite.cache.*;
import org.apache.ignite.cache.query.*;
import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.processors.query.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.discovery.tcp.internal.*;
import org.jetbrains.annotations.*;
import javax.cache.*;
@@ -53,33 +46,15 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter ctx;
-
-/** Gateway. */
-private GridCacheGateway gate;
-
/** Delegate. */
@GridToStringInclude
-private GridCacheProjectionEx delegate;
+private IgniteCacheProxyLockFree delegate;
/** Projection. */
private GridCacheProjectionImpl prj;
-/** */
-@GridToStringExclude
-private GridCacheProxyImpl legacyProxy;
-
-/** */
-@GridToStringExclude
-private CacheManager cacheMgr;
+/** Gateway. */
+private GridCacheGateway gate;
/**
* Empty constructor required for {@link Externalizable}.
@@ -103,22 +78,26 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter(ctx, delegate, prj);
+this.prj = prj;
+
+this.delegate = new IgniteCacheProxyLockFree<>(ctx, delegate, prj,
async);
}
/**
* @return Context.
*/
public GridCacheContext context() {
-return ctx;
+return delegate.context();
+}
+
+/**
+ * @return Lock free instance.
+ */
+public IgniteCacheProxyLockFree lockFree() {
+return delegate;
}
/**
@@ -133,7 +112,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter prev = gate.enter(prj);
try {
-return ctx.cache().metrics();
+return delegate.metrics();
}
finally {
gate.leave(prev);
@@ -145,20 +124,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter prev = gate.enter(prj);
try {
-List metrics = new ArrayList<>(grp.nodes().size());
-
-for (ClusterNode node : grp.nodes()) {
-Map nodeCacheMetrics =
((TcpDiscoveryNode)node).cacheMetrics();
-
-if (nodeCacheMetrics != null) {
-CacheMetrics e = nodeCacheMetrics.get(context().cacheId());
-
-if (e != null)
-metrics.add(e);
-}
-}
-
-return new CacheMetricsSnapshot(ctx.cache().metrics(), metrics);
+return delegate.metrics(grp);
}
finally {
gate.leave(prev);
@@ -170,7 +136,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter prev = gate.enter(prj);
try {
-return ctx.cache().mxBean();
+return delegate.mxBean();
}
finally {
gate.leave(prev);
@@ -179,12 +145,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter
[07/42] incubator-ignite git commit: #ignite-743: add StreamReceiver uses IgniteCacheProxyLockFree.
#ignite-743: add StreamReceiver uses IgniteCacheProxyLockFree.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dbcb60a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dbcb60a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dbcb60a1
Branch: refs/heads/ignite-gg-9613
Commit: dbcb60a134d6f919d8b0e95c96a7730705fed75f
Parents: b5d6303
Author: ivasilinets
Authored: Wed Apr 15 11:47:21 2015 +0300
Committer: ivasilinets
Committed: Wed Apr 15 11:47:21 2015 +0300
--
.../datastreamer/DataStreamerCacheUpdaters.java | 2 +-
.../datastreamer/DataStreamerImpl.java | 83 +---
2 files changed, 39 insertions(+), 46 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dbcb60a1/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
index ed51730..fc6783d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
@@ -85,7 +85,7 @@ public class DataStreamerCacheUpdaters {
// Here we assume that there are no key duplicates, so the following
calls are valid.
if (rmvCol != null)
-((IgniteCacheProxyLockFree)cache).removeAll(rmvCol);
+cache.removeAll(rmvCol);
if (putMap != null)
cache.putAll(putMap);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dbcb60a1/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
index a03a925..83fb3cb 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
@@ -1373,69 +1373,62 @@ public class DataStreamerImpl implements
IgniteDataStreamer, Delayed
/** {@inheritDoc} */
@Override public void receive(IgniteCache
cache,
Collection> entries) {
-IgniteCacheProxy proxy =
(IgniteCacheProxy)cache;
+IgniteCacheProxyLockFree proxy =
(IgniteCacheProxyLockFree)cache;
-proxy.gate().enter();
+GridCacheAdapter internalCache =
proxy.context().cache();
-try {
-GridCacheAdapter internalCache =
proxy.context().cache();
-
-if (internalCache.isNear())
-internalCache = internalCache.context().near().dht();
+if (internalCache.isNear())
+internalCache = internalCache.context().near().dht();
-GridCacheContext cctx = internalCache.context();
+GridCacheContext cctx = internalCache.context();
-AffinityTopologyVersion topVer =
cctx.affinity().affinityTopologyVersion();
+AffinityTopologyVersion topVer =
cctx.affinity().affinityTopologyVersion();
-GridCacheVersion ver = cctx.versions().next(topVer);
+GridCacheVersion ver = cctx.versions().next(topVer);
-long ttl = CU.TTL_ETERNAL;
-long expiryTime = CU.EXPIRE_TIME_ETERNAL;
+long ttl = CU.TTL_ETERNAL;
+long expiryTime = CU.EXPIRE_TIME_ETERNAL;
-ExpiryPolicy plc = cctx.expiry();
+ExpiryPolicy plc = cctx.expiry();
-for (Entry e : entries) {
-try {
-e.getKey().finishUnmarshal(cctx.cacheObjectContext(),
cctx.deploy().globalLoader());
+for (Entry e : entries) {
+try {
+e.getKey().finishUnmarshal(cctx.cacheObjectContext(),
cctx.deploy().globalLoader());
-GridCacheEntryEx entry =
internalCache.entryEx(e.getKey(), topVer);
+GridCacheEntryEx entry = internalCache.entryEx(e.getKey(),
topVer);
-entry.unswap(false);
+entry.unswap(false);
-if (plc != null) {
-ttl =
[17/42] incubator-ignite git commit: ignite-746 race in GridDhtAtomicUpdateFuture mapping and onNodeLeft
ignite-746 race in GridDhtAtomicUpdateFuture mapping and onNodeLeft
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fba8396c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fba8396c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fba8396c
Branch: refs/heads/ignite-gg-9613
Commit: fba8396c15cd9eab888459ac15eefac9f8fbf98b
Parents: 80b1e05
Author: sboikov
Authored: Thu Apr 16 12:42:34 2015 +0300
Committer: sboikov
Committed: Thu Apr 16 12:42:34 2015 +0300
--
.../distributed/dht/atomic/GridDhtAtomicCache.java| 10 --
...idCacheAtomicInvalidPartitionHandlingSelfTest.java | 14 +-
2 files changed, 13 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fba8396c/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 ce90f82..d23d55e 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
@@ -1126,6 +1126,9 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
retVal = new GridCacheReturn(ctx, node.isLocal(),
null, true);
res.returnValue(retVal);
+
+if (dhtFut != null)
+ctx.mvcc().addAtomicFuture(dhtFut.version(),
dhtFut);
}
else
// Should remap all keys.
@@ -2333,12 +2336,7 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
}
}
-GridDhtAtomicUpdateFuture fut = new GridDhtAtomicUpdateFuture(ctx,
completionCb, writeVer, updateReq,
-updateRes);
-
-ctx.mvcc().addAtomicFuture(fut.version(), fut);
-
-return fut;
+return new GridDhtAtomicUpdateFuture(ctx, completionCb, writeVer,
updateReq, updateRes);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fba8396c/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 1f63214..a68423b 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
@@ -173,13 +173,17 @@ public class
GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA
final Set keys = new LinkedHashSet<>();
-for (int i = 0; i < range; i++) {
-cache.put(i, 0);
+try (IgniteDataStreamer streamer =
grid(0).dataStreamer(null)) {
+streamer.allowOverwrite(true);
-keys.add(i);
+for (int i = 0; i < range; i++) {
+streamer.addData(i, 0);
-if (i > 0 && i % 10_000 == 0)
-System.err.println("Put: " + i);
+keys.add(i);
+
+if (i > 0 && i % 10_000 == 0)
+System.err.println("Put: " + i);
+}
}
final Affinity aff = grid(0).affinity(null);
[39/42] incubator-ignite git commit: #ignite-sprint-4: fix S3CheckpointManagerSelfTest.
#ignite-sprint-4: fix S3CheckpointManagerSelfTest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/11baaa8e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/11baaa8e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/11baaa8e
Branch: refs/heads/ignite-gg-9613
Commit: 11baaa8ec1c18aff11d360a846db8c47895c9cfd
Parents: afb553a
Author: ivasilinets
Authored: Fri Apr 17 18:05:44 2015 +0300
Committer: ivasilinets
Committed: Fri Apr 17 18:05:44 2015 +0300
--
.../ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java | 2 +-
.../ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/11baaa8e/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java
--
diff --git
a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java
b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java
index e6a4eec..a354e67 100644
---
a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java
+++
b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointManagerSelfTest.java
@@ -39,7 +39,7 @@ public class S3CheckpointManagerSelfTest extends
GridCheckpointManagerAbstractSe
spi.setAwsCredentials(cred);
-spi.setBucketNameSuffix("test");
+spi.setBucketNameSuffix("test-bucket");
cfg.setCheckpointSpi(spi);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/11baaa8e/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java
--
diff --git
a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java
b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java
index 6196d44..56f39de 100644
---
a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java
+++
b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3SessionCheckpointSelfTest.java
@@ -39,7 +39,7 @@ public class S3SessionCheckpointSelfTest extends
GridSessionCheckpointAbstractSe
spi.setAwsCredentials(cred);
-spi.setBucketNameSuffix("test");
+spi.setBucketNameSuffix("test-bucket");
cfg.setCheckpointSpi(spi);
[24/42] incubator-ignite git commit: # ignite-746-1 removed timeout for atomic futures
# ignite-746-1 removed timeout for atomic futures
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b6efeab0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b6efeab0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b6efeab0
Branch: refs/heads/ignite-gg-9613
Commit: b6efeab0a71d2bacb58c25e333677f7f5776f1af
Parents: cac5072
Author: sboikov
Authored: Thu Apr 16 18:04:19 2015 +0300
Committer: sboikov
Committed: Thu Apr 16 18:04:19 2015 +0300
--
.../cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java | 5 -
.../distributed/dht/atomic/GridNearAtomicUpdateFuture.java | 5 -
2 files changed, 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b6efeab0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
index f6aa5b6..40ab104 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
@@ -86,9 +86,6 @@ public class GridDhtAtomicUpdateFuture extends
GridFutureAdapter
/** Future keys. */
private Collection keys;
-/** Future map time. */
-private volatile long mapTime;
-
/**
* @param cctx Cache context.
* @param completionCb Callback to invoke when future is completed.
@@ -314,8 +311,6 @@ public class GridDhtAtomicUpdateFuture extends
GridFutureAdapter
* Sends requests to remote nodes.
*/
public void map() {
-mapTime = U.currentTimeMillis();
-
if (!mappings.isEmpty()) {
for (GridDhtAtomicUpdateRequest req : mappings.values()) {
try {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b6efeab0/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 6ea326c..974a197 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
@@ -136,9 +136,6 @@ public class GridNearAtomicUpdateFuture extends
GridFutureAdapter
/** Task name hash. */
private final int taskNameHash;
-/** Map time. */
-private volatile long mapTime;
-
/**
* @param cctx Cache context.
* @param cache Cache instance.
@@ -439,8 +436,6 @@ public class GridNearAtomicUpdateFuture extends
GridFutureAdapter
return;
}
-mapTime = U.currentTimeMillis();
-
if (!remap && (cctx.config().getAtomicWriteOrderMode() == CLOCK ||
syncMode != FULL_ASYNC))
cctx.mvcc().addAtomicFuture(version(), this);
}
[38/42] incubator-ignite git commit: #ignite-sprint-4: fix S3CheckpointSpiSelfTest.
#ignite-sprint-4: fix S3CheckpointSpiSelfTest. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/afb553a6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/afb553a6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/afb553a6 Branch: refs/heads/ignite-gg-9613 Commit: afb553a683c0c98ab21754642c4ba92ca6afd9dd Parents: 357a715 Author: ivasilinets Authored: Fri Apr 17 17:45:16 2015 +0300 Committer: ivasilinets Committed: Fri Apr 17 17:45:16 2015 +0300 -- .../apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afb553a6/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java -- diff --git a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java index bb92e09..5cf0f2e 100644 --- a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java +++ b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java @@ -48,7 +48,7 @@ public class S3CheckpointSpiSelfTest extends GridSpiAbstractTest
[23/42] incubator-ignite git commit: # ignite-746-1 removed timeout for atomic futures
# ignite-746-1 removed timeout for atomic futures
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cac5072f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cac5072f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cac5072f
Branch: refs/heads/ignite-gg-9613
Commit: cac5072f15ec2a3c57996ce7e6a2454524653f71
Parents: 216cec3
Author: sboikov
Authored: Thu Apr 16 17:55:35 2015 +0300
Committer: sboikov
Committed: Thu Apr 16 17:55:35 2015 +0300
--
.../GridCacheAtomicTimeoutSelfTest.java | 314 ---
.../IgniteCacheAtomicMessageRecoveryTest.java | 32 ++
.../IgniteCacheMessageRecoveryAbstractTest.java | 175 +++
.../IgniteCacheTxMessageRecoveryTest.java | 32 ++
.../ignite/testsuites/IgniteCacheTestSuite.java | 2 +
5 files changed, 241 insertions(+), 314 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cac5072f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java
deleted file mode 100644
index bde9ec7..000
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAtomicTimeoutSelfTest.java
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache.distributed;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cache.affinity.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.managers.communication.*;
-import org.apache.ignite.internal.processors.cache.*;
-import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*;
-import org.apache.ignite.internal.util.nio.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.plugin.extensions.communication.*;
-import org.apache.ignite.spi.*;
-import org.apache.ignite.spi.communication.tcp.*;
-import org.apache.ignite.testframework.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
-
-/**
- * Tests timeout exception when message gets lost.
- */
-public class GridCacheAtomicTimeoutSelfTest extends GridCommonAbstractTest {
-/** Grid count. */
-public static final int GRID_CNT = 3;
-
-/** {@inheritDoc} */
-@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
-IgniteConfiguration cfg = super.getConfiguration(gridName);
-
-TestCommunicationSpi commSpi = new TestCommunicationSpi();
-
-cfg.setCommunicationSpi(commSpi);
-
-CacheConfiguration ccfg = defaultCacheConfiguration();
-
-ccfg.setCacheMode(PARTITIONED);
-ccfg.setAtomicityMode(ATOMIC);
-ccfg.setBackups(1);
-ccfg.setAtomicWriteOrderMode(PRIMARY);
-ccfg.setNearConfiguration(null);
-ccfg.setWriteSynchronizationMode(FULL_SYNC);
-
-cfg.setCacheConfiguration(ccfg);
-
-cfg.setCommunicationSpi(new TestCommunicationSpi());
-
-cfg.setNetworkTimeout(3000);
-
-return cfg;
-}
-
-/** {@inheritDoc} */
-@Override protected void beforeTestsStarted() throws Exception {
-startGrids(GRID_CNT);
-}
-
-/** {@inheritDoc} */
-@Override
[25/42] incubator-ignite git commit: sp-3-p1 minor
sp-3-p1 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/63faf7f9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/63faf7f9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/63faf7f9
Branch: refs/heads/ignite-gg-9613
Commit: 63faf7f9222411e4a6b24c6624bc9c890e7f31d7
Parents: 30e318b
Author: Yakov Zhdanov
Authored: Thu Apr 16 19:39:27 2015 +0300
Committer: Yakov Zhdanov
Committed: Thu Apr 16 19:39:27 2015 +0300
--
.../processors/cache/GridCacheAdapter.java | 43
1 file changed, 18 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/63faf7f9/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 30e3bc7..62dae3c 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
@@ -2102,7 +2102,7 @@ public abstract class GridCacheAdapter implements
GridCache,
validateCacheValue(val);
-return asyncOp(new AsyncOp(key) {
+return asyncOp(new AsyncOp() {
@Override public IgniteInternalFuture op(IgniteTxLocalAdapter
tx) {
return tx.putAllAsync(ctx, F.t(key, val), true, entry, ttl,
filter)
.chain((IgniteClosure, V>)RET2VAL);
@@ -2254,7 +2254,7 @@ public abstract class GridCacheAdapter implements
GridCache,
if (keyCheck)
validateCacheKey(key);
-IgniteInternalFuture fut = asyncOp(new AsyncInOp(key) {
+IgniteInternalFuture fut = asyncOp(new AsyncInOp() {
@Override public IgniteInternalFuture
inOp(IgniteTxLocalAdapter tx) {
Map> invokeMap =
Collections.singletonMap(key, (EntryProcessor) entryProcessor);
@@ -2407,7 +2407,7 @@ public abstract class GridCacheAdapter implements
GridCache,
validateCacheValue(val);
-return asyncOp(new AsyncOp(key) {
+return asyncOp(new AsyncOp() {
@Override public IgniteInternalFuture
op(IgniteTxLocalAdapter tx) {
return tx.putAllAsync(ctx, F.t(key, val), false, entry, ttl,
filter).chain(
(IgniteClosure,
Boolean>) RET2FLAG);
@@ -2466,7 +2466,7 @@ public abstract class GridCacheAdapter implements
GridCache,
validateCacheValue(val);
-IgniteInternalFuture fut = asyncOp(new AsyncOp(key) {
+IgniteInternalFuture fut = asyncOp(new AsyncOp() {
@Override public IgniteInternalFuture op(IgniteTxLocalAdapter
tx) {
return tx.putAllAsync(ctx, F.t(key, val), true, null, -1,
ctx.noValArray())
.chain((IgniteClosure, V>) RET2VAL);
@@ -2525,7 +2525,7 @@ public abstract class GridCacheAdapter implements
GridCache,
validateCacheValue(val);
-IgniteInternalFuture fut = asyncOp(new AsyncOp(key) {
+IgniteInternalFuture fut = asyncOp(new AsyncOp() {
@Override public IgniteInternalFuture
op(IgniteTxLocalAdapter tx) {
return tx.putAllAsync(ctx, F.t(key, val), false, null, -1,
ctx.noValArray()).chain(
(IgniteClosure,
Boolean>)RET2FLAG);
@@ -2575,7 +2575,7 @@ public abstract class GridCacheAdapter implements
GridCache,
validateCacheValue(val);
-IgniteInternalFuture fut = asyncOp(new AsyncOp(key) {
+IgniteInternalFuture fut = asyncOp(new AsyncOp() {
@Override public IgniteInternalFuture op(IgniteTxLocalAdapter
tx) {
return tx.putAllAsync(ctx, F.t(key, val), true, null, -1,
ctx.hasValArray()).chain(
(IgniteClosure,
V>)RET2VAL);
@@ -2621,7 +2621,7 @@ public abstract class GridCacheAdapter implements
GridCache,
validateCacheValue(val);
-return asyncOp(new AsyncOp(key) {
+return asyncOp(new AsyncOp() {
@Override public IgniteInternalFuture
op(IgniteTxLocalAdapter tx) {
return tx.putAllAsync(ctx, F.t(key, val), false, null, -1,
ctx.hasValArray()).chain(
(IgniteClosure,
Boolean>) RET2FLAG);
@@ -2675,7 +2675,7 @@ public abstract class GridCacheAdapter implements
GridCache,
validateCacheValue(newVal);
-IgniteInternalFuture fut = asyncOp(new AsyncOp(key) {
+IgniteInternalFuture fut = asyncOp(new AsyncOp() {
@Overr
[15/42] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-743
Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-743 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d6434bb7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d6434bb7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d6434bb7 Branch: refs/heads/ignite-gg-9613 Commit: d6434bb7ad13a429fab92ee4416a09b7b08cf3b4 Parents: d0b5d85 a57a520 Author: sboikov Authored: Thu Apr 16 09:51:19 2015 +0300 Committer: sboikov Committed: Thu Apr 16 09:51:19 2015 +0300 -- DEVNOTES.txt| 49 examples/README.txt | 2 +- .../dht/atomic/GridDhtAtomicCache.java | 2 +- .../GridDhtPartitionsExchangeFuture.java| 5 ++ 4 files changed, 56 insertions(+), 2 deletions(-) --
[21/42] incubator-ignite git commit: # ignite-746-1
# ignite-746-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/036b9ba3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/036b9ba3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/036b9ba3
Branch: refs/heads/ignite-gg-9613
Commit: 036b9ba3ad651c69cd44c44ab0a0fabcc9681b32
Parents: fba8396
Author: sboikov
Authored: Thu Apr 16 15:10:41 2015 +0300
Committer: sboikov
Committed: Thu Apr 16 15:10:41 2015 +0300
--
.../cache/distributed/dht/atomic/GridDhtAtomicCache.java | 11 ---
1 file changed, 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/036b9ba3/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 d23d55e..33faf17 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
@@ -86,13 +86,6 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
/** */
private GridNearAtomicCache near;
-/** */
-private final GridDisconnectListener disconnectLsnr = new
GridDisconnectListener() {
-@Override public void onNodeDisconnected(UUID nodeId) {
-scheduleAtomicFutureRecheck();
-}
-};
-
/**
* Empty constructor required by {@link Externalizable}.
*/
@@ -224,16 +217,12 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
}
});
}
-
-ctx.io().addDisconnectListener(disconnectLsnr);
}
/** {@inheritDoc} */
@Override public void stop() {
for (DeferredResponseBuffer buf : pendingResponses.values())
buf.finish();
-
-ctx.io().removeDisconnectListener(disconnectLsnr);
}
/**
[36/42] incubator-ignite git commit: sp-3-p1 protected ping by busy lock
sp-3-p1 protected ping by busy lock
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ba96cba6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ba96cba6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ba96cba6
Branch: refs/heads/ignite-gg-9613
Commit: ba96cba6cd20a03a7659e91748a8ccfa2858773a
Parents: 63faf7f
Author: Yakov Zhdanov
Authored: Fri Apr 17 16:27:34 2015 +0300
Committer: Yakov Zhdanov
Committed: Fri Apr 17 16:27:34 2015 +0300
--
.../managers/discovery/GridDiscoveryManager.java | 15 ++-
1 file changed, 14 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ba96cba6/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 9f74b83..3ad1594 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -173,6 +173,9 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
/** Map of dynamic cache filters. */
private Map registeredCaches = new HashMap<>();
+/** */
+private final GridSpinBusyLock busyLock = new GridSpinBusyLock();
+
/** @param ctx Context. */
public GridDiscoveryManager(GridKernalContext ctx) {
super(ctx, ctx.config().getDiscoverySpi());
@@ -914,6 +917,8 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
/** {@inheritDoc} */
@Override public void stop(boolean cancel) throws IgniteCheckedException {
+busyLock.block();
+
// Stop receiving notifications.
getSpi().setListener(null);
@@ -973,7 +978,15 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
public boolean pingNode(UUID nodeId) {
assert nodeId != null;
-return getSpi().pingNode(nodeId);
+if (!busyLock.enterBusy())
+return false;
+
+try {
+return getSpi().pingNode(nodeId);
+}
+finally {
+busyLock.leaveBusy();
+}
}
/**
[20/42] incubator-ignite git commit: ignite-754: bug fixed
ignite-754: bug fixed
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f6a08642
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f6a08642
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f6a08642
Branch: refs/heads/ignite-gg-9613
Commit: f6a08642a390c46ef69432125790ec2ab3acd8d9
Parents: 0071386
Author: Denis Magda
Authored: Thu Apr 16 14:45:32 2015 +0300
Committer: Denis Magda
Committed: Thu Apr 16 14:45:32 2015 +0300
--
.../ignite/internal/managers/discovery/GridDiscoveryManager.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f6a08642/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index ff41952..27f62b2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -800,7 +800,7 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
*/
private int nodeJavaMajorVer(ClusterNode node) throws
IgniteCheckedException {
try {
-return
Integer.parseInt(node.attribute("java.version").split(".")[1]);
+return
Integer.parseInt(node.attribute("java.version").split("\\.")[1]);
}
catch (Exception e) {
throw new IgniteCheckedException("Failed to get java major version
with reason: " + e.getMessage());
[28/42] incubator-ignite git commit: # ignite-sprint-4 added test
# ignite-sprint-4 added 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/197885da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/197885da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/197885da
Branch: refs/heads/ignite-gg-9613
Commit: 197885dab22ebc160c2b5cce70e12a3d609a9277
Parents: b6efeab
Author: sboikov
Authored: Fri Apr 17 11:07:13 2015 +0300
Committer: sboikov
Committed: Fri Apr 17 11:07:13 2015 +0300
--
.../internal/GridLifecycleBeanSelfTest.java | 36
1 file changed, 36 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/197885da/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleBeanSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleBeanSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleBeanSelfTest.java
index 5821ef6..f0f890d 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleBeanSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/GridLifecycleBeanSelfTest.java
@@ -21,6 +21,7 @@ import org.apache.ignite.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.lifecycle.*;
+import org.apache.ignite.resources.*;
import org.apache.ignite.testframework.junits.common.*;
import java.io.*;
@@ -49,6 +50,41 @@ public class GridLifecycleBeanSelfTest extends
GridCommonAbstractTest {
/**
* @throws Exception If failed.
*/
+public void testGetIgnite() throws Exception {
+final AtomicBoolean done = new AtomicBoolean();
+
+bean = new LifeCycleBaseBean() {
+/** */
+@IgniteInstanceResource
+private Ignite ignite;
+
+@Override public void onLifecycleEvent(LifecycleEventType evt) {
+super.onLifecycleEvent(evt);
+
+if (evt == LifecycleEventType.AFTER_NODE_START) {
+Ignite ignite0 = Ignition.ignite(ignite.name());
+
+assertNotNull(ignite0);
+assertNotNull(ignite0.cluster().localNode());
+
+done.set(true);
+}
+}
+};
+
+try {
+startGrid();
+
+assertTrue(done.get());
+}
+finally {
+stopAllGrids();
+}
+}
+
+/**
+ * @throws Exception If failed.
+ */
public void testNoErrors() throws Exception {
bean = new LifeCycleBaseBean();
[05/42] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-743
Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-743 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/66a1b3c8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/66a1b3c8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/66a1b3c8 Branch: refs/heads/ignite-gg-9613 Commit: 66a1b3c80dc9742edf4301ae1cb2018896a9eaa7 Parents: bd80bca 9c0ef57 Author: ivasilinets Authored: Tue Apr 14 16:21:57 2015 +0300 Committer: ivasilinets Committed: Tue Apr 14 16:21:57 2015 +0300 -- .../distributed/near/GridNearCacheEntry.java| 6 ++-- .../GridCacheAbstractFailoverSelfTest.java | 37 .../processors/cache/GridCachePutAllTask.java | 23 +--- .../junits/common/GridCommonAbstractTest.java | 36 ++- .../IgniteCacheFailoverTestSuite.java | 2 +- 5 files changed, 90 insertions(+), 14 deletions(-) --
[27/42] incubator-ignite git commit: # IGNITE-753 Fixed build.
# IGNITE-753 Fixed build.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6a6ca1a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6a6ca1a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6a6ca1a8
Branch: refs/heads/ignite-gg-9613
Commit: 6a6ca1a89b0de2fca584c3a4478113516c486d1c
Parents: f2cc14c
Author: AKuznetsov
Authored: Fri Apr 17 10:47:52 2015 +0700
Committer: AKuznetsov
Committed: Fri Apr 17 10:47:52 2015 +0700
--
.../cache/CacheVersionedEntryImpl.java | 29 +++-
1 file changed, 28 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6a6ca1a8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheVersionedEntryImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheVersionedEntryImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheVersionedEntryImpl.java
index 1b2fa50..59394f5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheVersionedEntryImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheVersionedEntryImpl.java
@@ -19,12 +19,24 @@ package org.apache.ignite.internal.processors.cache;
import org.jetbrains.annotations.*;
+import java.io.*;
+
/**
*
*/
public class CacheVersionedEntryImpl extends CacheEntryImpl {
+/** */
+private static final long serialVersionUID = 0L;
+
/** Version. */
-private final Object ver;
+private Object ver;
+
+/**
+ * Required by {@link Externalizable}.
+ */
+public CacheVersionedEntryImpl() {
+// No-op.
+}
/**
* @param key Key.
@@ -46,6 +58,21 @@ public class CacheVersionedEntryImpl extends
CacheEntryImpl {
return ver;
}
+
+/** {@inheritDoc} */
+@Override public void writeExternal(ObjectOutput out) throws IOException {
+super.writeExternal(out);
+
+out.writeObject(ver);
+}
+
+/** {@inheritDoc} */
+@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
+super.readExternal(in);
+
+ver = in.readObject();
+}
+
/** {@inheritDoc} */
public String toString() {
return "VersionedEntry [key=" + getKey() + ", val=" + getValue() + ",
ver=" + ver + ']';
[04/42] incubator-ignite git commit: #ignite-743: Implement IgniteCacheProxyLockFree.
#ignite-743: Implement IgniteCacheProxyLockFree.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bd80bca1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bd80bca1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bd80bca1
Branch: refs/heads/ignite-gg-9613
Commit: bd80bca168f4468b7302c55f025f47eedfe5a090
Parents: a9bd017
Author: ivasilinets
Authored: Tue Apr 14 16:20:59 2015 +0300
Committer: ivasilinets
Committed: Tue Apr 14 16:20:59 2015 +0300
--
.../processors/cache/IgniteCacheProxy.java | 140 +--
1 file changed, 70 insertions(+), 70 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bd80bca1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index d6f4e85..d72ed5a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -48,7 +48,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter delegate;
+private IgniteCacheProxyLockFree lockFreeCache;
/** Projection. */
private GridCacheProjectionImpl prj;
@@ -83,21 +83,21 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter(ctx, delegate, prj,
async);
+lockFreeCache = new IgniteCacheProxyLockFree<>(ctx, delegate, prj,
async);
}
/**
* @return Context.
*/
public GridCacheContext context() {
-return delegate.context();
+return lockFreeCache.context();
}
/**
* @return Lock free instance.
*/
public IgniteCacheProxyLockFree lockFree() {
-return delegate;
+return lockFreeCache;
}
/**
@@ -112,7 +112,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter prev = gate.enter(prj);
try {
-return delegate.metrics();
+return lockFreeCache.metrics();
}
finally {
gate.leave(prev);
@@ -124,7 +124,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter prev = gate.enter(prj);
try {
-return delegate.metrics(grp);
+return lockFreeCache.metrics(grp);
}
finally {
gate.leave(prev);
@@ -136,7 +136,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter prev = gate.enter(prj);
try {
-return delegate.mxBean();
+return lockFreeCache.mxBean();
}
finally {
gate.leave(prev);
@@ -145,7 +145,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter> C
getConfiguration(Class clazz) {
-return delegate.getConfiguration(clazz);
+return lockFreeCache.getConfiguration(clazz);
}
/** {@inheritDoc} */
@@ -153,7 +153,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter prev = gate.enter(prj);
try {
-return delegate.randomEntry();
+return lockFreeCache.randomEntry();
}
finally {
gate.leave(prev);
@@ -165,7 +165,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter prev = gate.enter(prj);
try {
-return delegate.withExpiryPolicy(plc);
+return lockFreeCache.withExpiryPolicy(plc);
}
finally {
gate.leave(prev);
@@ -182,7 +182,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter prev = gate.enter(prj);
try {
-delegate.loadCache(p, args);
+lockFreeCache.loadCache(p, args);
}
finally {
gate.leave(prev);
@@ -194,7 +194,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter prev = gate.enter(prj);
try {
-delegate.localLoadCache(p, args);
+lockFreeCache.localLoadCache(p, args);
}
finally {
gate.leave(prev);
@@ -206,7 +206,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter prev = gate.enter(prj);
try {
-return delegate.getAndPutIfAbsent(key, val);
+return lockFreeCache.getAndPutIfAbsent(key, val);
}
finally {
gate.leave(prev);
@@ -215,17 +215,17 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter keys) {
-return delegate.lockAll(keys);
+return lockFreeCache.lockAll(keys);
}
/** {@inheritDoc} */
@Override public boolean isLoca
[14/42] incubator-ignite git commit: #ignite-743: Revert all.
#ignite-743: Revert all.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d0b5d850
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d0b5d850
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d0b5d850
Branch: refs/heads/ignite-gg-9613
Commit: d0b5d8502ec7a07a041a31d50e15fc85e68ac679
Parents: ecf963e
Author: ivasilinets
Authored: Wed Apr 15 17:11:04 2015 +0300
Committer: ivasilinets
Committed: Wed Apr 15 17:11:04 2015 +0300
--
.../processors/cache/GridCacheGateway.java | 128 +-
.../processors/cache/IgniteCacheProxy.java | 1217 ++
.../cache/IgniteCacheProxyLockFree.java | 1153 -
.../datastreamer/DataStreamerImpl.java |9 +-
.../datastreamer/DataStreamerUpdateJob.java |4 +-
5 files changed, 1059 insertions(+), 1452 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0b5d850/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
index 4868b3f..97fada9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
@@ -69,8 +69,7 @@ public class GridCacheGateway {
* @return {@code true} if enter successful, {@code false} if the cache or
the node was stopped.
*/
public boolean enterIfNotClosed() {
-if (ctx.deploymentEnabled())
-ctx.deploy().onEnter();
+enterIfNotClosedNoLock();
// Must unlock in case of unexpected errors to avoid
// deadlocks during kernal stop.
@@ -86,16 +85,35 @@ public class GridCacheGateway {
}
/**
+ * Enter a cache call without lock.
+ *
+ * @return {@code true} if enter successful, {@code false} if the cache or
the node was stopped.
+ */
+public boolean enterIfNotClosedNoLock() {
+if (ctx.deploymentEnabled())
+ctx.deploy().onEnter();
+
+return !stopped;
+}
+
+/**
+ * Leave a cache call entered by {@link #enter()} method.
+ */
+public void leaveNoLock() {
+ctx.tm().resetContext();
+ctx.mvcc().contextReset();
+
+// Unwind eviction notifications.
+if (!ctx.shared().closed(ctx))
+CU.unwindEvicts(ctx);
+}
+
+/**
* Leave a cache call entered by {@link #enter()} method.
*/
public void leave() {
try {
-ctx.tm().resetContext();
-ctx.mvcc().contextReset();
-
-// Unwind eviction notifications.
-if (!ctx.shared().closed(ctx))
-CU.unwindEvicts(ctx);
+ leaveNoLock();
}
finally {
rwLock.readUnlock();
@@ -107,6 +125,45 @@ public class GridCacheGateway {
* @return Previous projection set on this thread.
*/
@Nullable public GridCacheProjectionImpl enter(@Nullable
GridCacheProjectionImpl prj) {
+onEnter();
+
+rwLock.readLock();
+
+if (stopped) {
+rwLock.readUnlock();
+
+throw new IllegalStateException("Dynamic cache has been stopped: "
+ ctx.name());
+}
+
+// Must unlock in case of unexpected errors to avoid
+// deadlocks during kernal stop.
+try {
+return setProjectionPerCall(prj);
+}
+catch (RuntimeException e) {
+rwLock.readUnlock();
+
+throw e;
+}
+}
+
+/**
+ * @param prj Projection to guard.
+ * @return Previous projection set on this thread.
+ */
+@Nullable public GridCacheProjectionImpl enterNoLock(@Nullable
GridCacheProjectionImpl prj) {
+onEnter();
+
+if (stopped)
+throw new IllegalStateException("Dynamic cache has been stopped: "
+ ctx.name());
+
+return setProjectionPerCall(prj);
+}
+
+/**
+ * On enter.
+ */
+private void onEnter() {
try {
ctx.itHolder().checkWeakQueue();
@@ -127,50 +184,47 @@ public class GridCacheGateway {
if (ctx.deploymentEnabled())
ctx.deploy().onEnter();
+}
-rwLock.readLock();
+/**
+ * Set thread local projection per call.
+ *
+ * @param prj Projection to guard.
+ * @return Previous projection set on this thread.
+ */
+private GridCacheProjectionImpl setProjectionPerCall(@Nullable
GridCacheProjectionImpl prj) {
+
[32/42] incubator-ignite git commit: ignite-754: minor fixes after the first review round
ignite-754: minor fixes after the first review round
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/102de7b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/102de7b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/102de7b5
Branch: refs/heads/ignite-gg-9613
Commit: 102de7b5386a97cf211b100695b30fdcf10d1351
Parents: f6a0864
Author: Denis Magda
Authored: Fri Apr 17 11:53:19 2015 +0300
Committer: Denis Magda
Committed: Fri Apr 17 11:53:19 2015 +0300
--
.../managers/discovery/GridDiscoveryManager.java| 16 ++--
1 file changed, 10 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/102de7b5/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 27f62b2..e7c86f5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -738,18 +738,18 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
Object locMode = locNode.attribute(ATTR_DEPLOYMENT_MODE);
-int locJvmMajVer = nodeJavaMajorVer(locNode);
+int locJvmMajVer = nodeJavaMajorVersion(locNode);
boolean locP2pEnabled = locNode.attribute(ATTR_PEER_CLASSLOADING);
boolean warned = false;
for (ClusterNode n : nodes) {
-int rmtJvmMajVer = nodeJavaMajorVer(n);
+int rmtJvmMajVer = nodeJavaMajorVersion(n);
if (locJvmMajVer != rmtJvmMajVer)
-throw new IgniteCheckedException("Local node's java major
version = " + locJvmMajVer +
-" is different from remote node's one = " + rmtJvmMajVer);
+throw new IgniteCheckedException("Local node's java major
version is different from remote node's one" +
+" [locJvmMajVer=" + locJvmMajVer + ", rmtJvmMajVer=" +
rmtJvmMajVer + "]");
String rmtPreferIpV4 = n.attribute("java.net.preferIPv4Stack");
@@ -798,12 +798,16 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
* @return Java major version.
* @throws IgniteCheckedException If failed to get the version.
*/
-private int nodeJavaMajorVer(ClusterNode node) throws
IgniteCheckedException {
+private int nodeJavaMajorVersion(ClusterNode node) throws
IgniteCheckedException {
try {
+// The format is identical for Oracle JDK, OpenJDK and IBM JDK.
return
Integer.parseInt(node.attribute("java.version").split("\\.")[1]);
}
catch (Exception e) {
-throw new IgniteCheckedException("Failed to get java major version
with reason: " + e.getMessage());
+U.error(log, "Failed to get java major version (unknown
'java.version' format) [ver=" +
+node.attribute("java.version") + "]", e);
+
+return 0;
}
}
[35/42] incubator-ignite git commit: Merge branch 'ignite-sprint-4' into ignite-gg-9613
Merge branch 'ignite-sprint-4' into ignite-gg-9613 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d0fae5d1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d0fae5d1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d0fae5d1 Branch: refs/heads/ignite-gg-9613 Commit: d0fae5d153fa9cdd603e99ff589ee5813909a065 Parents: 2a27fe0 357a715 Author: vozerov-gridgain Authored: Fri Apr 17 15:31:04 2015 +0300 Committer: vozerov-gridgain Committed: Fri Apr 17 15:31:04 2015 +0300 -- .../discovery/GridDiscoveryManager.java | 28 ++ .../processors/cache/GridCacheAtomicFuture.java | 7 - .../processors/cache/GridCacheGateway.java | 111 -- .../processors/cache/IgniteCacheProxy.java | 353 +++ .../dht/atomic/GridDhtAtomicCache.java | 51 +-- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 19 - .../dht/atomic/GridNearAtomicUpdateFuture.java | 14 - .../datastreamer/DataStreamerCacheUpdaters.java | 2 +- .../datastreamer/DataStreamerImpl.java | 81 ++--- .../datastreamer/DataStreamerUpdateJob.java | 16 +- .../dr/IgniteDrDataStreamerCacheUpdater.java| 2 - .../internal/GridLifecycleBeanSelfTest.java | 36 ++ .../GridCacheAtomicTimeoutSelfTest.java | 314 - .../IgniteCacheAtomicMessageRecoveryTest.java | 32 ++ .../IgniteCacheMessageRecoveryAbstractTest.java | 175 + .../IgniteCacheTxMessageRecoveryTest.java | 32 ++ ...eAtomicInvalidPartitionHandlingSelfTest.java | 14 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 3 +- .../query/h2/sql/GridSqlFunction.java | 6 +- .../query/h2/sql/GridSqlPlaceholder.java| 51 +++ .../query/h2/sql/GridSqlQueryParser.java| 6 +- .../h2/sql/AbstractH2CompareQueryTest.java | 49 ++- .../query/h2/sql/GridQueryParsingTest.java | 9 + .../query/h2/sql/H2CompareBigQueryTest.java | 2 +- .../processors/query/h2/sql/bigQuery.sql| 2 +- 25 files changed, 742 insertions(+), 673 deletions(-) --
[37/42] incubator-ignite git commit: sp-3-p1 minor
sp-3-p1 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/54390af4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/54390af4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/54390af4
Branch: refs/heads/ignite-gg-9613
Commit: 54390af4d3fdf7941f570e51f0f6d3fa417fa69d
Parents: ba96cba
Author: Yakov Zhdanov
Authored: Fri Apr 17 16:28:12 2015 +0300
Committer: Yakov Zhdanov
Committed: Fri Apr 17 16:28:12 2015 +0300
--
.../ignite/internal/managers/discovery/GridDiscoveryManager.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54390af4/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 3ad1594..1c70fb2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -912,7 +912,8 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
}
if (!locJoinEvt.isDone())
-locJoinEvt.onDone(new IgniteCheckedException("Failed to wait for
local node joined event (grid is stopping)."));
+locJoinEvt.onDone(
+new IgniteCheckedException("Failed to wait for local node
joined event (grid is stopping)."));
}
/** {@inheritDoc} */
[19/42] incubator-ignite git commit: ignite-754: added missing comments
ignite-754: added missing comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0071386d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0071386d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0071386d
Branch: refs/heads/ignite-gg-9613
Commit: 0071386d359fb92af8f4b0cc3d00b537184999a6
Parents: bee6ac8
Author: Denis Magda
Authored: Thu Apr 16 14:39:28 2015 +0300
Committer: Denis Magda
Committed: Thu Apr 16 14:39:28 2015 +0300
--
.../internal/managers/discovery/GridDiscoveryManager.java| 8
1 file changed, 8 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0071386d/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 7b6edc2..ff41952 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -791,6 +791,13 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
log.debug("Finished node attributes consistency check.");
}
+/**
+ * Gets Java major version running on the node.
+ *
+ * @param node Cluster node.
+ * @return Java major version.
+ * @throws IgniteCheckedException If failed to get the version.
+ */
private int nodeJavaMajorVer(ClusterNode node) throws
IgniteCheckedException {
try {
return
Integer.parseInt(node.attribute("java.version").split(".")[1]);
@@ -799,6 +806,7 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
throw new IgniteCheckedException("Failed to get java major version
with reason: " + e.getMessage());
}
}
+
/**
* @param nodes Nodes.
* @return Total CPUs.
[11/42] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-743
Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-743 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8ee275f6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8ee275f6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8ee275f6 Branch: refs/heads/ignite-gg-9613 Commit: 8ee275f6904b2b7058eb712da9eb7b7342d7ca51 Parents: 483b620 2b0ec46 Author: ivasilinets Authored: Wed Apr 15 13:19:13 2015 +0300 Committer: ivasilinets Committed: Wed Apr 15 13:19:13 2015 +0300 -- DEVNOTES.txt| 4 +- assembly/dependencies-fabric.xml| 50 + assembly/dependencies-hadoop.xml| 1 - assembly/dependencies-optional-fabric.xml | 82 -- assembly/dependencies-optional-hadoop.xml | 83 -- assembly/release-base.xml | 5 - assembly/release-fabric.xml | 5 + examples/pom.xml| 2 +- .../hibernate/CacheHibernateStoreExample.java | 3 - .../store/jdbc/CacheJdbcStoreExample.java | 3 - modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/codegen/pom.xml | 14 ++- modules/core/pom.xml| 2 +- .../apache/ignite/IgniteSystemProperties.java | 6 - .../internal/managers/GridManagerAdapter.java | 4 + .../discovery/GridDiscoveryManager.java | 14 +++ .../dht/GridPartitionedGetFuture.java | 20 +++- .../distributed/near/GridNearGetFuture.java | 20 +++- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 5 + .../org/apache/ignite/spi/IgniteSpiContext.java | 6 + .../communication/tcp/TcpCommunicationSpi.java | 70 ++-- .../tcp/TcpCommunicationSpiMBean.java | 9 -- .../ignite/spi/discovery/DiscoverySpi.java | 7 ++ .../discovery/tcp/TcpClientDiscoverySpi.java| 12 ++ .../spi/discovery/tcp/TcpDiscoverySpi.java | 32 +- ...ridFailFastNodeFailureDetectionSelfTest.java | 112 +++ .../GridCacheAbstractFailoverSelfTest.java | 7 +- .../cache/GridCachePutAllFailoverSelfTest.java | 2 +- .../processors/cache/GridCachePutAllTask.java | 31 - .../testframework/GridSpiTestContext.java | 5 + .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../testsuites/IgniteCacheRestartTestSuite.java | 2 +- modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml| 2 +- .../processors/query/h2/IgniteH2Indexing.java | 3 +- modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml| 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 43 +++ 58 files changed, 412 insertions(+), 303 deletions(-) --
[01/42] incubator-ignite git commit: #ignite-743: Add class IgniteCacheProxyLockFree.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-gg-9613 2a27fe087 -> 3b9b1e670
#ignite-743: Add class IgniteCacheProxyLockFree.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/196337aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/196337aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/196337aa
Branch: refs/heads/ignite-gg-9613
Commit: 196337aaf0ea0fb183bcd8f8ed75559b6ba4c871
Parents: 59b11b4
Author: ivasilinets
Authored: Tue Apr 14 14:49:17 2015 +0300
Committer: ivasilinets
Committed: Tue Apr 14 14:49:17 2015 +0300
--
.../cache/IgniteCacheProxyLockFree.java | 24
.../dr/IgniteDrDataStreamerCacheUpdater.java| 2 --
2 files changed, 24 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/196337aa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java
new file mode 100644
index 000..81e1f24
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java
@@ -0,0 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+/**
+ * Cache proxy lock free.
+ */
+public class IgniteCacheProxyLockFree {
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/196337aa/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/IgniteDrDataStreamerCacheUpdater.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/IgniteDrDataStreamerCacheUpdater.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/IgniteDrDataStreamerCacheUpdater.java
index 818b99a..c3a8989 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/IgniteDrDataStreamerCacheUpdater.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/dr/IgniteDrDataStreamerCacheUpdater.java
@@ -53,8 +53,6 @@ public class IgniteDrDataStreamerCacheUpdater implements
StreamReceiver
[41/42] incubator-ignite git commit: Merge branch 'ignite-sprint-3-p1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-4
Merge branch 'ignite-sprint-3-p1' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-4
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5049704d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5049704d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5049704d
Branch: refs/heads/ignite-gg-9613
Commit: 5049704da5742ab7e4215f66a699dce62df357db
Parents: 11baaa8 9934af1
Author: AKuznetsov
Authored: Fri Apr 17 22:24:38 2015 +0700
Committer: AKuznetsov
Committed: Fri Apr 17 22:24:38 2015 +0700
--
.../discovery/GridDiscoveryManager.java | 18 ++-
.../processors/cache/CacheEntryImpl.java| 29 +++-
.../cache/CacheVersionedEntryImpl.java | 29 +++-
.../processors/cache/GridCacheAdapter.java | 43 +++---
.../GridCacheQuerySerializationSelfTest.java| 144 +++
.../IgniteCacheQuerySelfTestSuite.java | 2 +
6 files changed, 234 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5049704d/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5049704d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 71d3c0d,62dae3c..81cdf02
---
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
@@@ -2020,9 -2102,9 +2020,9 @@@ public abstract class GridCacheAdapter<
validateCacheValue(val);
- return asyncOp(new AsyncOp(key) {
+ return asyncOp(new AsyncOp() {
@Override public IgniteInternalFuture op(IgniteTxLocalAdapter
tx) {
-return tx.putAllAsync(ctx, F.t(key, val), true, entry, ttl,
filter)
+return tx.putAllAsync(ctx, F.t(key, val), true, null, -1,
filter)
.chain((IgniteClosure, V>)RET2VAL);
}
@@@ -2352,9 -2407,9 +2352,9 @@@
validateCacheValue(val);
- return asyncOp(new AsyncOp(key) {
+ return asyncOp(new AsyncOp() {
@Override public IgniteInternalFuture
op(IgniteTxLocalAdapter tx) {
-return tx.putAllAsync(ctx, F.t(key, val), false, entry, ttl,
filter).chain(
+return tx.putAllAsync(ctx, F.t(key, val), false, null, -1,
filter).chain(
(IgniteClosure,
Boolean>) RET2FLAG);
}
@@@ -2739,10 -2818,10 +2739,10 @@@
if (keyCheck)
validateCacheKey(key);
- IgniteInternalFuture fut = asyncOp(new AsyncOp(key) {
+ IgniteInternalFuture fut = asyncOp(new AsyncOp() {
@Override public IgniteInternalFuture op(IgniteTxLocalAdapter
tx) {
// TODO should we invoke interceptor here?
-return tx.removeAllAsync(ctx, Collections.singletonList(key),
null, true, filter)
+return tx.removeAllAsync(ctx, Collections.singletonList(key),
null, true, CU.empty0())
.chain((IgniteClosure, V>) RET2VAL);
}
@@@ -2862,9 -2956,9 +2862,9 @@@
if (keyCheck)
validateCacheKey(key);
- IgniteInternalFuture fut = asyncOp(new AsyncOp(key)
{
+ IgniteInternalFuture fut = asyncOp(new AsyncOp() {
@Override public IgniteInternalFuture
op(IgniteTxLocalAdapter tx) {
-return tx.removeAllAsync(ctx, Collections.singletonList(key),
entry, false, filter).chain(
+return tx.removeAllAsync(ctx, Collections.singletonList(key),
null, false, filter).chain(
(IgniteClosure,
Boolean>)RET2FLAG);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5049704d/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java
--
[10/42] incubator-ignite git commit: #ignite-738: Fix async supported.
#ignite-738: Fix async supported.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/483b6208
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/483b6208
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/483b6208
Branch: refs/heads/ignite-gg-9613
Commit: 483b620856d36d482b8c6bbe59af29cd38c79666
Parents: a4143aa
Author: ivasilinets
Authored: Wed Apr 15 12:42:21 2015 +0300
Committer: ivasilinets
Committed: Wed Apr 15 12:42:21 2015 +0300
--
.../processors/cache/IgniteCacheProxy.java | 28 +---
1 file changed, 19 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/483b6208/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 2cda18a..2f2d70c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -41,8 +41,7 @@ import java.util.concurrent.locks.*;
/**
* Cache proxy.
*/
-public class IgniteCacheProxy extends AsyncSupportAdapter>
-implements IgniteCache, Externalizable {
+public class IgniteCacheProxy implements IgniteCache,
Externalizable {
/** */
private static final long serialVersionUID = 0L;
@@ -75,8 +74,6 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter prj,
boolean async
) {
-super(async);
-
assert ctx != null;
gate = ctx.gate();
@@ -144,6 +141,24 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter withAsync() {
+if (isAsync())
+return this;
+
+return new IgniteCacheProxy<>(context(), delegate(), prj, true);
+}
+
+/** {@inheritDoc} */
+@Override public boolean isAsync() {
+return lockFreeCache.isAsync();
+}
+
+/** {@inheritDoc} */
+@Override public IgniteFuture future() {
+return lockFreeCache.future();
+}
+
+/** {@inheritDoc} */
@Override public > C
getConfiguration(Class clazz) {
return lockFreeCache.getConfiguration(clazz);
}
@@ -794,11 +809,6 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter createAsyncInstance() {
-return lockFreeCache.createAsyncInstance();
-}
-
/**
* Creates projection that will operate with portable objects.
Projection returned by this method will force
* cache not to deserialize portable objects, so keys and values will be
returned from cache API methods without
[18/42] incubator-ignite git commit: ignite-754: implemented
ignite-754: implemented
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/bee6ac82
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bee6ac82
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bee6ac82
Branch: refs/heads/ignite-gg-9613
Commit: bee6ac82d6ed41dc7e5262c72100c7274a1e7880
Parents: 655514b
Author: Denis Magda
Authored: Thu Apr 16 13:53:51 2015 +0300
Committer: Denis Magda
Committed: Thu Apr 16 13:53:51 2015 +0300
--
.../managers/discovery/GridDiscoveryManager.java| 16
1 file changed, 16 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/bee6ac82/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
index 9f74b83..7b6edc2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java
@@ -738,11 +738,19 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
Object locMode = locNode.attribute(ATTR_DEPLOYMENT_MODE);
+int locJvmMajVer = nodeJavaMajorVer(locNode);
+
boolean locP2pEnabled = locNode.attribute(ATTR_PEER_CLASSLOADING);
boolean warned = false;
for (ClusterNode n : nodes) {
+int rmtJvmMajVer = nodeJavaMajorVer(n);
+
+if (locJvmMajVer != rmtJvmMajVer)
+throw new IgniteCheckedException("Local node's java major
version = " + locJvmMajVer +
+" is different from remote node's one = " + rmtJvmMajVer);
+
String rmtPreferIpV4 = n.attribute("java.net.preferIPv4Stack");
if (!F.eq(rmtPreferIpV4, locPreferIpV4)) {
@@ -783,6 +791,14 @@ public class GridDiscoveryManager extends
GridManagerAdapter {
log.debug("Finished node attributes consistency check.");
}
+private int nodeJavaMajorVer(ClusterNode node) throws
IgniteCheckedException {
+try {
+return
Integer.parseInt(node.attribute("java.version").split(".")[1]);
+}
+catch (Exception e) {
+throw new IgniteCheckedException("Failed to get java major version
with reason: " + e.getMessage());
+}
+}
/**
* @param nodes Nodes.
* @return Total CPUs.
[12/42] incubator-ignite git commit: #ignite-743: IsolatedUpdater should wait cache started.
#ignite-743: IsolatedUpdater should wait cache started.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ecf963e4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ecf963e4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ecf963e4
Branch: refs/heads/ignite-gg-9613
Commit: ecf963e4de1cc508d213170802515a20d7543396
Parents: 8ee275f
Author: ivasilinets
Authored: Wed Apr 15 14:54:48 2015 +0300
Committer: ivasilinets
Committed: Wed Apr 15 14:54:48 2015 +0300
--
.../internal/processors/datastreamer/DataStreamerImpl.java| 7 +++
1 file changed, 7 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ecf963e4/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
index 83fb3cb..0486bed 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerImpl.java
@@ -1375,6 +1375,13 @@ public class DataStreamerImpl implements
IgniteDataStreamer, Delayed
Collection> entries) {
IgniteCacheProxyLockFree proxy =
(IgniteCacheProxyLockFree)cache;
+try {
+proxy.context().awaitStarted();
+}
+catch (IgniteCheckedException e) {
+U.convertException(e);
+}
+
GridCacheAdapter internalCache =
proxy.context().cache();
if (internalCache.isNear())
[33/42] incubator-ignite git commit: Merge branch 'ignite-754' into ignite-sprint-4
Merge branch 'ignite-754' into ignite-sprint-4 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/122f3ce3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/122f3ce3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/122f3ce3 Branch: refs/heads/ignite-gg-9613 Commit: 122f3ce3c4b031bd279c9b337721348b330f66c0 Parents: ca6675f 102de7b Author: Denis Magda Authored: Fri Apr 17 11:54:58 2015 +0300 Committer: Denis Magda Committed: Fri Apr 17 11:54:58 2015 +0300 -- .../discovery/GridDiscoveryManager.java | 28 1 file changed, 28 insertions(+) --
[26/42] incubator-ignite git commit: # IGNITE-753 CacheEntryImpl implements Externalizable + test.
# IGNITE-753 CacheEntryImpl implements Externalizable + 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/f2cc14c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f2cc14c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f2cc14c1
Branch: refs/heads/ignite-gg-9613
Commit: f2cc14c1ee805f841b41d51d73c2321e9c004226
Parents: 30e318b
Author: AKuznetsov
Authored: Fri Apr 17 07:09:51 2015 +0700
Committer: AKuznetsov
Committed: Fri Apr 17 07:09:51 2015 +0700
--
.../processors/cache/CacheEntryImpl.java| 29 +++-
.../GridCacheQuerySerializationSelfTest.java| 144 +++
.../IgniteCacheQuerySelfTestSuite.java | 2 +
3 files changed, 172 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2cc14c1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
index ebe5f09..3bd7ef4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEntryImpl.java
@@ -18,16 +18,27 @@
package org.apache.ignite.internal.processors.cache;
import javax.cache.*;
+import java.io.*;
/**
*
*/
-public class CacheEntryImpl implements Cache.Entry {
+public class CacheEntryImpl implements Cache.Entry, Externalizable
{
/** */
-private final K key;
+private static final long serialVersionUID = 0L;
/** */
-private final V val;
+private K key;
+
+/** */
+private V val;
+
+/**
+ * Required by {@link Externalizable}.
+ */
+public CacheEntryImpl() {
+// No-op.
+}
/**
* @param key Key.
@@ -58,6 +69,18 @@ public class CacheEntryImpl implements Cache.Entry {
}
/** {@inheritDoc} */
+@Override public void writeExternal(ObjectOutput out) throws IOException {
+out.writeObject(key);
+out.writeObject(val);
+}
+
+/** {@inheritDoc} */
+@Override public void readExternal(ObjectInput in) throws IOException,
ClassNotFoundException {
+key = (K)in.readObject();
+val = (V)in.readObject();
+}
+
+/** {@inheritDoc} */
public String toString() {
return "Entry [key=" + key + ", val=" + val + ']';
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f2cc14c1/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySerializationSelfTest.java
--
diff --git
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySerializationSelfTest.java
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySerializationSelfTest.java
new file mode 100644
index 000..d42a440
--- /dev/null
+++
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQuerySerializationSelfTest.java
@@ -0,0 +1,144 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.cache.query.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.resources.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import javax.cache.*;
+import java.util.*;
+
+import static org.apache.ignite.cache.CacheMode.*;
+impor
[42/42] incubator-ignite git commit: Merge branch 'ignite-sprint-4' into ignite-gg-9613
Merge branch 'ignite-sprint-4' into ignite-gg-9613 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3b9b1e67 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3b9b1e67 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3b9b1e67 Branch: refs/heads/ignite-gg-9613 Commit: 3b9b1e67064fa6488159b8f01796db507435b7f5 Parents: d0fae5d 5049704 Author: vozerov-gridgain Authored: Mon Apr 20 09:04:02 2015 +0300 Committer: vozerov-gridgain Committed: Mon Apr 20 09:04:02 2015 +0300 -- .../s3/S3CheckpointManagerSelfTest.java | 2 +- .../checkpoint/s3/S3CheckpointSpiSelfTest.java | 2 +- .../s3/S3SessionCheckpointSelfTest.java | 2 +- .../discovery/GridDiscoveryManager.java | 18 ++- .../processors/cache/CacheEntryImpl.java| 29 +++- .../cache/CacheVersionedEntryImpl.java | 29 +++- .../processors/cache/GridCacheAdapter.java | 43 +++--- .../GridCacheQuerySerializationSelfTest.java| 144 +++ .../IgniteCacheQuerySelfTestSuite.java | 2 + 9 files changed, 237 insertions(+), 34 deletions(-) --
[09/42] incubator-ignite git commit: #ignite-743: fix marshalling.
#ignite-743: fix marshalling. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a4143aa3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a4143aa3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a4143aa3 Branch: refs/heads/ignite-gg-9613 Commit: a4143aa35bf0704e16320d8631820901b151680b Parents: 8f8119e Author: ivasilinets Authored: Wed Apr 15 11:57:47 2015 +0300 Committer: ivasilinets Committed: Wed Apr 15 11:57:47 2015 +0300 -- .../apache/ignite/internal/processors/cache/IgniteCacheProxy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4143aa3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index 3424c2c..2cda18a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@ -827,7 +827,7 @@ public class IgniteCacheProxy extends AsyncSupportAdapter prj0 = new GridCacheProjectionImpl<>( -(CacheProjection)(prj != null ? prj : lockFreeCache), +(CacheProjection)(prj != null ? prj : lockFreeCache.delegate()), (GridCacheContext)context(), prj != null && prj.skipStore(), prj != null ? prj.subjectId() : null,
[08/42] incubator-ignite git commit: #ignite-743: fix marshalling.
#ignite-743: fix marshalling.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8f8119e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8f8119e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8f8119e1
Branch: refs/heads/ignite-gg-9613
Commit: 8f8119e1573f93e667b04fade5d4fbe758c6b74e
Parents: dbcb60a
Author: ivasilinets
Authored: Wed Apr 15 11:51:48 2015 +0300
Committer: ivasilinets
Committed: Wed Apr 15 11:51:48 2015 +0300
--
.../ignite/internal/processors/cache/IgniteCacheProxy.java | 2 +-
.../internal/processors/cache/IgniteCacheProxyLockFree.java | 4
2 files changed, 5 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f8119e1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index d72ed5a..3424c2c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@ -892,7 +892,7 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter)in.readObject();
-prj = (GridCacheProjectionImpl) lockFreeCache.delegate();
+prj = lockFreeCache.projection();
gate = lockFreeCache.context().gate();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f8119e1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java
index 976eeac..8811b35 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java
@@ -116,6 +116,10 @@ public class IgniteCacheProxyLockFree extends
AsyncSupportAdapter projection() {
+return prj;
+}
+
/** {@inheritDoc} */
@Override public CacheMetrics metrics() {
return ctx.cache().metrics();
[40/42] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-3-p1' into ignite-sprint-3-p1
Merge remote-tracking branch 'origin/ignite-sprint-3-p1' into ignite-sprint-3-p1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9934af12 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9934af12 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9934af12 Branch: refs/heads/ignite-gg-9613 Commit: 9934af1278bdda620429b8d278b19e3e144b65aa Parents: 6a6ca1a 54390af Author: AKuznetsov Authored: Fri Apr 17 22:22:02 2015 +0700 Committer: AKuznetsov Committed: Fri Apr 17 22:22:02 2015 +0700 -- .../discovery/GridDiscoveryManager.java | 18 +++- .../processors/cache/GridCacheAdapter.java | 43 2 files changed, 34 insertions(+), 27 deletions(-) --
[13/42] incubator-ignite git commit: #ignite-743: Revert all.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d0b5d850/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java
deleted file mode 100644
index 8811b35..000
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxyLockFree.java
+++ /dev/null
@@ -1,1153 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.cache.CacheManager;
-import org.apache.ignite.cache.query.*;
-import org.apache.ignite.cluster.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.internal.*;
-import org.apache.ignite.internal.processors.cache.query.*;
-import org.apache.ignite.internal.processors.query.*;
-import org.apache.ignite.internal.util.*;
-import org.apache.ignite.internal.util.future.*;
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.mxbean.*;
-import org.apache.ignite.spi.discovery.tcp.internal.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.*;
-import javax.cache.configuration.*;
-import javax.cache.expiry.*;
-import javax.cache.integration.*;
-import javax.cache.processor.*;
-import java.io.*;
-import java.util.*;
-import java.util.concurrent.locks.*;
-
-/**
- * Cache proxy lock free.
- */
-public class IgniteCacheProxyLockFree extends
AsyncSupportAdapter>
-implements IgniteCache, Externalizable {
-/** */
-private static final long serialVersionUID = 0L;
-
-/** */
-private static final IgniteBiPredicate ACCEPT_ALL = new
IgniteBiPredicate() {
-@Override public boolean apply(Object k, Object v) {
-return true;
-}
-};
-
-/** Context. */
-private GridCacheContext ctx;
-
-/** Delegate. */
-@GridToStringInclude
-private GridCacheProjectionEx delegate;
-
-/** Projection. */
-private GridCacheProjectionImpl prj;
-
-/** */
-@GridToStringExclude
-private GridCacheProxyImpl legacyProxy;
-
-/** */
-@GridToStringExclude
-private CacheManager cacheMgr;
-
-/**
- * Empty constructor required for {@link Externalizable}.
- */
-public IgniteCacheProxyLockFree() {
-// No-op.
-}
-
-/**
- * @param ctx Context.
- * @param delegate Delegate.
- * @param prj Projection.
- * @param async Async support flag.
- */
-public IgniteCacheProxyLockFree(
-GridCacheContext ctx,
-GridCacheProjectionEx delegate,
-@Nullable GridCacheProjectionImpl prj,
-boolean async
-) {
-super(async);
-
-assert ctx != null;
-assert delegate != null;
-
-this.ctx = ctx;
-this.delegate = delegate;
-this.prj = prj;
-
-legacyProxy = new GridCacheProxyImpl<>(ctx, delegate, prj);
-}
-
-/**
- * @return Context.
- */
-public GridCacheContext context() {
-return ctx;
-}
-
-public GridCacheProjectionImpl projection() {
-return prj;
-}
-
-/** {@inheritDoc} */
-@Override public CacheMetrics metrics() {
-return ctx.cache().metrics();
-}
-
-/** {@inheritDoc} */
-@Override public CacheMetrics metrics(ClusterGroup grp) {
-List metrics = new ArrayList<>(grp.nodes().size());
-
-for (ClusterNode node : grp.nodes()) {
-Map nodeCacheMetrics =
((TcpDiscoveryNode)node).cacheMetrics();
-
-if (nodeCacheMetrics != null) {
-CacheMetrics e = nodeCacheMetrics.get(context().cacheId());
-
-if (e != null)
-metrics.add(e);
-}
-}
-
-return new CacheMetricsSnapsho
[22/42] incubator-ignite git commit: # ignite-746-1 removed timeout for atomic futures
# ignite-746-1 removed timeout for atomic futures
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/216cec3b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/216cec3b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/216cec3b
Branch: refs/heads/ignite-gg-9613
Commit: 216cec3b3087edcfdbf5606a618075857afcdd72
Parents: 036b9ba
Author: sboikov
Authored: Thu Apr 16 16:53:46 2015 +0300
Committer: sboikov
Committed: Thu Apr 16 16:54:40 2015 +0300
--
.../processors/cache/GridCacheAtomicFuture.java | 7 -
.../dht/atomic/GridDhtAtomicCache.java | 30
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 14 -
.../dht/atomic/GridNearAtomicUpdateFuture.java | 9 --
.../ignite/testsuites/IgniteCacheTestSuite.java | 1 -
5 files changed, 61 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/216cec3b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicFuture.java
index 8232e17..35d3ec5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAtomicFuture.java
@@ -39,11 +39,4 @@ public interface GridCacheAtomicFuture extends
GridCacheFuture {
* @return Future keys.
*/
public Collection keys();
-
-/**
- * Checks if timeout occurred.
- *
- * @param timeout Timeout to check.
- */
-public void checkTimeout(long timeout);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/216cec3b/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 33faf17..6984238 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
@@ -2175,36 +2175,6 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
}
/**
- * Checks if future timeout happened.
- */
-private void scheduleAtomicFutureRecheck() {
-final long timeout = ctx.kernalContext().config().getNetworkTimeout();
-
-ctx.time().addTimeoutObject(new GridTimeoutObjectAdapter(timeout * 2) {
-@Override public void onTimeout() {
-boolean leave = false;
-
-try {
-ctx.gate().enter();
-
-leave = true;
-
-for (GridCacheAtomicFuture fut :
ctx.mvcc().atomicFutures())
-fut.checkTimeout(timeout);
-}
-catch (IllegalStateException ignored) {
-if (log.isDebugEnabled())
-log.debug("Will not check pending atomic update
futures for timeout (Grid is stopping).");
-}
-finally {
-if (leave)
-ctx.gate().leave();
-}
-}
-});
-}
-
-/**
* @param entry Entry to check.
* @param req Update request.
* @param res Update response. If filter evaluation failed, key will be
added to failed keys and method
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/216cec3b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
index 2b1fa01..f6aa5b6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.jav
[34/42] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-743' into ignite-sprint-4
Merge remote-tracking branch 'remotes/origin/ignite-743' into ignite-sprint-4
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/357a7156
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/357a7156
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/357a7156
Branch: refs/heads/ignite-gg-9613
Commit: 357a7156baf2f78b070545e4d9be5500ec01cf65
Parents: 122f3ce 23a41df
Author: ivasilinets
Authored: Fri Apr 17 13:59:35 2015 +0300
Committer: ivasilinets
Committed: Fri Apr 17 13:59:35 2015 +0300
--
.../processors/cache/GridCacheGateway.java | 111 --
.../processors/cache/IgniteCacheProxy.java | 353 +++
.../datastreamer/DataStreamerCacheUpdaters.java | 2 +-
.../datastreamer/DataStreamerImpl.java | 81 ++---
.../datastreamer/DataStreamerUpdateJob.java | 16 +-
.../dr/IgniteDrDataStreamerCacheUpdater.java| 2 -
6 files changed, 320 insertions(+), 245 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/357a7156/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index b890407,c1a2d6a..244e200
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@@ -449,11 -485,9 +486,11 @@@ public class IgniteCacheProxy ext
@Override public QueryCursor query(Query qry) {
A.notNull(qry, "qry");
- GridCacheProjectionImpl prev = gate.enter(prj);
+ GridCacheProjectionImpl prev = onEnter(prj);
try {
+ctx.checkSecurity(SecurityPermission.CACHE_READ);
+
validate(qry);
if (qry instanceof ContinuousQuery)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/357a7156/modules/core/src/main/java/org/apache/ignite/internal/processors/datastreamer/DataStreamerCacheUpdaters.java
--
