You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2014/12/24 10:20:31 UTC
[1/4] incubator-ignite git commit: Added interop data loader.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-32 55370e2e1 -> 1dfc3fbd9
Added interop data loader.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c8a38a3f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c8a38a3f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c8a38a3f
Branch: refs/heads/ignite-32
Commit: c8a38a3f02c2c488332d2e28f204c8bb044a7da2
Parents: 3f25425
Author: vozerov <vo...@gridgain.com>
Authored: Wed Dec 24 11:12:57 2014 +0300
Committer: vozerov <vo...@gridgain.com>
Committed: Wed Dec 24 11:12:57 2014 +0300
----------------------------------------------------------------------
.../kernal/processors/interop/GridInteropProcessor.java | 9 +++++++++
.../processors/interop/os/GridOsInteropProcessor.java | 5 +++++
2 files changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c8a38a3f/modules/core/src/main/java/org/gridgain/grid/kernal/processors/interop/GridInteropProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/interop/GridInteropProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/interop/GridInteropProcessor.java
index 78498a5..3c2549e 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/interop/GridInteropProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/interop/GridInteropProcessor.java
@@ -57,6 +57,15 @@ public interface GridInteropProcessor extends GridProcessor {
public GridInteropTarget cache(@Nullable String name) throws IgniteCheckedException;
/**
+ * Gets native wrapper for data loader for cache with the given name.
+ *
+ * @param cacheName Cache name ({@code null} for default cache).
+ * @return Native data loader wrapper.
+ * @throws IgniteCheckedException If failed.
+ */
+ public GridInteropTarget dataLoader(@Nullable String cacheName) throws IgniteCheckedException;
+
+ /**
* Stops grid.
*
* @param cancel Cancel flag.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c8a38a3f/modules/core/src/main/java/org/gridgain/grid/kernal/processors/interop/os/GridOsInteropProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/interop/os/GridOsInteropProcessor.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/interop/os/GridOsInteropProcessor.java
index d09f126..f19f206 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/interop/os/GridOsInteropProcessor.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/interop/os/GridOsInteropProcessor.java
@@ -65,4 +65,9 @@ public class GridOsInteropProcessor extends GridInteropProcessorAdapter {
@Override public GridInteropTarget cache(@Nullable String name) throws IgniteCheckedException {
throw new UnsupportedOperationException(ERR_MSG);
}
+
+ /** {@inheritDoc} */
+ @Override public GridInteropTarget dataLoader(@Nullable String cacheName) throws IgniteCheckedException {
+ throw new UnsupportedOperationException(ERR_MSG);
+ }
}
[4/4] incubator-ignite git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-32
Posted by sb...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-32
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1dfc3fbd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1dfc3fbd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1dfc3fbd
Branch: refs/heads/ignite-32
Commit: 1dfc3fbd9fe9d650e93dd12bf4d01f7f0b05c35d
Parents: 55370e2 c541d65
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Dec 24 16:20:25 2014 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Dec 24 16:20:25 2014 +0700
----------------------------------------------------------------------
.../interop/GridInteropProcessor.java | 9 +++++++
.../interop/os/GridOsInteropProcessor.java | 5 ++++
.../tcp/GridOrderedMessageCancelSelfTest.java | 28 ++++++++++++--------
3 files changed, 31 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
[2/4] incubator-ignite git commit: Merge remote-tracking branch
'origin/master'
Posted by sb...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c9aa93e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c9aa93e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c9aa93e6
Branch: refs/heads/ignite-32
Commit: c9aa93e624de95fce56a6ab79081652a30f675f4
Parents: c8a38a3 a6fad32
Author: vozerov <vo...@gridgain.com>
Authored: Wed Dec 24 11:59:04 2014 +0300
Committer: vozerov <vo...@gridgain.com>
Committed: Wed Dec 24 11:59:04 2014 +0300
----------------------------------------------------------------------
.../org/gridgain/grid/kernal/GridKernal.java | 4 +
.../java/org/gridgain/grid/util/GridUtils.java | 87 ++++++++++++++------
.../gridgain/grid/util/GridTestClockTimer.java | 31 +++++++
.../testframework/junits/GridAbstractTest.java | 8 ++
4 files changed, 105 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
[3/4] incubator-ignite git commit: # master Fixed test to avoid hang
Posted by sb...@apache.org.
# master Fixed test to avoid hang
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c541d659
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c541d659
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c541d659
Branch: refs/heads/ignite-32
Commit: c541d65987a019d0a2ee550422edaecd09ad5869
Parents: c9aa93e
Author: sboikov <sb...@gridgain.com>
Authored: Wed Dec 24 13:13:13 2014 +0400
Committer: sboikov <sb...@gridgain.com>
Committed: Wed Dec 24 13:13:13 2014 +0400
----------------------------------------------------------------------
.../tcp/GridOrderedMessageCancelSelfTest.java | 28 ++++++++++++--------
1 file changed, 17 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c541d659/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
index 3684f5e..2a8edcf 100644
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
@@ -31,6 +31,7 @@ import org.jetbrains.annotations.*;
import java.util.*;
import java.util.concurrent.*;
+import static java.util.concurrent.TimeUnit.*;
import static org.gridgain.grid.cache.GridCacheMode.*;
import static org.gridgain.grid.cache.GridCachePreloadMode.*;
@@ -125,7 +126,7 @@ public class GridOrderedMessageCancelSelfTest extends GridCommonAbstractTest {
resLatch.countDown();
- finishLatch.await();
+ assertTrue(U.await(finishLatch, 5000, MILLISECONDS));
Map map = U.field(((GridKernal)grid(0)).context().io(), "msgSetMap");
@@ -145,21 +146,26 @@ public class GridOrderedMessageCancelSelfTest extends GridCommonAbstractTest {
/** {@inheritDoc} */
@Override protected void notifyListener(UUID sndId, GridTcpCommunicationMessageAdapter msg,
IgniteRunnable msgC) {
- GridIoMessage ioMsg = (GridIoMessage)msg;
+ try {
+ GridIoMessage ioMsg = (GridIoMessage)msg;
- boolean wait = ioMsg.message() instanceof GridCacheQueryResponse ||
- ioMsg.message() instanceof GridJobExecuteResponse;
+ boolean wait = ioMsg.message() instanceof GridCacheQueryResponse ||
+ ioMsg.message() instanceof GridJobExecuteResponse;
- if (wait) {
- cancelLatch.countDown();
+ if (wait) {
+ cancelLatch.countDown();
- U.awaitQuiet(resLatch);
- }
+ assertTrue(U.await(resLatch, 5000, MILLISECONDS));
+ }
- super.notifyListener(sndId, msg, msgC);
+ super.notifyListener(sndId, msg, msgC);
- if (wait)
- finishLatch.countDown();
+ if (wait)
+ finishLatch.countDown();
+ }
+ catch (Exception e) {
+ fail("Unexpected error: " + e);
+ }
}
}