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/30 10:07:15 UTC
[1/9] incubator-ignite git commit: # SS-3 fix performance problem:
cache values returned from readFromCache().
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-1 254045110 -> 9996c90ea
# SS-3 fix performance problem: cache values returned from readFromCache().
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/794e0541
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/794e0541
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/794e0541
Branch: refs/heads/ignite-1
Commit: 794e05412e2f9cb600ae15d74f7636a889284dc0
Parents: c541d65
Author: sevdokimov <se...@gridgain.com>
Authored: Mon Dec 29 20:30:14 2014 +0300
Committer: sevdokimov <se...@gridgain.com>
Committed: Mon Dec 29 20:30:14 2014 +0300
----------------------------------------------------------------------
.../processors/query/h2/opt/GridH2AbstractKeyValueRow.java | 4 ++--
.../kernal/processors/query/h2/opt/GridH2KeyValueRowOffheap.java | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/794e0541/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java b/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java
index 6d526a7..f3c0f41 100644
--- a/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java
+++ b/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java
@@ -219,9 +219,9 @@ public abstract class GridH2AbstractKeyValueRow extends GridH2Row {
if (valObj != null) {
Value upd = wrap(valObj, desc.valueType());
- Value res = updateWeakValue(v, upd);
+ Value res = updateWeakValue(null, upd);
- if (res == v) {
+ if (res == null) {
if (super.getValue(KEY_COL) == null)
cache();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/794e0541/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/opt/GridH2KeyValueRowOffheap.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/opt/GridH2KeyValueRowOffheap.java b/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/opt/GridH2KeyValueRowOffheap.java
index 7f386f0..7f567ee 100644
--- a/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/opt/GridH2KeyValueRowOffheap.java
+++ b/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/opt/GridH2KeyValueRowOffheap.java
@@ -207,6 +207,8 @@ public class GridH2KeyValueRowOffheap extends GridH2AbstractKeyValueRow {
/** {@inheritDoc} */
@SuppressWarnings("NonSynchronizedMethodOverridesSynchronizedMethod")
@Override protected Value updateWeakValue(Value exp, Value upd) {
+ setValue(VAL_COL, upd);
+
return exp;
}
[3/9] incubator-ignite git commit: # ignite moved test using queries
to indexing module
Posted by sb...@apache.org.
# ignite moved test using queries to indexing module
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/04a442ef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/04a442ef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/04a442ef
Branch: refs/heads/ignite-1
Commit: 04a442efaa3953098f61c832d52147cb0c9e374d
Parents: 7abc5f9
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 30 09:37:39 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 30 09:37:39 2014 +0300
----------------------------------------------------------------------
.../tcp/GridOrderedMessageCancelSelfTest.java | 211 -------------------
.../bamboo/GridComputeGridTestSuite.java | 1 -
.../tcp/GridOrderedMessageCancelSelfTest.java | 211 +++++++++++++++++++
.../testsuites/GridCacheQuerySelfTestSuite.java | 3 +
4 files changed, 214 insertions(+), 212 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/04a442ef/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
deleted file mode 100644
index 2a8edcf..0000000
--- a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/* @java.file.header */
-
-/* _________ _____ __________________ _____
- * __ ____/___________(_)______ /__ ____/______ ____(_)_______
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
- */
-
-package org.apache.ignite.spi.communication.tcp;
-
-import org.apache.ignite.*;
-import org.apache.ignite.compute.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.marshaller.*;
-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.gridgain.grid.cache.*;
-import org.gridgain.grid.cache.query.*;
-import org.gridgain.grid.kernal.*;
-import org.gridgain.grid.kernal.managers.communication.*;
-import org.gridgain.grid.kernal.processors.cache.query.*;
-import org.gridgain.grid.util.direct.*;
-import org.gridgain.grid.util.typedef.internal.*;
-import org.gridgain.testframework.junits.common.*;
-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.*;
-
-/**
- *
- */
-public class GridOrderedMessageCancelSelfTest extends GridCommonAbstractTest {
- /** IP finder. */
- private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
-
- /** Cancel latch. */
- private static CountDownLatch cancelLatch;
-
- /** Process response latch. */
- private static CountDownLatch resLatch;
-
- /** Finish latch. */
- private static CountDownLatch finishLatch;
-
- /** {@inheritDoc} */
- @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
- IgniteConfiguration cfg = super.getConfiguration(gridName);
-
- GridCacheConfiguration cache = defaultCacheConfiguration();
-
- cache.setCacheMode(PARTITIONED);
- cache.setPreloadMode(NONE);
-
- cfg.setCacheConfiguration(cache);
-
- cfg.setCommunicationSpi(new CommunicationSpi());
-
- TcpDiscoverySpi disco = new TcpDiscoverySpi();
-
- disco.setIpFinder(IP_FINDER);
-
- cfg.setDiscoverySpi(disco);
-
- return cfg;
- }
-
- /** {@inheritDoc} */
- @Override protected void beforeTest() throws Exception {
- cancelLatch = new CountDownLatch(1);
- resLatch = new CountDownLatch(1);
- finishLatch = new CountDownLatch(1);
-
- startGridsMultiThreaded(2);
- }
-
- /** {@inheritDoc} */
- @Override protected void afterTest() throws Exception {
- stopAllGrids();
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testQuery() throws Exception {
- GridCacheQueryFuture<Map.Entry<Object, Object>> fut =
- grid(0).cache(null).queries().createSqlQuery(String.class, "_key is not null").execute();
-
- testMessageSet(fut);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testTask() throws Exception {
- ComputeTaskFuture<?> fut = executeAsync(compute(grid(0).forRemotes()), Task.class, null);
-
- testMessageSet(fut);
- }
-
- /**
- * @throws Exception If failed.
- */
- public void testTaskException() throws Exception {
- ComputeTaskFuture<?> fut = executeAsync(compute(grid(0).forRemotes()), FailTask.class, null);
-
- testMessageSet(fut);
- }
-
- /**
- * @param fut Future to cancel.
- * @throws Exception If failed.
- */
- private void testMessageSet(IgniteFuture<?> fut) throws Exception {
- cancelLatch.await();
-
- assertTrue(fut.cancel());
-
- resLatch.countDown();
-
- assertTrue(U.await(finishLatch, 5000, MILLISECONDS));
-
- Map map = U.field(((GridKernal)grid(0)).context().io(), "msgSetMap");
-
- info("Map: " + map);
-
- assertTrue(map.isEmpty());
- }
-
- /**
- * Communication SPI.
- */
- private static class CommunicationSpi extends TcpCommunicationSpi {
- /** */
- @IgniteMarshallerResource
- private IgniteMarshaller marsh;
-
- /** {@inheritDoc} */
- @Override protected void notifyListener(UUID sndId, GridTcpCommunicationMessageAdapter msg,
- IgniteRunnable msgC) {
- try {
- GridIoMessage ioMsg = (GridIoMessage)msg;
-
- boolean wait = ioMsg.message() instanceof GridCacheQueryResponse ||
- ioMsg.message() instanceof GridJobExecuteResponse;
-
- if (wait) {
- cancelLatch.countDown();
-
- assertTrue(U.await(resLatch, 5000, MILLISECONDS));
- }
-
- super.notifyListener(sndId, msg, msgC);
-
- if (wait)
- finishLatch.countDown();
- }
- catch (Exception e) {
- fail("Unexpected error: " + e);
- }
- }
- }
-
- /**
- * Test task.
- */
- @ComputeTaskSessionFullSupport
- private static class Task extends ComputeTaskSplitAdapter<Void, Void> {
- /** {@inheritDoc} */
- @Override protected Collection<? extends ComputeJob> split(int gridSize, Void arg) throws IgniteCheckedException {
- return Collections.singleton(new ComputeJobAdapter() {
- @Nullable @Override public Object execute() {
- return null;
- }
- });
- }
-
- /** {@inheritDoc} */
- @Nullable @Override public Void reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
- return null;
- }
- }
-
- /**
- * Test task.
- */
- @ComputeTaskSessionFullSupport
- private static class FailTask extends ComputeTaskSplitAdapter<Void, Void> {
- /** {@inheritDoc} */
- @Override protected Collection<? extends ComputeJob> split(int gridSize, Void arg) throws IgniteCheckedException {
- return Collections.singleton(new ComputeJobAdapter() {
- @Nullable @Override public Object execute() throws IgniteCheckedException {
- throw new IgniteCheckedException("Task failed.");
- }
- });
- }
-
- /** {@inheritDoc} */
- @Nullable @Override public Void reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
- return null;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/04a442ef/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridComputeGridTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridComputeGridTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridComputeGridTestSuite.java
index b488a5a..a574cfc 100644
--- a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridComputeGridTestSuite.java
+++ b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridComputeGridTestSuite.java
@@ -78,7 +78,6 @@ public class GridComputeGridTestSuite {
suite.addTestSuite(GridTaskNameAnnotationSelfTest.class);
suite.addTestSuite(GridJobCheckpointCleanupSelfTest.class);
suite.addTestSuite(GridEventStorageSelfTest.class);
- suite.addTestSuite(GridOrderedMessageCancelSelfTest.class);
suite.addTestSuite(GridFailoverTaskWithPredicateSelfTest.class);
suite.addTestSuite(GridProjectionLocalJobMultipleArgumentsSelfTest.class);
suite.addTestSuite(GridAffinitySelfTest.class);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/04a442ef/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
new file mode 100644
index 0000000..2a8edcf
--- /dev/null
+++ b/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
@@ -0,0 +1,211 @@
+/* @java.file.header */
+
+/* _________ _____ __________________ _____
+ * __ ____/___________(_)______ /__ ____/______ ____(_)_______
+ * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
+ * / /_/ / _ / _ / / /_/ / / /_/ / / /_/ / _ / _ / / /
+ * \____/ /_/ /_/ \_,__/ \____/ \__,_/ /_/ /_/ /_/
+ */
+
+package org.apache.ignite.spi.communication.tcp;
+
+import org.apache.ignite.*;
+import org.apache.ignite.compute.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.marshaller.*;
+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.gridgain.grid.cache.*;
+import org.gridgain.grid.cache.query.*;
+import org.gridgain.grid.kernal.*;
+import org.gridgain.grid.kernal.managers.communication.*;
+import org.gridgain.grid.kernal.processors.cache.query.*;
+import org.gridgain.grid.util.direct.*;
+import org.gridgain.grid.util.typedef.internal.*;
+import org.gridgain.testframework.junits.common.*;
+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.*;
+
+/**
+ *
+ */
+public class GridOrderedMessageCancelSelfTest extends GridCommonAbstractTest {
+ /** IP finder. */
+ private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
+
+ /** Cancel latch. */
+ private static CountDownLatch cancelLatch;
+
+ /** Process response latch. */
+ private static CountDownLatch resLatch;
+
+ /** Finish latch. */
+ private static CountDownLatch finishLatch;
+
+ /** {@inheritDoc} */
+ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception {
+ IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+ GridCacheConfiguration cache = defaultCacheConfiguration();
+
+ cache.setCacheMode(PARTITIONED);
+ cache.setPreloadMode(NONE);
+
+ cfg.setCacheConfiguration(cache);
+
+ cfg.setCommunicationSpi(new CommunicationSpi());
+
+ TcpDiscoverySpi disco = new TcpDiscoverySpi();
+
+ disco.setIpFinder(IP_FINDER);
+
+ cfg.setDiscoverySpi(disco);
+
+ return cfg;
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void beforeTest() throws Exception {
+ cancelLatch = new CountDownLatch(1);
+ resLatch = new CountDownLatch(1);
+ finishLatch = new CountDownLatch(1);
+
+ startGridsMultiThreaded(2);
+ }
+
+ /** {@inheritDoc} */
+ @Override protected void afterTest() throws Exception {
+ stopAllGrids();
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testQuery() throws Exception {
+ GridCacheQueryFuture<Map.Entry<Object, Object>> fut =
+ grid(0).cache(null).queries().createSqlQuery(String.class, "_key is not null").execute();
+
+ testMessageSet(fut);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testTask() throws Exception {
+ ComputeTaskFuture<?> fut = executeAsync(compute(grid(0).forRemotes()), Task.class, null);
+
+ testMessageSet(fut);
+ }
+
+ /**
+ * @throws Exception If failed.
+ */
+ public void testTaskException() throws Exception {
+ ComputeTaskFuture<?> fut = executeAsync(compute(grid(0).forRemotes()), FailTask.class, null);
+
+ testMessageSet(fut);
+ }
+
+ /**
+ * @param fut Future to cancel.
+ * @throws Exception If failed.
+ */
+ private void testMessageSet(IgniteFuture<?> fut) throws Exception {
+ cancelLatch.await();
+
+ assertTrue(fut.cancel());
+
+ resLatch.countDown();
+
+ assertTrue(U.await(finishLatch, 5000, MILLISECONDS));
+
+ Map map = U.field(((GridKernal)grid(0)).context().io(), "msgSetMap");
+
+ info("Map: " + map);
+
+ assertTrue(map.isEmpty());
+ }
+
+ /**
+ * Communication SPI.
+ */
+ private static class CommunicationSpi extends TcpCommunicationSpi {
+ /** */
+ @IgniteMarshallerResource
+ private IgniteMarshaller marsh;
+
+ /** {@inheritDoc} */
+ @Override protected void notifyListener(UUID sndId, GridTcpCommunicationMessageAdapter msg,
+ IgniteRunnable msgC) {
+ try {
+ GridIoMessage ioMsg = (GridIoMessage)msg;
+
+ boolean wait = ioMsg.message() instanceof GridCacheQueryResponse ||
+ ioMsg.message() instanceof GridJobExecuteResponse;
+
+ if (wait) {
+ cancelLatch.countDown();
+
+ assertTrue(U.await(resLatch, 5000, MILLISECONDS));
+ }
+
+ super.notifyListener(sndId, msg, msgC);
+
+ if (wait)
+ finishLatch.countDown();
+ }
+ catch (Exception e) {
+ fail("Unexpected error: " + e);
+ }
+ }
+ }
+
+ /**
+ * Test task.
+ */
+ @ComputeTaskSessionFullSupport
+ private static class Task extends ComputeTaskSplitAdapter<Void, Void> {
+ /** {@inheritDoc} */
+ @Override protected Collection<? extends ComputeJob> split(int gridSize, Void arg) throws IgniteCheckedException {
+ return Collections.singleton(new ComputeJobAdapter() {
+ @Nullable @Override public Object execute() {
+ return null;
+ }
+ });
+ }
+
+ /** {@inheritDoc} */
+ @Nullable @Override public Void reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
+ return null;
+ }
+ }
+
+ /**
+ * Test task.
+ */
+ @ComputeTaskSessionFullSupport
+ private static class FailTask extends ComputeTaskSplitAdapter<Void, Void> {
+ /** {@inheritDoc} */
+ @Override protected Collection<? extends ComputeJob> split(int gridSize, Void arg) throws IgniteCheckedException {
+ return Collections.singleton(new ComputeJobAdapter() {
+ @Nullable @Override public Object execute() throws IgniteCheckedException {
+ throw new IgniteCheckedException("Task failed.");
+ }
+ });
+ }
+
+ /** {@inheritDoc} */
+ @Nullable @Override public Void reduce(List<ComputeJobResult> results) throws IgniteCheckedException {
+ return null;
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/04a442ef/modules/indexing/src/test/java/org/gridgain/testsuites/GridCacheQuerySelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/indexing/src/test/java/org/gridgain/testsuites/GridCacheQuerySelfTestSuite.java b/modules/indexing/src/test/java/org/gridgain/testsuites/GridCacheQuerySelfTestSuite.java
index 7a2ec15..6f0cf04 100644
--- a/modules/indexing/src/test/java/org/gridgain/testsuites/GridCacheQuerySelfTestSuite.java
+++ b/modules/indexing/src/test/java/org/gridgain/testsuites/GridCacheQuerySelfTestSuite.java
@@ -10,6 +10,7 @@
package org.gridgain.testsuites;
import junit.framework.*;
+import org.apache.ignite.spi.communication.tcp.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.near.*;
import org.gridgain.grid.kernal.processors.cache.distributed.replicated.*;
@@ -86,6 +87,8 @@ public class GridCacheQuerySelfTestSuite extends TestSuite {
suite.addTestSuite(GridCacheSwapScanQuerySelfTest.class);
+ suite.addTestSuite(GridOrderedMessageCancelSelfTest.class);
+
return suite;
}
}
[7/9] incubator-ignite git commit: # ignite utility methods for tests
Posted by sb...@apache.org.
# ignite utility methods for 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/84881745
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/84881745
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/84881745
Branch: refs/heads/ignite-1
Commit: 8488174594e1f06a42dafc1e03107d79e0acd3ef
Parents: 7543f27
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 30 11:10:12 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 30 11:10:12 2014 +0300
----------------------------------------------------------------------
.../src/main/java/org/gridgain/grid/util/GridUtils.java | 10 ++++++++++
.../java/org/gridgain/testframework/GridTestUtils.java | 7 +++++++
2 files changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/84881745/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java b/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
index b687a31..37c2109 100644
--- a/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
+++ b/modules/core/src/main/java/org/gridgain/grid/util/GridUtils.java
@@ -5596,6 +5596,16 @@ public abstract class GridUtils {
}
/**
+ * Checks if given class is of {@code Ignite} type.
+ *
+ * @param cls Class to check.
+ * @return {@code True} if given class is of {@code GridGain} type.
+ */
+ public static boolean isIgnite(Class<?> cls) {
+ return cls.getName().startsWith("org.apache.ignite");
+ }
+
+ /**
* Checks if given class is of {@code Grid} type.
*
* @param cls Class to check.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/84881745/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java b/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java
index bdd7042..092abbf 100644
--- a/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java
+++ b/modules/core/src/test/java/org/gridgain/testframework/GridTestUtils.java
@@ -1382,4 +1382,11 @@ public final class GridTestUtils {
return res;
}
+
+ /**
+ * @return Path to apache ignite.
+ */
+ public static String apacheIgniteTestPath() {
+ return System.getProperty("IGNITE_TEST_PATH", U.getGridGainHome() + "/target/ignite");
+ }
}
[8/9] incubator-ignite git commit: # ignite fixed portable
deserialization on get
Posted by sb...@apache.org.
# ignite fixed portable deserialization on get
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6fd75f90
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6fd75f90
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6fd75f90
Branch: refs/heads/ignite-1
Commit: 6fd75f907c96a0b5eb31b0e118a4e88895a501fd
Parents: 8488174
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 30 11:23:16 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 30 11:23:16 2014 +0300
----------------------------------------------------------------------
.../gridgain/grid/kernal/processors/cache/GridCacheAdapter.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6fd75f90/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
index 82098bb..2022680 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
@@ -1776,8 +1776,8 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter im
else {
val = ctx.cloneOnFlag(val);
- if (ctx.portableEnabled() && deserializePortable && val instanceof PortableObject)
- val = ((PortableObject)val).deserialize();
+ if (ctx.portableEnabled() && deserializePortable)
+ val = (V)ctx.unwrapPortableIfNeeded(val, false);
map.put(key, val);
[2/9] incubator-ignite git commit: # ignite updated javax.cache
version, minor fix for IgniteException.getMessage
Posted by sb...@apache.org.
# ignite updated javax.cache version, minor fix for IgniteException.getMessage
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7abc5f9a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7abc5f9a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7abc5f9a
Branch: refs/heads/ignite-1
Commit: 7abc5f9ac9ba8cd0015b67246aa3c0d8dfd68b6c
Parents: 794e054
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 30 09:29:08 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 30 09:29:08 2014 +0300
----------------------------------------------------------------------
modules/core/pom.xml | 2 +-
modules/core/src/main/java/org/apache/ignite/IgniteCache.java | 3 ++-
.../core/src/main/java/org/apache/ignite/IgniteException.java | 2 +-
.../main/java/org/apache/ignite/cache/CacheConfiguration.java | 2 +-
.../ignite/internal/processors/cache/IgniteCacheProxy.java | 4 ++--
5 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7abc5f9a/modules/core/pom.xml
----------------------------------------------------------------------
diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index cf84023..cf9e66b 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -31,7 +31,7 @@
<dependency>
<groupId>javax.cache</groupId>
<artifactId>cache-api</artifactId>
- <version>1.0.0-PFD</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7abc5f9a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index 48a601e..a59573e 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -16,6 +16,7 @@ import org.apache.ignite.transactions.*;
import org.jetbrains.annotations.*;
import javax.cache.*;
+import javax.cache.configuration.*;
import javax.cache.expiry.*;
import java.util.*;
import java.util.concurrent.locks.*;
@@ -57,7 +58,7 @@ public interface IgniteCache<K, V> extends javax.cache.Cache<K, V>, IgniteAsyncS
public @Override IgniteCache<K, V> enableAsync();
/** {@inheritDoc} */
- public @Override CacheConfiguration<K, V> getConfiguration();
+ public @Override <C extends Configuration<K, V>> C getConfiguration(Class<C> clazz);
/**
* Gets a random entry out of cache. In the worst cache scenario this method
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7abc5f9a/modules/core/src/main/java/org/apache/ignite/IgniteException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteException.java b/modules/core/src/main/java/org/apache/ignite/IgniteException.java
index 85f000f..b4ffb31 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteException.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteException.java
@@ -85,7 +85,7 @@ public class IgniteException extends RuntimeException {
* Adds troubleshooting links if they where not added by below in {@code cause} hierarchy.
*/
@Override public String getMessage() {
- return X.hasCauseExcludeRoot(this, IgniteException.class, IgniteException.class) ?
+ return X.hasCauseExcludeRoot(this, IgniteException.class, IgniteCheckedException.class) ?
super.getMessage() : errorMessageWithHelpUrls(super.getMessage());
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7abc5f9a/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
index 617f65f..d977b2e 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
@@ -18,6 +18,6 @@ import javax.cache.configuration.*;
* @version @java.version
*/
// TODO: remove 'abstract'
-public abstract class CacheConfiguration<K, V> extends Configuration<K, V> {
+public abstract class CacheConfiguration<K, V> implements Configuration<K, V> {
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7abc5f9a/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 5971d69..2d40f29 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
@@ -60,7 +60,7 @@ public class IgniteCacheProxy<K, V> implements IgniteCache<K, V>, Externalizable
}
/** {@inheritDoc} */
- @Override public CacheConfiguration<K, V> getConfiguration() {
+ @Override public <C extends Configuration<K, V>> C getConfiguration(Class<C> clazz) {
// TODO IGNITE-1.
throw new UnsupportedOperationException();
}
@@ -468,7 +468,7 @@ public class IgniteCacheProxy<K, V> implements IgniteCache<K, V>, Externalizable
}
/** {@inheritDoc} */
- @Override public <T> Map<K, T> invokeAll(Set<? extends K> keys,
+ @Override public <T> Map<K, EntryProcessorResult<T>> invokeAll(Set<? extends K> keys,
EntryProcessor<K, V, T> entryProcessor,
Object... args) {
// TODO IGNITE-1.
[9/9] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-1
Posted by sb...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-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/9996c90e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9996c90e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9996c90e
Branch: refs/heads/ignite-1
Commit: 9996c90eacabc91830fa2f6970dc33f346a4ccd7
Parents: 2540451 6fd75f9
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 30 12:06:42 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 30 12:06:42 2014 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/IgniteException.java | 2 +-
.../processors/cache/GridCacheAdapter.java | 4 +-
.../java/org/gridgain/grid/util/GridUtils.java | 10 +
.../tcp/GridOrderedMessageCancelSelfTest.java | 211 -------------------
.../gridgain/grid/lang/IgniteUuidSelfTest.java | 3 +
.../gridgain/testframework/GridTestUtils.java | 7 +
.../GridCacheDataStructuresSelfTestSuite.java | 5 +-
.../bamboo/GridCacheFailoverTestSuite.java | 5 +-
.../bamboo/GridComputeGridTestSuite.java | 1 -
.../query/h2/opt/GridH2AbstractKeyValueRow.java | 4 +-
.../query/h2/opt/GridH2KeyValueRowOffheap.java | 2 +
.../tcp/GridOrderedMessageCancelSelfTest.java | 211 +++++++++++++++++++
.../testsuites/GridCacheQuerySelfTestSuite.java | 3 +
13 files changed, 247 insertions(+), 221 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9996c90e/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
[4/9] incubator-ignite git commit: # ignite avoid division by 0
Posted by sb...@apache.org.
# ignite avoid division by 0
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/679608c2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/679608c2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/679608c2
Branch: refs/heads/ignite-1
Commit: 679608c21a6a9dd1061ba41c1a2eaa13560e5a1d
Parents: 04a442e
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 30 09:51:23 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 30 09:51:23 2014 +0300
----------------------------------------------------------------------
.../src/test/java/org/gridgain/grid/lang/IgniteUuidSelfTest.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/679608c2/modules/core/src/test/java/org/gridgain/grid/lang/IgniteUuidSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/lang/IgniteUuidSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/lang/IgniteUuidSelfTest.java
index b9f0074..186a4b3 100644
--- a/modules/core/src/test/java/org/gridgain/grid/lang/IgniteUuidSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/lang/IgniteUuidSelfTest.java
@@ -95,6 +95,9 @@ public class IgniteUuidSelfTest extends GridCommonAbstractTest {
long dur2 = System.currentTimeMillis() - start;
+ if (dur2 == 0)
+ dur2 = 1;
+
System.out.println("Creation: UUID=" + dur1 + "ms, GridUuid=" + dur2 + "ms, " + (dur1 / dur2) + "x faster.");
}
[6/9] incubator-ignite git commit: # ignite commented hanging tests
Posted by sb...@apache.org.
# ignite commented hanging 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/7543f27a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7543f27a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7543f27a
Branch: refs/heads/ignite-1
Commit: 7543f27ab14e324926606cc86acba5787a135342
Parents: e01bf3c
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 30 10:06:39 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 30 10:06:39 2014 +0300
----------------------------------------------------------------------
.../gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7543f27a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java
index 7584e00..2775623 100644
--- a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java
+++ b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java
@@ -29,8 +29,9 @@ public class GridCacheFailoverTestSuite extends TestSuite {
suite.addTestSuite(GridCacheAtomicInvalidPartitionHandlingSelfTest.class);
// Group lock failover.
- suite.addTestSuite(GridCacheGroupLockFailoverSelfTest.class);
- suite.addTestSuite(GridCacheGroupLockFailoverOptimisticTxSelfTest.class);
+ // TODO: IGNITE-80.
+ //suite.addTestSuite(GridCacheGroupLockFailoverSelfTest.class);
+ //suite.addTestSuite(GridCacheGroupLockFailoverOptimisticTxSelfTest.class);
// Failure consistency tests.
suite.addTestSuite(GridCacheDhtAtomicRemoveFailureTest.class);
[5/9] incubator-ignite git commit: # ignite commented hanging tests
Posted by sb...@apache.org.
# ignite commented hanging 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/e01bf3c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e01bf3c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e01bf3c7
Branch: refs/heads/ignite-1
Commit: e01bf3c783d7f595246d7f08fcbfaac488c8aeed
Parents: 679608c
Author: sboikov <sb...@gridgain.com>
Authored: Tue Dec 30 10:00:52 2014 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Dec 30 10:00:52 2014 +0300
----------------------------------------------------------------------
.../testsuites/GridCacheDataStructuresSelfTestSuite.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e01bf3c7/modules/core/src/test/java/org/gridgain/testsuites/GridCacheDataStructuresSelfTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/testsuites/GridCacheDataStructuresSelfTestSuite.java b/modules/core/src/test/java/org/gridgain/testsuites/GridCacheDataStructuresSelfTestSuite.java
index 8dbd03b..c21319c 100644
--- a/modules/core/src/test/java/org/gridgain/testsuites/GridCacheDataStructuresSelfTestSuite.java
+++ b/modules/core/src/test/java/org/gridgain/testsuites/GridCacheDataStructuresSelfTestSuite.java
@@ -51,8 +51,9 @@ public class GridCacheDataStructuresSelfTestSuite extends TestSuite {
suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueApiSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedQueueMultiNodeSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueMultiNodeSelfTest.class));
- suite.addTest(new TestSuite(GridCachePartitionedQueueCreateMultiNodeSelfTest.class));
- suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.class));
+ // TODO: IGNITE-80.
+ //suite.addTest(new TestSuite(GridCachePartitionedQueueCreateMultiNodeSelfTest.class));
+ //suite.addTest(new TestSuite(GridCachePartitionedAtomicQueueCreateMultiNodeSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedSetSelfTest.class));
suite.addTest(new TestSuite(GridCachePartitionedAtomicSetSelfTest.class));