You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/05/07 15:26:32 UTC
[1/6] incubator-ignite git commit: # sprint-5 Minor fix: removed
redundant space char.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-836_2 490827ead -> 4be04388e
# sprint-5 Minor fix: removed redundant space char.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/54e814a7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/54e814a7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/54e814a7
Branch: refs/heads/ignite-836_2
Commit: 54e814a7e8434e33f396733c4acdd0e79ac1524f
Parents: bd7ae30
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu May 7 15:31:24 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu May 7 15:31:24 2015 +0700
----------------------------------------------------------------------
.../java/org/apache/ignite/schema/generator/CodeGenerator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/54e814a7/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
----------------------------------------------------------------------
diff --git a/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java b/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
index f8901d2..8a994f2 100644
--- a/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
+++ b/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
@@ -674,7 +674,7 @@ public class CodeGenerator {
if (!groups.isEmpty()) {
add2(src, "// Groups for " + tbl + ".");
add2(src, (first ? "Map<String, LinkedHashMap<String, IgniteBiTuple<Class<?>, Boolean>>> " : "") +
- " grps = new LinkedHashMap<>();");
+ "grps = new LinkedHashMap<>();");
add0(src, "");
for (Map.Entry<String, Map<String, IndexItem>> group : groups.entrySet()) {
[4/6] incubator-ignite git commit: # IGNITE-709 Add additional tests.
Posted by se...@apache.org.
# IGNITE-709 Add additional tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7625bdca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7625bdca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7625bdca
Branch: refs/heads/ignite-836_2
Commit: 7625bdcafdcaed16c8648ac45f6ec832f62268ad
Parents: bf80c27
Author: sevdokimov <se...@gridgain.com>
Authored: Thu May 7 16:23:42 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Thu May 7 16:23:42 2015 +0300
----------------------------------------------------------------------
.../spi/discovery/tcp/TcpClientDiscoverySpi.java | 13 +++++++++++++
.../ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 13 ++++++++++++-
2 files changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7625bdca/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
index c319f9e..def9568 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
@@ -466,10 +466,14 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp
msg.client(true);
+ System.out.println("TcpClientDiscoverySpi.SocketReader: join write: " + msg);
+
writeToSocket(sock, msg);
int res = readReceipt(sock, ackTimeout);
+ System.out.println("TcpClientDiscoverySpi.SocketReader: join res: " + (res == RES_OK ? "OK" : "" + res));
+
switch (res) {
case RES_OK:
return sock;
@@ -667,6 +671,9 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp
msg.senderNodeId(rmtNodeId);
+ if (!(msg instanceof TcpDiscoveryHeartbeatMessage))
+ System.out.println("TcpClientDiscoverySpi.SocketReader: read: " + msg);
+
if (log.isDebugEnabled())
log.debug("Message has been received: " + msg);
@@ -777,6 +784,9 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp
}
try {
+ if (!(msg instanceof TcpDiscoveryHeartbeatMessage))
+ System.out.println("TcpClientDiscoverySpi.SocketReader: write: " + msg);
+
writeToSocket(sock, msg);
msg = null;
@@ -924,6 +934,9 @@ public class TcpClientDiscoverySpi extends TcpDiscoverySpiAdapter implements Tcp
while (true) {
Object msg = queue.take();
+ if (!(msg instanceof TcpDiscoveryHeartbeatMessage))
+ System.out.println("TcpClientDiscoverySpi.MessageWorker: process: " + msg);
+
if (msg == JOIN_TIMEOUT) {
if (joinLatch.getCount() > 0) {
joinErr = new IgniteSpiException("Join process timed out [sock=" + sock +
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7625bdca/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 a9a9306..c1b60a7 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
@@ -3401,7 +3401,18 @@ public class TcpDiscoverySpi extends TcpDiscoverySpiAdapter implements TcpDiscov
if (routerNode == null)
throw new IgniteSpiException("Router node for client does not exist: " + node);
- assert !routerNode.isClient();
+ if (routerNode.isClient())
+ throw new IgniteSpiException("Router node is a client node: " + node);
+
+ if (routerNode.id().equals(getLocalNodeId())) {
+ ClientMessageWorker worker = clientMsgWorkers.get(node.id());
+
+ msg.verify(getLocalNodeId()); // Client worker require verified messages.
+
+ worker.addMessage(msg);
+
+ return;
+ }
trySendMessageDirectly(routerNode, msg);
[5/6] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-709_2' into ignite-836_2
Posted by se...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-709_2' into ignite-836_2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2d6754f8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2d6754f8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2d6754f8
Branch: refs/heads/ignite-836_2
Commit: 2d6754f8358fa96311fdc5fefa5aa0a38ecfc265
Parents: 490827e 7625bdc
Author: sevdokimov <se...@gridgain.com>
Authored: Thu May 7 16:25:58 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Thu May 7 16:25:58 2015 +0300
----------------------------------------------------------------------
.../spi/discovery/tcp/TcpClientDiscoverySpi.java | 13 +++++++++++++
.../ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 13 ++++++++++++-
2 files changed, 25 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d6754f8/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpi.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2d6754f8/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java
----------------------------------------------------------------------
[3/6] incubator-ignite git commit: Minor tests fix
Posted by se...@apache.org.
Minor tests 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/29da67ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/29da67ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/29da67ce
Branch: refs/heads/ignite-836_2
Commit: 29da67ce0bbee3c7837126423a6290a6cc2a22cf
Parents: 61808ed
Author: agura <ag...@gridgain.com>
Authored: Thu May 7 15:18:34 2015 +0300
Committer: agura <ag...@gridgain.com>
Committed: Thu May 7 15:18:34 2015 +0300
----------------------------------------------------------------------
...CacheLoadingConcurrentGridStartSelfTest.java | 49 ++++++++++++--------
1 file changed, 29 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/29da67ce/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLoadingConcurrentGridStartSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLoadingConcurrentGridStartSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLoadingConcurrentGridStartSelfTest.java
index 74273d1..798494f 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLoadingConcurrentGridStartSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheLoadingConcurrentGridStartSelfTest.java
@@ -30,6 +30,7 @@ import org.jetbrains.annotations.*;
import javax.cache.*;
import javax.cache.configuration.*;
import javax.cache.integration.*;
+import java.io.*;
import java.util.concurrent.*;
import static org.apache.ignite.cache.CacheMode.*;
@@ -55,26 +56,7 @@ public class CacheLoadingConcurrentGridStartSelfTest extends GridCommonAbstractT
ccfg.setBackups(1);
- CacheStore<Integer, String> store = new CacheStoreAdapter<Integer, String>() {
- @Override public void loadCache(IgniteBiInClosure<Integer, String> f, Object... args) {
- for (int i = 0; i < KEYS_CNT; i++)
- f.apply(i, Integer.toString(i));
- }
-
- @Nullable @Override public String load(Integer i) throws CacheLoaderException {
- return null;
- }
-
- @Override public void write(Cache.Entry<? extends Integer, ? extends String> entry) throws CacheWriterException {
- // No-op.
- }
-
- @Override public void delete(Object o) throws CacheWriterException {
- // No-op.
- }
- };
-
- ccfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store));
+ ccfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(new TestCacheStoreAdapter()));
cfg.setCacheConfiguration(ccfg);
@@ -151,4 +133,31 @@ public class CacheLoadingConcurrentGridStartSelfTest extends GridCommonAbstractT
assertEquals(KEYS_CNT, total);
}
+
+ /**
+ * Cache store adapter.
+ */
+ private static class TestCacheStoreAdapter extends CacheStoreAdapter<Integer, String> implements Serializable {
+ /** {@inheritDoc} */
+ @Override public void loadCache(IgniteBiInClosure<Integer, String> f, Object... args) {
+ for (int i = 0; i < KEYS_CNT; i++)
+ f.apply(i, Integer.toString(i));
+ }
+
+ /** {@inheritDoc} */
+ @Nullable @Override public String load(Integer i) throws CacheLoaderException {
+ return null;
+ }
+
+ /** {@inheritDoc} */
+ @Override public void write(Cache.Entry<? extends Integer, ? extends String> entry)
+ throws CacheWriterException {
+ // No-op.
+ }
+
+ /** {@inheritDoc} */
+ @Override public void delete(Object o) throws CacheWriterException {
+ // No-op.
+ }
+ }
}
[2/6] incubator-ignite git commit: # sprint-5 Minor code formatting.
Posted by se...@apache.org.
# sprint-5 Minor code formatting.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/61808edc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/61808edc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/61808edc
Branch: refs/heads/ignite-836_2
Commit: 61808edc62f0bd9f9306f86d99d0488c196793e7
Parents: 54e814a
Author: AKuznetsov <ak...@gridgain.com>
Authored: Thu May 7 15:33:03 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Thu May 7 15:33:03 2015 +0700
----------------------------------------------------------------------
.../java/org/apache/ignite/schema/generator/CodeGenerator.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/61808edc/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
----------------------------------------------------------------------
diff --git a/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java b/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
index 8a994f2..5b74cdd 100644
--- a/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
+++ b/modules/schema-import/src/main/java/org/apache/ignite/schema/generator/CodeGenerator.java
@@ -69,7 +69,7 @@ public class CodeGenerator {
* @throws IllegalStateException If passed string is not valid java identifier.
*/
private static void checkValidJavaIdentifier(String identifier, boolean split, String msg, String type)
- throws IllegalStateException{
+ throws IllegalStateException {
if (identifier.isEmpty())
throw new IllegalStateException(msg + " could not be empty!");
@@ -679,7 +679,7 @@ public class CodeGenerator {
for (Map.Entry<String, Map<String, IndexItem>> group : groups.entrySet()) {
add2(src, (firstGrp ? "LinkedHashMap<String, IgniteBiTuple<Class<?>, Boolean>> " : "") +
- "grpItems = new LinkedHashMap<>();");
+ "grpItems = new LinkedHashMap<>();");
add0(src, "");
for (Map.Entry<String, IndexItem> grpItem : group.getValue().entrySet()) {
[6/6] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-sprint-5' into ignite-836_2
Posted by se...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-sprint-5' into ignite-836_2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4be04388
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4be04388
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4be04388
Branch: refs/heads/ignite-836_2
Commit: 4be04388e2452db1794a3a72b7c235f551226ec6
Parents: 2d6754f 29da67c
Author: sevdokimov <se...@gridgain.com>
Authored: Thu May 7 16:26:17 2015 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Thu May 7 16:26:17 2015 +0300
----------------------------------------------------------------------
...CacheLoadingConcurrentGridStartSelfTest.java | 49 ++++++++++++--------
.../ignite/schema/generator/CodeGenerator.java | 6 +--
2 files changed, 32 insertions(+), 23 deletions(-)
----------------------------------------------------------------------