incubator-ignite git commit: # Ignite: removed visor-trial module
Repository: incubator-ignite
Updated Branches:
refs/heads/master 57a262811 -> 2b1619cbc
# Ignite: removed visor-trial 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/2b1619cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2b1619cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2b1619cb
Branch: refs/heads/master
Commit: 2b1619cbcd0200b8639db4f66a2467980886fb52
Parents: 57a2628
Author: sboikov
Authored: Mon Dec 8 11:18:29 2014 +0300
Committer: sboikov
Committed: Mon Dec 8 11:18:29 2014 +0300
--
modules/visor-trial/ggvisorui.bat | 139 --
modules/visor-trial/ggvisorui.exe | Bin 5632 -> 0 bytes
modules/visor-trial/ggvisorui.sh| 131 --
.../licenses/RSyntaxTextArea.License.txt| 24 -
modules/visor-trial/licenses/apache-2.0.txt | 202
.../visor-trial/licenses/javax.mail-license.txt | 20 -
modules/visor-trial/licenses/jide-sla.txt | 55 ---
.../juniversalchardet-MPL1.1-license.txt| 470 ---
.../licenses/miglayout-bsd-license.txt | 1 -
.../visor-trial/licenses/scala-bsd-license.txt | 18 -
modules/visor-trial/pom.xml | 105 -
modules/visor-trial/readme.txt | 1 -
pom.xml | 20 -
13 files changed, 1186 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2b1619cb/modules/visor-trial/ggvisorui.bat
--
diff --git a/modules/visor-trial/ggvisorui.bat
b/modules/visor-trial/ggvisorui.bat
deleted file mode 100644
index 90b94b3..000
--- a/modules/visor-trial/ggvisorui.bat
+++ /dev/null
@@ -1,139 +0,0 @@
-::
-:: @bat.file.header
-:: __ ___
-:: __ /___(_)__ /__ /__ (_)___
-:: _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
-:: / /_/ / _ /_ / / /_/ / / /_/ / / /_/ / _ / _ / / /
-:: \/ /_/ /_/ \_,__/ \/ \__,_/ /_/ /_/ /_/
-::
-:: Version: @bat.file.version
-::
-
-::
-:: Starts Visor Dashboard with GridGain on the classpath.
-::
-
-@echo off
-
-if "%OS%" == "Windows_NT" setlocal
-
-:: Check JAVA_HOME.
-if not "%JAVA_HOME%" == "" goto checkJdk
-echo %0, ERROR: JAVA_HOME environment variable is not found.
-echo %0, ERROR: Please create JAVA_HOME variable pointing to location of
JDK 1.7 or JDK 1.8.
-echo %0, ERROR: You can also download latest JDK at:
http://java.sun.com/getjava
-goto error_finish
-
-:checkJdk
-:: Check that JDK is where it should be.
-if exist "%JAVA_HOME%\bin\java.exe" goto checkJdkVersion
-echo %0, ERROR: The JDK is not found in %JAVA_HOME%.
-echo %0, ERROR: Please modify your script so that JAVA_HOME would point to
valid location of JDK.
-goto error_finish
-
-:checkJdkVersion
-"%JAVA_HOME%\bin\java.exe" -version 2>&1 | findstr "1\.[78]\." > nul
-if %ERRORLEVEL% equ 0 goto checkGridGainHome1
-echo %0, ERROR: The version of JAVA installed in %JAVA_HOME% is incorrect.
-echo %0, ERROR: Please install JDK 1.7 or 1.8.
-echo %0, ERROR: You can also download latest JDK at:
http://java.sun.com/getjava
-goto error_finish
-
-:: Check GRIDGAIN_HOME.
-:checkGridGainHome1
-if not "%GRIDGAIN_HOME%" == "" goto checkGridGainHome2
-pushd "%~dp0"/..
-set GRIDGAIN_HOME=%CD%
-popd
-
-:checkGridGainHome2
-:: Strip double quotes from GRIDGAIN_HOME
-set GRIDGAIN_HOME=%GRIDGAIN_HOME:"=%
-
-:: remove all trailing slashes from GRIDGAIN_HOME.
-if %GRIDGAIN_HOME:~-1,1% == \ goto removeTrailingSlash
-if %GRIDGAIN_HOME:~-1,1% == / goto removeTrailingSlash
-goto checkGridGainHome3
-
-:removeTrailingSlash
-set GRIDGAIN_HOME=%GRIDGAIN_HOME:~0,-1%
-goto checkGridGainHome2
-
-:checkGridGainHome3
-if exist "%GRIDGAIN_HOME%\config" goto checkGridGainHome4
-echo %0, ERROR: GridGain installation folder is not found or GRIDGAIN_HOME
environment variable is not valid.
-echo Please create GRIDGAIN_HOME environment variable pointing to location
of
-echo GridGain installation folder.
-goto error_finish
-
-:checkGridGainHome4
-
-::
-:: Set SCRIPTS_HOME - base path to scripts.
-::
-set SCRIPTS_HOME=%GRIDGAIN_HOME%\os\bin &:: Will be replaced by
SCRIPTS_HOME=${GRIDGAIN_HOME}\bin in release.
-
-:: Remove trailing spaces
-for /l %%a in (1,1,31) do if /i "%SCRIPTS_HOME:~-1%" == " " set
SCRIPTS_HOME=%SCRIPTS_HOME:~0,-1%
-
-if /i "%SCRIPTS_HOME%\" == "%~dp0" goto run
-echo %0, WARN: GRIDGAIN_HOME environment variable may be pointing to wrong
folder: %GRIDGAIN_HOME%
-
-:run
-
-::
-:: Set GRIDGAIN_LIBS
-::
-call "%SCRIPTS_HOME%\include\setenv.bat"
-call "%SCRIPTS_HOME%\include\ta
incubator-ignite git commit: Ignite - fixed compilation
Repository: incubator-ignite
Updated Branches:
refs/heads/master 2b1619cbc -> 984373dc3
Ignite - fixed compilation
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/984373dc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/984373dc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/984373dc
Branch: refs/heads/master
Commit: 984373dc308b79f374112d66ada1f79daf91de1f
Parents: 2b1619c
Author: Valentin Kulichenko
Authored: Mon Dec 8 14:57:59 2014 +0300
Committer: Valentin Kulichenko
Committed: Mon Dec 8 14:57:59 2014 +0300
--
.../integration/GridClientAbstractMultiNodeSelfTest.java | 11 +--
.../kernal/processors/rest/GridRestProcessorTest.java| 6 +++---
2 files changed, 8 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/984373dc/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java
--
diff --git
a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java
b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java
index 0cca292..259ee3a 100644
---
a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java
+++
b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractMultiNodeSelfTest.java
@@ -16,6 +16,10 @@ import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.resources.*;
import org.apache.ignite.spi.*;
+import org.apache.ignite.spi.communication.tcp.*;
+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.client.*;
import org.gridgain.client.balancer.*;
import org.gridgain.client.ssl.*;
@@ -25,11 +29,6 @@ import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.managers.communication.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.kernal.processors.cache.distributed.*;
-import org.gridgain.grid.spi.*;
-import org.apache.ignite.spi.communication.tcp.*;
-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.util.direct.*;
import org.gridgain.grid.util.typedef.*;
import org.gridgain.testframework.*;
@@ -779,7 +778,7 @@ public abstract class GridClientAbstractMultiNodeSelfTest
extends GridCommonAbst
if (!(o instanceof GridDistributedLockRequest))
return;
-GridKernal g = (GridKernal)G.grid(nodeId);
+GridKernal g = (GridKernal)G.ignite(nodeId);
GridCacheContext cacheCtx =
g.internalCache(REPLICATED_ASYNC_CACHE_NAME).context();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/984373dc/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessorTest.java
--
diff --git
a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessorTest.java
b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessorTest.java
index 09c2fb6..dc2af51 100644
---
a/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessorTest.java
+++
b/modules/clients/src/test/java/org/gridgain/grid/kernal/processors/rest/GridRestProcessorTest.java
@@ -127,7 +127,7 @@ public class GridRestProcessorTest extends
GridCommonAbstractTest {
* @throws GridException If failed.
*/
private void populateCache() throws GridException {
-GridCache cache = G.grid().cache(null);
+GridCache cache = G.ignite().cache(null);
cache.put("int", intValue());
cache.put("string", "cacheString");
@@ -147,8 +147,8 @@ public class GridRestProcessorTest extends
GridCommonAbstractTest {
* @throws GridException If failed.
*/
private void deployTasks() throws GridException {
-G.grid().compute().localDeployTask(TestTask1.class,
TestTask1.class.getClassLoader());
-G.grid().compute().localDeployTask(TestTask2.class,
TestTask2.class.getClassLoader());
+G.ignite().compute().localDeployTask(TestTask1.class,
TestTask1.class.getClassLoader());
+G.ignite().compute().localDeployTask(TestTask2.class,
TestTask2.class.getClassLoader());
}
/**
[4/5] incubator-ignite git commit: Ignite - Cleanup test since store single update is removed.
Ignite - Cleanup test since store single update is removed.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c0255c05
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c0255c05
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c0255c05
Branch: refs/heads/master
Commit: c0255c050367e88e95b2f8bb4a99cf7dd7f77037
Parents: ef04ea4
Author: Alexey Goncharuk
Authored: Mon Dec 8 19:10:42 2014 -0800
Committer: Alexey Goncharuk
Committed: Mon Dec 8 19:10:42 2014 -0800
--
.../GridCacheBasicStoreNoBatchAbstractTest.java | 251 ---
...chePartitionedBasicStoreNoBatchSelfTest.java | 25 --
...acheReplicatedBasicStoreNoBatchSelfTest.java | 25 --
...cheLocalAtomicBasicStoreNoBatchSelfTest.java | 24 --
...GridCacheLocalBasicStoreNoBatchSelfTest.java | 25 --
.../bamboo/GridDataGridTestSuite.java | 6 +-
6 files changed, 1 insertion(+), 355 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c0255c05/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreNoBatchAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreNoBatchAbstractTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreNoBatchAbstractTest.java
deleted file mode 100644
index 910d133..000
---
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicStoreNoBatchAbstractTest.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/* @java.file.header */
-
-/* __ ___
- * __ /___(_)__ /__ /__ (_)___
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ /_ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \/ /_/ /_/ \_,__/ \/ \__,_/ /_/ /_/ /_/
- */
-
-package org.gridgain.grid.kernal.processors.cache;
-
-import org.apache.ignite.configuration.*;
-import org.gridgain.grid.cache.*;
-import org.apache.ignite.spi.discovery.tcp.*;
-import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
-import org.gridgain.grid.util.typedef.*;
-import org.gridgain.testframework.junits.common.*;
-
-import java.util.*;
-
-import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
-
-/**
- * Test store without batch.
- */
-public abstract class GridCacheBasicStoreNoBatchAbstractTest extends
GridCommonAbstractTest {
-/** Cache store. */
-private static final GridCacheTestStore store = new GridCacheTestStore();
-
-/** Constructs a test. */
-protected GridCacheBasicStoreNoBatchAbstractTest() {
-super(true /*start grid. */);
-}
-
-/** {@inheritDoc} */
-@Override protected void beforeTest() throws Exception {
-store.resetTimestamp();
-}
-
-/** {@inheritDoc} */
-@Override protected void afterTest() throws Exception {
-GridCache cache = cache();
-
-if (cache != null)
-cache.removeAll(F.>alwaysTrue());
-
-store.reset();
-}
-
-/** @return Cache mode. */
-protected abstract GridCacheMode cacheMode();
-
-/** {@inheritDoc} */
-@Override protected final IgniteConfiguration getConfiguration() throws
Exception {
-IgniteConfiguration c = super.getConfiguration();
-
-TcpDiscoverySpi disco = new TcpDiscoverySpi();
-
-disco.setIpFinder(new TcpDiscoveryVmIpFinder(true));
-
-c.setDiscoverySpi(disco);
-
-GridCacheConfiguration cc = defaultCacheConfiguration();
-
-cc.setCacheMode(cacheMode());
-
-cc.setStore(store);
-
-
cc.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC);
-cc.setAtomicityMode(atomicityMode());
-
-c.setCacheConfiguration(cc);
-
-return c;
-}
-
-/**
- * @return Cache atomicity mode.
- */
-protected GridCacheAtomicityMode atomicityMode() {
-return TRANSACTIONAL;
-}
-
-/** @throws Exception If test fails. */
-public void testWriteThrough() throws Exception {
-GridCache cache = cache();
-
-Map map = store.getMap();
-
-assert map.isEmpty();
-
-GridCacheTx tx = atomicityMode() == TRANSACTIONAL ? cache.txStart() :
null;
-
-try {
-for (int i = 1; i <= 10; i++) {
-cache.put(i, Integer.toString(i));
-
-checkLastMethod("put");
-}
-
-if (tx != null) {
-tx.commit();
-
-checkLastMethod("put");
-}
-}
-finally {
-if (tx != null)
-tx.close();
-}
-
-
[2/5] incubator-ignite git commit: Ignite - Fixing cache tests.
Ignite - Fixing cache 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/3ec08ec1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3ec08ec1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3ec08ec1
Branch: refs/heads/master
Commit: 3ec08ec101f7ee8f0f486a686f21a42aef611bc6
Parents: 9f90d7d
Author: Alexey Goncharuk
Authored: Mon Dec 8 18:09:33 2014 -0800
Committer: Alexey Goncharuk
Committed: Mon Dec 8 18:09:33 2014 -0800
--
.../processors/cache/GridCacheMvccManager.java | 31 +++-
.../processors/cache/GridCacheTxManager.java| 3 ++
.../GridCacheNodeFailureAbstractTest.java | 10 +--
.../bamboo/GridDataGridTestSuite.java | 14 -
4 files changed, 41 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ec08ec1/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java
--
diff --git
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java
index bedc33f..41c1c0c 100644
---
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java
+++
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMvccManager.java
@@ -63,6 +63,10 @@ public class GridCacheMvccManager extends
GridCacheSharedManagerAdapter,
GridDistributedCacheEntry> locked = newMap();
+/** Near locked keys. Need separate map because mvcc manager is shared
between caches. */
+@GridToStringExclude
+private final ConcurrentMap,
GridDistributedCacheEntry> nearLocked = newMap();
+
/** Active futures mapped by version ID. */
@GridToStringExclude
private final ConcurrentMap>> futs = newMap();
@@ -135,12 +139,18 @@ public class GridCacheMvccManager extends
GridCacheSharedManagerAdapter entry) {
-locked.put(entry.txKey(), entry);
+if (entry.isNear())
+nearLocked.put(entry.txKey(), entry);
+else
+locked.put(entry.txKey(), entry);
}
/** {@inheritDoc} */
@Override public void onFreed(GridDistributedCacheEntry entry) {
-locked.remove(entry.txKey());
+if (entry.isNear())
+nearLocked.remove(entry.txKey());
+else
+locked.remove(entry.txKey());
}
};
@@ -155,7 +165,7 @@ public class GridCacheMvccManager extends
GridCacheSharedManagerAdapter entry : locked.values()) {
+for (GridDistributedCacheEntry entry : locked()) {
try {
entry.removeExplicitNodeLocks(discoEvt.eventNode().id());
}
@@ -508,6 +518,13 @@ public class GridCacheMvccManager extends
GridCacheSharedManagerAdapter> locked() {
+return F.concat(false, locked.values(), nearLocked.values());
+}
+
+/**
* This method has poor performance, so use with care. It is currently
only used by {@code DGC}.
*
* @return Remote candidates.
@@ -515,7 +532,7 @@ public class GridCacheMvccManager extends
GridCacheSharedManagerAdapter> remoteCandidates() {
Collection> rmtCands = new LinkedList<>();
-for (GridDistributedCacheEntry entry : locked.values()) {
+for (GridDistributedCacheEntry entry : locked()) {
rmtCands.addAll(entry.remoteMvccSnapshot());
}
@@ -530,7 +547,7 @@ public class GridCacheMvccManager extends
GridCacheSharedManagerAdapter> localCandidates() {
Collection> locCands = new LinkedList<>();
-for (GridDistributedCacheEntry entry : locked.values()) {
+for (GridDistributedCacheEntry entry : locked()) {
try {
locCands.addAll(entry.localCandidates());
}
@@ -955,8 +972,8 @@ public class GridCacheMvccManager extends
GridCacheSharedManagerAdapter>() {
@Override public boolean
apply(GridDistributedCacheEntry e) {
return F.isAll(e.key(), keyFilter);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3ec08ec1/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
--
diff --git
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
index da0deed..9bd8a7a 100644
---
a/modules/core/src/main/java/org/gridgain/grid/kernal/processo
[5/5] incubator-ignite git commit: Ignite - Moved failover tests to proper test suite.
Ignite - Moved failover tests to proper test suite.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e2c4d265
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e2c4d265
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e2c4d265
Branch: refs/heads/master
Commit: e2c4d2658d84c07723dc673b205ef7fbf233dcf6
Parents: c0255c0
Author: Alexey Goncharuk
Authored: Mon Dec 8 19:12:15 2014 -0800
Committer: Alexey Goncharuk
Committed: Mon Dec 8 19:12:15 2014 -0800
--
.../gridgain/testsuites/bamboo/GridCacheFailoverTestSuite.java| 3 +++
.../org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java | 2 --
2 files changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e2c4d265/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 28d837c..65c6d07 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
@@ -43,6 +43,9 @@ public class GridCacheFailoverTestSuite extends TestSuite {
// suite.addTestSuite(GridCacheAtomicNearRemoveFailureTest.class);
TODO GG-9150
suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest.class);
+//suite.addTest(new
TestSuite(GridCachePartitionedFailoverSelfTest.class)); TODO-gg-4813
+//suite.addTest(new
TestSuite(GridCacheColocatedFailoverSelfTest.class)); TODO-gg-4813
+
return suite;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e2c4d265/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java
--
diff --git
a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java
b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java
index 077c9d0..49f5c38 100644
---
a/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java
+++
b/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java
@@ -165,8 +165,6 @@ public class GridDataGridTestSuite extends TestSuite {
suite.addTest(new
TestSuite(GridCachePartitionedAffinityFilterSelfTest.class));
suite.addTest(new
TestSuite(GridCachePartitionedPreloadLifecycleSelfTest.class));
suite.addTest(new TestSuite(GridCacheDhtPreloadDelayedSelfTest.class));
-//suite.addTest(new
TestSuite(GridCachePartitionedFailoverSelfTest.class)); TODO-gg-4813
-//suite.addTest(new
TestSuite(GridCacheColocatedFailoverSelfTest.class)); TODO-gg-4813
suite.addTest(new TestSuite(GridPartitionedBackupLoadSelfTest.class));
suite.addTest(new
TestSuite(GridCachePartitionedLoadCacheSelfTest.class));
suite.addTest(new
TestSuite(GridCacheDhtEvictionsDisabledSelfTest.class));
[3/5] incubator-ignite git commit: Ignite - Fixing cache tests.
Ignite - Fixing cache 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/ef04ea46
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ef04ea46
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ef04ea46
Branch: refs/heads/master
Commit: ef04ea463f5af7620cab27ef8c4268105b2f8e2a
Parents: 3ec08ec
Author: Alexey Goncharuk
Authored: Mon Dec 8 18:56:01 2014 -0800
Committer: Alexey Goncharuk
Committed: Mon Dec 8 18:56:01 2014 -0800
--
.../processors/cache/GridCacheTxHandler.java| 2 +-
.../processors/cache/GridCacheTxManager.java| 2 +-
...ansformWriteThroughSingleUpdateSelfTest.java | 98
.../bamboo/GridDataGridTestSuite.java | 3 +-
4 files changed, 3 insertions(+), 102 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef04ea46/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java
--
diff --git
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java
index e01f5aa..593c424 100644
---
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java
+++
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxHandler.java
@@ -966,7 +966,7 @@ public class GridCacheTxHandler {
res.invalidPartitions(tx.invalidPartitions());
-if (tx.empty()) {
+if (tx.empty() && req.last()) {
tx.rollback();
return null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef04ea46/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
--
diff --git
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
index 9bd8a7a..52c43f4 100644
---
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
+++
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxManager.java
@@ -995,7 +995,7 @@ public class GridCacheTxManager extends
GridCacheSharedManagerAdapterhttp://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ef04ea46/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTransformWriteThroughSingleUpdateSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTransformWriteThroughSingleUpdateSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTransformWriteThroughSingleUpdateSelfTest.java
deleted file mode 100644
index 0e431bf..000
---
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/dht/GridCachePartitionedTransformWriteThroughSingleUpdateSelfTest.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/* @java.file.header */
-
-/* __ ___
- * __ /___(_)__ /__ /__ (_)___
- * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
- * / /_/ / _ /_ / / /_/ / / /_/ / / /_/ / _ / _ / / /
- * \/ /_/ /_/ \_,__/ \/ \__,_/ /_/ /_/ /_/
- */
-
-package org.gridgain.grid.kernal.processors.cache.distributed.dht;
-
-import org.gridgain.grid.*;
-import org.gridgain.testframework.*;
-
-import java.util.concurrent.*;
-
-import static org.gridgain.grid.cache.GridCacheTxConcurrency.OPTIMISTIC;
-
-/**
- * Test for transform put with single update enabled.
- */
-public class GridCachePartitionedTransformWriteThroughSingleUpdateSelfTest
-extends GridCacheAbstractTransformWriteThroughSelfTest {
-/** {@inheritDoc} */
-@Override protected boolean batchUpdate() {
-return false;
-}
-
-/** {@inheritDoc} */
-@Override public void testTransformOptimisticNearUpdate() throws Exception
{
-GridTestUtils.assertThrows(log, new Callable() {
-@Override public Object call() throws Exception {
-checkTransform(OPTIMISTIC, NEAR_NODE, OP_UPDATE);
-
-return null;
-}
-}, GridException.class, null);
-
-}
-
-/** {@inheritDoc} */
-@Override public void testTransformOptimisticPrimaryUpdate() throws
Exception {
-GridTestUtils
[1/5] incubator-ignite git commit: Ignite - Fixes for invalidate flag.
Repository: incubator-ignite
Updated Branches:
refs/heads/master 984373dc3 -> e2c4d2658
Ignite - Fixes for invalidate flag.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9f90d7d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9f90d7d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9f90d7d6
Branch: refs/heads/master
Commit: 9f90d7d6250cbaa83d0c8c09f0b44fde01eddb09
Parents: 984373d
Author: Alexey Goncharuk
Authored: Mon Dec 8 14:50:19 2014 -0800
Committer: Alexey Goncharuk
Committed: Mon Dec 8 14:50:19 2014 -0800
--
.../kernal/processors/cache/GridCacheAdapter.java | 7 +--
.../kernal/processors/cache/GridCacheTxAdapter.java | 14 ++
.../kernal/processors/cache/GridCacheTxHandler.java | 2 ++
.../processors/cache/GridCacheTxLocalAdapter.java | 5 +++--
.../kernal/processors/cache/GridCacheTxManager.java | 2 ++
.../dht/GridDhtTransactionalCacheAdapter.java | 1 +
.../cache/distributed/dht/GridDhtTxLocal.java | 2 ++
.../cache/distributed/dht/GridDhtTxLocalAdapter.java | 5 +++--
.../cache/distributed/near/GridNearTxLocal.java | 4 ++--
.../kernal/processors/cache/local/GridLocalTx.java| 4 ++--
.../cache/transactions/IgniteTransactionsImpl.java| 8
.../testsuites/bamboo/GridDataGridTestSuite.java | 4 ++--
.../processors/cache/jta/GridCacheJtaManager.java | 1 +
13 files changed, 35 insertions(+), 24 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9f90d7d6/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 31cd964..f6207be 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
@@ -25,7 +25,6 @@ import org.gridgain.grid.cache.query.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.processors.cache.affinity.*;
import org.gridgain.grid.kernal.processors.cache.datastructures.*;
-import org.gridgain.grid.kernal.processors.cache.distributed.*;
import org.gridgain.grid.kernal.processors.cache.distributed.dht.*;
import org.gridgain.grid.kernal.processors.cache.dr.*;
import org.gridgain.grid.kernal.processors.cache.query.*;
@@ -52,7 +51,6 @@ import static org.gridgain.grid.cache.GridCacheFlag.*;
import static org.gridgain.grid.cache.GridCachePeekMode.*;
import static org.gridgain.grid.cache.GridCacheTxConcurrency.*;
import static org.gridgain.grid.cache.GridCacheTxIsolation.*;
-import static org.gridgain.grid.cache.GridCacheTxState.*;
import static org.apache.ignite.events.IgniteEventType.*;
import static org.gridgain.grid.kernal.GridClosureCallMode.*;
import static org.gridgain.grid.kernal.processors.dr.GridDrType.*;
@@ -61,6 +59,7 @@ import static
org.gridgain.grid.kernal.processors.task.GridTaskThreadContextKey.
/**
* Adapter for different cache implementations.
*/
+@SuppressWarnings("unchecked")
public abstract class GridCacheAdapter extends GridMetadataAwareAdapter
implements GridCache,
GridCacheProjectionEx, Externalizable {
/** */
@@ -3166,6 +3165,7 @@ public abstract class GridCacheAdapter extends
GridMetadataAwareAdapter im
concurrency,
isolation,
timeout,
+false,
txSize,
/** group lock keys */null,
/** partition lock */false
@@ -3221,6 +3221,7 @@ public abstract class GridCacheAdapter extends
GridMetadataAwareAdapter im
concurrency,
isolation,
timeout,
+ctx.hasFlag(INVALIDATE),
txSize,
grpLockKey,
partLock
@@ -3696,6 +3697,7 @@ public abstract class GridCacheAdapter extends
GridMetadataAwareAdapter im
PESSIMISTIC,
READ_COMMITTED,
tCfg.getDefaultTxTimeout(),
+ctx.hasFlag(INVALIDATE),
0,
/** group lock keys */null,
/** partition lock */false
@@ -3765,6 +3767,7 @@ public abstract class GridCacheAdapter extends
GridMetadataAwareAdapter im
PESSIMISTIC,
READ_COMMITTED,
ctx.kernalContext().config().getTransactionsConfiguration().getDefaultTxTimeout(),
+ctx.hasFlag(INVALIDATE),
0,
null,
false);
http:
