[30/49] incubator-ignite git commit: ignite-629: Remove test for Force transform flag.
ignite-629: Remove test for Force transform 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/528ea7af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/528ea7af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/528ea7af
Branch: refs/heads/ignite-645
Commit: 528ea7afab72f05ed367bd85d0a031f67094574e
Parents: 053d32c
Author: ivasilinets
Authored: Tue Mar 31 00:46:47 2015 +0300
Committer: ivasilinets
Committed: Tue Mar 31 00:46:47 2015 +0300
--
.../GridCacheReturnValueTransferSelfTest.java | 205 ---
.../ignite/testsuites/IgniteCacheTestSuite.java | 1 -
2 files changed, 206 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/528ea7af/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
deleted file mode 100644
index 5b3e19d..000
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import javax.cache.processor.*;
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-
-/**
- * Tests transform for extra traffic.
- */
-public class GridCacheReturnValueTransferSelfTest extends
GridCommonAbstractTest {
-/** Distribution mode. */
-private boolean cache;
-
-/** Atomicity mode. */
-private CacheAtomicityMode atomicityMode;
-
-/** Atomic write order mode. */
-private CacheAtomicWriteOrderMode writeOrderMode;
-
-/** Number of backups. */
-private int backups;
-
-/** Fail deserialization flag. */
-private static volatile boolean failDeserialization;
-
-/** {@inheritDoc} */
-@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
-IgniteConfiguration cfg = super.getConfiguration(gridName);
-
-CacheConfiguration ccfg = new CacheConfiguration();
-
-ccfg.setBackups(backups);
-ccfg.setCacheMode(PARTITIONED);
-ccfg.setAtomicityMode(atomicityMode);
-ccfg.setAtomicWriteOrderMode(writeOrderMode);
-
-cfg.setCacheConfiguration(ccfg);
-
-if (!cache)
-cfg.setClientMode(true);
-
-return cfg;
-}
-
-/**
- * @throws Exception If failed.
- */
-public void testTransformAtomicPrimaryNoBackups() throws Exception {
-checkTransform(ATOMIC, PRIMARY, 0);
-}
-
-/**
- * @throws Exception If failed.
- */
-public void testTransformAtomicClockNoBackups() throws Exception {
-checkTransform(ATOMIC, CLOCK, 0);
-}
-
-/**
- * @throws Exception If failed.
- */
-public void testTransformAtomicPrimaryOneBackup() throws Exception {
-checkTransform(ATOMIC, PRIMARY, 1);
-}
-
-/**
- * @throws Exception If failed.
- */
-public void testTransformAtomicClockOneBackup() throws Exception {
-checkTransform(ATOMIC, CLOCK, 1);
-}
-
-/**
- * @throws Exception If failed.
- * TODO gg-8273 enable when fixed
- */
-public void _testTransformTransactionalNoBackups() throws Exception {
-checkTransform(TRANSACTIONAL, PRIMARY, 0);
-}
-
-/**
- * @throw
[05/49] incubator-ignite git commit: #ignite-629: remove CacheFlag.READ
#ignite-629: remove CacheFlag.READ
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/078f99b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/078f99b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/078f99b9
Branch: refs/heads/ignite-645
Commit: 078f99b9fae2567fc2b882aa4e0034f2421e11f5
Parents: 748ddb6
Author: ivasilinets
Authored: Fri Mar 27 16:39:39 2015 +0300
Committer: ivasilinets
Committed: Fri Mar 27 16:39:39 2015 +0300
--
.../internal/processors/cache/CacheFlag.java| 10 --
.../processors/cache/CacheProjection.java | 118 +--
.../processors/cache/GridCacheAdapter.java | 95 +--
.../processors/cache/GridCacheContext.java | 25
.../processors/cache/GridCacheMapEntry.java | 4 -
.../processors/cache/GridCacheProjectionEx.java | 12 --
.../dht/atomic/GridDhtAtomicCache.java | 6 -
.../distributed/near/GridNearCacheAdapter.java | 6 +-
.../local/atomic/GridLocalAtomicCache.java | 46
.../continuous/CacheContinuousQueryHandler.java | 5 -
.../OptimizedObjectStreamSelfTest.java | 2 +-
11 files changed, 8 insertions(+), 321 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/078f99b9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
index 67332ff..6744d76 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
@@ -30,19 +30,9 @@ import javax.cache.processor.*;
* {@link CacheProjection#flagsOn(CacheFlag...)}
* {@link CacheProjection#flagsOff(CacheFlag...)}
*
- * Also, some flags, like {@link #READ} may be implicitly set whenever
- * creating new projections and passing entries to predicate filters.
*/
public enum CacheFlag {
/**
- * Only operations that don't change cached data are allowed.
- * This flag is automatically set on underlying projection for
- * all the entries that are given to predicate filters to make
- * sure that data cannot be updated during predicate evaluation.
- */
-READ,
-
-/**
* Clone values prior to returning them to user.
*
* Whenever values are returned from cache, they cannot be directly updated
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/078f99b9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
index d1941eb..200ee10 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
@@ -536,9 +536,6 @@ public interface CacheProjection extends
Iterable> {
* Transactions
* This method is transactional and will enlist the entry into ongoing
transaction
* if there is one.
- * Cache Flags
- * This method is not available if any of the following flags are set on
projection:
- * {@link CacheFlag#READ}.
*
* @param key Key to store in cache.
* @param val Value to be associated with the given key.
@@ -575,9 +572,6 @@ public interface CacheProjection extends
Iterable> {
* Transactions
* This method is transactional and will enlist the entry into ongoing
transaction
* if there is one.
- * Cache Flags
- * This method is not available if any of the following flags are set on
projection:
- * {@link CacheFlag#READ}.
*
* @param key Key to store in cache.
* @param val Value to be associated with the given key.
@@ -604,9 +598,6 @@ public interface CacheProjection extends
Iterable> {
* Transactions
* This method is transactional and will enlist the entry into ongoing
transaction
* if there is one.
- * Cache Flags
- * This method is not available if any of the following flags are set on
projection:
- * {@link CacheFlag#READ}.
*
* @param key Key to store in cache.
* @param val Value to be associated with the given key.
@@ -637,9 +628,6 @@ public interface CacheProjection extends
Iterable> {
* Transa
[40/49] incubator-ignite git commit: # ignite-629-1
# ignite-629-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/67bb43aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/67bb43aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/67bb43aa
Branch: refs/heads/ignite-645
Commit: 67bb43aaf1a233393e5d88bdc60161b454c0939a
Parents: a4f580e
Author: sboikov
Authored: Tue Mar 31 13:36:21 2015 +0300
Committer: sboikov
Committed: Tue Mar 31 13:36:21 2015 +0300
--
.../processors/cache/GridCacheAdapter.java| 3 ---
.../processors/cache/GridCacheConcurrentMap.java | 18 --
.../processors/cache/IgniteCacheProxy.java| 2 --
3 files changed, 16 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67bb43aa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index c3a1225..8c6bfd6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -402,7 +402,6 @@ public abstract class GridCacheAdapter implements
GridCache,
GridCacheProjectionImpl prj = new GridCacheProjectionImpl<>(this,
ctx,
-null,
false,
null,
false,
@@ -427,7 +426,6 @@ public abstract class GridCacheAdapter implements
GridCache,
return new GridCacheProjectionImpl<>(
(CacheProjection)this,
(GridCacheContext)ctx,
-null,
false,
null,
true,
@@ -445,7 +443,6 @@ public abstract class GridCacheAdapter implements
GridCache,
return new GridCacheProjectionImpl<>(
this,
ctx,
-null,
false,
null,
false,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67bb43aa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
index 51df644..ba6a7f4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
@@ -1744,7 +1744,12 @@ public class GridCacheConcurrentMap {
curVal = null;
try {
-
((IgniteKernal)ctx.grid()).getCache(ctx.name()).remove(e.key());
+CacheProjection prj = ctx.projectionPerCall();
+
+if (prj != null)
+prj.removex(e.key());
+else
+
((IgniteKernal)ctx.grid()).getCache(ctx.name()).removex(e.key());
}
catch (IgniteCheckedException ex) {
throw new IgniteException(ex);
@@ -2021,7 +2026,16 @@ public class GridCacheConcurrentMap {
/** {@inheritDoc} */
@Override public void remove() {
-it.remove();
+GridCacheProjectionImpl oldPrj = ctx.projectionPerCall();
+
+ctx.projectionPerCall(prjPerCall);
+
+try {
+it.remove();
+}
+finally {
+ctx.projectionPerCall(oldPrj);
+}
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67bb43aa/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 364b1c3..dfc3ef4 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
@@ -1414,8 +1414,6 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter prj0 = new GridCacheProjectionImpl<>(
(prj != null ? prj : delegate),
ctx,
-null,
-
[43/49] incubator-ignite git commit: # ignite-sprint-3 fixed issue number
# ignite-sprint-3 fixed issue number
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c302175e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c302175e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c302175e
Branch: refs/heads/ignite-645
Commit: c302175e49452c67ff5800f67896e7c20dba6db5
Parents: e182c34
Author: sboikov
Authored: Tue Mar 31 15:37:47 2015 +0300
Committer: sboikov
Committed: Tue Mar 31 15:37:47 2015 +0300
--
.../ignite/testsuites/IgniteCacheFailoverTestSuite.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c302175e/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java
index 17f2458..9556235 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java
@@ -28,7 +28,7 @@ import
org.apache.ignite.internal.processors.cache.distributed.near.*;
*/
public class IgniteCacheFailoverTestSuite extends TestSuite {
/**
- * @return Ignite Cache Group Lock Failover test suite.
+ * @return Ignite Cache Failover test suite.
* @throws Exception Thrown in case of the failure.
*/
public static TestSuite suite() throws Exception {
@@ -52,9 +52,9 @@ public class IgniteCacheFailoverTestSuite extends TestSuite {
suite.addTestSuite(GridCacheAtomicPrimaryWriteOrderFailoverSelfTest.class);
suite.addTestSuite(GridCacheAtomicReplicatedFailoverSelfTest.class);
-//suite.addTestSuite(GridCachePartitionedFailoverSelfTest.class);
TODO-gg-4813
-//suite.addTestSuite(GridCacheColocatedFailoverSelfTest.class);
TODO-gg-4813
-//suite.addTestSuite(GridCacheReplicatedFailoverSelfTest.class);
TODO-gg-4813
+//suite.addTestSuite(GridCachePartitionedFailoverSelfTest.class);
TODO IGNITE-631.
+//suite.addTestSuite(GridCacheColocatedFailoverSelfTest.class); TODO
IGNITE-631.
+//suite.addTestSuite(GridCacheReplicatedFailoverSelfTest.class); TODO
IGNITE-631.
return suite;
}
[01/49] incubator-ignite git commit: #ignite-629: Remove CacheFlag.Local
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-645 a17175c09 -> 7368fdb61 (forced update)
#ignite-629: Remove CacheFlag.Local
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4bc5b222
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4bc5b222
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4bc5b222
Branch: refs/heads/ignite-645
Commit: 4bc5b2225d705d88aefcb6e655f12a4f13d5e5cf
Parents: 71ecef2
Author: ivasilinets
Authored: Fri Mar 27 15:28:47 2015 +0300
Committer: ivasilinets
Committed: Fri Mar 27 15:28:47 2015 +0300
--
.../internal/processors/cache/CacheFlag.java| 10 +--
.../processors/cache/CacheProjection.java | 70 +---
.../processors/cache/GridCacheAdapter.java | 16 +
.../processors/cache/GridCacheContext.java | 20 ++
.../processors/cache/GridCacheMapEntry.java | 2 -
.../processors/cache/GridCacheProjectionEx.java | 8 +--
.../dht/colocated/GridDhtColocatedCache.java| 1 -
.../distributed/near/GridNearAtomicCache.java | 1 -
.../near/GridNearTransactionalCache.java| 1 -
.../local/atomic/GridLocalAtomicCache.java | 6 --
.../ignite/scalar/pimps/ScalarCachePimp.scala | 18 ++---
11 files changed, 52 insertions(+), 101 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4bc5b222/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
index 9712ae1..fc38969 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
@@ -30,19 +30,11 @@ import javax.cache.processor.*;
* {@link CacheProjection#flagsOn(CacheFlag...)}
* {@link CacheProjection#flagsOff(CacheFlag...)}
*
- * Also, some flags, like {@link #LOCAL}, or {@link #READ} may be implicitly
set whenever
+ * Also, some flags, like {@link #READ} may be implicitly set whenever
* creating new projections and passing entries to predicate filters.
*/
public enum CacheFlag {
-/**
- * Only operations that don't require any communication with
- * other cache nodes are allowed. This flag is automatically set
- * on underlying projection for all the entries that are given to
- * predicate filters to make sure that no distribution happens
- * from inside of predicate evaluation.
- */
LOCAL,
-
/**
* Only operations that don't change cached data are allowed.
* This flag is automatically set on underlying projection for
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4bc5b222/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
index 6659735..768edbe 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
@@ -443,8 +443,6 @@ public interface CacheProjection extends
Iterable> {
* Transactions
* This method is transactional and will enlist the entry into ongoing
transaction
* if there is one.
- * Cache Flags
- * This method is not available if {@link CacheFlag#LOCAL} flag is set on
projection.
*
* @param key Key to retrieve the value for.
* @return Value for the given key.
@@ -468,8 +466,6 @@ public interface CacheProjection extends
Iterable> {
* Transactions
* This method is transactional and will enlist the entry into ongoing
transaction
* if there is one.
- * Cache Flags
- * This method is not available if {@link CacheFlag#LOCAL} flag is set on
projection.
*
* @param key Key for the value to get.
* @return Future for the get operation.
@@ -492,8 +488,6 @@ public interface CacheProjection extends
Iterable> {
* Transactions
* This method is transactional and will enlist the entry into ongoing
transaction
* if there is one.
- * Cache Flags
- * This method is not available if {@link CacheFlag#LOCAL} flag is set on
projection.
*
* @param keys Keys to get.
* @return Map of key-value pairs.
@@ -516,8 +5
[36/49] incubator-ignite git commit: ignite-629: Add test for skip store and remove iterator.
ignite-629: Add test for skip store and remove iterator. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/50998c50 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/50998c50 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/50998c50 Branch: refs/heads/ignite-645 Commit: 50998c504573834e243df8b00681dcc8aa22dcf6 Parents: 885643a Author: ivasilinets Authored: Tue Mar 31 12:30:44 2015 +0300 Committer: ivasilinets Committed: Tue Mar 31 12:30:44 2015 +0300 -- .../cache/GridCacheAbstractFullApiSelfTest.java | 28 1 file changed, 28 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50998c50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index f543be0..1a8bdcd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -4291,6 +4291,34 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertNotNull(cache.get(key)); } + +String newKey = "New key"; + +assertFalse(map.containsKey(newKey)); + +cacheSkipStore.put(newKey, 1); + +assertFalse(map.containsKey(newKey)); + +cache.put(newKey, 1); + +assertTrue(map.containsKey(newKey)); + +Iterator> it = cacheSkipStore.iterator(); + +assertTrue(it.hasNext()); + +Cache.Entry entry = it.next(); + +String removedKey = entry.getKey(); + +assertTrue(map.containsKey(removedKey)); + +it.remove(); + +assertNull(cacheSkipStore.get(removedKey)); + +assertTrue(map.containsKey(removedKey)); } /**
[41/49] incubator-ignite git commit: # ignite-629-1
# ignite-629-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/79c76cd1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/79c76cd1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/79c76cd1
Branch: refs/heads/ignite-645
Commit: 79c76cd16d0a506a2775cb41f885bd3aff39f96e
Parents: 67bb43a
Author: sboikov
Authored: Tue Mar 31 13:55:37 2015 +0300
Committer: sboikov
Committed: Tue Mar 31 14:23:06 2015 +0300
--
.../processors/cache/GridCacheAdapter.java | 6 --
.../cache/GridCacheConcurrentMap.java | 21 ++--
.../cache/GridCacheAbstractFullApiSelfTest.java | 2 +-
3 files changed, 7 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79c76cd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 8c6bfd6..02429b3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -4091,7 +4091,9 @@ public abstract class GridCacheAdapter implements
GridCache,
* @return Distributed ignite cache iterator.
*/
public Iterator> igniteIterator() {
-if (!ctx.isSwapOrOffheapEnabled() &&
ctx.kernalContext().discovery().size() == 1)
+GridCacheContext ctx0 = ctx.isNear() ? ctx.near().dht().context() :
ctx;
+
+if (!ctx0.isSwapOrOffheapEnabled() &&
ctx0.kernalContext().discovery().size() == 1)
return localIteratorHonorExpirePolicy();
final GridCacheProjectionImpl prj = ctx.projectionPerCall();
@@ -4371,7 +4373,7 @@ public abstract class GridCacheAdapter implements
GridCache,
OPTIMISTIC,
READ_COMMITTED,
tCfg.getDefaultTxTimeout(),
-!skipStore(),
+!ctx.skipStore(),
0,
/** group lock keys */null,
/** partition lock */false
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79c76cd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
index ba6a7f4..f45d00e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
@@ -1744,12 +1744,7 @@ public class GridCacheConcurrentMap {
curVal = null;
try {
-CacheProjection prj = ctx.projectionPerCall();
-
-if (prj != null)
-prj.removex(e.key());
-else
-
((IgniteKernal)ctx.grid()).getCache(ctx.name()).removex(e.key());
+
((IgniteKernal)ctx.grid()).getCache(ctx.name()).remove(e.key());
}
catch (IgniteCheckedException ex) {
throw new IgniteException(ex);
@@ -1806,9 +1801,6 @@ public class GridCacheConcurrentMap {
/** */
private GridCacheProjectionImpl prjPerCall;
-/** */
-private boolean clone;
-
/**
* Empty constructor required for {@link Externalizable}.
*/
@@ -2026,16 +2018,7 @@ public class GridCacheConcurrentMap {
/** {@inheritDoc} */
@Override public void remove() {
-GridCacheProjectionImpl oldPrj = ctx.projectionPerCall();
-
-ctx.projectionPerCall(prjPerCall);
-
-try {
-it.remove();
-}
-finally {
-ctx.projectionPerCall(oldPrj);
-}
+it.remove();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79c76cd1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/G
[22/49] incubator-ignite git commit: # ignite-629-1 review
# ignite-629-1 review
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2415712a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2415712a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2415712a
Branch: refs/heads/ignite-645
Commit: 2415712ac711ae3deaa624b8bd9efd598aa33fa2
Parents: c4bef11
Author: sboikov
Authored: Mon Mar 30 12:31:08 2015 +0300
Committer: sboikov
Committed: Mon Mar 30 12:37:28 2015 +0300
--
.../processors/cache/CacheProjection.java | 2 +-
.../processors/cache/GridCacheAdapter.java | 28 +++---
.../processors/cache/GridCacheEntryEx.java | 3 +-
.../processors/cache/GridCacheMapEntry.java | 18 ++--
.../cache/GridCacheProjectionImpl.java | 14 +--
.../processors/cache/GridCacheProxyImpl.java| 3 +-
.../processors/cache/IgniteCacheProxy.java | 7 +-
.../GridDistributedTxRemoteAdapter.java | 2 +-
.../distributed/dht/GridDhtCacheAdapter.java| 2 +-
.../distributed/dht/GridDhtLocalPartition.java | 2 +-
.../distributed/dht/GridDhtLockFuture.java | 2 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 2 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 2 +-
.../colocated/GridDhtDetachedCacheEntry.java| 2 +-
.../transactions/IgniteTxLocalAdapter.java | 6 +-
.../datastreamer/DataStreamerImpl.java | 2 +-
.../GridCacheAtomicReferenceImpl.java | 2 -
.../GridCacheAtomicStampedImpl.java | 2 -
.../handlers/cache/GridCacheCommandHandler.java | 27 +++---
.../processors/cache/GridCacheTestEntryEx.java | 2 +-
.../cache/IgniteCacheInvokeAbstractTest.java| 6 +-
...GridCacheValueConsistencyAtomicSelfTest.java | 98
22 files changed, 61 insertions(+), 173 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2415712a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
index fb51620..6189d6b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
@@ -242,7 +242,7 @@ public interface CacheProjection extends
Iterable> {
/**
* @param skipStore Skip store.
- * @retur New projection based on this one, but with skip store.
+ * @return New projection based on this one, but with skip store.
*/
public CacheProjection setSkipStore(boolean skipStore);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2415712a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 864d6b2..db1fd12 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -407,12 +407,12 @@ public abstract class GridCacheAdapter implements
GridCache,
return this;
GridCacheProjectionImpl prj = new GridCacheProjectionImpl<>(this,
-ctx,
-null,
-skipStore,
-null,
-false,
-null);
+ctx,
+null,
+skipStore,
+null,
+false,
+null);
return new GridCacheProxyImpl<>(ctx, prj, prj);
}
@@ -1602,8 +1602,7 @@ public abstract class GridCacheAdapter implements
GridCache,
return getAllAsync(Collections.singletonList(key), /*force
primary*/true, /*skip tx*/false, null, null,
taskName, true, false).chain(new CX1>, V>() {
-@Override
-public V applyx(IgniteInternalFuture> e) throws
IgniteCheckedException {
+@Override public V applyx(IgniteInternalFuture> e)
throws IgniteCheckedException {
return e.get().get(key);
}
});
@@ -2458,13 +2457,11 @@ public abstract class GridCacheAdapter implements
GridCache,
ctx.dr().onReceiveCacheEntriesReceived(drMap.size());
return asyncOp(new AsyncInOp(drMap.keySet()) {
-@Override
-public Ignite
[35/49] incubator-ignite git commit: ignite-629: Revert GridCacheReturnValueTransferSelfTest.
ignite-629: Revert GridCacheReturnValueTransferSelfTest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/885643ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/885643ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/885643ac
Branch: refs/heads/ignite-645
Commit: 885643ac03f52a4b4d97f1535be3c6a1e344a100
Parents: a9996d8
Author: ivasilinets
Authored: Tue Mar 31 12:11:39 2015 +0300
Committer: ivasilinets
Committed: Tue Mar 31 12:11:39 2015 +0300
--
.../GridCacheReturnValueTransferSelfTest.java | 191 +++
1 file changed, 191 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/885643ac/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
new file mode 100644
index 000..4761e21
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
@@ -0,0 +1,191 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import javax.cache.processor.*;
+import java.io.*;
+import java.util.*;
+
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+
+/**
+ * Tests transform for extra traffic.
+ */
+public class GridCacheReturnValueTransferSelfTest extends
GridCommonAbstractTest {
+/** Distribution mode. */
+private boolean cache;
+
+/** Atomicity mode. */
+private CacheAtomicityMode atomicityMode;
+
+/** Atomic write order mode. */
+private CacheAtomicWriteOrderMode writeOrderMode;
+
+/** Number of backups. */
+private int backups;
+
+/** Fail deserialization flag. */
+private static volatile boolean failDeserialization;
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+CacheConfiguration ccfg = new CacheConfiguration();
+
+ccfg.setBackups(backups);
+ccfg.setCacheMode(PARTITIONED);
+ccfg.setAtomicityMode(atomicityMode);
+ccfg.setAtomicWriteOrderMode(writeOrderMode);
+
+cfg.setCacheConfiguration(ccfg);
+
+if (!cache)
+cfg.setClientMode(true);
+
+return cfg;
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testTransformAtomicPrimaryNoBackups() throws Exception {
+checkTransform(ATOMIC, PRIMARY, 0);
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testTransformAtomicClockNoBackups() throws Exception {
+checkTransform(ATOMIC, CLOCK, 0);
+}
+
+/**
+ * @throws Exception If failed.
+ * TODO gg-8273 enable when fixed
+ */
+public void _testTransformTransactionalNoBackups() throws Exception {
+checkTransform(TRANSACTIONAL, PRIMARY, 0);
+}
+
+/**
+ * @throws Exception If failed.
+ * TODO gg-8273 enable when fixed
+ */
+public void _testTransformTransactionalOneBackup() throws Exception {
+checkTransform(TRANSACTIONAL, PRIMARY, 1);
+}
+
+/**
+ * @param mode Atomicity mode.
+ * @param order Atomic cache write order mode.
+ * @param b Number of backups.
+ * @throws Exception If failed.
+ */
+private void checkTransfo
[34/49] incubator-ignite git commit: # ignite-629-1
# ignite-629-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/a9996d8f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a9996d8f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a9996d8f
Branch: refs/heads/ignite-645
Commit: a9996d8fdb2ae5ecbf1a56b88a4161f5d8bcf5de
Parents: 1617648
Author: sboikov
Authored: Tue Mar 31 11:01:37 2015 +0300
Committer: sboikov
Committed: Tue Mar 31 11:01:37 2015 +0300
--
.../ignite/internal/client/impl/ClientCacheFlagsCodecTest.java | 1 +
.../ignite/internal/processors/cache/CacheProjection.java | 4 ++--
.../ignite/internal/processors/cache/GridCacheContext.java | 2 +-
.../internal/processors/cache/GridCacheProjectionImpl.java | 5 -
.../processors/cache/local/atomic/GridLocalAtomicCache.java | 1 +
.../java/org/apache/ignite/IgniteCacheAffinitySelfTest.java | 1 -
.../processors/cache/IgniteCacheInvokeAbstractTest.java | 4
7 files changed, 9 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9996d8f/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
index 973a0a3..9f177d7 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
@@ -44,6 +44,7 @@ public class ClientCacheFlagsCodecTest extends TestCase {
assertTrue(bits != 0);
boolean out = GridCacheCommandHandler.parseCacheFlags(bits);
+
assertEquals(out, true);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9996d8f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
index 6189d6b..d4f1ec0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
@@ -241,8 +241,8 @@ public interface CacheProjection extends
Iterable> {
public CacheProjection projection(@Nullable CacheEntryPredicate
filter);
/**
- * @param skipStore Skip store.
- * @return New projection based on this one, but with skip store.
+ * @param skipStore Skip store flag.
+ * @return New projection based on this one, but with skip store flag
enabled.
*/
public CacheProjection setSkipStore(boolean skipStore);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9996d8f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index bec175a..7fae62f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -1225,7 +1225,7 @@ public class GridCacheContext implements
Externalizable {
}
/**
- * @return {@code true} if the skip store is set.
+ * @return {@code true} if the skip store flag is set.
*/
public boolean skipStore() {
if (nearContext())
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9996d8f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
index 3517b42..eea665a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
@@ -89,7 +89,10 @@
[33/49] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-629-1
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-629-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/1617648e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1617648e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1617648e Branch: refs/heads/ignite-645 Commit: 1617648e448c3842b64261457b9b9fce0eca80f3 Parents: 6047580 c2f5211 Author: sboikov Authored: Tue Mar 31 10:41:18 2015 +0300 Committer: sboikov Committed: Tue Mar 31 10:41:18 2015 +0300 -- DEVNOTES.txt | 6 ++ .../visor/cache/VisorCacheStoreConfiguration.java | 18 +++--- 2 files changed, 17 insertions(+), 7 deletions(-) --
[44/49] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-654
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-654 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/41963b70 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/41963b70 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/41963b70 Branch: refs/heads/ignite-645 Commit: 41963b70f02edb63080cc9b0e8f40e693fbfee59 Parents: 3821f00 c302175 Author: sboikov Authored: Tue Mar 31 15:48:10 2015 +0300 Committer: sboikov Committed: Tue Mar 31 15:48:10 2015 +0300 -- DEVNOTES.txt| 6 + .../ignite/internal/GridKernalContextImpl.java | 3 +- .../org/apache/ignite/internal/IgniteEx.java| 4 +- .../apache/ignite/internal/IgniteKernal.java| 5 +- .../cache/CacheConflictResolutionManager.java | 30 ++ .../cache/CacheOsConflictResolutionManager.java | 58 .../processors/cache/CacheProjection.java | 24 -- .../processors/cache/GridCacheAdapter.java | 60 .../processors/cache/GridCacheContext.java | 19 +- .../processors/cache/GridCacheProcessor.java| 20 +- .../processors/cache/GridCacheProjectionEx.java | 9 - .../cache/GridCacheProjectionImpl.java | 280 +++ .../processors/cache/GridCacheProxyImpl.java| 19 -- .../processors/cache/IgniteCacheProxy.java | 2 - .../CacheDataStructuresManager.java | 4 +- .../processors/cache/dr/GridCacheDrManager.java | 5 - .../cache/dr/GridOsCacheDrManager.java | 106 +++ .../cache/dr/os/GridOsCacheDrManager.java | 111 .../cache/query/GridCacheQueriesImpl.java | 23 +- .../transactions/IgniteTxLocalAdapter.java | 13 +- .../version/CacheVersionConflictResolver.java | 40 +++ ...ridCacheVersionAbstractConflictResolver.java | 56 .../GridCacheVersionConflictResolver.java | 59 .../GridProjectionForCachesSelfTest.java| 12 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 2 + .../GridServiceReassignmentSelfTest.java| 5 +- .../loadtests/hashmap/GridCacheTestContext.java | 6 +- .../IgniteCacheFailoverTestSuite.java | 8 +- .../hadoop/jobtracker/HadoopJobTracker.java | 7 +- .../HadoopDefaultMapReducePlannerSelfTest.java | 3 +- parent/pom.xml | 38 +-- 31 files changed, 351 insertions(+), 686 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/41963b70/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/41963b70/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java --
[26/49] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-629-1
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-629-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/2c49bf73 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2c49bf73 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2c49bf73 Branch: refs/heads/ignite-645 Commit: 2c49bf735e8ed6ef5bbcbb5459589257a950e6fa Parents: ea7b4bf a6f7294 Author: ivasilinets Authored: Mon Mar 30 15:06:04 2015 +0300 Committer: ivasilinets Committed: Mon Mar 30 15:06:04 2015 +0300 -- modules/core/pom.xml | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) --
[37/49] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-629-1
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-629-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/5b6700f1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5b6700f1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5b6700f1 Branch: refs/heads/ignite-645 Commit: 5b6700f1dc2583d7910444c38628768920530b51 Parents: 50998c5 6ef11d4 Author: sboikov Authored: Tue Mar 31 12:34:54 2015 +0300 Committer: sboikov Committed: Tue Mar 31 12:34:54 2015 +0300 -- parent/pom.xml | 38 +++--- 1 file changed, 19 insertions(+), 19 deletions(-) --
[28/49] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-629-1
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-629-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/2f73436d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2f73436d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2f73436d Branch: refs/heads/ignite-645 Commit: 2f73436dd412c789d3a3de19aa17f6b903f84b9d Parents: 40d6b75 bca4198 Author: ivasilinets Authored: Mon Mar 30 23:10:50 2015 +0300 Committer: ivasilinets Committed: Mon Mar 30 23:10:50 2015 +0300 -- modules/core/pom.xml | 7 +++ .../cache/IgniteCacheDynamicStopSelfTest.java| 19 +++ parent/pom.xml | 3 ++- 3 files changed, 16 insertions(+), 13 deletions(-) --
[47/49] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-629-1' into ignite-sprint-3
Merge remote-tracking branch 'remotes/origin/ignite-629-1' into ignite-sprint-3 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c6b3380f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c6b3380f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c6b3380f Branch: refs/heads/ignite-645 Commit: c6b3380f6391e92584bfeb6d3b2fe28edb0ebbe5 Parents: 7aba4ba 79c76cd Author: sboikov Authored: Tue Mar 31 17:31:53 2015 +0300 Committer: sboikov Committed: Tue Mar 31 17:31:53 2015 +0300 -- .../client/impl/ClientCacheFlagsCodecTest.java | 18 +- .../internal/client/GridClientCacheFlag.java| 13 -- .../impl/connection/GridClientConnection.java | 9 - .../internal/processors/cache/CacheFlag.java| 108 - .../processors/cache/CacheFlagException.java| 67 -- .../processors/cache/CacheProjection.java | 209 + .../internal/processors/cache/GridCache.java| 3 - .../processors/cache/GridCacheAdapter.java | 211 -- .../cache/GridCacheConcurrentMap.java | 44 +--- .../processors/cache/GridCacheContext.java | 222 +-- .../processors/cache/GridCacheEntryEx.java | 3 +- .../processors/cache/GridCacheMapEntry.java | 27 +-- .../processors/cache/GridCacheProjectionEx.java | 20 -- .../cache/GridCacheProjectionImpl.java | 77 ++- .../processors/cache/GridCacheProxyImpl.java| 36 +-- .../cache/GridCacheSharedContext.java | 21 -- .../processors/cache/IgniteCacheProxy.java | 29 +-- .../GridDistributedTxRemoteAdapter.java | 2 +- .../distributed/dht/GridDhtCacheAdapter.java| 2 +- .../distributed/dht/GridDhtLocalPartition.java | 2 +- .../distributed/dht/GridDhtLockFuture.java | 2 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../dht/atomic/GridDhtAtomicCache.java | 32 --- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 2 - .../dht/atomic/GridNearAtomicUpdateFuture.java | 3 - .../dht/atomic/GridNearAtomicUpdateRequest.java | 78 ++- .../dht/colocated/GridDhtColocatedCache.java| 2 - .../colocated/GridDhtDetachedCacheEntry.java| 2 +- .../distributed/near/GridNearAtomicCache.java | 2 - .../distributed/near/GridNearCacheAdapter.java | 9 - .../near/GridNearTransactionalCache.java| 2 - .../cache/distributed/near/GridNearTxLocal.java | 4 +- .../local/atomic/GridLocalAtomicCache.java | 74 +-- .../continuous/CacheContinuousQueryHandler.java | 5 - .../transactions/IgniteTransactionsImpl.java| 1 - .../transactions/IgniteTxLocalAdapter.java | 6 +- .../cache/transactions/IgniteTxManager.java | 2 - .../datastreamer/DataStreamerImpl.java | 2 +- .../datastructures/DataStructuresProcessor.java | 13 +- .../datastructures/GridCacheAtomicLongImpl.java | 14 +- .../GridCacheAtomicReferenceImpl.java | 2 +- .../GridCacheAtomicReferenceValue.java | 15 +- .../GridCacheAtomicSequenceImpl.java| 2 +- .../GridCacheAtomicStampedImpl.java | 2 +- .../GridCacheAtomicStampedValue.java| 15 +- .../GridCacheCountDownLatchImpl.java| 2 +- .../handlers/cache/GridCacheCommandHandler.java | 66 +++--- .../cache/GridCacheAbstractFlagsTest.java | 97 .../cache/GridCacheAbstractFullApiSelfTest.java | 61 - .../GridCacheReturnValueTransferSelfTest.java | 36 +-- .../processors/cache/GridCacheTestEntryEx.java | 2 +- .../cache/IgniteCacheInvokeAbstractTest.java| 11 - ...GridCacheValueConsistencyAtomicSelfTest.java | 101 - .../near/GridCachePartitionedFlagsTest.java | 41 .../GridCacheReplicatedFlagsTest.java | 28 --- .../cache/GridCacheCommandHandlerSelfTest.java | 2 +- .../OptimizedObjectStreamSelfTest.java | 4 - .../ignite/testsuites/IgniteCacheTestSuite.java | 1 - .../processors/cache/jta/CacheJtaManager.java | 1 - .../ignite/scalar/pimps/ScalarCachePimp.scala | 36 --- 61 files changed, 278 insertions(+), 1629 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6b3380f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6b3380f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java --
[48/49] incubator-ignite git commit: ignite-645 Remove GridCachePeekMode
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7368fdb6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
index 1ab738f..a0d9f03 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
@@ -158,13 +158,13 @@ public class GridCacheNearReadersSelfTest extends
GridCommonAbstractTest {
assertTrue(cache1.containsKey(1));
assertTrue(cache1.containsKey(2));
-assertNotNull(near(cache1).peek(1));
-assertNotNull(near(cache1).peek(2));
-assertNotNull(dht(cache1).peek(1));
-assertNull(dht(cache1).peek(2));
+assertNotNull(nearPeek(cache1, 1));
+assertNotNull(nearPeek(cache1, 2));
+assertNotNull(dhtPeek(cache1, 1));
+assertNull(dhtPeek(cache1, 2));
-assertNull(near(cache2).peek(1));
-assertNotNull(dht(cache2).peek(2));
+assertNull(nearPeek(cache2, 1));
+assertNotNull(dhtPeek(cache2, 2));
// Node2 should have node1 in reader's map, since request to
// put key 2 came from node1.
@@ -177,7 +177,7 @@ public class GridCacheNearReadersSelfTest extends
GridCommonAbstractTest {
assertEquals("v1", cache2.get(1));
// Check that key1 is in near cache of cache2.
-assertNotNull(near(cache2).peek(1));
+assertNotNull(nearPeek(cache2, 1));
// Now node1 should have node2 in readers map.
assertTrue(e1.readers().contains(n2.id()));
@@ -185,8 +185,8 @@ public class GridCacheNearReadersSelfTest extends
GridCommonAbstractTest {
// Evict locally from cache2.
cache2.localEvict(Collections.singleton(1));
-assertNull(near(cache2).peek(1));
-assertNull(dht(cache2).peek(1));
+assertNull(nearPeek(cache2, 1));
+assertNull(dhtPeek(cache2, 1));
// Node 1 still has node2 in readers map.
assertTrue(e1.readers().contains(n2.id()));
@@ -240,10 +240,10 @@ public class GridCacheNearReadersSelfTest extends
GridCommonAbstractTest {
assertTrue(cache1.containsKey(1));
assertTrue(cache2.containsKey(1));
-assertEquals("v1", near(cache1).peek(1));
-assertEquals("v1", near(cache2).peek(1));
-assertEquals("v1", dht(cache1).peek(1));
-assertEquals("v1", dht(cache2).peek(1));
+assertEquals("v1", nearPeek(cache1, 1));
+assertEquals("v1", nearPeek(cache2, 1));
+assertEquals("v1", dhtPeek(cache1, 1));
+assertEquals("v1", dhtPeek(cache2, 1));
assertNull(near(cache1).peekNearOnly(1));
assertNull(near(cache2).peekNearOnly(1));
@@ -256,10 +256,10 @@ public class GridCacheNearReadersSelfTest extends
GridCommonAbstractTest {
assertTrue(cache1.containsKey(2));
assertTrue(cache2.containsKey(2));
-assertEquals("v2", near(cache1).peek(2));
-assertEquals("v2", near(cache2).peek(2));
-assertEquals("v2", dht(cache1).peek(2));
-assertEquals("v2", dht(cache2).peek(2));
+assertEquals("v2", nearPeek(cache1, 2));
+assertEquals("v2", nearPeek(cache2, 2));
+assertEquals("v2", dhtPeek(cache1, 2));
+assertEquals("v2", dhtPeek(cache2, 2));
assertNull(near(cache1).peekNearOnly(2));
assertNull(near(cache2).peekNearOnly(2));
@@ -284,7 +284,7 @@ public class GridCacheNearReadersSelfTest extends
GridCommonAbstractTest {
cache2.localEvict(Collections.singleton(1));
assertNull(near(cache2).peekNearOnly(1));
-assertEquals("v1", dht(cache2).peek(1));
+assertEquals("v1", dhtPeek(cache2, 1));
assertEquals("v1", cache1.getAndPut(1, "z1"));
@@ -292,7 +292,7 @@ public class GridCacheNearReadersSelfTest extends
GridCommonAbstractTest {
assertFalse(e1.readers().contains(n2.id()));
assertNull(near(cache2).peekNearOnly(1));
-assertEquals("z1", dht(cache2).peek(1));
+assertEquals("z1", dhtPeek(cache2, 1));
}
/** @throws Exception If failed. */
@@ -443,9 +443,9 @@ public class GridCacheNearReadersSelfTest extends
GridCommonAbstractTest {
assertNull(cache.getAndPut(key1, val1));
-assertEquals(val1, dht(0).peek(key1));
-assertEquals(val1, dht(1).peek(key1));
-assertNull(dht(2).peek(key1));
+assertEquals(val1, dhtPeek(0, key1));
+assertEquals(val1, dhtPeek(1, key1));
+asser
[27/49] incubator-ignite git commit: #ignite-629: Fix GridCacheCommandHandlerSelfTest.
#ignite-629: Fix GridCacheCommandHandlerSelfTest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/40d6b75a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/40d6b75a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/40d6b75a
Branch: refs/heads/ignite-645
Commit: 40d6b75a49937f63654b434c072a8bf5fd5ebd8a
Parents: 2c49bf7
Author: ivasilinets
Authored: Mon Mar 30 15:20:27 2015 +0300
Committer: ivasilinets
Committed: Mon Mar 30 15:20:27 2015 +0300
--
.../rest/handlers/cache/GridCacheCommandHandlerSelfTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/40d6b75a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
index c4c7ff6..2a6ae9d 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
@@ -218,7 +218,7 @@ public class GridCacheCommandHandlerSelfTest extends
GridCommonAbstractTest {
return fut;
}
// Rewriting flagOn result to keep intercepting
invocations after it.
-else if ("flagsOn".equals(mtd.getName()))
+else if ("setSkipStore".equals(mtd.getName()))
return proxy;
else if ("forSubjectId".equals(mtd.getName()))
return proxy;
[39/49] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-629-1
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-629-1
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a4f580e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a4f580e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a4f580e8
Branch: refs/heads/ignite-645
Commit: a4f580e8bec7a5ac2ed8ac265ceb7a6c2e07d68f
Parents: 5fd9ded dfe90fb
Author: sboikov
Authored: Tue Mar 31 13:01:22 2015 +0300
Committer: sboikov
Committed: Tue Mar 31 13:01:22 2015 +0300
--
.../org/apache/ignite/internal/IgniteEx.java| 4 +-
.../apache/ignite/internal/IgniteKernal.java| 5 +-
.../processors/cache/CacheProjection.java | 24 --
.../processors/cache/GridCacheAdapter.java | 60 +---
.../processors/cache/GridCacheProcessor.java| 11 -
.../processors/cache/GridCacheProjectionEx.java | 9 -
.../cache/GridCacheProjectionImpl.java | 276 +++
.../processors/cache/GridCacheProxyImpl.java| 19 --
.../processors/cache/IgniteCacheProxy.java | 2 +-
.../CacheDataStructuresManager.java | 4 +-
.../cache/query/GridCacheQueriesImpl.java | 23 +-
.../GridProjectionForCachesSelfTest.java| 12 +-
...achePartitionedMultiNodeFullApiSelfTest.java | 2 +
.../GridServiceReassignmentSelfTest.java| 5 +-
.../hadoop/jobtracker/HadoopJobTracker.java | 7 +-
.../HadoopDefaultMapReducePlannerSelfTest.java | 3 +-
16 files changed, 56 insertions(+), 410 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4f580e8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
--
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
index d4f1ec0,c6e13ee..0ff316d
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
@@@ -217,34 -219,25 +217,10 @@@ public interface CacheProjection
public CacheQueries queries();
/**
- * Gets cache projection only for given key and value type. Only {@code
non-null} key-value
- * pairs that have matching key and value pairs will be used in this
projection.
- *
- * @param keyType Key type.
- * @param valType Value type.
- * @param Key type.
- * @param Value type.
- * @return Cache projection for given key and value types.
- */
- public CacheProjection projection(Class
keyType, Class valType);
-
- /**
- * Gets cache projection based on given entry filter. This filter will be
simply passed through
- * to all cache operations on this projection. Unlike
projection(org.apache.ignite.lang.IgniteBiPredicate)
- * method, this filter will not be used for pre-filtering.
- * Gets cache projection base on this one, but with the specified flags
turned on.
- * Cache Flags
- * The resulting projection will inherit all the flags from this
projection.
-- *
- * @param filter Filter to be passed through to all cache operations. If
{@code null}, then the
- * same projection is returned. If cache operation receives its own
filter, then filters
- * will be {@code 'anded'}.
- * @return Projection based on given filter.
- */
- public CacheProjection projection(@Nullable CacheEntryPredicate
filter);
-
- /**
- * @param flags Flags to turn on (if empty, then no-op).
- * @return New projection based on this one, but with the specified flags
turned on.
+ * @param skipStore Skip store flag.
+ * @return New projection based on this one, but with skip store flag
enabled.
*/
-public CacheProjection flagsOn(@Nullable CacheFlag... flags);
-
-/**
- * Gets cache projection base on this but with the specified flags turned
off.
- * Cache Flags
- * The resulting projection will inherit all the flags from this
projection except for
- * the ones that were turned off.
- *
- * @param flags Flags to turn off (if
[12/49] incubator-ignite git commit: #ignite-629: remove CacheFlag.CLONE
#ignite-629: remove CacheFlag.CLONE
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ad84583b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ad84583b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ad84583b
Branch: refs/heads/ignite-645
Commit: ad84583b104c9af8222bf724d90bed632e0198bb
Parents: 4022338
Author: ivasilinets
Authored: Fri Mar 27 19:13:40 2015 +0300
Committer: ivasilinets
Committed: Fri Mar 27 19:13:40 2015 +0300
--
.../internal/processors/cache/CacheFlag.java| 11
.../processors/cache/GridCacheAdapter.java | 32 +--
.../cache/GridCacheConcurrentMap.java | 22 ++--
.../processors/cache/GridCacheContext.java | 57
.../local/atomic/GridLocalAtomicCache.java | 20 ++-
.../datastructures/DataStructuresProcessor.java | 15 +++---
.../datastructures/GridCacheAtomicLongImpl.java | 14 ++---
.../GridCacheAtomicReferenceImpl.java | 2 +-
.../GridCacheAtomicSequenceImpl.java| 2 +-
.../GridCacheAtomicStampedImpl.java | 2 +-
.../GridCacheCountDownLatchImpl.java| 2 +-
.../OptimizedObjectStreamSelfTest.java | 2 +-
12 files changed, 43 insertions(+), 138 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad84583b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
index 5bef17d..f403a53 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
@@ -32,17 +32,6 @@ import javax.cache.processor.*;
*
*/
public enum CacheFlag {
-/**
- * Clone values prior to returning them to user.
- *
- * Whenever values are returned from cache, they cannot be directly updated
- * as cache holds the same references internally. If it is needed to
- * update values that are returned from cache, this flag will provide
- * automatic cloning of values prior to returning so they can be directly
- * updated.
- */
-CLONE,
-
/** Skips store, i.e. no read-through and no write-through behavior. */
SKIP_STORE;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad84583b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 79c8fce..b7d545f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -2332,7 +2332,7 @@ public abstract class GridCacheAdapter implements
GridCache,
validateCacheValue(val);
-V prevVal = ctx.cloneOnFlag(syncOp(new SyncOp(true) {
+V prevVal = syncOp(new SyncOp(true) {
@Override public V op(IgniteTxLocalAdapter tx) throws
IgniteCheckedException {
return (V)tx.putAllAsync(ctx, F.t(key, val), true, cached,
ttl, filter).get().value();
}
@@ -2340,7 +2340,7 @@ public abstract class GridCacheAdapter implements
GridCache,
@Override public String toString() {
return "put [key=" + key + ", val=" + val + ", filter=" +
Arrays.toString(filter) + ']';
}
-}));
+});
if (statsEnabled)
metrics0().addPutAndGetTimeNanos(System.nanoTime() - start);
@@ -2394,7 +2394,7 @@ public abstract class GridCacheAdapter implements
GridCache,
validateCacheValue(val);
-return ctx.wrapClone(asyncOp(new AsyncOp(key) {
+return asyncOp(new AsyncOp(key) {
@Override public IgniteInternalFuture op(IgniteTxLocalAdapter
tx) {
return tx.putAllAsync(ctx, F.t(key, val), true, entry, ttl,
filter)
.chain((IgniteClosure, V>)RET2VAL);
@@ -2403,7 +2403,7 @@ public abstract class GridCacheAdapter implements
GridCache,
@Override public String toString() {
return "putAsync [key=" + key + ", val=" + val + ", filter=" +
Arrays.toString(filter) + ']';
}
-}));
+});
}
/** {@inheritDoc}
[23/49] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-629-1' into ignite-629-1
Merge remote-tracking branch 'origin/ignite-629-1' into ignite-629-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/e9a45c0c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e9a45c0c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e9a45c0c Branch: refs/heads/ignite-645 Commit: e9a45c0c313b427d8c11fbee79560d464d24dae3 Parents: 2415712 69aaedd Author: sboikov Authored: Mon Mar 30 12:42:09 2015 +0300 Committer: sboikov Committed: Mon Mar 30 12:42:09 2015 +0300 -- --
[42/49] incubator-ignite git commit: # ignite-sprint-3 avoid StringIndexOutOfBoundsException (ignite-657)
# ignite-sprint-3 avoid StringIndexOutOfBoundsException (ignite-657)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e182c34b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e182c34b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e182c34b
Branch: refs/heads/ignite-645
Commit: e182c34bde3321f7fb8e9af471bc0dfa2a938f65
Parents: 07683c9
Author: sboikov
Authored: Tue Mar 31 15:34:05 2015 +0300
Committer: sboikov
Committed: Tue Mar 31 15:34:05 2015 +0300
--
.../cache/transactions/IgniteTxLocalAdapter.java | 13 -
1 file changed, 8 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e182c34b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
index ca85838..e552619 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
@@ -3067,17 +3067,20 @@ public abstract class IgniteTxLocalAdapter extends
IgniteTxAdapter
if (!cctx.txCompatible(this, activeCacheIds, cacheCtx)) {
StringBuilder cacheNames = new StringBuilder();
+int idx = 0;
+
for (Integer activeCacheId : activeCacheIds) {
cacheNames.append(cctx.cacheContext(activeCacheId).name());
-cacheNames.append(", ");
+if (idx++ < activeCacheIds.size() - 1)
+cacheNames.append(", ");
}
-cacheNames.setLength(cacheNames.length() - 2);
-
throw new IgniteCheckedException("Failed to enlist new cache
to existing transaction " +
-"(cache configurations are not compatible)
[activeCaches=[" + cacheNames +
-"], cacheName=" + cacheCtx.name() + ", txSystem=" +
system() +
+"(cache configurations are not compatible) [" +
+"activeCaches=[" + cacheNames + "]" +
+", cacheName=" + cacheCtx.name() +
+", txSystem=" + system() +
", cacheSystem=" + cacheCtx.system() + ']');
}
else
[10/13] incubator-ignite git commit: # IGNITE-562 Minor fix for comments.
# IGNITE-562 Minor fix for comments.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0dfb5c03
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0dfb5c03
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0dfb5c03
Branch: refs/heads/ignite-645
Commit: 0dfb5c03bb785a8fdbbdb70d8260ea7922e2accc
Parents: 528d46b
Author: AKuznetsov
Authored: Wed Apr 1 10:22:44 2015 +0700
Committer: AKuznetsov
Committed: Wed Apr 1 10:22:44 2015 +0700
--
.../ignite/visor/commands/disco/VisorDiscoveryCommand.scala | 8
.../ignite/visor/commands/tasks/VisorTasksCommand.scala | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0dfb5c03/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala
index 11689f5..3b6ca7e 100644
---
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala
+++
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala
@@ -41,16 +41,16 @@ import scala.language.{implicitConversions, reflectiveCalls}
* {{{
*
+---+
* | disco | Prints topology change log as seen from the oldest node.
|
- * | | Timeframe for querying events can be specified in arguments.
|
+ * | | Timeframe for querying events can be specified in arguments.
|
* | |
|
- * | | Note that this command depends on Ignite events.
|
+ * | | Note that this command depends on Ignite events.
|
* | |
|
- * | | Ignite events can be individually enabled and disabled and
disabled events |
+ * | | Ignite events can be individually enabled and disabled and
disabled events|
* | | can affect the results produced by this command. Note also that
configuration |
* | | of Event Storage SPI that is responsible for temporary storage of
generated |
* | | events on each node can also affect the functionality of this
command.|
* | |
|
- * | | By default - all events are DISABLED and Ignite stores last
10,000 local |
+ * | | By default - all events are DISABLED and Ignite stores last
10,000 local |
* | | events on each node. Both of these defaults can be changed in
configuration. |
*
+---+
* }}}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0dfb5c03/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala
index 9d9dde0..5feae8c 100644
---
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala
+++
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala
@@ -242,14 +242,14 @@ private case class VisorTask(
*
+---+
* | tasks | Prints statistics about tasks and executions.
|
* | |
|
- * | | Note that this command depends on Ignite events.
|
+ * | | Note that this command depends on Ignite events.
|
* | |
|
- * | | Ignite events can be individually enabled and disabled and
disabled events |
+ * | | Ignite events can be individually enabled and disabled and
disabled events|
* | | can affect the results produced by this co
[13/13] incubator-ignite git commit: ignite-645 Remove GridCachePeekMode
ignite-645 Remove GridCachePeekMode
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dfb4679f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dfb4679f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dfb4679f
Branch: refs/heads/ignite-645
Commit: dfb4679f912eb226b04c20b29e6e2d6872e95b9f
Parents: 35d05e9
Author: Andrey Gura
Authored: Mon Mar 30 21:57:29 2015 +0300
Committer: Andrey Gura
Committed: Wed Apr 1 11:55:02 2015 +0300
--
.../cache/CacheEvictableEntryImpl.java | 11 +-
.../processors/cache/CacheProjection.java | 36 ---
.../processors/cache/GridCacheAdapter.java | 257 +--
.../cache/GridCacheDeploymentManager.java | 7 +-
.../processors/cache/GridCacheEntryEx.java | 42 +--
.../processors/cache/GridCacheMapEntry.java | 183 +
.../processors/cache/GridCachePeekMode.java | 81 --
.../cache/GridCacheProjectionImpl.java | 11 -
.../processors/cache/GridCacheProxyImpl.java| 24 --
.../processors/cache/GridCacheUtils.java| 11 -
.../distributed/dht/GridDhtCacheAdapter.java| 9 +-
.../dht/atomic/GridDhtAtomicCache.java | 29 +--
.../dht/colocated/GridDhtColocatedCache.java| 45 +---
.../distributed/near/GridNearCacheAdapter.java | 54 +---
.../distributed/near/GridNearTxRemote.java | 11 +-
.../processors/task/GridTaskProcessor.java | 9 +-
.../resources/META-INF/classnames.properties| 1 -
.../GridCachePreloadingEvictionsSelfTest.java | 4 +-
.../processors/cache/GridCacheTestEntryEx.java | 31 +--
...GridCacheDhtEvictionNearReadersSelfTest.java | 14 +-
.../dht/GridCacheDhtEvictionSelfTest.java | 24 +-
.../dht/GridCacheDhtMappingSelfTest.java| 2 +-
.../near/GridCacheNearMultiNodeSelfTest.java| 72 ++
.../near/GridCacheNearOneNodeSelfTest.java | 25 +-
.../near/GridCacheNearReadersSelfTest.java | 92 +++
.../GridCacheReplicatedPreloadSelfTest.java | 11 +-
.../processors/igfs/IgfsProcessorSelfTest.java | 3 +-
.../processors/igfs/IgfsSizeSelfTest.java | 46 +---
.../junits/common/GridCommonAbstractTest.java | 42 +++
.../cache/GridIndexingWithNoopSwapSelfTest.java | 2 +-
30 files changed, 253 insertions(+), 936 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfb4679f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictableEntryImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictableEntryImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictableEntryImpl.java
index 6144807..5d6062e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictableEntryImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheEvictableEntryImpl.java
@@ -76,16 +76,18 @@ public class CacheEvictableEntryImpl implements
EvictableEntry {
/**
* @return Peeks value.
*/
-@SuppressWarnings("unchecked")
@Nullable public V peek() {
try {
-CacheObject val = cached.peek(GridCachePeekMode.GLOBAL);
+CacheObject val = cached.peek(true, false, false, null);
return val != null ?
val.value(cached.context().cacheObjectContext(), false) : null;
}
catch (GridCacheEntryRemovedException e) {
return null;
}
+catch (IgniteCheckedException e) {
+throw new IgniteException(e);
+}
}
/** {@inheritDoc} */
@@ -114,13 +116,16 @@ public class CacheEvictableEntryImpl implements
EvictableEntry {
return null;
try {
-CacheObject val = e.peek(GridCachePeekMode.GLOBAL,
CU.empty0());
+CacheObject val = e.peek(true, false, false, null);
return val != null ?
val.value(cached.context().cacheObjectContext(), false) : null;
}
catch (GridCacheEntryRemovedException ignored) {
// No-op.
}
+catch (IgniteCheckedException ex) {
+throw new IgniteException(ex);
+}
}
}
catch (GridCacheFilterFailedException ignored) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfb4679f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/
[03/13] incubator-ignite git commit: Merge branches 'ignite-644' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-644
Merge branches 'ignite-644' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-644 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f1f873bf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f1f873bf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f1f873bf Branch: refs/heads/ignite-645 Commit: f1f873bf5eb1d5d8c024f68ab9aaa90bd0cc9122 Parents: 5ee3767 c6b3380 Author: Valentin Kulichenko Authored: Tue Mar 31 14:08:23 2015 -0700 Committer: Valentin Kulichenko Committed: Tue Mar 31 14:08:23 2015 -0700 -- DEVNOTES.txt| 6 + .../client/impl/ClientCacheFlagsCodecTest.java | 18 +- .../ignite/internal/GridKernalContextImpl.java | 9 +- .../org/apache/ignite/internal/IgniteEx.java| 4 +- .../apache/ignite/internal/IgniteKernal.java| 12 +- .../internal/client/GridClientCacheFlag.java| 13 - .../impl/connection/GridClientConnection.java | 9 - .../internal/managers/GridManagerAdapter.java | 4 + .../cache/CacheConflictResolutionManager.java | 30 ++ .../internal/processors/cache/CacheFlag.java| 108 -- .../processors/cache/CacheFlagException.java| 67 .../cache/CacheOsConflictResolutionManager.java | 58 +++ .../processors/cache/CacheProjection.java | 233 +--- .../internal/processors/cache/GridCache.java| 3 - .../processors/cache/GridCacheAdapter.java | 271 +++--- .../cache/GridCacheConcurrentMap.java | 44 +-- .../processors/cache/GridCacheContext.java | 241 ++--- .../processors/cache/GridCacheEntryEx.java | 3 +- .../processors/cache/GridCacheMapEntry.java | 27 +- .../processors/cache/GridCacheProcessor.java| 20 +- .../processors/cache/GridCacheProjectionEx.java | 29 -- .../cache/GridCacheProjectionImpl.java | 357 +++ .../processors/cache/GridCacheProxyImpl.java| 55 +-- .../cache/GridCacheSharedContext.java | 21 -- .../processors/cache/IgniteCacheProxy.java | 31 +- .../CacheDataStructuresManager.java | 4 +- .../GridDistributedTxRemoteAdapter.java | 2 +- .../distributed/dht/GridDhtCacheAdapter.java| 2 +- .../distributed/dht/GridDhtLocalPartition.java | 2 +- .../distributed/dht/GridDhtLockFuture.java | 2 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../dht/GridPartitionedGetFuture.java | 3 +- .../dht/atomic/GridDhtAtomicCache.java | 32 -- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 2 - .../dht/atomic/GridNearAtomicUpdateFuture.java | 3 - .../dht/atomic/GridNearAtomicUpdateRequest.java | 78 ++-- .../dht/colocated/GridDhtColocatedCache.java| 2 - .../colocated/GridDhtDetachedCacheEntry.java| 2 +- .../distributed/near/GridNearAtomicCache.java | 2 - .../distributed/near/GridNearCacheAdapter.java | 9 - .../distributed/near/GridNearGetFuture.java | 3 +- .../near/GridNearTransactionalCache.java| 2 - .../cache/distributed/near/GridNearTxLocal.java | 4 +- .../processors/cache/dr/GridCacheDrManager.java | 5 - .../cache/dr/GridOsCacheDrManager.java | 106 ++ .../cache/dr/os/GridOsCacheDrManager.java | 111 -- .../local/atomic/GridLocalAtomicCache.java | 74 +--- .../cache/query/GridCacheQueriesImpl.java | 23 +- .../continuous/CacheContinuousQueryHandler.java | 5 - .../transactions/IgniteTransactionsImpl.java| 1 - .../transactions/IgniteTxLocalAdapter.java | 19 +- .../cache/transactions/IgniteTxManager.java | 2 - .../version/CacheVersionConflictResolver.java | 40 +++ ...ridCacheVersionAbstractConflictResolver.java | 56 --- .../GridCacheVersionConflictResolver.java | 59 --- .../datastreamer/DataStreamerImpl.java | 2 +- .../datastructures/DataStructuresProcessor.java | 13 +- .../datastructures/GridCacheAtomicLongImpl.java | 14 +- .../GridCacheAtomicReferenceImpl.java | 2 +- .../GridCacheAtomicReferenceValue.java | 15 +- .../GridCacheAtomicSequenceImpl.java| 2 +- .../GridCacheAtomicStampedImpl.java | 2 +- .../GridCacheAtomicStampedValue.java| 15 +- .../GridCacheCountDownLatchImpl.java| 2 +- .../handlers/cache/GridCacheCommandHandler.java | 66 ++-- .../cache/VisorCacheStoreConfiguration.java | 18 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 16 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 5 + .../communication/tcp/TcpCommunicationSpi.java | 13 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 14 +- .../GridProjectionForCachesSelfTest.java| 12 +- .../GridCa
[01/13] incubator-ignite git commit: IGNITE-644 - Marshaller cache config
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-645 7368fdb61 -> dfb4679f9 (forced update)
IGNITE-644 - Marshaller cache config
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5ee3767d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5ee3767d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5ee3767d
Branch: refs/heads/ignite-645
Commit: 5ee3767d916018922f59edc2fd70b13349e1afc4
Parents: bca4198
Author: Valentin Kulichenko
Authored: Mon Mar 30 12:37:13 2015 -0700
Committer: Valentin Kulichenko
Committed: Mon Mar 30 12:37:13 2015 -0700
--
.../org/apache/ignite/internal/IgnitionEx.java | 34 +---
.../distributed/near/GridNearAtomicCache.java | 3 +-
2 files changed, 17 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ee3767d/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 4c8a567..7442d12 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -1751,7 +1751,7 @@ public class IgnitionEx {
}
// Always add marshaller and utility caches.
-copies[0] = marshallerSystemCache(clientDisco);
+copies[0] = marshallerSystemCache();
copies[1] = utilitySystemCache(clientDisco);
cfg.setCacheConfiguration(copies);
@@ -1897,26 +1897,22 @@ public class IgnitionEx {
/**
* Creates marshaller system cache configuration.
*
- * @param client If {@code true} creates client-only cache
configuration.
* @return Marshaller system cache configuration.
*/
-private static CacheConfiguration marshallerSystemCache(boolean
client) {
-if (!client) {
-CacheConfiguration cache = new CacheConfiguration();
-
-cache.setName(CU.MARSH_CACHE_NAME);
-cache.setCacheMode(REPLICATED);
-cache.setAtomicityMode(ATOMIC);
-cache.setSwapEnabled(false);
-cache.setRebalanceMode(SYNC);
-cache.setWriteSynchronizationMode(FULL_SYNC);
-cache.setAffinity(new RendezvousAffinityFunction(false, 100));
-cache.setNodeFilter(CacheConfiguration.ALL_NODES);
-
-return cache;
-}
-
-return null;
+private static CacheConfiguration marshallerSystemCache() {
+CacheConfiguration cache = new CacheConfiguration();
+
+cache.setName(CU.MARSH_CACHE_NAME);
+cache.setCacheMode(REPLICATED);
+cache.setAtomicityMode(ATOMIC);
+cache.setSwapEnabled(false);
+cache.setRebalanceMode(SYNC);
+cache.setWriteSynchronizationMode(FULL_SYNC);
+cache.setAffinity(new RendezvousAffinityFunction(false, 20));
+cache.setNodeFilter(CacheConfiguration.ALL_NODES);
+cache.setStartSize(300);
+
+return cache;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ee3767d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
index 6e24261..d34b13b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
@@ -69,7 +69,8 @@ public class GridNearAtomicCache extends
GridNearCacheAdapter {
public GridNearAtomicCache(GridCacheContext ctx) {
super(ctx);
-int size = Integer.getInteger(IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE,
1_000_000);
+int size = CU.isSystemCache(ctx.name()) ? 100 :
+Integer.getInteger(IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE,
1_000_000);
rmvQueue = new GridCircularBuffer<>(U.ceilPow2(size / 10));
}
[11/13] incubator-ignite git commit: # IGNITE-598: Implemented.
# IGNITE-598: Implemented.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/35d05e92
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/35d05e92
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/35d05e92
Branch: refs/heads/ignite-645
Commit: 35d05e9282903ee9b78bbbef30bd41c9d250bea4
Parents: 0dfb5c0
Author: vozerov-gridgain
Authored: Wed Apr 1 11:16:25 2015 +0300
Committer: vozerov-gridgain
Committed: Wed Apr 1 11:16:25 2015 +0300
--
.../configuration/CacheConfiguration.java | 23
.../ignite/internal/GridCachePluginContext.java | 72 +
.../ignite/internal/GridKernalContextImpl.java | 9 +-
.../processors/cache/GridCacheContext.java | 17 ++-
.../processors/cache/GridCacheProcessor.java| 44
.../processors/cache/GridCacheUtils.java| 39 +++
.../processors/plugin/CachePluginManager.java | 107 +++
.../ignite/plugin/CachePluginConfiguration.java | 33 ++
.../ignite/plugin/CachePluginContext.java | 54 ++
.../ignite/plugin/CachePluginProvider.java | 83 ++
...eJdbcStoreAbstractMultithreadedSelfTest.java | 11 +-
.../cache/GridCacheMemoryModeSelfTest.java | 12 ++-
.../loadtests/hashmap/GridCacheTestContext.java | 4 +-
13 files changed, 470 insertions(+), 38 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/35d05e92/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index 19e9c62..8d5ba6c 100644
---
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -30,6 +30,7 @@ import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
+import org.apache.ignite.plugin.*;
import org.jetbrains.annotations.*;
import javax.cache.*;
@@ -326,6 +327,9 @@ public class CacheConfiguration extends
MutableConfiguration {
/** Copy on read flag. */
private boolean cpOnRead = DFLT_COPY_ON_READ;
+/** Cache plugin configurations. */
+private CachePluginConfiguration[] pluginCfgs;
+
/** Empty constructor (all values are initialized to their defaults). */
public CacheConfiguration() {
/* No-op. */
@@ -409,6 +413,7 @@ public class CacheConfiguration extends
MutableConfiguration {
writeBehindFlushSize = cc.getWriteBehindFlushSize();
writeBehindFlushThreadCnt = cc.getWriteBehindFlushThreadCount();
writeSync = cc.getWriteSynchronizationMode();
+pluginCfgs = cc.getPluginConfigurations();
}
/**
@@ -1575,6 +1580,24 @@ public class CacheConfiguration extends
MutableConfiguration {
this.sqlOnheapRowCacheSize = size;
}
+/**
+ * Gets array of cache plugin configurations.
+ *
+ * @return Cache plugin configurations.
+ */
+public CachePluginConfiguration[] getPluginConfigurations() {
+return pluginCfgs != null ? pluginCfgs : new
CachePluginConfiguration[0];
+}
+
+/**
+ * Sets cache plugin configurations.
+ *
+ * @param pluginCfgs Cache plugin configurations.
+ */
+public void setPluginConfigurations(CachePluginConfiguration...
pluginCfgs) {
+this.pluginCfgs = pluginCfgs;
+}
+
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(CacheConfiguration.class, this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/35d05e92/modules/core/src/main/java/org/apache/ignite/internal/GridCachePluginContext.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridCachePluginContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridCachePluginContext.java
new file mode 100644
index 000..57df0b0
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/GridCachePluginContext.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance
[05/13] incubator-ignite git commit: IGNITE-651 - Persistance for marshaller cache
IGNITE-651 - Persistance for marshaller cache
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/00c934cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/00c934cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/00c934cc
Branch: refs/heads/ignite-645
Commit: 00c934cc3921d05f92e1c0f7400ae9253b779b01
Parents: ea7d248
Author: Valentin Kulichenko
Authored: Tue Mar 31 14:52:31 2015 -0700
Committer: Valentin Kulichenko
Committed: Tue Mar 31 14:52:31 2015 -0700
--
.../ignite/internal/MarshallerContextImpl.java | 31
1 file changed, 26 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00c934cc/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
index 4a27222..d5a0526 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
@@ -23,6 +23,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
import javax.cache.event.*;
import java.io.*;
+import java.nio.channels.*;
import java.util.concurrent.*;
/**
@@ -124,8 +125,18 @@ public class MarshallerContextImpl extends
MarshallerContextAdapter {
if (clsName == null) {
File file = new File(workDir, id + ".classname");
-try (BufferedReader reader = new BufferedReader(new
FileReader(file))) {
-clsName = reader.readLine();
+try (
+FileInputStream in = new FileInputStream(file);
+BufferedReader reader = new BufferedReader(new
InputStreamReader(in))
+) {
+FileLock lock = in.getChannel().lock(0, Long.MAX_VALUE, true);
+
+try {
+clsName = reader.readLine();
+}
+finally {
+lock.release();
+}
}
catch (IOException e) {
throw new IgniteCheckedException("Failed to read class name
from file [id=" + id +
@@ -162,10 +173,20 @@ public class MarshallerContextImpl extends
MarshallerContextAdapter {
File file = new File(workDir, evt.getKey() + ".classname");
-try (Writer writer = new FileWriter(file)) {
-writer.write(evt.getValue());
+try (
+FileOutputStream out = new FileOutputStream(file);
+Writer writer = new OutputStreamWriter(out)
+) {
+FileLock lock = out.getChannel().lock();
+
+try {
+writer.write(evt.getValue());
-writer.flush();
+writer.flush();
+}
+finally {
+lock.release();
+}
}
catch (IOException e) {
U.error(log, "Failed to write class name to file [id=" +
evt.getKey() +
[12/13] incubator-ignite git commit: ignite-645 Remove GridCachePeekMode
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dfb4679f/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
index 1ab738f..a0d9f03 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java
@@ -158,13 +158,13 @@ public class GridCacheNearReadersSelfTest extends
GridCommonAbstractTest {
assertTrue(cache1.containsKey(1));
assertTrue(cache1.containsKey(2));
-assertNotNull(near(cache1).peek(1));
-assertNotNull(near(cache1).peek(2));
-assertNotNull(dht(cache1).peek(1));
-assertNull(dht(cache1).peek(2));
+assertNotNull(nearPeek(cache1, 1));
+assertNotNull(nearPeek(cache1, 2));
+assertNotNull(dhtPeek(cache1, 1));
+assertNull(dhtPeek(cache1, 2));
-assertNull(near(cache2).peek(1));
-assertNotNull(dht(cache2).peek(2));
+assertNull(nearPeek(cache2, 1));
+assertNotNull(dhtPeek(cache2, 2));
// Node2 should have node1 in reader's map, since request to
// put key 2 came from node1.
@@ -177,7 +177,7 @@ public class GridCacheNearReadersSelfTest extends
GridCommonAbstractTest {
assertEquals("v1", cache2.get(1));
// Check that key1 is in near cache of cache2.
-assertNotNull(near(cache2).peek(1));
+assertNotNull(nearPeek(cache2, 1));
// Now node1 should have node2 in readers map.
assertTrue(e1.readers().contains(n2.id()));
@@ -185,8 +185,8 @@ public class GridCacheNearReadersSelfTest extends
GridCommonAbstractTest {
// Evict locally from cache2.
cache2.localEvict(Collections.singleton(1));
-assertNull(near(cache2).peek(1));
-assertNull(dht(cache2).peek(1));
+assertNull(nearPeek(cache2, 1));
+assertNull(dhtPeek(cache2, 1));
// Node 1 still has node2 in readers map.
assertTrue(e1.readers().contains(n2.id()));
@@ -240,10 +240,10 @@ public class GridCacheNearReadersSelfTest extends
GridCommonAbstractTest {
assertTrue(cache1.containsKey(1));
assertTrue(cache2.containsKey(1));
-assertEquals("v1", near(cache1).peek(1));
-assertEquals("v1", near(cache2).peek(1));
-assertEquals("v1", dht(cache1).peek(1));
-assertEquals("v1", dht(cache2).peek(1));
+assertEquals("v1", nearPeek(cache1, 1));
+assertEquals("v1", nearPeek(cache2, 1));
+assertEquals("v1", dhtPeek(cache1, 1));
+assertEquals("v1", dhtPeek(cache2, 1));
assertNull(near(cache1).peekNearOnly(1));
assertNull(near(cache2).peekNearOnly(1));
@@ -256,10 +256,10 @@ public class GridCacheNearReadersSelfTest extends
GridCommonAbstractTest {
assertTrue(cache1.containsKey(2));
assertTrue(cache2.containsKey(2));
-assertEquals("v2", near(cache1).peek(2));
-assertEquals("v2", near(cache2).peek(2));
-assertEquals("v2", dht(cache1).peek(2));
-assertEquals("v2", dht(cache2).peek(2));
+assertEquals("v2", nearPeek(cache1, 2));
+assertEquals("v2", nearPeek(cache2, 2));
+assertEquals("v2", dhtPeek(cache1, 2));
+assertEquals("v2", dhtPeek(cache2, 2));
assertNull(near(cache1).peekNearOnly(2));
assertNull(near(cache2).peekNearOnly(2));
@@ -284,7 +284,7 @@ public class GridCacheNearReadersSelfTest extends
GridCommonAbstractTest {
cache2.localEvict(Collections.singleton(1));
assertNull(near(cache2).peekNearOnly(1));
-assertEquals("v1", dht(cache2).peek(1));
+assertEquals("v1", dhtPeek(cache2, 1));
assertEquals("v1", cache1.getAndPut(1, "z1"));
@@ -292,7 +292,7 @@ public class GridCacheNearReadersSelfTest extends
GridCommonAbstractTest {
assertFalse(e1.readers().contains(n2.id()));
assertNull(near(cache2).peekNearOnly(1));
-assertEquals("z1", dht(cache2).peek(1));
+assertEquals("z1", dhtPeek(cache2, 1));
}
/** @throws Exception If failed. */
@@ -443,9 +443,9 @@ public class GridCacheNearReadersSelfTest extends
GridCommonAbstractTest {
assertNull(cache.getAndPut(key1, val1));
-assertEquals(val1, dht(0).peek(key1));
-assertEquals(val1, dht(1).peek(key1));
-assertNull(dht(2).peek(key1));
+assertEquals(val1, dhtPeek(0, key1));
+assertEquals(val1, dhtPeek(1, key1));
+asser
[07/13] incubator-ignite git commit: IGNITE-651 - Fixed system transactions test since marshaller cache is not transactional anymore.
IGNITE-651 - Fixed system transactions test since marshaller cache is not
transactional anymore.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ca472ac5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ca472ac5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ca472ac5
Branch: refs/heads/ignite-645
Commit: ca472ac50c3e679a305bb9a01a56b180ac3fff82
Parents: 685209c
Author: Alexey Goncharuk
Authored: Tue Mar 31 18:46:45 2015 -0700
Committer: Alexey Goncharuk
Committed: Tue Mar 31 18:46:45 2015 -0700
--
.../ignite/internal/MarshallerContextImpl.java | 2 +-
.../transactions/IgniteTransactionsImpl.java| 4 +++
.../IgniteCacheSystemTransactionsSelfTest.java | 38 ++--
3 files changed, 15 insertions(+), 29 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca472ac5/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
index 4a27222..e6ef192 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
@@ -158,7 +158,7 @@ public class MarshallerContextImpl extends
MarshallerContextAdapter {
@Override public void onUpdated(Iterable> events)
throws CacheEntryListenerException {
for (CacheEntryEvent evt :
events) {
-assert evt.getOldValue() == null;
+assert evt.getOldValue() == null : "Received non-null old
value for system marshaller cache: " + evt;
File file = new File(workDir, evt.getKey() + ".classname");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca472ac5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java
index afa2826..c3ad32b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.processors.cache.transactions;
+import org.apache.ignite.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.*;
@@ -137,6 +138,9 @@ public class IgniteTransactionsImpl implements
IgniteTransactionsEx {
long timeout, int txSize, @Nullable GridCacheContext sysCacheCtx) {
TransactionConfiguration cfg =
cctx.gridConfig().getTransactionConfiguration();
+if (sysCacheCtx != null && !sysCacheCtx.transactional())
+throw new IgniteException("Failed to start transaction on
non-transactional cache: " + sysCacheCtx.name());
+
if (!cfg.isTxSerializableEnabled() && isolation == SERIALIZABLE)
throw new IllegalArgumentException("SERIALIZABLE isolation level
is disabled (to enable change " +
"'txSerializableEnabled' configuration property)");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca472ac5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java
index f06838a..d4c3a1b 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java
@@ -24,9 +24,11 @@ import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.cache.transactions.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.testframework.*;
import org
[09/13] incubator-ignite git commit: # IGNITE-562 Minor rename preload -> rebalance.
# IGNITE-562 Minor rename preload -> rebalance.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/528d46bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/528d46bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/528d46bc
Branch: refs/heads/ignite-645
Commit: 528d46bc95fa40049c24a7eee1d27812934ac5a5
Parents: 17a9744
Author: AKuznetsov
Authored: Wed Apr 1 10:18:57 2015 +0700
Committer: AKuznetsov
Committed: Wed Apr 1 10:18:57 2015 +0700
--
.../commands/events/VisorEventsCommand.scala| 24 ++--
1 file changed, 12 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/528d46bc/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
index 3316579..01d8b14 100644
---
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
+++
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
@@ -41,16 +41,16 @@ import scala.language.implicitConversions
* ==Help==
* {{{
*
++
- * | events | Prints events from a node.
|
+ * | events | Prints events from a node.
|
* ||
|
- * || Note that this command depends on Ignite events.
|
+ * || Note that this command depends on Ignite events.
|
* ||
|
- * || Ignite events can be individually enabled and disabled and
disabled events |
+ * || Ignite events can be individually enabled and disabled and
disabled events|
* || can affect the results produced by this command. Note also that
configuration |
* || of Event Storage SPI that is responsible for temporary storage
of generated |
* || events on each node can also affect the functionality of this
command.|
* ||
|
- * || By default - all events are DISABLED and Ignite stores last
10,000 local |
+ * || By default - all events are DISABLED and Ignite stores last
10,000 local |
* || events on each node. Both of these defaults can be changed in
configuration. |
*
++
* }}}
@@ -58,7 +58,7 @@ import scala.language.implicitConversions
* Specification
* {{{
* events
- * events "{-id=|-id8=}
{-e=}
+ * events "{-id=|-id8=}
{-e=}
* {-t=s|m|h|d} {-s=e|t} {-r} {-c=}"
* }}}
*
@@ -72,7 +72,7 @@ import scala.language.implicitConversions
* Node ID8.
* Either '-id' or '-id8' can be specified.
* If called without the arguments - starts in interactive mode.
- * -e=
+ * -e=
* Comma separated list of event types that should be queried:
*ch Checkpoint events.
*de Deployment events.
@@ -81,7 +81,7 @@ import scala.language.implicitConversions
*ta Task execution events.
*cl Cloud events.
*ca Cache events.
- *cp Cache pre-loader events.
+ *cr Cache rebalance events.
*sw Swapspace events.
* -t=s|m|h|d
* Defines time frame for querying events:
@@ -159,7 +159,7 @@ class VisorEventsCommand {
case "jo" => arr ++= EVTS_JOB_EXECUTION.toList
case "ta" => arr ++= EVTS_TASK_EXECUTION.toList
case "ca" => arr ++= EVTS_CACHE.toList
-case "cp" => arr ++= EVTS_CACHE_REBALANCE.toList
+case "cr" => arr ++= EVTS_CACHE_REBALANCE.toList
case "sw" => arr ++= EVTS_SWAPSPACE.toList
case "di" => arr ++= EVTS_DISCOVERY.toList
case t => throw new IllegalArgumentException("Unknown event
type: " + t)
@@ -185,7 +185,7 @@ class VisorEventsCommand {
case t if EVTS_TASK_EXECUTION.contains(t) => "ta"
case t if EVTS_CACHE.contains(t) => "ca"
[08/13] incubator-ignite git commit: Merge branch 'ignite-644' into ignite-sprint-3
Merge branch 'ignite-644' into ignite-sprint-3 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/17a9744d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/17a9744d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/17a9744d Branch: refs/heads/ignite-645 Commit: 17a9744d2b7cc23a7e27cb20b45038ed114c589e Parents: ca472ac ad140b9 Author: Valentin Kulichenko Authored: Tue Mar 31 18:51:46 2015 -0700 Committer: Valentin Kulichenko Committed: Tue Mar 31 18:51:46 2015 -0700 -- .../src/main/java/org/apache/ignite/internal/IgnitionEx.java | 4 ++-- .../processors/cache/distributed/near/GridNearAtomicCache.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/17a9744d/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java --
[04/13] incubator-ignite git commit: # IGNITE-644 - Review
# IGNITE-644 - Review
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ad140b90
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ad140b90
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ad140b90
Branch: refs/heads/ignite-645
Commit: ad140b906526cb95f6db14daf9f1c025e2e45c9d
Parents: f1f873b
Author: Valentin Kulichenko
Authored: Tue Mar 31 14:18:50 2015 -0700
Committer: Valentin Kulichenko
Committed: Tue Mar 31 14:18:50 2015 -0700
--
.../org/apache/ignite/internal/IgnitionEx.java | 34 +++-
1 file changed, 19 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad140b90/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 7442d12..5b52919 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -1751,7 +1751,7 @@ public class IgnitionEx {
}
// Always add marshaller and utility caches.
-copies[0] = marshallerSystemCache();
+copies[0] = marshallerSystemCache(clientDisco);
copies[1] = utilitySystemCache(clientDisco);
cfg.setCacheConfiguration(copies);
@@ -1899,20 +1899,24 @@ public class IgnitionEx {
*
* @return Marshaller system cache configuration.
*/
-private static CacheConfiguration marshallerSystemCache() {
-CacheConfiguration cache = new CacheConfiguration();
-
-cache.setName(CU.MARSH_CACHE_NAME);
-cache.setCacheMode(REPLICATED);
-cache.setAtomicityMode(ATOMIC);
-cache.setSwapEnabled(false);
-cache.setRebalanceMode(SYNC);
-cache.setWriteSynchronizationMode(FULL_SYNC);
-cache.setAffinity(new RendezvousAffinityFunction(false, 20));
-cache.setNodeFilter(CacheConfiguration.ALL_NODES);
-cache.setStartSize(300);
-
-return cache;
+private static CacheConfiguration marshallerSystemCache(boolean
client) {
+if (!client) {
+CacheConfiguration cache = new CacheConfiguration();
+
+cache.setName(CU.MARSH_CACHE_NAME);
+cache.setCacheMode(REPLICATED);
+cache.setAtomicityMode(ATOMIC);
+cache.setSwapEnabled(false);
+cache.setRebalanceMode(SYNC);
+cache.setWriteSynchronizationMode(FULL_SYNC);
+cache.setAffinity(new RendezvousAffinityFunction(false, 20));
+cache.setNodeFilter(CacheConfiguration.ALL_NODES);
+cache.setStartSize(300);
+
+return cache;
+}
+
+return null;
}
/**
[02/13] incubator-ignite git commit: IGNITE-651 - Persistance for marshaller cache
IGNITE-651 - Persistance for marshaller cache
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ea7d2485
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ea7d2485
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ea7d2485
Branch: refs/heads/ignite-645
Commit: ea7d2485622cc455be536dec3ecbb36dec3498db
Parents: c6b3380
Author: Valentin Kulichenko
Authored: Tue Mar 31 13:29:08 2015 -0700
Committer: Valentin Kulichenko
Committed: Tue Mar 31 13:29:08 2015 -0700
--
.../checkpoint/s3/S3CheckpointSpiSelfTest.java | 12 +--
.../ignite/internal/GridKernalContextImpl.java | 3 +-
.../org/apache/ignite/internal/IgnitionEx.java | 6 +-
.../internal/MarshallerContextAdapter.java | 6 +-
.../ignite/internal/MarshallerContextImpl.java | 90 ++--
.../processors/cache/GridCacheProcessor.java| 8 +-
.../CacheContinuousQueryListener.java | 3 +
.../continuous/CacheContinuousQueryManager.java | 2 +-
.../ignite/internal/util/IgniteUtils.java | 2 +-
.../ignite/marshaller/MarshallerContext.java| 3 +-
.../optimized/OptimizedMarshallerUtils.java | 9 +-
.../managers/GridNoopManagerSelfTest.java | 2 +-
.../communication/GridIoManagerSelfTest.java| 9 +-
.../internal/util/IgniteUtilsSelfTest.java | 2 +-
.../OptimizedMarshallerNodeFailoverTest.java| 71 ++-
.../spi/GridSpiLocalHostInjectionTest.java | 2 +-
.../GridPriorityQueueCollisionSpiSelfTest.java | 2 +-
...RobinLoadBalancingSpiNotPerTaskSelfTest.java | 2 +-
.../testframework/junits/GridAbstractTest.java | 28 +++---
.../junits/GridTestKernalContext.java | 2 +-
.../junits/IgniteTestResources.java | 8 +-
.../junits/spi/GridSpiAbstractTest.java | 13 +--
22 files changed, 231 insertions(+), 54 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea7d2485/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java
--
diff --git
a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java
b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java
index f48a754..bb92e09 100644
---
a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java
+++
b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java
@@ -100,7 +100,7 @@ public class S3CheckpointSpiSelfTest extends
GridSpiAbstractTesthttp://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea7d2485/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index 6c953e7..4abf5e7 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@ -325,6 +325,7 @@ public class GridKernalContextImpl implements
GridKernalContext, Externalizable
* @param mgmtExecSvc Management executor service.
* @param igfsExecSvc IGFS executor service.
* @param restExecSvc REST executor service.
+ * @throws IgniteCheckedException In case of error.
*/
@SuppressWarnings("TypeMayBeWeakened")
protected GridKernalContextImpl(
@@ -339,7 +340,7 @@ public class GridKernalContextImpl implements
GridKernalContext, Externalizable
ExecutorService p2pExecSvc,
ExecutorService mgmtExecSvc,
ExecutorService igfsExecSvc,
-ExecutorService restExecSvc) {
+ExecutorService restExecSvc) throws IgniteCheckedException {
assert grid != null;
assert cfg != null;
assert gw != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea7d2485/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 4c8a567..19fff08 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -19,11 +19,11 @@ package org.apache.ignite.internal;
import org.apache.ignite.*;
import org.apache.ignite.cache.affinity.rendezvous.*;
-import org.apache.ignite.compute.ComputeJob;
+import org.a
[06/13] incubator-ignite git commit: IGNITE-651 - Persistance for marshaller cache
IGNITE-651 - Persistance for marshaller cache
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/685209c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/685209c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/685209c6
Branch: refs/heads/ignite-645
Commit: 685209c6e360dc8299e9e5b3227e8e9a7929898b
Parents: 00c934c
Author: Valentin Kulichenko
Authored: Tue Mar 31 15:37:24 2015 -0700
Committer: Valentin Kulichenko
Committed: Tue Mar 31 15:37:24 2015 -0700
--
.../ignite/internal/MarshallerContextImpl.java | 31
...ridCacheContinuousQueryAbstractSelfTest.java | 2 +-
2 files changed, 6 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/685209c6/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
index d5a0526..4a27222 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
@@ -23,7 +23,6 @@ import org.apache.ignite.internal.util.typedef.internal.*;
import javax.cache.event.*;
import java.io.*;
-import java.nio.channels.*;
import java.util.concurrent.*;
/**
@@ -125,18 +124,8 @@ public class MarshallerContextImpl extends
MarshallerContextAdapter {
if (clsName == null) {
File file = new File(workDir, id + ".classname");
-try (
-FileInputStream in = new FileInputStream(file);
-BufferedReader reader = new BufferedReader(new
InputStreamReader(in))
-) {
-FileLock lock = in.getChannel().lock(0, Long.MAX_VALUE, true);
-
-try {
-clsName = reader.readLine();
-}
-finally {
-lock.release();
-}
+try (BufferedReader reader = new BufferedReader(new
FileReader(file))) {
+clsName = reader.readLine();
}
catch (IOException e) {
throw new IgniteCheckedException("Failed to read class name
from file [id=" + id +
@@ -173,20 +162,10 @@ public class MarshallerContextImpl extends
MarshallerContextAdapter {
File file = new File(workDir, evt.getKey() + ".classname");
-try (
-FileOutputStream out = new FileOutputStream(file);
-Writer writer = new OutputStreamWriter(out)
-) {
-FileLock lock = out.getChannel().lock();
-
-try {
-writer.write(evt.getValue());
+try (Writer writer = new FileWriter(file)) {
+writer.write(evt.getValue());
-writer.flush();
-}
-finally {
-lock.release();
-}
+writer.flush();
}
catch (IOException e) {
U.error(log, "Failed to write class name to file [id=" +
evt.getKey() +
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/685209c6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
index 27bb4e4..a22e0c7 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
@@ -174,7 +174,7 @@ public abstract class
GridCacheContinuousQueryAbstractSelfTest extends GridCommo
for (int i = 0; i < gridCount(); i++) {
GridContinuousProcessor proc = grid(i).context().continuous();
-assertEquals(String.valueOf(i), 2, ((Map)U.field(proc,
"locInfos")).size());
+assertEquals(String.valueOf(i), 3, ((Map)U.field(proc,
"locInfos")).size());
assertEquals(String.valueOf(i), 0, ((Map)U.field(proc,
"rmtInfos")).size());
[2/2] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/13edeb41 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/13edeb41 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/13edeb41 Branch: refs/heads/ignite-sprint-3 Commit: 13edeb417cb23cf009e59dd862716b3dffd45119 Parents: f7e32fb 35d05e9 Author: Artem Shutak Authored: Wed Apr 1 11:58:33 2015 +0300 Committer: Artem Shutak Committed: Wed Apr 1 11:58:33 2015 +0300 -- .../checkpoint/s3/S3CheckpointSpiSelfTest.java | 12 +-- .../configuration/CacheConfiguration.java | 23 .../ignite/internal/GridCachePluginContext.java | 72 + .../ignite/internal/GridKernalContextImpl.java | 12 +-- .../org/apache/ignite/internal/IgnitionEx.java | 10 +- .../internal/MarshallerContextAdapter.java | 6 +- .../ignite/internal/MarshallerContextImpl.java | 90 ++-- .../processors/cache/GridCacheContext.java | 17 ++- .../processors/cache/GridCacheProcessor.java| 52 - .../processors/cache/GridCacheUtils.java| 39 +++ .../distributed/near/GridNearAtomicCache.java | 3 +- .../CacheContinuousQueryListener.java | 3 + .../continuous/CacheContinuousQueryManager.java | 2 +- .../transactions/IgniteTransactionsImpl.java| 4 + .../processors/plugin/CachePluginManager.java | 107 +++ .../ignite/internal/util/IgniteUtils.java | 2 +- .../ignite/marshaller/MarshallerContext.java| 3 +- .../optimized/OptimizedMarshallerUtils.java | 9 +- .../ignite/plugin/CachePluginConfiguration.java | 33 ++ .../ignite/plugin/CachePluginContext.java | 54 ++ .../ignite/plugin/CachePluginProvider.java | 83 ++ ...eJdbcStoreAbstractMultithreadedSelfTest.java | 11 +- .../managers/GridNoopManagerSelfTest.java | 2 +- .../communication/GridIoManagerSelfTest.java| 9 +- .../cache/GridCacheMemoryModeSelfTest.java | 12 ++- .../IgniteCacheSystemTransactionsSelfTest.java | 38 ++- ...ridCacheContinuousQueryAbstractSelfTest.java | 2 +- .../internal/util/IgniteUtilsSelfTest.java | 2 +- .../loadtests/hashmap/GridCacheTestContext.java | 4 +- .../OptimizedMarshallerNodeFailoverTest.java| 71 +++- .../spi/GridSpiLocalHostInjectionTest.java | 2 +- .../GridPriorityQueueCollisionSpiSelfTest.java | 2 +- ...RobinLoadBalancingSpiNotPerTaskSelfTest.java | 2 +- .../testframework/junits/GridAbstractTest.java | 28 +++-- .../junits/GridTestKernalContext.java | 2 +- .../junits/IgniteTestResources.java | 8 +- .../junits/spi/GridSpiAbstractTest.java | 13 +-- .../commands/disco/VisorDiscoveryCommand.scala | 8 +- .../commands/events/VisorEventsCommand.scala| 24 ++--- .../commands/tasks/VisorTasksCommand.scala | 6 +- 40 files changed, 739 insertions(+), 143 deletions(-) --
[1/2] incubator-ignite git commit: ignite-198: change company name GridGain on ApacheIgnite at example
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-sprint-3 35d05e928 -> 13edeb417
ignite-198: change company name GridGain on ApacheIgnite at example
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f7e32fb5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f7e32fb5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f7e32fb5
Branch: refs/heads/ignite-sprint-3
Commit: f7e32fb596a71f630237b8a06f846febbdbcf005
Parents: c6b3380
Author: Artem Shutak
Authored: Wed Apr 1 11:58:16 2015 +0300
Committer: Artem Shutak
Committed: Wed Apr 1 11:58:16 2015 +0300
--
.../ignite/examples/datagrid/CacheQueryExample.java | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7e32fb5/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
index 8fba9c7..6d6126d 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
@@ -167,9 +167,9 @@ public class CacheQueryExample {
"and lower(org.name) = lower(?)";
// Execute queries for find employees for different organizations.
-print("Following people are 'GridGain' employees: ",
+print("Following people are 'ApacheIgnite' employees: ",
cache.query(new SqlQuery, Person>(Person.class,
joinSql).
-setArgs("GridGain")).getAll());
+setArgs("ApacheIgnite")).getAll());
print("Following people are 'Other' employees: ",
cache.query(new SqlQuery, Person>(Person.class,
joinSql).
@@ -200,7 +200,7 @@ public class CacheQueryExample {
private static void sqlQueryWithAggregation() {
IgniteCache, Person> cache =
Ignition.ignite().cache(PERSON_CACHE);
-// Calculate average of salary of all persons in GridGain.
+// Calculate average of salary of all persons in ApacheIgnite.
// Note that we also join on Organization cache as well.
String sql =
"select avg(salary) " +
@@ -208,10 +208,10 @@ public class CacheQueryExample {
"where Person.orgId = org.id " +
"and lower(org.name) = lower(?)";
-QueryCursor> cursor = cache.query(new
SqlFieldsQuery(sql).setArgs("GridGain"));
+QueryCursor> cursor = cache.query(new
SqlFieldsQuery(sql).setArgs("ApacheIgnite"));
// Calculate average salary for a specific organization.
-print("Average salary for 'GridGain' employees: ", cursor.getAll());
+print("Average salary for 'ApacheIgnite' employees: ",
cursor.getAll());
}
/**
@@ -261,7 +261,7 @@ public class CacheQueryExample {
IgniteCache orgCache =
Ignition.ignite().cache(ORG_CACHE);
// Organizations.
-Organization org1 = new Organization("GridGain");
+Organization org1 = new Organization("ApacheIgnite");
Organization org2 = new Organization("Other");
orgCache.put(org1.id, org1);
[42/50] incubator-ignite git commit: IGNITE-651 - Persistance for marshaller cache
IGNITE-651 - Persistance for marshaller cache
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/685209c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/685209c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/685209c6
Branch: refs/heads/ignite-gg-9950
Commit: 685209c6e360dc8299e9e5b3227e8e9a7929898b
Parents: 00c934c
Author: Valentin Kulichenko
Authored: Tue Mar 31 15:37:24 2015 -0700
Committer: Valentin Kulichenko
Committed: Tue Mar 31 15:37:24 2015 -0700
--
.../ignite/internal/MarshallerContextImpl.java | 31
...ridCacheContinuousQueryAbstractSelfTest.java | 2 +-
2 files changed, 6 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/685209c6/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
index d5a0526..4a27222 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
@@ -23,7 +23,6 @@ import org.apache.ignite.internal.util.typedef.internal.*;
import javax.cache.event.*;
import java.io.*;
-import java.nio.channels.*;
import java.util.concurrent.*;
/**
@@ -125,18 +124,8 @@ public class MarshallerContextImpl extends
MarshallerContextAdapter {
if (clsName == null) {
File file = new File(workDir, id + ".classname");
-try (
-FileInputStream in = new FileInputStream(file);
-BufferedReader reader = new BufferedReader(new
InputStreamReader(in))
-) {
-FileLock lock = in.getChannel().lock(0, Long.MAX_VALUE, true);
-
-try {
-clsName = reader.readLine();
-}
-finally {
-lock.release();
-}
+try (BufferedReader reader = new BufferedReader(new
FileReader(file))) {
+clsName = reader.readLine();
}
catch (IOException e) {
throw new IgniteCheckedException("Failed to read class name
from file [id=" + id +
@@ -173,20 +162,10 @@ public class MarshallerContextImpl extends
MarshallerContextAdapter {
File file = new File(workDir, evt.getKey() + ".classname");
-try (
-FileOutputStream out = new FileOutputStream(file);
-Writer writer = new OutputStreamWriter(out)
-) {
-FileLock lock = out.getChannel().lock();
-
-try {
-writer.write(evt.getValue());
+try (Writer writer = new FileWriter(file)) {
+writer.write(evt.getValue());
-writer.flush();
-}
-finally {
-lock.release();
-}
+writer.flush();
}
catch (IOException e) {
U.error(log, "Failed to write class name to file [id=" +
evt.getKey() +
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/685209c6/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
index 27bb4e4..a22e0c7 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
@@ -174,7 +174,7 @@ public abstract class
GridCacheContinuousQueryAbstractSelfTest extends GridCommo
for (int i = 0; i < gridCount(); i++) {
GridContinuousProcessor proc = grid(i).context().continuous();
-assertEquals(String.valueOf(i), 2, ((Map)U.field(proc,
"locInfos")).size());
+assertEquals(String.valueOf(i), 3, ((Map)U.field(proc,
"locInfos")).size());
assertEquals(String.valueOf(i), 0, ((Map)U.field(proc,
"rmtInfos")).size());
[28/50] incubator-ignite git commit: ignite-629: Add test for skip store and remove iterator.
ignite-629: Add test for skip store and remove iterator. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/50998c50 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/50998c50 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/50998c50 Branch: refs/heads/ignite-gg-9950 Commit: 50998c504573834e243df8b00681dcc8aa22dcf6 Parents: 885643a Author: ivasilinets Authored: Tue Mar 31 12:30:44 2015 +0300 Committer: ivasilinets Committed: Tue Mar 31 12:30:44 2015 +0300 -- .../cache/GridCacheAbstractFullApiSelfTest.java | 28 1 file changed, 28 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/50998c50/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java index f543be0..1a8bdcd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -4291,6 +4291,34 @@ public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstract assertNotNull(cache.get(key)); } + +String newKey = "New key"; + +assertFalse(map.containsKey(newKey)); + +cacheSkipStore.put(newKey, 1); + +assertFalse(map.containsKey(newKey)); + +cache.put(newKey, 1); + +assertTrue(map.containsKey(newKey)); + +Iterator> it = cacheSkipStore.iterator(); + +assertTrue(it.hasNext()); + +Cache.Entry entry = it.next(); + +String removedKey = entry.getKey(); + +assertTrue(map.containsKey(removedKey)); + +it.remove(); + +assertNull(cacheSkipStore.get(removedKey)); + +assertTrue(map.containsKey(removedKey)); } /**
[31/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-629-1
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-629-1
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a4f580e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a4f580e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a4f580e8
Branch: refs/heads/ignite-gg-9950
Commit: a4f580e8bec7a5ac2ed8ac265ceb7a6c2e07d68f
Parents: 5fd9ded dfe90fb
Author: sboikov
Authored: Tue Mar 31 13:01:22 2015 +0300
Committer: sboikov
Committed: Tue Mar 31 13:01:22 2015 +0300
--
.../org/apache/ignite/internal/IgniteEx.java| 4 +-
.../apache/ignite/internal/IgniteKernal.java| 5 +-
.../processors/cache/CacheProjection.java | 24 --
.../processors/cache/GridCacheAdapter.java | 60 +---
.../processors/cache/GridCacheProcessor.java| 11 -
.../processors/cache/GridCacheProjectionEx.java | 9 -
.../cache/GridCacheProjectionImpl.java | 276 +++
.../processors/cache/GridCacheProxyImpl.java| 19 --
.../processors/cache/IgniteCacheProxy.java | 2 +-
.../CacheDataStructuresManager.java | 4 +-
.../cache/query/GridCacheQueriesImpl.java | 23 +-
.../GridProjectionForCachesSelfTest.java| 12 +-
...achePartitionedMultiNodeFullApiSelfTest.java | 2 +
.../GridServiceReassignmentSelfTest.java| 5 +-
.../hadoop/jobtracker/HadoopJobTracker.java | 7 +-
.../HadoopDefaultMapReducePlannerSelfTest.java | 3 +-
16 files changed, 56 insertions(+), 410 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a4f580e8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
--
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
index d4f1ec0,c6e13ee..0ff316d
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
@@@ -217,34 -219,25 +217,10 @@@ public interface CacheProjection
public CacheQueries queries();
/**
- * Gets cache projection only for given key and value type. Only {@code
non-null} key-value
- * pairs that have matching key and value pairs will be used in this
projection.
- *
- * @param keyType Key type.
- * @param valType Value type.
- * @param Key type.
- * @param Value type.
- * @return Cache projection for given key and value types.
- */
- public CacheProjection projection(Class
keyType, Class valType);
-
- /**
- * Gets cache projection based on given entry filter. This filter will be
simply passed through
- * to all cache operations on this projection. Unlike
projection(org.apache.ignite.lang.IgniteBiPredicate)
- * method, this filter will not be used for pre-filtering.
- * Gets cache projection base on this one, but with the specified flags
turned on.
- * Cache Flags
- * The resulting projection will inherit all the flags from this
projection.
-- *
- * @param filter Filter to be passed through to all cache operations. If
{@code null}, then the
- * same projection is returned. If cache operation receives its own
filter, then filters
- * will be {@code 'anded'}.
- * @return Projection based on given filter.
- */
- public CacheProjection projection(@Nullable CacheEntryPredicate
filter);
-
- /**
- * @param flags Flags to turn on (if empty, then no-op).
- * @return New projection based on this one, but with the specified flags
turned on.
+ * @param skipStore Skip store flag.
+ * @return New projection based on this one, but with skip store flag
enabled.
*/
-public CacheProjection flagsOn(@Nullable CacheFlag... flags);
-
-/**
- * Gets cache projection base on this but with the specified flags turned
off.
- * Cache Flags
- * The resulting projection will inherit all the flags from this
projection except for
- * the ones that were turned off.
- *
- * @param flags Flags to turn off
[07/50] incubator-ignite git commit: #ignite-629: Clone on get.
#ignite-629: Clone 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/2062fecf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2062fecf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2062fecf
Branch: refs/heads/ignite-gg-9950
Commit: 2062fecfa560fc474faa617f52d43af9b90fd46b
Parents: 3381630
Author: ivasilinets
Authored: Sun Mar 29 22:43:51 2015 +0300
Committer: ivasilinets
Committed: Sun Mar 29 22:43:51 2015 +0300
--
.../datastructures/GridCacheAtomicReferenceImpl.java | 8 +++-
.../datastructures/GridCacheAtomicStampedImpl.java | 8 +++-
2 files changed, 14 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2062fecf/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
index 4a4efdd..273ae35 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
@@ -18,6 +18,8 @@
package org.apache.ignite.internal.processors.datastructures;
import org.apache.ignite.*;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.cache.transactions.*;
@@ -68,7 +70,11 @@ public final class GridCacheAtomicReferenceImpl
implements GridCacheAtomicRef
/** Callable for {@link #get} operation */
private final Callable getCall = new Callable() {
@Override public T call() throws Exception {
-GridCacheAtomicReferenceValue ref = atomicView.get(key);
+boolean clone = ctx.cache().configuration().getCacheMode() ==
CacheMode.LOCAL &&
+ctx.cache().configuration().getAtomicityMode() ==
CacheAtomicityMode.ATOMIC;
+
+GridCacheAtomicReferenceValue ref = clone ?
X.cloneObject(atomicView.get(key), false, true) :
+atomicView.get(key);
if (ref == null)
throw new IgniteCheckedException("Failed to find atomic
reference with given name: " + name);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2062fecf/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
index 64f32fc..86b19af 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
@@ -18,6 +18,8 @@
package org.apache.ignite.internal.processors.datastructures;
import org.apache.ignite.*;
+import org.apache.ignite.cache.CacheAtomicityMode;
+import org.apache.ignite.cache.CacheMode;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.cache.transactions.*;
@@ -70,7 +72,11 @@ public final class GridCacheAtomicStampedImpl
implements GridCacheAtomicSt
/** Callable for {@link #get()} operation */
private final Callable> getCall = new
Callable>() {
@Override public IgniteBiTuple call() throws Exception {
-GridCacheAtomicStampedValue stmp = atomicView.get(key);
+boolean clone = ctx.cache().configuration().getCacheMode() ==
CacheMode.LOCAL &&
+ctx.cache().configuration().getAtomicityMode() ==
CacheAtomicityMode.ATOMIC;
+
+GridCacheAtomicStampedValue stmp = clone ?
X.cloneObject(atomicView.get(key), false, true) :
+atomicView.get(key);
if (stmp == null)
throw new IgniteCheckedException("Failed to find atomic
stamped with given name: " + name);
[11/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-3' into ignite-629-1
Merge remote-tracking branch 'remotes/origin/sprint-3' into ignite-629-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/c4bef11f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c4bef11f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c4bef11f Branch: refs/heads/ignite-gg-9950 Commit: c4bef11f380946ac2577ea6081aea72676126cb6 Parents: a1725e1 8e590f9 Author: sboikov Authored: Mon Mar 30 11:53:41 2015 +0300 Committer: sboikov Committed: Mon Mar 30 11:53:41 2015 +0300 -- DEVNOTES.txt| 15 +-- RELEASE_NOTES.txt | 20 ++- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../near/GridNearTxPrepareFuture.java | 2 +- .../cache/transactions/IgniteTxManager.java | 4 +- .../ignite/IgniteCacheAffinitySelfTest.java | 8 +- .../GridCacheAbstractFailoverSelfTest.java | 134 +-- .../GridCacheAbstractFailoverTxSelfTest.java| 110 +++ .../GridCacheInterceptorAbstractSelfTest.java | 2 + .../dht/GridCacheColocatedFailoverSelfTest.java | 2 +- .../atomic/GridCacheAtomicFailoverSelfTest.java | 52 +++ ...AtomicPrimaryWriteOrderFailoverSelfTest.java | 36 + ...idCacheAtomicReplicatedFailoverSelfTest.java | 32 + .../GridCachePartitionedFailoverSelfTest.java | 2 +- .../GridCacheReplicatedFailoverSelfTest.java| 2 +- .../IgniteCacheFailoverTestSuite.java | 13 +- modules/geospatial/README.txt | 15 +++ .../processors/hadoop/HadoopClassLoader.java| 21 ++- .../processors/hadoop/HadoopDefaultJobInfo.java | 2 +- .../hadoop/jobtracker/HadoopJobTracker.java | 4 +- .../processors/hadoop/v2/HadoopDaemon.java | 125 + .../processors/hadoop/v2/HadoopV2Job.java | 58 ++-- .../apache/ignite/igfs/IgfsEventsTestSuite.java | 4 +- .../hadoop/HadoopClassLoaderTest.java | 2 +- .../testsuites/IgniteHadoopTestSuite.java | 2 +- .../IgniteIgfsLinuxAndMacOSTestSuite.java | 2 +- modules/hibernate/README.txt| 15 +++ modules/schedule/README.txt | 15 +++ pom.xml | 22 ++- 29 files changed, 570 insertions(+), 153 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c4bef11f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java --
[26/50] incubator-ignite git commit: # ignite-629-1
# ignite-629-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/a9996d8f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a9996d8f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a9996d8f
Branch: refs/heads/ignite-gg-9950
Commit: a9996d8fdb2ae5ecbf1a56b88a4161f5d8bcf5de
Parents: 1617648
Author: sboikov
Authored: Tue Mar 31 11:01:37 2015 +0300
Committer: sboikov
Committed: Tue Mar 31 11:01:37 2015 +0300
--
.../ignite/internal/client/impl/ClientCacheFlagsCodecTest.java | 1 +
.../ignite/internal/processors/cache/CacheProjection.java | 4 ++--
.../ignite/internal/processors/cache/GridCacheContext.java | 2 +-
.../internal/processors/cache/GridCacheProjectionImpl.java | 5 -
.../processors/cache/local/atomic/GridLocalAtomicCache.java | 1 +
.../java/org/apache/ignite/IgniteCacheAffinitySelfTest.java | 1 -
.../processors/cache/IgniteCacheInvokeAbstractTest.java | 4
7 files changed, 9 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9996d8f/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
index 973a0a3..9f177d7 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
@@ -44,6 +44,7 @@ public class ClientCacheFlagsCodecTest extends TestCase {
assertTrue(bits != 0);
boolean out = GridCacheCommandHandler.parseCacheFlags(bits);
+
assertEquals(out, true);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9996d8f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
index 6189d6b..d4f1ec0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
@@ -241,8 +241,8 @@ public interface CacheProjection extends
Iterable> {
public CacheProjection projection(@Nullable CacheEntryPredicate
filter);
/**
- * @param skipStore Skip store.
- * @return New projection based on this one, but with skip store.
+ * @param skipStore Skip store flag.
+ * @return New projection based on this one, but with skip store flag
enabled.
*/
public CacheProjection setSkipStore(boolean skipStore);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9996d8f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index bec175a..7fae62f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -1225,7 +1225,7 @@ public class GridCacheContext implements
Externalizable {
}
/**
- * @return {@code true} if the skip store is set.
+ * @return {@code true} if the skip store flag is set.
*/
public boolean skipStore() {
if (nearContext())
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9996d8f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
index 3517b42..eea665a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
@@ -89,7 +89,1
[17/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-629-1
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-629-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/2c49bf73 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2c49bf73 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2c49bf73 Branch: refs/heads/ignite-gg-9950 Commit: 2c49bf735e8ed6ef5bbcbb5459589257a950e6fa Parents: ea7b4bf a6f7294 Author: ivasilinets Authored: Mon Mar 30 15:06:04 2015 +0300 Committer: ivasilinets Committed: Mon Mar 30 15:06:04 2015 +0300 -- modules/core/pom.xml | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) --
[27/50] incubator-ignite git commit: ignite-629: Revert GridCacheReturnValueTransferSelfTest.
ignite-629: Revert GridCacheReturnValueTransferSelfTest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/885643ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/885643ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/885643ac
Branch: refs/heads/ignite-gg-9950
Commit: 885643ac03f52a4b4d97f1535be3c6a1e344a100
Parents: a9996d8
Author: ivasilinets
Authored: Tue Mar 31 12:11:39 2015 +0300
Committer: ivasilinets
Committed: Tue Mar 31 12:11:39 2015 +0300
--
.../GridCacheReturnValueTransferSelfTest.java | 191 +++
1 file changed, 191 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/885643ac/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
new file mode 100644
index 000..4761e21
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
@@ -0,0 +1,191 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import javax.cache.processor.*;
+import java.io.*;
+import java.util.*;
+
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+
+/**
+ * Tests transform for extra traffic.
+ */
+public class GridCacheReturnValueTransferSelfTest extends
GridCommonAbstractTest {
+/** Distribution mode. */
+private boolean cache;
+
+/** Atomicity mode. */
+private CacheAtomicityMode atomicityMode;
+
+/** Atomic write order mode. */
+private CacheAtomicWriteOrderMode writeOrderMode;
+
+/** Number of backups. */
+private int backups;
+
+/** Fail deserialization flag. */
+private static volatile boolean failDeserialization;
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+CacheConfiguration ccfg = new CacheConfiguration();
+
+ccfg.setBackups(backups);
+ccfg.setCacheMode(PARTITIONED);
+ccfg.setAtomicityMode(atomicityMode);
+ccfg.setAtomicWriteOrderMode(writeOrderMode);
+
+cfg.setCacheConfiguration(ccfg);
+
+if (!cache)
+cfg.setClientMode(true);
+
+return cfg;
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testTransformAtomicPrimaryNoBackups() throws Exception {
+checkTransform(ATOMIC, PRIMARY, 0);
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testTransformAtomicClockNoBackups() throws Exception {
+checkTransform(ATOMIC, CLOCK, 0);
+}
+
+/**
+ * @throws Exception If failed.
+ * TODO gg-8273 enable when fixed
+ */
+public void _testTransformTransactionalNoBackups() throws Exception {
+checkTransform(TRANSACTIONAL, PRIMARY, 0);
+}
+
+/**
+ * @throws Exception If failed.
+ * TODO gg-8273 enable when fixed
+ */
+public void _testTransformTransactionalOneBackup() throws Exception {
+checkTransform(TRANSACTIONAL, PRIMARY, 1);
+}
+
+/**
+ * @param mode Atomicity mode.
+ * @param order Atomic cache write order mode.
+ * @param b Number of backups.
+ * @throws Exception If failed.
+ */
+private void checkTra
[06/50] incubator-ignite git commit: #ignite-629: Remove forceTransformBackups parameter from GridNearAtomicUpdateRequest.
#ignite-629: Remove forceTransformBackups parameter from
GridNearAtomicUpdateRequest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3381630e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3381630e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3381630e
Branch: refs/heads/ignite-gg-9950
Commit: 3381630e7b1dc091d5f282353fa903c24af8765a
Parents: 3073a5e
Author: ivasilinets
Authored: Sun Mar 29 21:47:28 2015 +0300
Committer: ivasilinets
Committed: Sun Mar 29 21:47:28 2015 +0300
--
.../dht/atomic/GridDhtAtomicCache.java | 26 ---
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 2 -
.../dht/atomic/GridNearAtomicUpdateFuture.java | 2 -
.../dht/atomic/GridNearAtomicUpdateRequest.java | 78 ++--
4 files changed, 22 insertions(+), 86 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3381630e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index ee59f9c..c376fa0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -1109,8 +1109,6 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
return;
}
-checkClearForceTransformBackups(req, locked);
-
boolean hasNear = ctx.discovery().cacheNearNode(node,
name());
GridCacheVersion ver = req.updateVersion();
@@ -1758,9 +1756,6 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
EntryProcessor entryProcessor
= null;
-if (req.forceTransformBackups() && op == TRANSFORM)
-entryProcessor = (EntryProcessor)writeVal;
-
if (!readersOnly) {
dhtFut.addWriteEntry(entry,
updRes.newValue(),
@@ -2567,27 +2562,6 @@ public class GridDhtAtomicCache extends
GridDhtCacheAdapter {
}
/**
- * Checks if entries being transformed are empty. Clears
forceTransformBackup flag enforcing
- * sending transformed value to backups if at least one empty entry is
found.
- *
- * @param req Near atomic update request.
- * @param locked Already locked entries (from the request).
- */
-@SuppressWarnings("ForLoopReplaceableByForEach")
-private void checkClearForceTransformBackups(GridNearAtomicUpdateRequest
req,
-List locked) {
-if (ctx.writeThrough() && req.operation() == TRANSFORM) {
-for (int i = 0; i < locked.size(); i++) {
-if (!locked.get(i).hasValue()) {
-req.forceTransformBackups(false);
-
-return;
-}
-}
-}
-}
-
-/**
* @param nodeId Node ID to send message to.
* @param ver Version to ack.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3381630e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
index 4cd1fd8..2b1fa01 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
@@ -112,8 +112,6 @@ public class GridDhtAtomicUpdateFuture extends
GridFutureAdapter
this.completionCb = completionCb;
this.updateRes = updateRes;
-forceTransformBackups = updateReq.forceTransformBackups();
-
if (log == null)
log = U.logger(cctx.kernalContext(), logRef,
GridDhtAtomicUpdateFuture.class);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3381630e/modules/core/src/main/java/org/apache/ignite/i
[15/50] incubator-ignite git commit: # ignite-629-1 review
# ignite-629-1 review
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c02ff0f4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c02ff0f4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c02ff0f4
Branch: refs/heads/ignite-gg-9950
Commit: c02ff0f42e9ccd745234b5be26305cffcf640a75
Parents: e9a45c0
Author: sboikov
Authored: Mon Mar 30 12:46:05 2015 +0300
Committer: sboikov
Committed: Mon Mar 30 12:46:05 2015 +0300
--
.../internal/processors/cache/GridCacheContext.java | 12
.../GridCacheAtomicReferenceValue.java | 15 +--
.../datastructures/GridCacheAtomicStampedValue.java | 15 +--
3 files changed, 2 insertions(+), 40 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c02ff0f4/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index 4f1267d..bec175a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -1174,18 +1174,6 @@ public class GridCacheContext implements
Externalizable {
}
/**
- * Clone cached object.
- *
- * @param obj Object to clone
- * @return Clone of the given object.
- * @throws IgniteCheckedException If failed to clone object.
- */
-@SuppressWarnings({"unchecked"})
-@Nullable public T cloneValue(@Nullable T obj) throws
IgniteCheckedException {
-return obj == null ? null : X.cloneObject(obj, false, true);
-}
-
-/**
* Sets thread local projection.
*
* @param prj Flags to set.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c02ff0f4/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceValue.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceValue.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceValue.java
index ef2db3e..596534f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceValue.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceValue.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.processors.datastructures;
import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.util.lang.*;
-import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import java.io.*;
@@ -28,7 +27,7 @@ import java.io.*;
* Atomic reference value.
*/
public final class GridCacheAtomicReferenceValue implements
GridCacheInternal, GridPeerDeployAware,
-Externalizable, Cloneable {
+Externalizable {
/** */
private static final long serialVersionUID = 0L;
@@ -66,18 +65,6 @@ public final class GridCacheAtomicReferenceValue
implements GridCacheInternal
}
/** {@inheritDoc} */
-@SuppressWarnings( {"unchecked"})
-@Override public GridCacheAtomicReferenceValue clone() throws
CloneNotSupportedException {
-GridCacheAtomicReferenceValue obj =
(GridCacheAtomicReferenceValue)super.clone();
-
-T locVal = X.cloneObject(val, false, true);
-
-obj.set(locVal);
-
-return obj;
-}
-
-/** {@inheritDoc} */
@Override public void writeExternal(ObjectOutput out) throws IOException {
out.writeObject(val);
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c02ff0f4/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedValue.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedValue.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedValue.java
index 0f4be1e..f852597 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedValue.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedValue.java
@@ -30
[40/50] incubator-ignite git commit: # IGNITE-644 - Review
# IGNITE-644 - Review
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ad140b90
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ad140b90
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ad140b90
Branch: refs/heads/ignite-gg-9950
Commit: ad140b906526cb95f6db14daf9f1c025e2e45c9d
Parents: f1f873b
Author: Valentin Kulichenko
Authored: Tue Mar 31 14:18:50 2015 -0700
Committer: Valentin Kulichenko
Committed: Tue Mar 31 14:18:50 2015 -0700
--
.../org/apache/ignite/internal/IgnitionEx.java | 34 +++-
1 file changed, 19 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad140b90/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 7442d12..5b52919 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -1751,7 +1751,7 @@ public class IgnitionEx {
}
// Always add marshaller and utility caches.
-copies[0] = marshallerSystemCache();
+copies[0] = marshallerSystemCache(clientDisco);
copies[1] = utilitySystemCache(clientDisco);
cfg.setCacheConfiguration(copies);
@@ -1899,20 +1899,24 @@ public class IgnitionEx {
*
* @return Marshaller system cache configuration.
*/
-private static CacheConfiguration marshallerSystemCache() {
-CacheConfiguration cache = new CacheConfiguration();
-
-cache.setName(CU.MARSH_CACHE_NAME);
-cache.setCacheMode(REPLICATED);
-cache.setAtomicityMode(ATOMIC);
-cache.setSwapEnabled(false);
-cache.setRebalanceMode(SYNC);
-cache.setWriteSynchronizationMode(FULL_SYNC);
-cache.setAffinity(new RendezvousAffinityFunction(false, 20));
-cache.setNodeFilter(CacheConfiguration.ALL_NODES);
-cache.setStartSize(300);
-
-return cache;
+private static CacheConfiguration marshallerSystemCache(boolean
client) {
+if (!client) {
+CacheConfiguration cache = new CacheConfiguration();
+
+cache.setName(CU.MARSH_CACHE_NAME);
+cache.setCacheMode(REPLICATED);
+cache.setAtomicityMode(ATOMIC);
+cache.setSwapEnabled(false);
+cache.setRebalanceMode(SYNC);
+cache.setWriteSynchronizationMode(FULL_SYNC);
+cache.setAffinity(new RendezvousAffinityFunction(false, 20));
+cache.setNodeFilter(CacheConfiguration.ALL_NODES);
+cache.setStartSize(300);
+
+return cache;
+}
+
+return null;
}
/**
[16/50] incubator-ignite git commit: #ignite-629: Add tests for Skip store.
#ignite-629: Add tests for Skip store.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ea7b4bfa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ea7b4bfa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ea7b4bfa
Branch: refs/heads/ignite-gg-9950
Commit: ea7b4bfa51660cd11abf492cd812d21ae1602a1d
Parents: c02ff0f
Author: ivasilinets
Authored: Mon Mar 30 15:05:54 2015 +0300
Committer: ivasilinets
Committed: Mon Mar 30 15:05:54 2015 +0300
--
.../cache/GridCacheAbstractFullApiSelfTest.java | 28
1 file changed, 28 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea7b4bfa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 6e9a869..b3dd4f2 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -4263,6 +4263,34 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
}
/**
+ * @throws Exception If failed.
+ */
+public void testWithSkipStore() throws Exception {
+IgniteCache cache = grid(0).cache(null);
+
+IgniteCache cacheSkipStore = cache.withSkipStore();
+
+List keys = primaryKeysForCache(cache, 10);
+
+for (int i = 0; i < keys.size(); ++i)
+putToStore(keys.get(i), i);
+
+assertFalse(cacheSkipStore.iterator().hasNext());
+
+for (String key : keys) {
+assertNull(cacheSkipStore.get(key));
+
+assertNotNull(cache.get(key));
+}
+
+for (String key : keys) {
+cacheSkipStore.remove(key);
+
+assertNotNull(cache.get(key));
+}
+}
+
+/**
*
*/
protected CacheStartMode cacheStartType() {
[37/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-629-1' into ignite-sprint-3
Merge remote-tracking branch 'remotes/origin/ignite-629-1' into ignite-sprint-3 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c6b3380f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c6b3380f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c6b3380f Branch: refs/heads/ignite-gg-9950 Commit: c6b3380f6391e92584bfeb6d3b2fe28edb0ebbe5 Parents: 7aba4ba 79c76cd Author: sboikov Authored: Tue Mar 31 17:31:53 2015 +0300 Committer: sboikov Committed: Tue Mar 31 17:31:53 2015 +0300 -- .../client/impl/ClientCacheFlagsCodecTest.java | 18 +- .../internal/client/GridClientCacheFlag.java| 13 -- .../impl/connection/GridClientConnection.java | 9 - .../internal/processors/cache/CacheFlag.java| 108 - .../processors/cache/CacheFlagException.java| 67 -- .../processors/cache/CacheProjection.java | 209 + .../internal/processors/cache/GridCache.java| 3 - .../processors/cache/GridCacheAdapter.java | 211 -- .../cache/GridCacheConcurrentMap.java | 44 +--- .../processors/cache/GridCacheContext.java | 222 +-- .../processors/cache/GridCacheEntryEx.java | 3 +- .../processors/cache/GridCacheMapEntry.java | 27 +-- .../processors/cache/GridCacheProjectionEx.java | 20 -- .../cache/GridCacheProjectionImpl.java | 77 ++- .../processors/cache/GridCacheProxyImpl.java| 36 +-- .../cache/GridCacheSharedContext.java | 21 -- .../processors/cache/IgniteCacheProxy.java | 29 +-- .../GridDistributedTxRemoteAdapter.java | 2 +- .../distributed/dht/GridDhtCacheAdapter.java| 2 +- .../distributed/dht/GridDhtLocalPartition.java | 2 +- .../distributed/dht/GridDhtLockFuture.java | 2 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../dht/atomic/GridDhtAtomicCache.java | 32 --- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 2 - .../dht/atomic/GridNearAtomicUpdateFuture.java | 3 - .../dht/atomic/GridNearAtomicUpdateRequest.java | 78 ++- .../dht/colocated/GridDhtColocatedCache.java| 2 - .../colocated/GridDhtDetachedCacheEntry.java| 2 +- .../distributed/near/GridNearAtomicCache.java | 2 - .../distributed/near/GridNearCacheAdapter.java | 9 - .../near/GridNearTransactionalCache.java| 2 - .../cache/distributed/near/GridNearTxLocal.java | 4 +- .../local/atomic/GridLocalAtomicCache.java | 74 +-- .../continuous/CacheContinuousQueryHandler.java | 5 - .../transactions/IgniteTransactionsImpl.java| 1 - .../transactions/IgniteTxLocalAdapter.java | 6 +- .../cache/transactions/IgniteTxManager.java | 2 - .../datastreamer/DataStreamerImpl.java | 2 +- .../datastructures/DataStructuresProcessor.java | 13 +- .../datastructures/GridCacheAtomicLongImpl.java | 14 +- .../GridCacheAtomicReferenceImpl.java | 2 +- .../GridCacheAtomicReferenceValue.java | 15 +- .../GridCacheAtomicSequenceImpl.java| 2 +- .../GridCacheAtomicStampedImpl.java | 2 +- .../GridCacheAtomicStampedValue.java| 15 +- .../GridCacheCountDownLatchImpl.java| 2 +- .../handlers/cache/GridCacheCommandHandler.java | 66 +++--- .../cache/GridCacheAbstractFlagsTest.java | 97 .../cache/GridCacheAbstractFullApiSelfTest.java | 61 - .../GridCacheReturnValueTransferSelfTest.java | 36 +-- .../processors/cache/GridCacheTestEntryEx.java | 2 +- .../cache/IgniteCacheInvokeAbstractTest.java| 11 - ...GridCacheValueConsistencyAtomicSelfTest.java | 101 - .../near/GridCachePartitionedFlagsTest.java | 41 .../GridCacheReplicatedFlagsTest.java | 28 --- .../cache/GridCacheCommandHandlerSelfTest.java | 2 +- .../OptimizedObjectStreamSelfTest.java | 4 - .../ignite/testsuites/IgniteCacheTestSuite.java | 1 - .../processors/cache/jta/CacheJtaManager.java | 1 - .../ignite/scalar/pimps/ScalarCachePimp.scala | 36 --- 61 files changed, 278 insertions(+), 1629 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6b3380f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c6b3380f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java --
[18/50] incubator-ignite git commit: #ignite-629: Fix GridCacheCommandHandlerSelfTest.
#ignite-629: Fix GridCacheCommandHandlerSelfTest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/40d6b75a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/40d6b75a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/40d6b75a
Branch: refs/heads/ignite-gg-9950
Commit: 40d6b75a49937f63654b434c072a8bf5fd5ebd8a
Parents: 2c49bf7
Author: ivasilinets
Authored: Mon Mar 30 15:20:27 2015 +0300
Committer: ivasilinets
Committed: Mon Mar 30 15:20:27 2015 +0300
--
.../rest/handlers/cache/GridCacheCommandHandlerSelfTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/40d6b75a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
index c4c7ff6..2a6ae9d 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandlerSelfTest.java
@@ -218,7 +218,7 @@ public class GridCacheCommandHandlerSelfTest extends
GridCommonAbstractTest {
return fut;
}
// Rewriting flagOn result to keep intercepting
invocations after it.
-else if ("flagsOn".equals(mtd.getName()))
+else if ("setSkipStore".equals(mtd.getName()))
return proxy;
else if ("forSubjectId".equals(mtd.getName()))
return proxy;
[05/50] incubator-ignite git commit: #ignite-629: Remove invalidate parameter from GridNearTxLocal constructor.
#ignite-629: Remove invalidate parameter from GridNearTxLocal constructor.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3073a5ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3073a5ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3073a5ec
Branch: refs/heads/ignite-gg-9950
Commit: 3073a5ecc703d9e1056b23e6fe81d6a7186cdeda
Parents: fc123eb
Author: ivasilinets
Authored: Sun Mar 29 21:41:43 2015 +0300
Committer: ivasilinets
Committed: Sun Mar 29 21:41:43 2015 +0300
--
.../ignite/internal/processors/cache/GridCacheAdapter.java | 2 --
.../processors/cache/distributed/near/GridNearTxLocal.java | 4 +---
.../processors/cache/transactions/IgniteTransactionsImpl.java| 1 -
.../internal/processors/cache/transactions/IgniteTxManager.java | 2 --
.../ignite/internal/processors/cache/jta/CacheJtaManager.java| 1 -
5 files changed, 1 insertion(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3073a5ec/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index b7d545f..f836788 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -4442,7 +4442,6 @@ public abstract class GridCacheAdapter implements
GridCache,
OPTIMISTIC,
READ_COMMITTED,
tCfg.getDefaultTxTimeout(),
-false,
!ctx.hasFlag(SKIP_STORE),
0,
/** group lock keys */null,
@@ -4514,7 +4513,6 @@ public abstract class GridCacheAdapter implements
GridCache,
OPTIMISTIC,
READ_COMMITTED,
ctx.kernalContext().config().getTransactionConfiguration().getDefaultTxTimeout(),
-false,
!ctx.hasFlag(SKIP_STORE),
0,
null,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3073a5ec/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
index 1db4902..fa916b0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
@@ -97,7 +97,6 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter {
* @param concurrency Concurrency.
* @param isolation Isolation.
* @param timeout Timeout.
- * @param invalidate Invalidate flag.
* @param storeEnabled Store enabled flag.
* @param txSize Transaction size.
* @param grpLockKey Group lock key if this is a group lock transaction.
@@ -114,7 +113,6 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter {
TransactionConcurrency concurrency,
TransactionIsolation isolation,
long timeout,
-boolean invalidate,
boolean storeEnabled,
int txSize,
@Nullable IgniteTxKey grpLockKey,
@@ -132,7 +130,7 @@ public class GridNearTxLocal extends GridDhtTxLocalAdapter {
concurrency,
isolation,
timeout,
-invalidate,
+false,
storeEnabled,
txSize,
grpLockKey,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3073a5ec/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java
index 7957b9d..afa2826 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsI
[41/50] incubator-ignite git commit: IGNITE-651 - Persistance for marshaller cache
IGNITE-651 - Persistance for marshaller cache
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/00c934cc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/00c934cc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/00c934cc
Branch: refs/heads/ignite-gg-9950
Commit: 00c934cc3921d05f92e1c0f7400ae9253b779b01
Parents: ea7d248
Author: Valentin Kulichenko
Authored: Tue Mar 31 14:52:31 2015 -0700
Committer: Valentin Kulichenko
Committed: Tue Mar 31 14:52:31 2015 -0700
--
.../ignite/internal/MarshallerContextImpl.java | 31
1 file changed, 26 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/00c934cc/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
index 4a27222..d5a0526 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
@@ -23,6 +23,7 @@ import org.apache.ignite.internal.util.typedef.internal.*;
import javax.cache.event.*;
import java.io.*;
+import java.nio.channels.*;
import java.util.concurrent.*;
/**
@@ -124,8 +125,18 @@ public class MarshallerContextImpl extends
MarshallerContextAdapter {
if (clsName == null) {
File file = new File(workDir, id + ".classname");
-try (BufferedReader reader = new BufferedReader(new
FileReader(file))) {
-clsName = reader.readLine();
+try (
+FileInputStream in = new FileInputStream(file);
+BufferedReader reader = new BufferedReader(new
InputStreamReader(in))
+) {
+FileLock lock = in.getChannel().lock(0, Long.MAX_VALUE, true);
+
+try {
+clsName = reader.readLine();
+}
+finally {
+lock.release();
+}
}
catch (IOException e) {
throw new IgniteCheckedException("Failed to read class name
from file [id=" + id +
@@ -162,10 +173,20 @@ public class MarshallerContextImpl extends
MarshallerContextAdapter {
File file = new File(workDir, evt.getKey() + ".classname");
-try (Writer writer = new FileWriter(file)) {
-writer.write(evt.getValue());
+try (
+FileOutputStream out = new FileOutputStream(file);
+Writer writer = new OutputStreamWriter(out)
+) {
+FileLock lock = out.getChannel().lock();
+
+try {
+writer.write(evt.getValue());
-writer.flush();
+writer.flush();
+}
+finally {
+lock.release();
+}
}
catch (IOException e) {
U.error(log, "Failed to write class name to file [id=" +
evt.getKey() +
[45/50] incubator-ignite git commit: # IGNITE-562 Minor rename preload -> rebalance.
# IGNITE-562 Minor rename preload -> rebalance.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/528d46bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/528d46bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/528d46bc
Branch: refs/heads/ignite-gg-9950
Commit: 528d46bc95fa40049c24a7eee1d27812934ac5a5
Parents: 17a9744
Author: AKuznetsov
Authored: Wed Apr 1 10:18:57 2015 +0700
Committer: AKuznetsov
Committed: Wed Apr 1 10:18:57 2015 +0700
--
.../commands/events/VisorEventsCommand.scala| 24 ++--
1 file changed, 12 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/528d46bc/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
index 3316579..01d8b14 100644
---
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
+++
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/events/VisorEventsCommand.scala
@@ -41,16 +41,16 @@ import scala.language.implicitConversions
* ==Help==
* {{{
*
++
- * | events | Prints events from a node.
|
+ * | events | Prints events from a node.
|
* ||
|
- * || Note that this command depends on Ignite events.
|
+ * || Note that this command depends on Ignite events.
|
* ||
|
- * || Ignite events can be individually enabled and disabled and
disabled events |
+ * || Ignite events can be individually enabled and disabled and
disabled events|
* || can affect the results produced by this command. Note also that
configuration |
* || of Event Storage SPI that is responsible for temporary storage
of generated |
* || events on each node can also affect the functionality of this
command.|
* ||
|
- * || By default - all events are DISABLED and Ignite stores last
10,000 local |
+ * || By default - all events are DISABLED and Ignite stores last
10,000 local |
* || events on each node. Both of these defaults can be changed in
configuration. |
*
++
* }}}
@@ -58,7 +58,7 @@ import scala.language.implicitConversions
* Specification
* {{{
* events
- * events "{-id=|-id8=}
{-e=}
+ * events "{-id=|-id8=}
{-e=}
* {-t=s|m|h|d} {-s=e|t} {-r} {-c=}"
* }}}
*
@@ -72,7 +72,7 @@ import scala.language.implicitConversions
* Node ID8.
* Either '-id' or '-id8' can be specified.
* If called without the arguments - starts in interactive mode.
- * -e=
+ * -e=
* Comma separated list of event types that should be queried:
*ch Checkpoint events.
*de Deployment events.
@@ -81,7 +81,7 @@ import scala.language.implicitConversions
*ta Task execution events.
*cl Cloud events.
*ca Cache events.
- *cp Cache pre-loader events.
+ *cr Cache rebalance events.
*sw Swapspace events.
* -t=s|m|h|d
* Defines time frame for querying events:
@@ -159,7 +159,7 @@ class VisorEventsCommand {
case "jo" => arr ++= EVTS_JOB_EXECUTION.toList
case "ta" => arr ++= EVTS_TASK_EXECUTION.toList
case "ca" => arr ++= EVTS_CACHE.toList
-case "cp" => arr ++= EVTS_CACHE_REBALANCE.toList
+case "cr" => arr ++= EVTS_CACHE_REBALANCE.toList
case "sw" => arr ++= EVTS_SWAPSPACE.toList
case "di" => arr ++= EVTS_DISCOVERY.toList
case t => throw new IllegalArgumentException("Unknown event
type: " + t)
@@ -185,7 +185,7 @@ class VisorEventsCommand {
case t if EVTS_TASK_EXECUTION.contains(t) => "ta"
case t if EVTS_CACHE.contains(t) => "ca"
[39/50] incubator-ignite git commit: Merge branches 'ignite-644' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-644
Merge branches 'ignite-644' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-644 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f1f873bf Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f1f873bf Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f1f873bf Branch: refs/heads/ignite-gg-9950 Commit: f1f873bf5eb1d5d8c024f68ab9aaa90bd0cc9122 Parents: 5ee3767 c6b3380 Author: Valentin Kulichenko Authored: Tue Mar 31 14:08:23 2015 -0700 Committer: Valentin Kulichenko Committed: Tue Mar 31 14:08:23 2015 -0700 -- DEVNOTES.txt| 6 + .../client/impl/ClientCacheFlagsCodecTest.java | 18 +- .../ignite/internal/GridKernalContextImpl.java | 9 +- .../org/apache/ignite/internal/IgniteEx.java| 4 +- .../apache/ignite/internal/IgniteKernal.java| 12 +- .../internal/client/GridClientCacheFlag.java| 13 - .../impl/connection/GridClientConnection.java | 9 - .../internal/managers/GridManagerAdapter.java | 4 + .../cache/CacheConflictResolutionManager.java | 30 ++ .../internal/processors/cache/CacheFlag.java| 108 -- .../processors/cache/CacheFlagException.java| 67 .../cache/CacheOsConflictResolutionManager.java | 58 +++ .../processors/cache/CacheProjection.java | 233 +--- .../internal/processors/cache/GridCache.java| 3 - .../processors/cache/GridCacheAdapter.java | 271 +++--- .../cache/GridCacheConcurrentMap.java | 44 +-- .../processors/cache/GridCacheContext.java | 241 ++--- .../processors/cache/GridCacheEntryEx.java | 3 +- .../processors/cache/GridCacheMapEntry.java | 27 +- .../processors/cache/GridCacheProcessor.java| 20 +- .../processors/cache/GridCacheProjectionEx.java | 29 -- .../cache/GridCacheProjectionImpl.java | 357 +++ .../processors/cache/GridCacheProxyImpl.java| 55 +-- .../cache/GridCacheSharedContext.java | 21 -- .../processors/cache/IgniteCacheProxy.java | 31 +- .../CacheDataStructuresManager.java | 4 +- .../GridDistributedTxRemoteAdapter.java | 2 +- .../distributed/dht/GridDhtCacheAdapter.java| 2 +- .../distributed/dht/GridDhtLocalPartition.java | 2 +- .../distributed/dht/GridDhtLockFuture.java | 2 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../dht/GridPartitionedGetFuture.java | 3 +- .../dht/atomic/GridDhtAtomicCache.java | 32 -- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 2 - .../dht/atomic/GridNearAtomicUpdateFuture.java | 3 - .../dht/atomic/GridNearAtomicUpdateRequest.java | 78 ++-- .../dht/colocated/GridDhtColocatedCache.java| 2 - .../colocated/GridDhtDetachedCacheEntry.java| 2 +- .../distributed/near/GridNearAtomicCache.java | 2 - .../distributed/near/GridNearCacheAdapter.java | 9 - .../distributed/near/GridNearGetFuture.java | 3 +- .../near/GridNearTransactionalCache.java| 2 - .../cache/distributed/near/GridNearTxLocal.java | 4 +- .../processors/cache/dr/GridCacheDrManager.java | 5 - .../cache/dr/GridOsCacheDrManager.java | 106 ++ .../cache/dr/os/GridOsCacheDrManager.java | 111 -- .../local/atomic/GridLocalAtomicCache.java | 74 +--- .../cache/query/GridCacheQueriesImpl.java | 23 +- .../continuous/CacheContinuousQueryHandler.java | 5 - .../transactions/IgniteTransactionsImpl.java| 1 - .../transactions/IgniteTxLocalAdapter.java | 19 +- .../cache/transactions/IgniteTxManager.java | 2 - .../version/CacheVersionConflictResolver.java | 40 +++ ...ridCacheVersionAbstractConflictResolver.java | 56 --- .../GridCacheVersionConflictResolver.java | 59 --- .../datastreamer/DataStreamerImpl.java | 2 +- .../datastructures/DataStructuresProcessor.java | 13 +- .../datastructures/GridCacheAtomicLongImpl.java | 14 +- .../GridCacheAtomicReferenceImpl.java | 2 +- .../GridCacheAtomicReferenceValue.java | 15 +- .../GridCacheAtomicSequenceImpl.java| 2 +- .../GridCacheAtomicStampedImpl.java | 2 +- .../GridCacheAtomicStampedValue.java| 15 +- .../GridCacheCountDownLatchImpl.java| 2 +- .../handlers/cache/GridCacheCommandHandler.java | 66 ++-- .../cache/VisorCacheStoreConfiguration.java | 18 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 16 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 5 + .../communication/tcp/TcpCommunicationSpi.java | 13 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 14 +- .../GridProjectionForCachesSelfTest.java| 12 +- .../Gr
[38/50] incubator-ignite git commit: IGNITE-651 - Persistance for marshaller cache
IGNITE-651 - Persistance for marshaller cache
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ea7d2485
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ea7d2485
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ea7d2485
Branch: refs/heads/ignite-gg-9950
Commit: ea7d2485622cc455be536dec3ecbb36dec3498db
Parents: c6b3380
Author: Valentin Kulichenko
Authored: Tue Mar 31 13:29:08 2015 -0700
Committer: Valentin Kulichenko
Committed: Tue Mar 31 13:29:08 2015 -0700
--
.../checkpoint/s3/S3CheckpointSpiSelfTest.java | 12 +--
.../ignite/internal/GridKernalContextImpl.java | 3 +-
.../org/apache/ignite/internal/IgnitionEx.java | 6 +-
.../internal/MarshallerContextAdapter.java | 6 +-
.../ignite/internal/MarshallerContextImpl.java | 90 ++--
.../processors/cache/GridCacheProcessor.java| 8 +-
.../CacheContinuousQueryListener.java | 3 +
.../continuous/CacheContinuousQueryManager.java | 2 +-
.../ignite/internal/util/IgniteUtils.java | 2 +-
.../ignite/marshaller/MarshallerContext.java| 3 +-
.../optimized/OptimizedMarshallerUtils.java | 9 +-
.../managers/GridNoopManagerSelfTest.java | 2 +-
.../communication/GridIoManagerSelfTest.java| 9 +-
.../internal/util/IgniteUtilsSelfTest.java | 2 +-
.../OptimizedMarshallerNodeFailoverTest.java| 71 ++-
.../spi/GridSpiLocalHostInjectionTest.java | 2 +-
.../GridPriorityQueueCollisionSpiSelfTest.java | 2 +-
...RobinLoadBalancingSpiNotPerTaskSelfTest.java | 2 +-
.../testframework/junits/GridAbstractTest.java | 28 +++---
.../junits/GridTestKernalContext.java | 2 +-
.../junits/IgniteTestResources.java | 8 +-
.../junits/spi/GridSpiAbstractTest.java | 13 +--
22 files changed, 231 insertions(+), 54 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea7d2485/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java
--
diff --git
a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java
b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java
index f48a754..bb92e09 100644
---
a/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java
+++
b/modules/aws/src/test/java/org/apache/ignite/spi/checkpoint/s3/S3CheckpointSpiSelfTest.java
@@ -100,7 +100,7 @@ public class S3CheckpointSpiSelfTest extends
GridSpiAbstractTesthttp://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea7d2485/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index 6c953e7..4abf5e7 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@ -325,6 +325,7 @@ public class GridKernalContextImpl implements
GridKernalContext, Externalizable
* @param mgmtExecSvc Management executor service.
* @param igfsExecSvc IGFS executor service.
* @param restExecSvc REST executor service.
+ * @throws IgniteCheckedException In case of error.
*/
@SuppressWarnings("TypeMayBeWeakened")
protected GridKernalContextImpl(
@@ -339,7 +340,7 @@ public class GridKernalContextImpl implements
GridKernalContext, Externalizable
ExecutorService p2pExecSvc,
ExecutorService mgmtExecSvc,
ExecutorService igfsExecSvc,
-ExecutorService restExecSvc) {
+ExecutorService restExecSvc) throws IgniteCheckedException {
assert grid != null;
assert cfg != null;
assert gw != null;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea7d2485/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 4c8a567..19fff08 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -19,11 +19,11 @@ package org.apache.ignite.internal;
import org.apache.ignite.*;
import org.apache.ignite.cache.affinity.rendezvous.*;
-import org.apache.ignite.compute.ComputeJob;
+import o
[13/50] incubator-ignite git commit: # ignite-629-1 review
# ignite-629-1 review
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2415712a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2415712a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2415712a
Branch: refs/heads/ignite-gg-9950
Commit: 2415712ac711ae3deaa624b8bd9efd598aa33fa2
Parents: c4bef11
Author: sboikov
Authored: Mon Mar 30 12:31:08 2015 +0300
Committer: sboikov
Committed: Mon Mar 30 12:37:28 2015 +0300
--
.../processors/cache/CacheProjection.java | 2 +-
.../processors/cache/GridCacheAdapter.java | 28 +++---
.../processors/cache/GridCacheEntryEx.java | 3 +-
.../processors/cache/GridCacheMapEntry.java | 18 ++--
.../cache/GridCacheProjectionImpl.java | 14 +--
.../processors/cache/GridCacheProxyImpl.java| 3 +-
.../processors/cache/IgniteCacheProxy.java | 7 +-
.../GridDistributedTxRemoteAdapter.java | 2 +-
.../distributed/dht/GridDhtCacheAdapter.java| 2 +-
.../distributed/dht/GridDhtLocalPartition.java | 2 +-
.../distributed/dht/GridDhtLockFuture.java | 2 +-
.../distributed/dht/GridDhtTxLocalAdapter.java | 2 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 2 +-
.../colocated/GridDhtDetachedCacheEntry.java| 2 +-
.../transactions/IgniteTxLocalAdapter.java | 6 +-
.../datastreamer/DataStreamerImpl.java | 2 +-
.../GridCacheAtomicReferenceImpl.java | 2 -
.../GridCacheAtomicStampedImpl.java | 2 -
.../handlers/cache/GridCacheCommandHandler.java | 27 +++---
.../processors/cache/GridCacheTestEntryEx.java | 2 +-
.../cache/IgniteCacheInvokeAbstractTest.java| 6 +-
...GridCacheValueConsistencyAtomicSelfTest.java | 98
22 files changed, 61 insertions(+), 173 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2415712a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
index fb51620..6189d6b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
@@ -242,7 +242,7 @@ public interface CacheProjection extends
Iterable> {
/**
* @param skipStore Skip store.
- * @retur New projection based on this one, but with skip store.
+ * @return New projection based on this one, but with skip store.
*/
public CacheProjection setSkipStore(boolean skipStore);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2415712a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 864d6b2..db1fd12 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -407,12 +407,12 @@ public abstract class GridCacheAdapter implements
GridCache,
return this;
GridCacheProjectionImpl prj = new GridCacheProjectionImpl<>(this,
-ctx,
-null,
-skipStore,
-null,
-false,
-null);
+ctx,
+null,
+skipStore,
+null,
+false,
+null);
return new GridCacheProxyImpl<>(ctx, prj, prj);
}
@@ -1602,8 +1602,7 @@ public abstract class GridCacheAdapter implements
GridCache,
return getAllAsync(Collections.singletonList(key), /*force
primary*/true, /*skip tx*/false, null, null,
taskName, true, false).chain(new CX1>, V>() {
-@Override
-public V applyx(IgniteInternalFuture> e) throws
IgniteCheckedException {
+@Override public V applyx(IgniteInternalFuture> e)
throws IgniteCheckedException {
return e.get().get(key);
}
});
@@ -2458,13 +2457,11 @@ public abstract class GridCacheAdapter implements
GridCache,
ctx.dr().onReceiveCacheEntriesReceived(drMap.size());
return asyncOp(new AsyncInOp(drMap.keySet()) {
-@Override
-public Ig
[23/50] incubator-ignite git commit: ignite-629: Wait partition map exchange in affinity test.
ignite-629: Wait partition map exchange in affinity test.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6047580d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6047580d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6047580d
Branch: refs/heads/ignite-gg-9950
Commit: 6047580daecad8014d4bac4bb6cbac6020fb7382
Parents: 528ea7a
Author: ivasilinets
Authored: Tue Mar 31 09:29:52 2015 +0300
Committer: ivasilinets
Committed: Tue Mar 31 09:29:52 2015 +0300
--
.../test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java| 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6047580d/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
b/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
index c4683fd..8d4a350 100644
---
a/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
@@ -96,6 +96,7 @@ public class IgniteCacheAffinitySelfTest extends
IgniteCacheAbstractTest {
startGrid(gridCount() - 1);
startGrid(gridCount());
+awaitPartitionMapExchange();
GRID_CNT += 1;
[34/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-654
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-654 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/41963b70 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/41963b70 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/41963b70 Branch: refs/heads/ignite-gg-9950 Commit: 41963b70f02edb63080cc9b0e8f40e693fbfee59 Parents: 3821f00 c302175 Author: sboikov Authored: Tue Mar 31 15:48:10 2015 +0300 Committer: sboikov Committed: Tue Mar 31 15:48:10 2015 +0300 -- DEVNOTES.txt| 6 + .../ignite/internal/GridKernalContextImpl.java | 3 +- .../org/apache/ignite/internal/IgniteEx.java| 4 +- .../apache/ignite/internal/IgniteKernal.java| 5 +- .../cache/CacheConflictResolutionManager.java | 30 ++ .../cache/CacheOsConflictResolutionManager.java | 58 .../processors/cache/CacheProjection.java | 24 -- .../processors/cache/GridCacheAdapter.java | 60 .../processors/cache/GridCacheContext.java | 19 +- .../processors/cache/GridCacheProcessor.java| 20 +- .../processors/cache/GridCacheProjectionEx.java | 9 - .../cache/GridCacheProjectionImpl.java | 280 +++ .../processors/cache/GridCacheProxyImpl.java| 19 -- .../processors/cache/IgniteCacheProxy.java | 2 - .../CacheDataStructuresManager.java | 4 +- .../processors/cache/dr/GridCacheDrManager.java | 5 - .../cache/dr/GridOsCacheDrManager.java | 106 +++ .../cache/dr/os/GridOsCacheDrManager.java | 111 .../cache/query/GridCacheQueriesImpl.java | 23 +- .../transactions/IgniteTxLocalAdapter.java | 13 +- .../version/CacheVersionConflictResolver.java | 40 +++ ...ridCacheVersionAbstractConflictResolver.java | 56 .../GridCacheVersionConflictResolver.java | 59 .../GridProjectionForCachesSelfTest.java| 12 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 2 + .../GridServiceReassignmentSelfTest.java| 5 +- .../loadtests/hashmap/GridCacheTestContext.java | 6 +- .../IgniteCacheFailoverTestSuite.java | 8 +- .../hadoop/jobtracker/HadoopJobTracker.java | 7 +- .../HadoopDefaultMapReducePlannerSelfTest.java | 3 +- parent/pom.xml | 38 +-- 31 files changed, 351 insertions(+), 686 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/41963b70/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/41963b70/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java --
[12/50] incubator-ignite git commit: #ignite-629: Remove clone on get in GridCacheAtomicReferenceImpl and GridCacheAtomicStampedImpl.
#ignite-629: Remove clone on get in GridCacheAtomicReferenceImpl and GridCacheAtomicStampedImpl. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/69aaedd9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/69aaedd9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/69aaedd9 Branch: refs/heads/ignite-gg-9950 Commit: 69aaedd9016de150b9f737e4cc125f71c10106b4 Parents: a1725e1 Author: ivasilinets Authored: Mon Mar 30 12:07:18 2015 +0300 Committer: ivasilinets Committed: Mon Mar 30 12:07:18 2015 +0300 -- .../processors/datastructures/GridCacheAtomicReferenceImpl.java| 2 -- .../processors/datastructures/GridCacheAtomicStampedImpl.java | 2 -- 2 files changed, 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/69aaedd9/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java index f8c71a7..4a4efdd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java @@ -18,8 +18,6 @@ package org.apache.ignite.internal.processors.datastructures; import org.apache.ignite.*; -import org.apache.ignite.cache.CacheAtomicityMode; -import org.apache.ignite.cache.CacheMode; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.transactions.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/69aaedd9/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java index 92e97cc..64f32fc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java @@ -18,8 +18,6 @@ package org.apache.ignite.internal.processors.datastructures; import org.apache.ignite.*; -import org.apache.ignite.cache.CacheAtomicityMode; -import org.apache.ignite.cache.CacheMode; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; import org.apache.ignite.internal.processors.cache.transactions.*;
[14/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-629-1' into ignite-629-1
Merge remote-tracking branch 'origin/ignite-629-1' into ignite-629-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/e9a45c0c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e9a45c0c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e9a45c0c Branch: refs/heads/ignite-gg-9950 Commit: e9a45c0c313b427d8c11fbee79560d464d24dae3 Parents: 2415712 69aaedd Author: sboikov Authored: Mon Mar 30 12:42:09 2015 +0300 Committer: sboikov Committed: Mon Mar 30 12:42:09 2015 +0300 -- --
[49/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/13edeb41 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/13edeb41 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/13edeb41 Branch: refs/heads/ignite-gg-9950 Commit: 13edeb417cb23cf009e59dd862716b3dffd45119 Parents: f7e32fb 35d05e9 Author: Artem Shutak Authored: Wed Apr 1 11:58:33 2015 +0300 Committer: Artem Shutak Committed: Wed Apr 1 11:58:33 2015 +0300 -- .../checkpoint/s3/S3CheckpointSpiSelfTest.java | 12 +-- .../configuration/CacheConfiguration.java | 23 .../ignite/internal/GridCachePluginContext.java | 72 + .../ignite/internal/GridKernalContextImpl.java | 12 +-- .../org/apache/ignite/internal/IgnitionEx.java | 10 +- .../internal/MarshallerContextAdapter.java | 6 +- .../ignite/internal/MarshallerContextImpl.java | 90 ++-- .../processors/cache/GridCacheContext.java | 17 ++- .../processors/cache/GridCacheProcessor.java| 52 - .../processors/cache/GridCacheUtils.java| 39 +++ .../distributed/near/GridNearAtomicCache.java | 3 +- .../CacheContinuousQueryListener.java | 3 + .../continuous/CacheContinuousQueryManager.java | 2 +- .../transactions/IgniteTransactionsImpl.java| 4 + .../processors/plugin/CachePluginManager.java | 107 +++ .../ignite/internal/util/IgniteUtils.java | 2 +- .../ignite/marshaller/MarshallerContext.java| 3 +- .../optimized/OptimizedMarshallerUtils.java | 9 +- .../ignite/plugin/CachePluginConfiguration.java | 33 ++ .../ignite/plugin/CachePluginContext.java | 54 ++ .../ignite/plugin/CachePluginProvider.java | 83 ++ ...eJdbcStoreAbstractMultithreadedSelfTest.java | 11 +- .../managers/GridNoopManagerSelfTest.java | 2 +- .../communication/GridIoManagerSelfTest.java| 9 +- .../cache/GridCacheMemoryModeSelfTest.java | 12 ++- .../IgniteCacheSystemTransactionsSelfTest.java | 38 ++- ...ridCacheContinuousQueryAbstractSelfTest.java | 2 +- .../internal/util/IgniteUtilsSelfTest.java | 2 +- .../loadtests/hashmap/GridCacheTestContext.java | 4 +- .../OptimizedMarshallerNodeFailoverTest.java| 71 +++- .../spi/GridSpiLocalHostInjectionTest.java | 2 +- .../GridPriorityQueueCollisionSpiSelfTest.java | 2 +- ...RobinLoadBalancingSpiNotPerTaskSelfTest.java | 2 +- .../testframework/junits/GridAbstractTest.java | 28 +++-- .../junits/GridTestKernalContext.java | 2 +- .../junits/IgniteTestResources.java | 8 +- .../junits/spi/GridSpiAbstractTest.java | 13 +-- .../commands/disco/VisorDiscoveryCommand.scala | 8 +- .../commands/events/VisorEventsCommand.scala| 24 ++--- .../commands/tasks/VisorTasksCommand.scala | 6 +- 40 files changed, 739 insertions(+), 143 deletions(-) --
[01/50] incubator-ignite git commit: #ignite-629: remove Client Flags
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-gg-9950 721058ae8 -> 9bb90c20b
#ignite-629: remove Client Flags
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/be6a1614
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/be6a1614
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/be6a1614
Branch: refs/heads/ignite-gg-9950
Commit: be6a16140f6c56beee5fc5c82d95beb26936a3a2
Parents: 520eef1
Author: ivasilinets
Authored: Fri Mar 27 17:53:30 2015 +0300
Committer: ivasilinets
Committed: Fri Mar 27 17:53:30 2015 +0300
--
.../internal/client/impl/ClientCacheFlagsCodecTest.java | 2 --
.../ignite/internal/client/GridClientCacheFlag.java | 10 --
.../client/impl/connection/GridClientConnection.java | 6 --
3 files changed, 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/be6a1614/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
index 8a2ff25..1117cd6 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
@@ -59,8 +59,6 @@ public class ClientCacheFlagsCodecTest extends TestCase {
doTestGroup(GridClientCacheFlag.values());
// none
doTestGroup();
-// some
-doTestGroup(GridClientCacheFlag.INVALIDATE);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/be6a1614/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java
b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java
index 0f6f076..a49e506 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java
@@ -29,16 +29,6 @@ public enum GridClientCacheFlag {
/** Skip swap space for reads and writes. */
SKIP_SWAP,
-/** Synchronous commit. */
-SYNC_COMMIT,
-
-/**
- * Switches a cache projection to work in {@code 'invalidation'} mode.
- * Instead of updating remote entries with new values, small invalidation
- * messages will be sent to set the values to {@code null}.
- */
-INVALIDATE,
-
/**
* Disable deserialization of portable objects on get operations.
* If set and portable marshaller is used, {@link
GridClientData#get(Object)}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/be6a1614/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnection.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnection.java
b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnection.java
index c643e0a..50b0216 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnection.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnection.java
@@ -109,12 +109,6 @@ public abstract class GridClientConnection {
if (flagSet.contains(GridClientCacheFlag.SKIP_SWAP))
bits |= 1 << 1;
-if (flagSet.contains(GridClientCacheFlag.SYNC_COMMIT))
-bits |= 1 << 2;
-
-if (flagSet.contains(GridClientCacheFlag.INVALIDATE))
-bits |= 1 << 4;
-
return bits;
}
[03/50] incubator-ignite git commit: #ignite-629: remove CacheFlag.CLONE
#ignite-629: remove CacheFlag.CLONE
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ad84583b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ad84583b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ad84583b
Branch: refs/heads/ignite-gg-9950
Commit: ad84583b104c9af8222bf724d90bed632e0198bb
Parents: 4022338
Author: ivasilinets
Authored: Fri Mar 27 19:13:40 2015 +0300
Committer: ivasilinets
Committed: Fri Mar 27 19:13:40 2015 +0300
--
.../internal/processors/cache/CacheFlag.java| 11
.../processors/cache/GridCacheAdapter.java | 32 +--
.../cache/GridCacheConcurrentMap.java | 22 ++--
.../processors/cache/GridCacheContext.java | 57
.../local/atomic/GridLocalAtomicCache.java | 20 ++-
.../datastructures/DataStructuresProcessor.java | 15 +++---
.../datastructures/GridCacheAtomicLongImpl.java | 14 ++---
.../GridCacheAtomicReferenceImpl.java | 2 +-
.../GridCacheAtomicSequenceImpl.java| 2 +-
.../GridCacheAtomicStampedImpl.java | 2 +-
.../GridCacheCountDownLatchImpl.java| 2 +-
.../OptimizedObjectStreamSelfTest.java | 2 +-
12 files changed, 43 insertions(+), 138 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad84583b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
index 5bef17d..f403a53 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
@@ -32,17 +32,6 @@ import javax.cache.processor.*;
*
*/
public enum CacheFlag {
-/**
- * Clone values prior to returning them to user.
- *
- * Whenever values are returned from cache, they cannot be directly updated
- * as cache holds the same references internally. If it is needed to
- * update values that are returned from cache, this flag will provide
- * automatic cloning of values prior to returning so they can be directly
- * updated.
- */
-CLONE,
-
/** Skips store, i.e. no read-through and no write-through behavior. */
SKIP_STORE;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad84583b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 79c8fce..b7d545f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -2332,7 +2332,7 @@ public abstract class GridCacheAdapter implements
GridCache,
validateCacheValue(val);
-V prevVal = ctx.cloneOnFlag(syncOp(new SyncOp(true) {
+V prevVal = syncOp(new SyncOp(true) {
@Override public V op(IgniteTxLocalAdapter tx) throws
IgniteCheckedException {
return (V)tx.putAllAsync(ctx, F.t(key, val), true, cached,
ttl, filter).get().value();
}
@@ -2340,7 +2340,7 @@ public abstract class GridCacheAdapter implements
GridCache,
@Override public String toString() {
return "put [key=" + key + ", val=" + val + ", filter=" +
Arrays.toString(filter) + ']';
}
-}));
+});
if (statsEnabled)
metrics0().addPutAndGetTimeNanos(System.nanoTime() - start);
@@ -2394,7 +2394,7 @@ public abstract class GridCacheAdapter implements
GridCache,
validateCacheValue(val);
-return ctx.wrapClone(asyncOp(new AsyncOp(key) {
+return asyncOp(new AsyncOp(key) {
@Override public IgniteInternalFuture op(IgniteTxLocalAdapter
tx) {
return tx.putAllAsync(ctx, F.t(key, val), true, entry, ttl,
filter)
.chain((IgniteClosure, V>)RET2VAL);
@@ -2403,7 +2403,7 @@ public abstract class GridCacheAdapter implements
GridCache,
@Override public String toString() {
return "putAsync [key=" + key + ", val=" + val + ", filter=" +
Arrays.toString(filter) + ']';
}
-}));
+});
}
/** {@inheritD
[08/50] incubator-ignite git commit: #ignite-629: remove forced flags.
#ignite-629: remove forced flags.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5d5e8a3b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5d5e8a3b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5d5e8a3b
Branch: refs/heads/ignite-gg-9950
Commit: 5d5e8a3beb4a37c0228132f3242981490cd2fbf2
Parents: 2062fec
Author: ivasilinets
Authored: Sun Mar 29 23:49:08 2015 +0300
Committer: ivasilinets
Committed: Sun Mar 29 23:49:08 2015 +0300
--
.../processors/cache/GridCacheAdapter.java | 2 +-
.../cache/GridCacheConcurrentMap.java | 19 +---
.../processors/cache/GridCacheContext.java | 96 +---
.../cache/GridCacheProjectionImpl.java | 13 +--
.../cache/GridCacheOffHeapSelfTest.java | 2 +-
5 files changed, 8 insertions(+), 124 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5d5e8a3b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index f836788..177b9b2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -381,7 +381,7 @@ public abstract class GridCacheAdapter implements
GridCache,
/** {@inheritDoc} */
@Override public Set flags() {
-return F.asSet(ctx.forcedFlags());
+return new HashSet<>();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5d5e8a3b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
index e0b756a..51df644 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
@@ -1802,9 +1802,6 @@ public class GridCacheConcurrentMap {
private GridCacheProjectionImpl prjPerCall;
/** */
-private CacheFlag[] forcedFlags;
-
-/** */
private boolean clone;
/**
@@ -1827,7 +1824,6 @@ public class GridCacheConcurrentMap {
ctx = map.ctx;
prjPerCall = ctx.projectionPerCall();
-forcedFlags = ctx.forcedFlags();
}
/** {@inheritDoc} */
@@ -1839,7 +1835,7 @@ public class GridCacheConcurrentMap {
* @return Entry iterator.
*/
Iterator> entryIterator() {
-return new EntryIterator<>(map, filter, ctx, prjPerCall,
forcedFlags);
+return new EntryIterator<>(map, filter, ctx, prjPerCall);
}
/**
@@ -1980,9 +1976,6 @@ public class GridCacheConcurrentMap {
/** */
private GridCacheProjectionImpl prjPerCall;
-/** */
-private CacheFlag[] forcedFlags;
-
/**
* Empty constructor required for {@link Externalizable}.
*/
@@ -1995,19 +1988,16 @@ public class GridCacheConcurrentMap {
* @param filter Entry filter.
* @param ctx Cache context.
* @param prjPerCall Projection per call.
- * @param forcedFlags Forced flags.
*/
EntryIterator(
GridCacheConcurrentMap map,
CacheEntryPredicate[] filter,
GridCacheContext ctx,
-GridCacheProjectionImpl prjPerCall,
-CacheFlag[] forcedFlags) {
+GridCacheProjectionImpl prjPerCall) {
it = new Iterator0<>(map, false, filter, -1, -1);
this.ctx = ctx;
this.prjPerCall = prjPerCall;
-this.forcedFlags = forcedFlags;
}
/** {@inheritDoc} */
@@ -2021,14 +2011,11 @@ public class GridCacheConcurrentMap {
ctx.projectionPerCall(prjPerCall);
-CacheFlag[] oldFlags = ctx.forceFlags(forcedFlags);
-
try {
return it.next().wrapLazyValue();
}
finally {
ctx.projectionPerCall(oldPrj);
-ctx.forceFlags(oldFlags);
}
}
@@ -2042,7 +2029,6 @@ public class GridCacheConcurrentMap {
[44/50] incubator-ignite git commit: Merge branch 'ignite-644' into ignite-sprint-3
Merge branch 'ignite-644' into ignite-sprint-3 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/17a9744d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/17a9744d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/17a9744d Branch: refs/heads/ignite-gg-9950 Commit: 17a9744d2b7cc23a7e27cb20b45038ed114c589e Parents: ca472ac ad140b9 Author: Valentin Kulichenko Authored: Tue Mar 31 18:51:46 2015 -0700 Committer: Valentin Kulichenko Committed: Tue Mar 31 18:51:46 2015 -0700 -- .../src/main/java/org/apache/ignite/internal/IgnitionEx.java | 4 ++-- .../processors/cache/distributed/near/GridNearAtomicCache.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/17a9744d/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java --
[29/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-629-1
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-629-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/5b6700f1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5b6700f1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5b6700f1 Branch: refs/heads/ignite-gg-9950 Commit: 5b6700f1dc2583d7910444c38628768920530b51 Parents: 50998c5 6ef11d4 Author: sboikov Authored: Tue Mar 31 12:34:54 2015 +0300 Committer: sboikov Committed: Tue Mar 31 12:34:54 2015 +0300 -- parent/pom.xml | 38 +++--- 1 file changed, 19 insertions(+), 19 deletions(-) --
[30/50] incubator-ignite git commit: # ignite-629-1
# ignite-629-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/5fd9ded9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5fd9ded9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5fd9ded9
Branch: refs/heads/ignite-gg-9950
Commit: 5fd9ded9336d3dd8cc0da3e88f548de8fb57c12c
Parents: 5b6700f
Author: sboikov
Authored: Tue Mar 31 12:53:34 2015 +0300
Committer: sboikov
Committed: Tue Mar 31 12:53:34 2015 +0300
--
.../processors/cache/GridCacheAdapter.java| 6 --
.../cache/GridCacheAbstractFullApiSelfTest.java | 10 +-
.../GridCacheReturnValueTransferSelfTest.java | 18 ++
3 files changed, 11 insertions(+), 23 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5fd9ded9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index db1fd12..00ab5719 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -4155,6 +4155,8 @@ public abstract class GridCacheAdapter implements
GridCache,
if (!ctx.isSwapOrOffheapEnabled() &&
ctx.kernalContext().discovery().size() == 1)
return localIteratorHonorExpirePolicy();
+final GridCacheProjectionImpl prj = ctx.projectionPerCall();
+
CacheQueryFuture> fut = queries().createScanQuery(null)
.keepAll(false)
.execute();
@@ -4165,7 +4167,7 @@ public abstract class GridCacheAdapter implements
GridCache,
}
@Override protected void remove(Cache.Entry item) {
-ctx.gate().enter();
+GridCacheProjectionImpl prev = ctx.gate().enter(prj);
try {
removex(item.getKey());
@@ -4174,7 +4176,7 @@ public abstract class GridCacheAdapter implements
GridCache,
throw CU.convertToCacheException(e);
}
finally {
-ctx.gate().leave();
+ctx.gate().leave(prev);
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5fd9ded9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 1a8bdcd..d5c279b 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -4310,19 +4310,19 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
Cache.Entry entry = it.next();
-String removedKey = entry.getKey();
+String rmvKey = entry.getKey();
-assertTrue(map.containsKey(removedKey));
+assertTrue(map.containsKey(rmvKey));
it.remove();
-assertNull(cacheSkipStore.get(removedKey));
+assertNull(cacheSkipStore.get(rmvKey));
-assertTrue(map.containsKey(removedKey));
+assertTrue(map.containsKey(rmvKey));
}
/**
- *
+ * @return Cache start mode.
*/
protected CacheStartMode cacheStartType() {
String mode = System.getProperty("cache.start.mode");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5fd9ded9/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
index 4761e21..0dd23a7 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
@@ -71,21 +71,7 @@ public class GridCa
[24/50] incubator-ignite git commit: # ignite-654
# ignite-654
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3821f002
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3821f002
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3821f002
Branch: refs/heads/ignite-gg-9950
Commit: 3821f002956b14f7404b8943e320909f3d6c0067
Parents: 768ca6a
Author: sboikov
Authored: Tue Mar 31 10:20:51 2015 +0300
Committer: sboikov
Committed: Tue Mar 31 10:38:54 2015 +0300
--
.../ignite/internal/GridKernalContextImpl.java| 6 +++---
.../org/apache/ignite/internal/IgniteKernal.java | 7 +++
.../internal/managers/GridManagerAdapter.java | 4
.../distributed/dht/GridPartitionedGetFuture.java | 3 ++-
.../cache/distributed/near/GridNearGetFuture.java | 3 ++-
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 16 +---
.../org/apache/ignite/spi/IgniteSpiContext.java | 5 +
.../communication/tcp/TcpCommunicationSpi.java| 13 -
.../ignite/spi/discovery/tcp/TcpDiscoverySpi.java | 14 +-
.../cache/GridCacheAbstractFailoverSelfTest.java | 2 +-
.../ignite/testframework/GridSpiTestContext.java | 18 +-
11 files changed, 59 insertions(+), 32 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3821f002/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index 0c3f41f..059a576 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@ -319,6 +319,7 @@ public class GridKernalContextImpl implements
GridKernalContext, Externalizable
* @param cfg Grid configuration.
* @param gw Kernal gateway.
* @param utilityCachePool Utility cache pool.
+ * @param marshCachePool Marshaller cache pool.
* @param execSvc Public executor service.
* @param sysExecSvc System executor service.
* @param p2pExecSvc P2P executor service.
@@ -387,6 +388,7 @@ public class GridKernalContextImpl implements
GridKernalContext, Externalizable
/**
* @param comp Manager to add.
+ * @param addToList If {@code true} component is added to components list.
*/
public void add(GridComponent comp, boolean addToList) {
assert comp != null;
@@ -495,9 +497,7 @@ public class GridKernalContextImpl implements
GridKernalContext, Externalizable
/** {@inheritDoc} */
@Override public boolean isStopping() {
-GridKernalState state = gw.getState();
-
-return state == GridKernalState.STOPPING || state ==
GridKernalState.STOPPED;
+return ((IgniteKernal)grid).isStopping();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3821f002/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index c9c3b8d..6899af9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -1671,6 +1671,13 @@ public class IgniteKernal implements IgniteEx,
IgniteMXBean, Externalizable {
}
/**
+ * @return {@code True} if node started shutdown sequence.
+ */
+public boolean isStopping() {
+return stopGuard.get();
+}
+
+/**
* @param cancel Whether or not to cancel running jobs.
*/
private void stop0(boolean cancel) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3821f002/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
index b965ea3..982ca86 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/GridManagerAdapter.java
@@ -281,6 +281,10 @@ public abstract class GridManagerAdapter implements GridMan
for (final IgniteSpi spi : spis) {
try {
spi.onContextInitialized(new Ign
[04/50] incubator-ignite git commit: #ignite-629: Remove imports
#ignite-629: Remove imports
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fc123eb6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fc123eb6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fc123eb6
Branch: refs/heads/ignite-gg-9950
Commit: fc123eb6bfd07cca05501e0db613b3258714945f
Parents: ad84583
Author: ivasilinets
Authored: Fri Mar 27 19:33:25 2015 +0300
Committer: ivasilinets
Committed: Fri Mar 27 19:33:25 2015 +0300
--
.../processors/datastructures/DataStructuresProcessor.java | 4
1 file changed, 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc123eb6/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
index b6b3993..1ef5c55 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java
@@ -18,7 +18,6 @@
package org.apache.ignite.internal.processors.datastructures;
import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.cluster.*;
@@ -39,7 +38,6 @@ import java.util.*;
import java.util.concurrent.*;
import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
-import static org.apache.ignite.internal.processors.cache.CacheFlag.*;
import static org.apache.ignite.internal.processors.cache.GridCacheOperation.*;
import static
org.apache.ignite.internal.processors.datastructures.DataStructuresProcessor.DataStructureType.*;
import static org.apache.ignite.transactions.TransactionConcurrency.*;
@@ -131,8 +129,6 @@ public final class DataStructuresProcessor extends
GridProcessorAdapter {
seqView = atomicsCache;
dsCacheCtx =
ctx.cache().internalCache(CU.ATOMICS_CACHE_NAME).context();
-
-CacheConfiguration cfg =
ctx.cache().internalCache(CU.ATOMICS_CACHE_NAME).configuration();
}
}
[43/50] incubator-ignite git commit: IGNITE-651 - Fixed system transactions test since marshaller cache is not transactional anymore.
IGNITE-651 - Fixed system transactions test since marshaller cache is not
transactional anymore.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ca472ac5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ca472ac5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ca472ac5
Branch: refs/heads/ignite-gg-9950
Commit: ca472ac50c3e679a305bb9a01a56b180ac3fff82
Parents: 685209c
Author: Alexey Goncharuk
Authored: Tue Mar 31 18:46:45 2015 -0700
Committer: Alexey Goncharuk
Committed: Tue Mar 31 18:46:45 2015 -0700
--
.../ignite/internal/MarshallerContextImpl.java | 2 +-
.../transactions/IgniteTransactionsImpl.java| 4 +++
.../IgniteCacheSystemTransactionsSelfTest.java | 38 ++--
3 files changed, 15 insertions(+), 29 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca472ac5/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
index 4a27222..e6ef192 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
@@ -158,7 +158,7 @@ public class MarshallerContextImpl extends
MarshallerContextAdapter {
@Override public void onUpdated(Iterable> events)
throws CacheEntryListenerException {
for (CacheEntryEvent evt :
events) {
-assert evt.getOldValue() == null;
+assert evt.getOldValue() == null : "Received non-null old
value for system marshaller cache: " + evt;
File file = new File(workDir, evt.getKey() + ".classname");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca472ac5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java
index afa2826..c3ad32b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTransactionsImpl.java
@@ -17,6 +17,7 @@
package org.apache.ignite.internal.processors.cache.transactions;
+import org.apache.ignite.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.internal.*;
import org.apache.ignite.internal.processors.cache.*;
@@ -137,6 +138,9 @@ public class IgniteTransactionsImpl implements
IgniteTransactionsEx {
long timeout, int txSize, @Nullable GridCacheContext sysCacheCtx) {
TransactionConfiguration cfg =
cctx.gridConfig().getTransactionConfiguration();
+if (sysCacheCtx != null && !sysCacheCtx.transactional())
+throw new IgniteException("Failed to start transaction on
non-transactional cache: " + sysCacheCtx.name());
+
if (!cfg.isTxSerializableEnabled() && isolation == SERIALIZABLE)
throw new IllegalArgumentException("SERIALIZABLE isolation level
is disabled (to enable change " +
"'txSerializableEnabled' configuration property)");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ca472ac5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java
index f06838a..d4c3a1b 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCacheSystemTransactionsSelfTest.java
@@ -24,9 +24,11 @@ import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.cache.transactions.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
+import org.apache.ignite.testframework.*;
import
[25/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-629-1
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-629-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/1617648e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1617648e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1617648e Branch: refs/heads/ignite-gg-9950 Commit: 1617648e448c3842b64261457b9b9fce0eca80f3 Parents: 6047580 c2f5211 Author: sboikov Authored: Tue Mar 31 10:41:18 2015 +0300 Committer: sboikov Committed: Tue Mar 31 10:41:18 2015 +0300 -- DEVNOTES.txt | 6 ++ .../visor/cache/VisorCacheStoreConfiguration.java | 18 +++--- 2 files changed, 17 insertions(+), 7 deletions(-) --
[22/50] incubator-ignite git commit: ignite-629: Remove test for Force transform flag.
ignite-629: Remove test for Force transform 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/528ea7af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/528ea7af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/528ea7af
Branch: refs/heads/ignite-gg-9950
Commit: 528ea7afab72f05ed367bd85d0a031f67094574e
Parents: 053d32c
Author: ivasilinets
Authored: Tue Mar 31 00:46:47 2015 +0300
Committer: ivasilinets
Committed: Tue Mar 31 00:46:47 2015 +0300
--
.../GridCacheReturnValueTransferSelfTest.java | 205 ---
.../ignite/testsuites/IgniteCacheTestSuite.java | 1 -
2 files changed, 206 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/528ea7af/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
deleted file mode 100644
index 5b3e19d..000
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import javax.cache.processor.*;
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-
-/**
- * Tests transform for extra traffic.
- */
-public class GridCacheReturnValueTransferSelfTest extends
GridCommonAbstractTest {
-/** Distribution mode. */
-private boolean cache;
-
-/** Atomicity mode. */
-private CacheAtomicityMode atomicityMode;
-
-/** Atomic write order mode. */
-private CacheAtomicWriteOrderMode writeOrderMode;
-
-/** Number of backups. */
-private int backups;
-
-/** Fail deserialization flag. */
-private static volatile boolean failDeserialization;
-
-/** {@inheritDoc} */
-@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
-IgniteConfiguration cfg = super.getConfiguration(gridName);
-
-CacheConfiguration ccfg = new CacheConfiguration();
-
-ccfg.setBackups(backups);
-ccfg.setCacheMode(PARTITIONED);
-ccfg.setAtomicityMode(atomicityMode);
-ccfg.setAtomicWriteOrderMode(writeOrderMode);
-
-cfg.setCacheConfiguration(ccfg);
-
-if (!cache)
-cfg.setClientMode(true);
-
-return cfg;
-}
-
-/**
- * @throws Exception If failed.
- */
-public void testTransformAtomicPrimaryNoBackups() throws Exception {
-checkTransform(ATOMIC, PRIMARY, 0);
-}
-
-/**
- * @throws Exception If failed.
- */
-public void testTransformAtomicClockNoBackups() throws Exception {
-checkTransform(ATOMIC, CLOCK, 0);
-}
-
-/**
- * @throws Exception If failed.
- */
-public void testTransformAtomicPrimaryOneBackup() throws Exception {
-checkTransform(ATOMIC, PRIMARY, 1);
-}
-
-/**
- * @throws Exception If failed.
- */
-public void testTransformAtomicClockOneBackup() throws Exception {
-checkTransform(ATOMIC, CLOCK, 1);
-}
-
-/**
- * @throws Exception If failed.
- * TODO gg-8273 enable when fixed
- */
-public void _testTransformTransactionalNoBackups() throws Exception {
-checkTransform(TRANSACTIONAL, PRIMARY, 0);
-}
-
-/**
- * @t
[35/50] incubator-ignite git commit: # ignite-654 fixed test
# ignite-654 fixed test
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/05c8d203
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/05c8d203
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/05c8d203
Branch: refs/heads/ignite-gg-9950
Commit: 05c8d2039f41c53a64136d3268c5809aba2ef7d4
Parents: 41963b7
Author: sboikov
Authored: Tue Mar 31 16:37:27 2015 +0300
Committer: sboikov
Committed: Tue Mar 31 16:37:27 2015 +0300
--
.../cache/GridCachePutAllFailoverSelfTest.java | 26 ++--
1 file changed, 19 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/05c8d203/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
index 1b3dd2e..4b5c250 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
@@ -40,6 +40,7 @@ import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;
+import static org.apache.ignite.cache.CachePeekMode.*;
import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
/**
@@ -50,7 +51,7 @@ public class GridCachePutAllFailoverSelfTest extends
GridCommonAbstractTest {
private static TcpDiscoveryIpFinder ipFinder = new
TcpDiscoveryVmIpFinder(true);
/** Size of the test map. */
-private static final int TEST_MAP_SIZE = 3;
+private static final int TEST_MAP_SIZE = 30_000;
/** Cache name. */
private static final String CACHE_NAME = "partitioned";
@@ -339,12 +340,18 @@ public class GridCachePutAllFailoverSelfTest extends
GridCommonAbstractTest {
int primaryCacheSize = 0;
for (Ignite g : runningWorkers) {
-info("> " + g.cache(CACHE_NAME).localSize());
+info("Cache size [node=" + g.name() +
+", localSize=" + g.cache(CACHE_NAME).localSize() +
+", localPrimarySize=" +
g.cache(CACHE_NAME).localSize(PRIMARY) +
+']');
primaryCacheSize +=
((IgniteKernal)g).internalCache(CACHE_NAME).primarySize();
}
assertEquals(TEST_MAP_SIZE, primaryCacheSize);
+
+for (Ignite g : runningWorkers)
+assertEquals(TEST_MAP_SIZE, g.cache(CACHE_NAME).size(PRIMARY));
}
finally {
stopAllGrids();
@@ -388,9 +395,6 @@ public class GridCachePutAllFailoverSelfTest extends
GridCommonAbstractTest {
}
try {
-// Dummy call to fetch affinity function from remote node
-master.cluster().mapKeyToNode(CACHE_NAME, "Dummy");
-
Map> dataChunks = new HashMap<>();
int chunkCntr = 0;
@@ -539,12 +543,18 @@ public class GridCachePutAllFailoverSelfTest extends
GridCommonAbstractTest {
int primaryCacheSize = 0;
for (Ignite g : runningWorkers) {
-info("> " + g.cache(CACHE_NAME).localSize());
+info("Cache size [node=" + g.name() +
+", localSize=" + g.cache(CACHE_NAME).localSize() +
+", localPrimarySize=" +
g.cache(CACHE_NAME).localSize(PRIMARY) +
+']');
-primaryCacheSize +=
((IgniteKernal)g).internalCache(CACHE_NAME).primarySize();
+primaryCacheSize += g.cache(CACHE_NAME).localSize(PRIMARY);
}
assertEquals(TEST_MAP_SIZE, primaryCacheSize);
+
+for (Ignite g : runningWorkers)
+assertEquals(TEST_MAP_SIZE, g.cache(CACHE_NAME).size(PRIMARY));
}
finally {
stopAllGrids();
@@ -602,6 +612,8 @@ public class GridCachePutAllFailoverSelfTest extends
GridCommonAbstractTest {
cfg.setDiscoverySpi(discoverySpi);
if (gridName.startsWith("master")) {
+cfg.setClientMode(true);
+
cfg.setUserAttributes(ImmutableMap.of("segment", "master"));
// For sure.
[50/50] incubator-ignite git commit: Merge branch 'ignite-sprint-3' into ignite-gg-9950
Merge branch 'ignite-sprint-3' into ignite-gg-9950 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9bb90c20 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9bb90c20 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9bb90c20 Branch: refs/heads/ignite-gg-9950 Commit: 9bb90c20b9c6fa400fc86489d4338a53d6da0e5b Parents: 721058a 13edeb4 Author: vozerov-gridgain Authored: Wed Apr 1 12:06:32 2015 +0300 Committer: vozerov-gridgain Committed: Wed Apr 1 12:06:32 2015 +0300 -- .../examples/datagrid/CacheQueryExample.java| 12 +- .../checkpoint/s3/S3CheckpointSpiSelfTest.java | 12 +- .../client/impl/ClientCacheFlagsCodecTest.java | 18 +- .../configuration/CacheConfiguration.java | 23 ++ .../ignite/internal/GridCachePluginContext.java | 72 ++ .../ignite/internal/GridKernalContextImpl.java | 18 +- .../apache/ignite/internal/IgniteKernal.java| 7 + .../org/apache/ignite/internal/IgnitionEx.java | 10 +- .../internal/MarshallerContextAdapter.java | 6 +- .../ignite/internal/MarshallerContextImpl.java | 90 ++- .../internal/client/GridClientCacheFlag.java| 13 - .../impl/connection/GridClientConnection.java | 9 - .../internal/managers/GridManagerAdapter.java | 4 + .../internal/processors/cache/CacheFlag.java| 108 - .../processors/cache/CacheFlagException.java| 67 -- .../processors/cache/CacheProjection.java | 209 +--- .../internal/processors/cache/GridCache.java| 3 - .../processors/cache/GridCacheAdapter.java | 211 .../cache/GridCacheConcurrentMap.java | 44 +--- .../processors/cache/GridCacheContext.java | 239 +++ .../processors/cache/GridCacheEntryEx.java | 3 +- .../processors/cache/GridCacheMapEntry.java | 27 +-- .../processors/cache/GridCacheProcessor.java| 52 ++-- .../processors/cache/GridCacheProjectionEx.java | 20 -- .../cache/GridCacheProjectionImpl.java | 77 ++ .../processors/cache/GridCacheProxyImpl.java| 36 +-- .../cache/GridCacheSharedContext.java | 21 -- .../processors/cache/GridCacheUtils.java| 39 +++ .../processors/cache/IgniteCacheProxy.java | 29 +-- .../GridDistributedTxRemoteAdapter.java | 2 +- .../distributed/dht/GridDhtCacheAdapter.java| 2 +- .../distributed/dht/GridDhtLocalPartition.java | 2 +- .../distributed/dht/GridDhtLockFuture.java | 2 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../dht/GridPartitionedGetFuture.java | 3 +- .../dht/atomic/GridDhtAtomicCache.java | 32 --- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 2 - .../dht/atomic/GridNearAtomicUpdateFuture.java | 3 - .../dht/atomic/GridNearAtomicUpdateRequest.java | 78 ++ .../dht/colocated/GridDhtColocatedCache.java| 2 - .../colocated/GridDhtDetachedCacheEntry.java| 2 +- .../distributed/near/GridNearAtomicCache.java | 5 +- .../distributed/near/GridNearCacheAdapter.java | 9 - .../distributed/near/GridNearGetFuture.java | 3 +- .../near/GridNearTransactionalCache.java| 2 - .../cache/distributed/near/GridNearTxLocal.java | 4 +- .../local/atomic/GridLocalAtomicCache.java | 74 +- .../continuous/CacheContinuousQueryHandler.java | 5 - .../CacheContinuousQueryListener.java | 3 + .../continuous/CacheContinuousQueryManager.java | 2 +- .../transactions/IgniteTransactionsImpl.java| 5 +- .../transactions/IgniteTxLocalAdapter.java | 6 +- .../cache/transactions/IgniteTxManager.java | 2 - .../datastreamer/DataStreamerImpl.java | 2 +- .../datastructures/DataStructuresProcessor.java | 13 +- .../datastructures/GridCacheAtomicLongImpl.java | 14 +- .../GridCacheAtomicReferenceImpl.java | 2 +- .../GridCacheAtomicReferenceValue.java | 15 +- .../GridCacheAtomicSequenceImpl.java| 2 +- .../GridCacheAtomicStampedImpl.java | 2 +- .../GridCacheAtomicStampedValue.java| 15 +- .../GridCacheCountDownLatchImpl.java| 2 +- .../processors/plugin/CachePluginManager.java | 107 + .../handlers/cache/GridCacheCommandHandler.java | 66 ++--- .../ignite/internal/util/IgniteUtils.java | 2 +- .../ignite/marshaller/MarshallerContext.java| 3 +- .../optimized/OptimizedMarshallerUtils.java | 9 +- .../ignite/plugin/CachePluginConfiguration.java | 33 +++ .../ignite/plugin/CachePluginContext.java | 54 + .../ignite/plugin/CachePluginProvider.java | 83 +++ .../org/apache/ignite/spi/IgniteSpiAdapter.java | 16 +- .../org/apache/ignite/spi/IgniteSpiContext.java | 5 + .
[10/50] incubator-ignite git commit: #ignite-629: Remove clone on get in GridCacheAtomicReferenceImpl and GridCacheAtomicStampedImpl.
#ignite-629: Remove clone on get in GridCacheAtomicReferenceImpl and
GridCacheAtomicStampedImpl.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a1725e14
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a1725e14
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a1725e14
Branch: refs/heads/ignite-gg-9950
Commit: a1725e140eddf9eeb77084089bebf67a414f8705
Parents: aa3864d
Author: ivasilinets
Authored: Mon Mar 30 11:50:15 2015 +0300
Committer: ivasilinets
Committed: Mon Mar 30 11:50:15 2015 +0300
--
.../datastructures/GridCacheAtomicReferenceImpl.java | 6 +-
.../processors/datastructures/GridCacheAtomicStampedImpl.java | 6 +-
2 files changed, 2 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1725e14/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
index 273ae35..f8c71a7 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicReferenceImpl.java
@@ -70,11 +70,7 @@ public final class GridCacheAtomicReferenceImpl
implements GridCacheAtomicRef
/** Callable for {@link #get} operation */
private final Callable getCall = new Callable() {
@Override public T call() throws Exception {
-boolean clone = ctx.cache().configuration().getCacheMode() ==
CacheMode.LOCAL &&
-ctx.cache().configuration().getAtomicityMode() ==
CacheAtomicityMode.ATOMIC;
-
-GridCacheAtomicReferenceValue ref = clone ?
X.cloneObject(atomicView.get(key), false, true) :
-atomicView.get(key);
+GridCacheAtomicReferenceValue ref = atomicView.get(key);
if (ref == null)
throw new IgniteCheckedException("Failed to find atomic
reference with given name: " + name);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a1725e14/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
index 86b19af..92e97cc 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/GridCacheAtomicStampedImpl.java
@@ -72,11 +72,7 @@ public final class GridCacheAtomicStampedImpl
implements GridCacheAtomicSt
/** Callable for {@link #get()} operation */
private final Callable> getCall = new
Callable>() {
@Override public IgniteBiTuple call() throws Exception {
-boolean clone = ctx.cache().configuration().getCacheMode() ==
CacheMode.LOCAL &&
-ctx.cache().configuration().getAtomicityMode() ==
CacheAtomicityMode.ATOMIC;
-
-GridCacheAtomicStampedValue stmp = clone ?
X.cloneObject(atomicView.get(key), false, true) :
-atomicView.get(key);
+GridCacheAtomicStampedValue stmp = atomicView.get(key);
if (stmp == null)
throw new IgniteCheckedException("Failed to find atomic
stamped with given name: " + name);
[46/50] incubator-ignite git commit: # IGNITE-562 Minor fix for comments.
# IGNITE-562 Minor fix for comments.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0dfb5c03
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0dfb5c03
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0dfb5c03
Branch: refs/heads/ignite-gg-9950
Commit: 0dfb5c03bb785a8fdbbdb70d8260ea7922e2accc
Parents: 528d46b
Author: AKuznetsov
Authored: Wed Apr 1 10:22:44 2015 +0700
Committer: AKuznetsov
Committed: Wed Apr 1 10:22:44 2015 +0700
--
.../ignite/visor/commands/disco/VisorDiscoveryCommand.scala | 8
.../ignite/visor/commands/tasks/VisorTasksCommand.scala | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0dfb5c03/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala
index 11689f5..3b6ca7e 100644
---
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala
+++
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/disco/VisorDiscoveryCommand.scala
@@ -41,16 +41,16 @@ import scala.language.{implicitConversions, reflectiveCalls}
* {{{
*
+---+
* | disco | Prints topology change log as seen from the oldest node.
|
- * | | Timeframe for querying events can be specified in arguments.
|
+ * | | Timeframe for querying events can be specified in arguments.
|
* | |
|
- * | | Note that this command depends on Ignite events.
|
+ * | | Note that this command depends on Ignite events.
|
* | |
|
- * | | Ignite events can be individually enabled and disabled and
disabled events |
+ * | | Ignite events can be individually enabled and disabled and
disabled events|
* | | can affect the results produced by this command. Note also that
configuration |
* | | of Event Storage SPI that is responsible for temporary storage of
generated |
* | | events on each node can also affect the functionality of this
command.|
* | |
|
- * | | By default - all events are DISABLED and Ignite stores last
10,000 local |
+ * | | By default - all events are DISABLED and Ignite stores last
10,000 local |
* | | events on each node. Both of these defaults can be changed in
configuration. |
*
+---+
* }}}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0dfb5c03/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala
--
diff --git
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala
index 9d9dde0..5feae8c 100644
---
a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala
+++
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/tasks/VisorTasksCommand.scala
@@ -242,14 +242,14 @@ private case class VisorTask(
*
+---+
* | tasks | Prints statistics about tasks and executions.
|
* | |
|
- * | | Note that this command depends on Ignite events.
|
+ * | | Note that this command depends on Ignite events.
|
* | |
|
- * | | Ignite events can be individually enabled and disabled and
disabled events |
+ * | | Ignite events can be individually enabled and disabled and
disabled events|
* | | can affect the results produced by thi
[48/50] incubator-ignite git commit: ignite-198: change company name GridGain on ApacheIgnite at example
ignite-198: change company name GridGain on ApacheIgnite at example
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f7e32fb5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f7e32fb5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f7e32fb5
Branch: refs/heads/ignite-gg-9950
Commit: f7e32fb596a71f630237b8a06f846febbdbcf005
Parents: c6b3380
Author: Artem Shutak
Authored: Wed Apr 1 11:58:16 2015 +0300
Committer: Artem Shutak
Committed: Wed Apr 1 11:58:16 2015 +0300
--
.../ignite/examples/datagrid/CacheQueryExample.java | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f7e32fb5/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
--
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
index 8fba9c7..6d6126d 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
@@ -167,9 +167,9 @@ public class CacheQueryExample {
"and lower(org.name) = lower(?)";
// Execute queries for find employees for different organizations.
-print("Following people are 'GridGain' employees: ",
+print("Following people are 'ApacheIgnite' employees: ",
cache.query(new SqlQuery, Person>(Person.class,
joinSql).
-setArgs("GridGain")).getAll());
+setArgs("ApacheIgnite")).getAll());
print("Following people are 'Other' employees: ",
cache.query(new SqlQuery, Person>(Person.class,
joinSql).
@@ -200,7 +200,7 @@ public class CacheQueryExample {
private static void sqlQueryWithAggregation() {
IgniteCache, Person> cache =
Ignition.ignite().cache(PERSON_CACHE);
-// Calculate average of salary of all persons in GridGain.
+// Calculate average of salary of all persons in ApacheIgnite.
// Note that we also join on Organization cache as well.
String sql =
"select avg(salary) " +
@@ -208,10 +208,10 @@ public class CacheQueryExample {
"where Person.orgId = org.id " +
"and lower(org.name) = lower(?)";
-QueryCursor> cursor = cache.query(new
SqlFieldsQuery(sql).setArgs("GridGain"));
+QueryCursor> cursor = cache.query(new
SqlFieldsQuery(sql).setArgs("ApacheIgnite"));
// Calculate average salary for a specific organization.
-print("Average salary for 'GridGain' employees: ", cursor.getAll());
+print("Average salary for 'ApacheIgnite' employees: ",
cursor.getAll());
}
/**
@@ -261,7 +261,7 @@ public class CacheQueryExample {
IgniteCache orgCache =
Ignition.ignite().cache(ORG_CACHE);
// Organizations.
-Organization org1 = new Organization("GridGain");
+Organization org1 = new Organization("ApacheIgnite");
Organization org2 = new Organization("Other");
orgCache.put(org1.id, org1);
[36/50] incubator-ignite git commit: # ignite-sprint-3 minor
# ignite-sprint-3 minor
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7aba4bad
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7aba4bad
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7aba4bad
Branch: refs/heads/ignite-gg-9950
Commit: 7aba4bad9aac10dc140c484580bce195b25634fc
Parents: 05c8d20
Author: sboikov
Authored: Tue Mar 31 17:31:06 2015 +0300
Committer: sboikov
Committed: Tue Mar 31 17:31:06 2015 +0300
--
.../GridCachePartitionedQueueCreateMultiNodeSelfTest.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7aba4bad/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
index 67dcb7a..67491fa 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/partitioned/GridCachePartitionedQueueCreateMultiNodeSelfTest.java
@@ -106,7 +106,11 @@ public class
GridCachePartitionedQueueCreateMultiNodeSelfTest extends IgniteColl
IgniteInternalFuture fut = multithreadedAsync(
new Callable() {
@Override public Object call() throws Exception {
-Ignite ignite = startGrid(idx.getAndIncrement());
+int idx0 = idx.getAndIncrement();
+
+Thread.currentThread().setName("createQueue-" + idx0);
+
+Ignite ignite = startGrid(idx0);
UUID locNodeId = ignite.cluster().localNode().id();
[20/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-629-1
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-629-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/2f73436d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2f73436d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2f73436d Branch: refs/heads/ignite-gg-9950 Commit: 2f73436dd412c789d3a3de19aa17f6b903f84b9d Parents: 40d6b75 bca4198 Author: ivasilinets Authored: Mon Mar 30 23:10:50 2015 +0300 Committer: ivasilinets Committed: Mon Mar 30 23:10:50 2015 +0300 -- modules/core/pom.xml | 7 +++ .../cache/IgniteCacheDynamicStopSelfTest.java| 19 +++ parent/pom.xml | 3 ++- 3 files changed, 16 insertions(+), 13 deletions(-) --
[47/50] incubator-ignite git commit: # IGNITE-598: Implemented.
# IGNITE-598: Implemented.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/35d05e92
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/35d05e92
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/35d05e92
Branch: refs/heads/ignite-gg-9950
Commit: 35d05e9282903ee9b78bbbef30bd41c9d250bea4
Parents: 0dfb5c0
Author: vozerov-gridgain
Authored: Wed Apr 1 11:16:25 2015 +0300
Committer: vozerov-gridgain
Committed: Wed Apr 1 11:16:25 2015 +0300
--
.../configuration/CacheConfiguration.java | 23
.../ignite/internal/GridCachePluginContext.java | 72 +
.../ignite/internal/GridKernalContextImpl.java | 9 +-
.../processors/cache/GridCacheContext.java | 17 ++-
.../processors/cache/GridCacheProcessor.java| 44
.../processors/cache/GridCacheUtils.java| 39 +++
.../processors/plugin/CachePluginManager.java | 107 +++
.../ignite/plugin/CachePluginConfiguration.java | 33 ++
.../ignite/plugin/CachePluginContext.java | 54 ++
.../ignite/plugin/CachePluginProvider.java | 83 ++
...eJdbcStoreAbstractMultithreadedSelfTest.java | 11 +-
.../cache/GridCacheMemoryModeSelfTest.java | 12 ++-
.../loadtests/hashmap/GridCacheTestContext.java | 4 +-
13 files changed, 470 insertions(+), 38 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/35d05e92/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index 19e9c62..8d5ba6c 100644
---
a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -30,6 +30,7 @@ import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.internal.util.typedef.internal.*;
import org.apache.ignite.lang.*;
+import org.apache.ignite.plugin.*;
import org.jetbrains.annotations.*;
import javax.cache.*;
@@ -326,6 +327,9 @@ public class CacheConfiguration extends
MutableConfiguration {
/** Copy on read flag. */
private boolean cpOnRead = DFLT_COPY_ON_READ;
+/** Cache plugin configurations. */
+private CachePluginConfiguration[] pluginCfgs;
+
/** Empty constructor (all values are initialized to their defaults). */
public CacheConfiguration() {
/* No-op. */
@@ -409,6 +413,7 @@ public class CacheConfiguration extends
MutableConfiguration {
writeBehindFlushSize = cc.getWriteBehindFlushSize();
writeBehindFlushThreadCnt = cc.getWriteBehindFlushThreadCount();
writeSync = cc.getWriteSynchronizationMode();
+pluginCfgs = cc.getPluginConfigurations();
}
/**
@@ -1575,6 +1580,24 @@ public class CacheConfiguration extends
MutableConfiguration {
this.sqlOnheapRowCacheSize = size;
}
+/**
+ * Gets array of cache plugin configurations.
+ *
+ * @return Cache plugin configurations.
+ */
+public CachePluginConfiguration[] getPluginConfigurations() {
+return pluginCfgs != null ? pluginCfgs : new
CachePluginConfiguration[0];
+}
+
+/**
+ * Sets cache plugin configurations.
+ *
+ * @param pluginCfgs Cache plugin configurations.
+ */
+public void setPluginConfigurations(CachePluginConfiguration...
pluginCfgs) {
+this.pluginCfgs = pluginCfgs;
+}
+
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(CacheConfiguration.class, this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/35d05e92/modules/core/src/main/java/org/apache/ignite/internal/GridCachePluginContext.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridCachePluginContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridCachePluginContext.java
new file mode 100644
index 000..57df0b0
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/GridCachePluginContext.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compli
[02/50] incubator-ignite git commit: #ignite-629: remove CacheFlag.SKIP_SWAP
#ignite-629: remove CacheFlag.SKIP_SWAP
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/40223387
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/40223387
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/40223387
Branch: refs/heads/ignite-gg-9950
Commit: 4022338795ae45e381599aac709dbff0d56b945f
Parents: be6a161
Author: ivasilinets
Authored: Fri Mar 27 17:58:12 2015 +0300
Committer: ivasilinets
Committed: Fri Mar 27 17:58:12 2015 +0300
--
.../internal/client/GridClientCacheFlag.java| 3 ---
.../impl/connection/GridClientConnection.java | 3 ---
.../internal/processors/cache/CacheFlag.java| 5 +
.../processors/cache/CacheProjection.java | 21 ++--
.../internal/processors/cache/GridCache.java| 3 ---
.../processors/cache/GridCacheAdapter.java | 6 --
.../processors/cache/GridCacheContext.java | 2 +-
.../processors/cache/GridCacheMapEntry.java | 2 +-
.../distributed/near/GridNearCacheAdapter.java | 8
.../handlers/cache/GridCacheCommandHandler.java | 3 ---
10 files changed, 9 insertions(+), 47 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/40223387/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java
b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java
index a49e506..707a31b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCacheFlag.java
@@ -26,9 +26,6 @@ public enum GridClientCacheFlag {
/** Skips store, i.e. no read-through and no write-through behavior. */
SKIP_STORE,
-/** Skip swap space for reads and writes. */
-SKIP_SWAP,
-
/**
* Disable deserialization of portable objects on get operations.
* If set and portable marshaller is used, {@link
GridClientData#get(Object)}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/40223387/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnection.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnection.java
b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnection.java
index 50b0216..4e5add7 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnection.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnection.java
@@ -106,9 +106,6 @@ public abstract class GridClientConnection {
if (flagSet.contains(GridClientCacheFlag.SKIP_STORE))
bits |= 1;
-if (flagSet.contains(GridClientCacheFlag.SKIP_SWAP))
-bits |= 1 << 1;
-
return bits;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/40223387/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
index ba026a6..5bef17d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
@@ -44,10 +44,7 @@ public enum CacheFlag {
CLONE,
/** Skips store, i.e. no read-through and no write-through behavior. */
-SKIP_STORE,
-
-/** Skip swap space for reads and writes. */
-SKIP_SWAP;
+SKIP_STORE;
/** */
private static final CacheFlag[] VALS = values();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/40223387/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
index 200ee10..9fd1285 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
@@ -1114,8
[33/50] incubator-ignite git commit: # ignite-629-1
# ignite-629-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/79c76cd1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/79c76cd1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/79c76cd1
Branch: refs/heads/ignite-gg-9950
Commit: 79c76cd16d0a506a2775cb41f885bd3aff39f96e
Parents: 67bb43a
Author: sboikov
Authored: Tue Mar 31 13:55:37 2015 +0300
Committer: sboikov
Committed: Tue Mar 31 14:23:06 2015 +0300
--
.../processors/cache/GridCacheAdapter.java | 6 --
.../cache/GridCacheConcurrentMap.java | 21 ++--
.../cache/GridCacheAbstractFullApiSelfTest.java | 2 +-
3 files changed, 7 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79c76cd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 8c6bfd6..02429b3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -4091,7 +4091,9 @@ public abstract class GridCacheAdapter implements
GridCache,
* @return Distributed ignite cache iterator.
*/
public Iterator> igniteIterator() {
-if (!ctx.isSwapOrOffheapEnabled() &&
ctx.kernalContext().discovery().size() == 1)
+GridCacheContext ctx0 = ctx.isNear() ? ctx.near().dht().context() :
ctx;
+
+if (!ctx0.isSwapOrOffheapEnabled() &&
ctx0.kernalContext().discovery().size() == 1)
return localIteratorHonorExpirePolicy();
final GridCacheProjectionImpl prj = ctx.projectionPerCall();
@@ -4371,7 +4373,7 @@ public abstract class GridCacheAdapter implements
GridCache,
OPTIMISTIC,
READ_COMMITTED,
tCfg.getDefaultTxTimeout(),
-!skipStore(),
+!ctx.skipStore(),
0,
/** group lock keys */null,
/** partition lock */false
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79c76cd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
index ba6a7f4..f45d00e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
@@ -1744,12 +1744,7 @@ public class GridCacheConcurrentMap {
curVal = null;
try {
-CacheProjection prj = ctx.projectionPerCall();
-
-if (prj != null)
-prj.removex(e.key());
-else
-
((IgniteKernal)ctx.grid()).getCache(ctx.name()).removex(e.key());
+
((IgniteKernal)ctx.grid()).getCache(ctx.name()).remove(e.key());
}
catch (IgniteCheckedException ex) {
throw new IgniteException(ex);
@@ -1806,9 +1801,6 @@ public class GridCacheConcurrentMap {
/** */
private GridCacheProjectionImpl prjPerCall;
-/** */
-private boolean clone;
-
/**
* Empty constructor required for {@link Externalizable}.
*/
@@ -2026,16 +2018,7 @@ public class GridCacheConcurrentMap {
/** {@inheritDoc} */
@Override public void remove() {
-GridCacheProjectionImpl oldPrj = ctx.projectionPerCall();
-
-ctx.projectionPerCall(prjPerCall);
-
-try {
-it.remove();
-}
-finally {
-ctx.projectionPerCall(oldPrj);
-}
+it.remove();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79c76cd1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cac
[09/50] incubator-ignite git commit: #ignite-629: remove CacheFlag SKIP_STORE.
#ignite-629: remove CacheFlag SKIP_STORE.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/aa3864dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/aa3864dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/aa3864dd
Branch: refs/heads/ignite-gg-9950
Commit: aa3864dd0ede52d643f5bfb7f3f060c72b97d3d7
Parents: 5d5e8a3
Author: ivasilinets
Authored: Mon Mar 30 00:52:47 2015 +0300
Committer: ivasilinets
Committed: Mon Mar 30 00:52:47 2015 +0300
--
.../client/impl/ClientCacheFlagsCodecTest.java | 17 ++--
.../internal/processors/cache/CacheFlag.java| 50
.../processors/cache/CacheFlagException.java| 67
.../processors/cache/CacheProjection.java | 64 ++--
.../processors/cache/GridCacheAdapter.java | 46 +--
.../processors/cache/GridCacheContext.java | 18 ++---
.../processors/cache/GridCacheMapEntry.java | 1 -
.../processors/cache/GridCacheProjectionEx.java | 8 --
.../cache/GridCacheProjectionImpl.java | 81 ++--
.../processors/cache/GridCacheProxyImpl.java| 41 +-
.../cache/GridCacheSharedContext.java | 15
.../processors/cache/IgniteCacheProxy.java | 26 ++-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 1 -
.../dht/colocated/GridDhtColocatedCache.java| 1 -
.../distributed/near/GridNearAtomicCache.java | 1 -
.../distributed/near/GridNearCacheAdapter.java | 1 -
.../near/GridNearTransactionalCache.java| 1 -
.../local/atomic/GridLocalAtomicCache.java | 1 -
.../handlers/cache/GridCacheCommandHandler.java | 56 +++---
.../GridCacheReturnValueTransferSelfTest.java | 1 -
.../cache/IgniteCacheInvokeAbstractTest.java| 1 -
...GridCacheValueConsistencyAtomicSelfTest.java | 1 -
.../OptimizedObjectStreamSelfTest.java | 4 -
.../ignite/scalar/pimps/ScalarCachePimp.scala | 36 -
24 files changed, 115 insertions(+), 424 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa3864dd/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
index 1117cd6..973a0a3 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
@@ -20,7 +20,6 @@ package org.apache.ignite.internal.client.impl;
import junit.framework.*;
import org.apache.ignite.internal.client.*;
import org.apache.ignite.internal.client.impl.connection.*;
-import org.apache.ignite.internal.processors.cache.*;
import org.apache.ignite.internal.processors.rest.handlers.cache.*;
import org.apache.ignite.internal.util.typedef.*;
@@ -29,7 +28,7 @@ import java.util.*;
import static org.apache.ignite.internal.client.GridClientCacheFlag.*;
/**
- * Tests conversions between GridClientCacheFlag and CacheFlag.
+ * Tests conversions between GridClientCacheFlag.
*/
public class ClientCacheFlagsCodecTest extends TestCase {
/**
@@ -44,10 +43,8 @@ public class ClientCacheFlagsCodecTest extends TestCase {
assertTrue(bits != 0);
-CacheFlag[] out = GridCacheCommandHandler.parseCacheFlags(bits);
-assertEquals(1, out.length);
-
-assertEquals(f.name(), out[0].name());
+boolean out = GridCacheCommandHandler.parseCacheFlags(bits);
+assertEquals(out, true);
}
}
@@ -70,12 +67,10 @@ public class ClientCacheFlagsCodecTest extends TestCase {
int bits = GridClientConnection.encodeCacheFlags(flagSet);
-CacheFlag[] out = GridCacheCommandHandler.parseCacheFlags(bits);
+boolean out = GridCacheCommandHandler.parseCacheFlags(bits);
-assertEquals(flagSet.contains(KEEP_PORTABLES) ? flagSet.size() - 1 :
flagSet.size(), out.length);
+int length = flagSet.contains(KEEP_PORTABLES) ? flagSet.size() - 1 :
flagSet.size();
-for (CacheFlag f : out) {
-
assertTrue(flagSet.contains(GridClientCacheFlag.valueOf(f.name(;
-}
+assertEquals(length > 0, out);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aa3864dd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java
--
diff --git
a/modules/core/src/main/java/org/ap
[32/50] incubator-ignite git commit: # ignite-629-1
# ignite-629-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/67bb43aa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/67bb43aa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/67bb43aa
Branch: refs/heads/ignite-gg-9950
Commit: 67bb43aaf1a233393e5d88bdc60161b454c0939a
Parents: a4f580e
Author: sboikov
Authored: Tue Mar 31 13:36:21 2015 +0300
Committer: sboikov
Committed: Tue Mar 31 13:36:21 2015 +0300
--
.../processors/cache/GridCacheAdapter.java| 3 ---
.../processors/cache/GridCacheConcurrentMap.java | 18 --
.../processors/cache/IgniteCacheProxy.java| 2 --
3 files changed, 16 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67bb43aa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index c3a1225..8c6bfd6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -402,7 +402,6 @@ public abstract class GridCacheAdapter implements
GridCache,
GridCacheProjectionImpl prj = new GridCacheProjectionImpl<>(this,
ctx,
-null,
false,
null,
false,
@@ -427,7 +426,6 @@ public abstract class GridCacheAdapter implements
GridCache,
return new GridCacheProjectionImpl<>(
(CacheProjection)this,
(GridCacheContext)ctx,
-null,
false,
null,
true,
@@ -445,7 +443,6 @@ public abstract class GridCacheAdapter implements
GridCache,
return new GridCacheProjectionImpl<>(
this,
ctx,
-null,
false,
null,
false,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67bb43aa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
index 51df644..ba6a7f4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
@@ -1744,7 +1744,12 @@ public class GridCacheConcurrentMap {
curVal = null;
try {
-
((IgniteKernal)ctx.grid()).getCache(ctx.name()).remove(e.key());
+CacheProjection prj = ctx.projectionPerCall();
+
+if (prj != null)
+prj.removex(e.key());
+else
+
((IgniteKernal)ctx.grid()).getCache(ctx.name()).removex(e.key());
}
catch (IgniteCheckedException ex) {
throw new IgniteException(ex);
@@ -2021,7 +2026,16 @@ public class GridCacheConcurrentMap {
/** {@inheritDoc} */
@Override public void remove() {
-it.remove();
+GridCacheProjectionImpl oldPrj = ctx.projectionPerCall();
+
+ctx.projectionPerCall(prjPerCall);
+
+try {
+it.remove();
+}
+finally {
+ctx.projectionPerCall(oldPrj);
+}
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/67bb43aa/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 364b1c3..dfc3ef4 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
@@ -1414,8 +1414,6 @@ public class IgniteCacheProxy extends
AsyncSupportAdapter prj0 = new GridCacheProjectionImpl<>(
(prj != null ? prj : delegate),
ctx,
-null,
-
[19/50] incubator-ignite git commit: IGNITE-644 - Marshaller cache config
IGNITE-644 - Marshaller cache config
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5ee3767d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5ee3767d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5ee3767d
Branch: refs/heads/ignite-gg-9950
Commit: 5ee3767d916018922f59edc2fd70b13349e1afc4
Parents: bca4198
Author: Valentin Kulichenko
Authored: Mon Mar 30 12:37:13 2015 -0700
Committer: Valentin Kulichenko
Committed: Mon Mar 30 12:37:13 2015 -0700
--
.../org/apache/ignite/internal/IgnitionEx.java | 34 +---
.../distributed/near/GridNearAtomicCache.java | 3 +-
2 files changed, 17 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ee3767d/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
index 4c8a567..7442d12 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
@@ -1751,7 +1751,7 @@ public class IgnitionEx {
}
// Always add marshaller and utility caches.
-copies[0] = marshallerSystemCache(clientDisco);
+copies[0] = marshallerSystemCache();
copies[1] = utilitySystemCache(clientDisco);
cfg.setCacheConfiguration(copies);
@@ -1897,26 +1897,22 @@ public class IgnitionEx {
/**
* Creates marshaller system cache configuration.
*
- * @param client If {@code true} creates client-only cache
configuration.
* @return Marshaller system cache configuration.
*/
-private static CacheConfiguration marshallerSystemCache(boolean
client) {
-if (!client) {
-CacheConfiguration cache = new CacheConfiguration();
-
-cache.setName(CU.MARSH_CACHE_NAME);
-cache.setCacheMode(REPLICATED);
-cache.setAtomicityMode(ATOMIC);
-cache.setSwapEnabled(false);
-cache.setRebalanceMode(SYNC);
-cache.setWriteSynchronizationMode(FULL_SYNC);
-cache.setAffinity(new RendezvousAffinityFunction(false, 100));
-cache.setNodeFilter(CacheConfiguration.ALL_NODES);
-
-return cache;
-}
-
-return null;
+private static CacheConfiguration marshallerSystemCache() {
+CacheConfiguration cache = new CacheConfiguration();
+
+cache.setName(CU.MARSH_CACHE_NAME);
+cache.setCacheMode(REPLICATED);
+cache.setAtomicityMode(ATOMIC);
+cache.setSwapEnabled(false);
+cache.setRebalanceMode(SYNC);
+cache.setWriteSynchronizationMode(FULL_SYNC);
+cache.setAffinity(new RendezvousAffinityFunction(false, 20));
+cache.setNodeFilter(CacheConfiguration.ALL_NODES);
+cache.setStartSize(300);
+
+return cache;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ee3767d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
index 6e24261..d34b13b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
@@ -69,7 +69,8 @@ public class GridNearAtomicCache extends
GridNearCacheAdapter {
public GridNearAtomicCache(GridCacheContext ctx) {
super(ctx);
-int size = Integer.getInteger(IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE,
1_000_000);
+int size = CU.isSystemCache(ctx.name()) ? 100 :
+Integer.getInteger(IGNITE_ATOMIC_CACHE_DELETE_HISTORY_SIZE,
1_000_000);
rmvQueue = new GridCircularBuffer<>(U.ceilPow2(size / 10));
}
[21/50] incubator-ignite git commit: ignite-629: Skip store test run only for one node.
ignite-629: Skip store test run only for one node.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/053d32cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/053d32cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/053d32cf
Branch: refs/heads/ignite-gg-9950
Commit: 053d32cfa79f0cc0ce6b47386471ba3b1786753d
Parents: 2f73436
Author: ivasilinets
Authored: Tue Mar 31 00:41:23 2015 +0300
Committer: ivasilinets
Committed: Tue Mar 31 00:41:23 2015 +0300
--
.../processors/cache/GridCacheAbstractFullApiSelfTest.java| 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/053d32cf/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index b3dd4f2..f543be0 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -4266,6 +4266,9 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
* @throws Exception If failed.
*/
public void testWithSkipStore() throws Exception {
+if (gridCount() > 1)
+return;
+
IgniteCache cache = grid(0).cache(null);
IgniteCache cacheSkipStore = cache.withSkipStore();
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/gg-9966 [created] 13edeb417
incubator-ignite git commit: gg-9966: change versions.
Repository: incubator-ignite Updated Branches: refs/heads/gg-9966 13edeb417 -> f26e98da8 gg-9966: change versions. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f26e98da Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f26e98da Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f26e98da Branch: refs/heads/gg-9966 Commit: f26e98da858bdfb6dfa5fea4c6dfb72f1c9cfabc Parents: 13edeb4 Author: ivasilinets Authored: Wed Apr 1 12:55:25 2015 +0300 Committer: ivasilinets Committed: Wed Apr 1 12:55:25 2015 +0300 -- examples/pom.xml | 18 +- examples/schema-import/pom.xml | 10 +- modules/aop/pom.xml| 8 modules/aws/pom.xml| 6 +++--- modules/clients/pom.xml| 12 ++-- modules/codegen/pom.xml| 6 +++--- modules/core/pom.xml | 2 +- modules/extdata/p2p/pom.xml| 6 +++--- modules/extdata/uri/pom.xml| 6 +++--- modules/geospatial/pom.xml | 6 +++--- modules/hadoop/pom.xml | 10 +- modules/hibernate/pom.xml | 8 modules/indexing/pom.xml | 6 +++--- modules/jcl/pom.xml| 6 +++--- modules/jta/pom.xml| 6 +++--- modules/log4j/pom.xml | 6 +++--- modules/rest-http/pom.xml | 4 ++-- modules/scalar/pom.xml | 12 ++-- modules/schedule/pom.xml | 6 +++--- modules/schema-import/pom.xml | 4 ++-- modules/slf4j/pom.xml | 4 ++-- modules/spring/pom.xml | 10 +- modules/ssh/pom.xml| 10 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 8 modules/visor-console/pom.xml | 10 +- modules/visor-plugins/pom.xml | 4 ++-- modules/web/pom.xml| 10 +- modules/yardstick/pom.xml | 8 pom.xml| 2 +- 30 files changed, 108 insertions(+), 108 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f26e98da/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index 26b4c15..14c4615 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -29,7 +29,7 @@ ignite-examples -1.0.1-RC1-SNAPSHOT +1.0.1-RC1 @@ -41,37 +41,37 @@ org.apache.ignite ignite-core -1.0.1-RC1-SNAPSHOT +1.0.1-RC1 org.apache.ignite ignite-hibernate -1.0.1-RC1-SNAPSHOT +1.0.1-RC1 org.apache.ignite ignite-spring -1.0.1-RC1-SNAPSHOT +1.0.1-RC1 org.apache.ignite ignite-log4j -1.0.1-RC1-SNAPSHOT +1.0.1-RC1 org.apache.ignite ignite-indexing -1.0.1-RC1-SNAPSHOT +1.0.1-RC1 org.apache.ignite ignite-schedule -1.0.1-RC1-SNAPSHOT +1.0.1-RC1 @@ -89,7 +89,7 @@ org.apache.ignite ignite-core -1.0.1-RC1-SNAPSHOT +1.0.1-RC1 test-jar test @@ -146,7 +146,7 @@ org.apache.ignite ignite-scalar -1.0.1-RC1-SNAPSHOT +1.0.1-RC1 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f26e98da/examples/schema-import/pom.xml -- diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml index 2af4978..d577b37 100644 --- a/examples/schema-import/pom.xml +++ b/examples/schema-import/pom.xml @@ -32,7 +32,7 @@ org.apache.ignite ignite-schema-import-demo -1.0.1-RC1-SNAPSHOT +1.0.1-RC1 @@ -44,25 +44,25 @@ org.apache.ignite ignite-core -1.0.1-RC1-SNAPSHOT +1.0.1-RC1 org.apache.ignite ignite-spring -1.0.1-RC1-SNAPSHOT +1.0.1-RC1 org.apache.ignite ignite-log4j -1.0.1-RC1-SNAPSHOT +1.0.1-RC1 org.apache.ignite ignite-indexing -1.0.1-RC1-SNAPSHOT +1.0.1-RC1 http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f26e98da/modules/aop/pom.xml --
[44/50] incubator-ignite git commit: Merge branch 'ignite-644' into ignite-sprint-3
Merge branch 'ignite-644' into ignite-sprint-3 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/17a9744d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/17a9744d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/17a9744d Branch: refs/heads/ignite-291 Commit: 17a9744d2b7cc23a7e27cb20b45038ed114c589e Parents: ca472ac ad140b9 Author: Valentin Kulichenko Authored: Tue Mar 31 18:51:46 2015 -0700 Committer: Valentin Kulichenko Committed: Tue Mar 31 18:51:46 2015 -0700 -- .../src/main/java/org/apache/ignite/internal/IgnitionEx.java | 4 ++-- .../processors/cache/distributed/near/GridNearAtomicCache.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/17a9744d/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java --
[31/50] incubator-ignite git commit: # ignite-629-1
# ignite-629-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/79c76cd1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/79c76cd1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/79c76cd1
Branch: refs/heads/ignite-291
Commit: 79c76cd16d0a506a2775cb41f885bd3aff39f96e
Parents: 67bb43a
Author: sboikov
Authored: Tue Mar 31 13:55:37 2015 +0300
Committer: sboikov
Committed: Tue Mar 31 14:23:06 2015 +0300
--
.../processors/cache/GridCacheAdapter.java | 6 --
.../cache/GridCacheConcurrentMap.java | 21 ++--
.../cache/GridCacheAbstractFullApiSelfTest.java | 2 +-
3 files changed, 7 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79c76cd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index 8c6bfd6..02429b3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@ -4091,7 +4091,9 @@ public abstract class GridCacheAdapter implements
GridCache,
* @return Distributed ignite cache iterator.
*/
public Iterator> igniteIterator() {
-if (!ctx.isSwapOrOffheapEnabled() &&
ctx.kernalContext().discovery().size() == 1)
+GridCacheContext ctx0 = ctx.isNear() ? ctx.near().dht().context() :
ctx;
+
+if (!ctx0.isSwapOrOffheapEnabled() &&
ctx0.kernalContext().discovery().size() == 1)
return localIteratorHonorExpirePolicy();
final GridCacheProjectionImpl prj = ctx.projectionPerCall();
@@ -4371,7 +4373,7 @@ public abstract class GridCacheAdapter implements
GridCache,
OPTIMISTIC,
READ_COMMITTED,
tCfg.getDefaultTxTimeout(),
-!skipStore(),
+!ctx.skipStore(),
0,
/** group lock keys */null,
/** partition lock */false
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79c76cd1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
index ba6a7f4..f45d00e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
@@ -1744,12 +1744,7 @@ public class GridCacheConcurrentMap {
curVal = null;
try {
-CacheProjection prj = ctx.projectionPerCall();
-
-if (prj != null)
-prj.removex(e.key());
-else
-
((IgniteKernal)ctx.grid()).getCache(ctx.name()).removex(e.key());
+
((IgniteKernal)ctx.grid()).getCache(ctx.name()).remove(e.key());
}
catch (IgniteCheckedException ex) {
throw new IgniteException(ex);
@@ -1806,9 +1801,6 @@ public class GridCacheConcurrentMap {
/** */
private GridCacheProjectionImpl prjPerCall;
-/** */
-private boolean clone;
-
/**
* Empty constructor required for {@link Externalizable}.
*/
@@ -2026,16 +2018,7 @@ public class GridCacheConcurrentMap {
/** {@inheritDoc} */
@Override public void remove() {
-GridCacheProjectionImpl oldPrj = ctx.projectionPerCall();
-
-ctx.projectionPerCall(prjPerCall);
-
-try {
-it.remove();
-}
-finally {
-ctx.projectionPerCall(oldPrj);
-}
+it.remove();
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79c76cd1/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/G
[17/50] incubator-ignite git commit: ignite-629: Revert GridCacheReturnValueTransferSelfTest.
ignite-629: Revert GridCacheReturnValueTransferSelfTest.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/885643ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/885643ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/885643ac
Branch: refs/heads/ignite-291
Commit: 885643ac03f52a4b4d97f1535be3c6a1e344a100
Parents: a9996d8
Author: ivasilinets
Authored: Tue Mar 31 12:11:39 2015 +0300
Committer: ivasilinets
Committed: Tue Mar 31 12:11:39 2015 +0300
--
.../GridCacheReturnValueTransferSelfTest.java | 191 +++
1 file changed, 191 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/885643ac/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
new file mode 100644
index 000..4761e21
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
@@ -0,0 +1,191 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.lang.*;
+import org.apache.ignite.testframework.junits.common.*;
+
+import javax.cache.processor.*;
+import java.io.*;
+import java.util.*;
+
+import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
+import static org.apache.ignite.cache.CacheAtomicityMode.*;
+import static org.apache.ignite.cache.CacheMode.*;
+
+/**
+ * Tests transform for extra traffic.
+ */
+public class GridCacheReturnValueTransferSelfTest extends
GridCommonAbstractTest {
+/** Distribution mode. */
+private boolean cache;
+
+/** Atomicity mode. */
+private CacheAtomicityMode atomicityMode;
+
+/** Atomic write order mode. */
+private CacheAtomicWriteOrderMode writeOrderMode;
+
+/** Number of backups. */
+private int backups;
+
+/** Fail deserialization flag. */
+private static volatile boolean failDeserialization;
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
+IgniteConfiguration cfg = super.getConfiguration(gridName);
+
+CacheConfiguration ccfg = new CacheConfiguration();
+
+ccfg.setBackups(backups);
+ccfg.setCacheMode(PARTITIONED);
+ccfg.setAtomicityMode(atomicityMode);
+ccfg.setAtomicWriteOrderMode(writeOrderMode);
+
+cfg.setCacheConfiguration(ccfg);
+
+if (!cache)
+cfg.setClientMode(true);
+
+return cfg;
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testTransformAtomicPrimaryNoBackups() throws Exception {
+checkTransform(ATOMIC, PRIMARY, 0);
+}
+
+/**
+ * @throws Exception If failed.
+ */
+public void testTransformAtomicClockNoBackups() throws Exception {
+checkTransform(ATOMIC, CLOCK, 0);
+}
+
+/**
+ * @throws Exception If failed.
+ * TODO gg-8273 enable when fixed
+ */
+public void _testTransformTransactionalNoBackups() throws Exception {
+checkTransform(TRANSACTIONAL, PRIMARY, 0);
+}
+
+/**
+ * @throws Exception If failed.
+ * TODO gg-8273 enable when fixed
+ */
+public void _testTransformTransactionalOneBackup() throws Exception {
+checkTransform(TRANSACTIONAL, PRIMARY, 1);
+}
+
+/**
+ * @param mode Atomicity mode.
+ * @param order Atomic cache write order mode.
+ * @param b Number of backups.
+ * @throws Exception If failed.
+ */
+private void checkTransfo
[01/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-611
Repository: incubator-ignite Updated Branches: refs/heads/ignite-291 f1ab7bce6 -> 677d8d8a0 Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-611 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/46bb91a3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/46bb91a3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/46bb91a3 Branch: refs/heads/ignite-291 Commit: 46bb91a3ec135b743fc8a2bdaacac64afeb14940 Parents: 2289f64 bca4198 Author: ivasilinets Authored: Mon Mar 30 23:02:49 2015 +0300 Committer: ivasilinets Committed: Mon Mar 30 23:02:49 2015 +0300 -- DEVNOTES.txt| 15 +-- RELEASE_NOTES.txt | 20 ++- modules/core/pom.xml| 9 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../near/GridNearTxPrepareFuture.java | 2 +- .../cache/transactions/IgniteTxManager.java | 4 +- .../ignite/IgniteCacheAffinitySelfTest.java | 8 +- .../GridCacheAbstractFailoverSelfTest.java | 134 +-- .../GridCacheAbstractFailoverTxSelfTest.java| 110 +++ .../GridCacheInterceptorAbstractSelfTest.java | 2 + .../cache/IgniteCacheDynamicStopSelfTest.java | 19 +-- .../dht/GridCacheColocatedFailoverSelfTest.java | 2 +- .../atomic/GridCacheAtomicFailoverSelfTest.java | 52 +++ ...AtomicPrimaryWriteOrderFailoverSelfTest.java | 36 + ...idCacheAtomicReplicatedFailoverSelfTest.java | 32 + .../GridCachePartitionedFailoverSelfTest.java | 2 +- .../GridCacheReplicatedFailoverSelfTest.java| 2 +- .../IgniteCacheFailoverTestSuite.java | 13 +- modules/geospatial/README.txt | 15 +++ .../processors/hadoop/HadoopClassLoader.java| 21 ++- .../processors/hadoop/HadoopDefaultJobInfo.java | 2 +- .../hadoop/jobtracker/HadoopJobTracker.java | 4 +- .../processors/hadoop/v2/HadoopDaemon.java | 125 + .../processors/hadoop/v2/HadoopV2Job.java | 58 ++-- .../apache/ignite/igfs/IgfsEventsTestSuite.java | 4 +- .../hadoop/HadoopClassLoaderTest.java | 2 +- .../testsuites/IgniteHadoopTestSuite.java | 2 +- .../IgniteIgfsLinuxAndMacOSTestSuite.java | 2 +- modules/hibernate/README.txt| 15 +++ modules/schedule/README.txt | 15 +++ parent/pom.xml | 3 +- pom.xml | 22 ++- 32 files changed, 588 insertions(+), 166 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/46bb91a3/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/jobtracker/HadoopJobTracker.java --
[20/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-test-compile' into ignite-sprint-3
Merge remote-tracking branch 'origin/ignite-test-compile' into ignite-sprint-3 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6ef11d49 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6ef11d49 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6ef11d49 Branch: refs/heads/ignite-291 Commit: 6ef11d4973df0c5961fa23c6f98dc90d5cf6cdd1 Parents: c2f5211 211a740 Author: anovikov Authored: Tue Mar 31 16:23:14 2015 +0700 Committer: anovikov Committed: Tue Mar 31 16:23:14 2015 +0700 -- parent/pom.xml | 38 +++--- 1 file changed, 19 insertions(+), 19 deletions(-) --
[30/50] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3
Merge remote-tracking branch 'origin/ignite-sprint-3' into ignite-sprint-3 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/07683c91 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/07683c91 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/07683c91 Branch: refs/heads/ignite-291 Commit: 07683c9120d2eda5758a9e5e88b05d46587ac2c2 Parents: b362fd2 dfe90fb Author: nikolay_tikhonov Authored: Tue Mar 31 13:39:00 2015 +0300 Committer: nikolay_tikhonov Committed: Tue Mar 31 13:39:00 2015 +0300 -- .../org/apache/ignite/internal/IgniteEx.java| 4 +- .../apache/ignite/internal/IgniteKernal.java| 5 +- .../processors/cache/CacheProjection.java | 24 -- .../processors/cache/GridCacheAdapter.java | 60 .../processors/cache/GridCacheProcessor.java| 11 - .../processors/cache/GridCacheProjectionEx.java | 9 - .../cache/GridCacheProjectionImpl.java | 280 +++ .../processors/cache/GridCacheProxyImpl.java| 19 -- .../processors/cache/IgniteCacheProxy.java | 2 - .../CacheDataStructuresManager.java | 4 +- .../cache/query/GridCacheQueriesImpl.java | 23 +- .../GridProjectionForCachesSelfTest.java| 12 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 2 + .../GridServiceReassignmentSelfTest.java| 5 +- .../hadoop/jobtracker/HadoopJobTracker.java | 7 +- .../HadoopDefaultMapReducePlannerSelfTest.java | 3 +- parent/pom.xml | 38 +-- 17 files changed, 76 insertions(+), 432 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/07683c91/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java --
[10/50] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-629-1
Merge remote-tracking branch 'remotes/origin/ignite-sprint-3' into ignite-629-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/1617648e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1617648e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1617648e Branch: refs/heads/ignite-291 Commit: 1617648e448c3842b64261457b9b9fce0eca80f3 Parents: 6047580 c2f5211 Author: sboikov Authored: Tue Mar 31 10:41:18 2015 +0300 Committer: sboikov Committed: Tue Mar 31 10:41:18 2015 +0300 -- DEVNOTES.txt | 6 ++ .../visor/cache/VisorCacheStoreConfiguration.java | 18 +++--- 2 files changed, 17 insertions(+), 7 deletions(-) --
[08/50] incubator-ignite git commit: # sprint-3 - updated dev notes.
# sprint-3 - updated dev notes. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c2f52114 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c2f52114 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c2f52114 Branch: refs/heads/ignite-291 Commit: c2f5211420893331813c77fb8a377e6397958690 Parents: 768ca6a Author: Dmitiry Setrakyan Authored: Tue Mar 31 00:19:36 2015 -0700 Committer: Dmitiry Setrakyan Committed: Tue Mar 31 00:19:36 2015 -0700 -- DEVNOTES.txt | 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c2f52114/DEVNOTES.txt -- diff --git a/DEVNOTES.txt b/DEVNOTES.txt index 54dbf72..2e8e431 100644 --- a/DEVNOTES.txt +++ b/DEVNOTES.txt @@ -23,3 +23,9 @@ To check license headers use: mvn clean validate -Pcheck-licenses For more information (e.g. exclude list) see "check-licenses" profile in pom.xml. + + +Useful Release Commands + +ZIP: zip -r9 apache-ignite-X.X.X-src apache-ignite-X.X.X-src.zip +PGP: gpg --armor --output apache-ignite-X.X.X-src.zip.asc --detach-sig apache-ignite-X.X.X-src.zip
[04/50] incubator-ignite git commit: ignite-629: Remove test for Force transform flag.
ignite-629: Remove test for Force transform 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/528ea7af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/528ea7af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/528ea7af
Branch: refs/heads/ignite-291
Commit: 528ea7afab72f05ed367bd85d0a031f67094574e
Parents: 053d32c
Author: ivasilinets
Authored: Tue Mar 31 00:46:47 2015 +0300
Committer: ivasilinets
Committed: Tue Mar 31 00:46:47 2015 +0300
--
.../GridCacheReturnValueTransferSelfTest.java | 205 ---
.../ignite/testsuites/IgniteCacheTestSuite.java | 1 -
2 files changed, 206 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/528ea7af/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
deleted file mode 100644
index 5b3e19d..000
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-import org.apache.ignite.*;
-import org.apache.ignite.cache.*;
-import org.apache.ignite.configuration.*;
-import org.apache.ignite.lang.*;
-import org.apache.ignite.testframework.junits.common.*;
-
-import javax.cache.processor.*;
-import java.io.*;
-import java.util.*;
-
-import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*;
-import static org.apache.ignite.cache.CacheAtomicityMode.*;
-import static org.apache.ignite.cache.CacheMode.*;
-
-/**
- * Tests transform for extra traffic.
- */
-public class GridCacheReturnValueTransferSelfTest extends
GridCommonAbstractTest {
-/** Distribution mode. */
-private boolean cache;
-
-/** Atomicity mode. */
-private CacheAtomicityMode atomicityMode;
-
-/** Atomic write order mode. */
-private CacheAtomicWriteOrderMode writeOrderMode;
-
-/** Number of backups. */
-private int backups;
-
-/** Fail deserialization flag. */
-private static volatile boolean failDeserialization;
-
-/** {@inheritDoc} */
-@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
-IgniteConfiguration cfg = super.getConfiguration(gridName);
-
-CacheConfiguration ccfg = new CacheConfiguration();
-
-ccfg.setBackups(backups);
-ccfg.setCacheMode(PARTITIONED);
-ccfg.setAtomicityMode(atomicityMode);
-ccfg.setAtomicWriteOrderMode(writeOrderMode);
-
-cfg.setCacheConfiguration(ccfg);
-
-if (!cache)
-cfg.setClientMode(true);
-
-return cfg;
-}
-
-/**
- * @throws Exception If failed.
- */
-public void testTransformAtomicPrimaryNoBackups() throws Exception {
-checkTransform(ATOMIC, PRIMARY, 0);
-}
-
-/**
- * @throws Exception If failed.
- */
-public void testTransformAtomicClockNoBackups() throws Exception {
-checkTransform(ATOMIC, CLOCK, 0);
-}
-
-/**
- * @throws Exception If failed.
- */
-public void testTransformAtomicPrimaryOneBackup() throws Exception {
-checkTransform(ATOMIC, PRIMARY, 1);
-}
-
-/**
- * @throws Exception If failed.
- */
-public void testTransformAtomicClockOneBackup() throws Exception {
-checkTransform(ATOMIC, CLOCK, 1);
-}
-
-/**
- * @throws Exception If failed.
- * TODO gg-8273 enable when fixed
- */
-public void _testTransformTransactionalNoBackups() throws Exception {
-checkTransform(TRANSACTIONAL, PRIMARY, 0);
-}
-
-/**
- * @throw
[07/50] incubator-ignite git commit: ignite-629: Wait partition map exchange in affinity test.
ignite-629: Wait partition map exchange in affinity test.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6047580d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6047580d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6047580d
Branch: refs/heads/ignite-291
Commit: 6047580daecad8014d4bac4bb6cbac6020fb7382
Parents: 528ea7a
Author: ivasilinets
Authored: Tue Mar 31 09:29:52 2015 +0300
Committer: ivasilinets
Committed: Tue Mar 31 09:29:52 2015 +0300
--
.../test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java| 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6047580d/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
b/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
index c4683fd..8d4a350 100644
---
a/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/IgniteCacheAffinitySelfTest.java
@@ -96,6 +96,7 @@ public class IgniteCacheAffinitySelfTest extends
IgniteCacheAbstractTest {
startGrid(gridCount() - 1);
startGrid(gridCount());
+awaitPartitionMapExchange();
GRID_CNT += 1;
[11/50] incubator-ignite git commit: # ignite-629-1
# ignite-629-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/a9996d8f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a9996d8f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a9996d8f
Branch: refs/heads/ignite-291
Commit: a9996d8fdb2ae5ecbf1a56b88a4161f5d8bcf5de
Parents: 1617648
Author: sboikov
Authored: Tue Mar 31 11:01:37 2015 +0300
Committer: sboikov
Committed: Tue Mar 31 11:01:37 2015 +0300
--
.../ignite/internal/client/impl/ClientCacheFlagsCodecTest.java | 1 +
.../ignite/internal/processors/cache/CacheProjection.java | 4 ++--
.../ignite/internal/processors/cache/GridCacheContext.java | 2 +-
.../internal/processors/cache/GridCacheProjectionImpl.java | 5 -
.../processors/cache/local/atomic/GridLocalAtomicCache.java | 1 +
.../java/org/apache/ignite/IgniteCacheAffinitySelfTest.java | 1 -
.../processors/cache/IgniteCacheInvokeAbstractTest.java | 4
7 files changed, 9 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9996d8f/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
--
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
index 973a0a3..9f177d7 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/client/impl/ClientCacheFlagsCodecTest.java
@@ -44,6 +44,7 @@ public class ClientCacheFlagsCodecTest extends TestCase {
assertTrue(bits != 0);
boolean out = GridCacheCommandHandler.parseCacheFlags(bits);
+
assertEquals(out, true);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9996d8f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
index 6189d6b..d4f1ec0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java
@@ -241,8 +241,8 @@ public interface CacheProjection extends
Iterable> {
public CacheProjection projection(@Nullable CacheEntryPredicate
filter);
/**
- * @param skipStore Skip store.
- * @return New projection based on this one, but with skip store.
+ * @param skipStore Skip store flag.
+ * @return New projection based on this one, but with skip store flag
enabled.
*/
public CacheProjection setSkipStore(boolean skipStore);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9996d8f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
index bec175a..7fae62f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
@@ -1225,7 +1225,7 @@ public class GridCacheContext implements
Externalizable {
}
/**
- * @return {@code true} if the skip store is set.
+ * @return {@code true} if the skip store flag is set.
*/
public boolean skipStore() {
if (nearContext())
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/a9996d8f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
index 3517b42..eea665a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
@@ -89,7 +89,10 @@
