incubator-ignite git commit: IGNITE-49 Fixed tests.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-35 e7e87fe99 -> 88d705d00
IGNITE-49 Fixed tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/88d705d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/88d705d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/88d705d0
Branch: refs/heads/ignite-35
Commit: 88d705d007fbb271191cbb637492309a6f84dbbd
Parents: e7e87fe
Author: nikolay_tikhonov
Authored: Wed Jan 21 11:28:27 2015 +0300
Committer: nikolay_tikhonov
Committed: Wed Jan 21 11:28:27 2015 +0300
--
.../p2p/GridAbstractMultinodeRedeployTest.java | 10 +-
.../GridExternalCacheQueryReducerClosure.java | 39
.../GridCacheQueryUserResourceSelfTest.java | 180 ---
3 files changed, 5 insertions(+), 224 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88d705d0/modules/core/src/test/java/org/gridgain/grid/p2p/GridAbstractMultinodeRedeployTest.java
--
diff --git
a/modules/core/src/test/java/org/gridgain/grid/p2p/GridAbstractMultinodeRedeployTest.java
b/modules/core/src/test/java/org/gridgain/grid/p2p/GridAbstractMultinodeRedeployTest.java
index 9e0cbd9..e8db7b7 100644
---
a/modules/core/src/test/java/org/gridgain/grid/p2p/GridAbstractMultinodeRedeployTest.java
+++
b/modules/core/src/test/java/org/gridgain/grid/p2p/GridAbstractMultinodeRedeployTest.java
@@ -90,20 +90,20 @@ abstract class GridAbstractMultinodeRedeployTest extends
GridCommonAbstractTest
ignite1.compute().localDeployTask(loadTaskClass(),
loadTaskClass().getClassLoader());
ignite2.compute().localDeployTask(loadTaskClass(),
loadTaskClass().getClassLoader());
-ComputeTaskFuture fut1 =
executeAsync(ignite1.compute(), TASK_NAME, Arrays.asList(
+ComputeTaskFuture fut1 =
executeAsync(ignite1.compute(), TASK_NAME, Arrays.asList(
ignite1.cluster().localNode().id(),
ignite2.cluster().localNode().id(),
ignite3.cluster().localNode().id()));
-ComputeTaskFuture fut2 =
executeAsync(ignite2.compute(), TASK_NAME, Arrays.asList(
+ComputeTaskFuture fut2 =
executeAsync(ignite2.compute(), TASK_NAME, Arrays.asList(
ignite1.cluster().localNode().id(),
ignite2.cluster().localNode().id(),
ignite3.cluster().localNode().id()));
-int[] res1 = fut1.get();
-int[] res2 = fut2.get();
+Integer res1 = fut1.get();
+Integer res2 = fut2.get();
-if (res1 == null || res2 == null || res1.length != 2 ||
res2.length != 2)
+if (res1 == null || res2 == null)
throw new IgniteCheckedException("Received wrong result.");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88d705d0/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridExternalCacheQueryReducerClosure.java
--
diff --git
a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridExternalCacheQueryReducerClosure.java
b/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridExternalCacheQueryReducerClosure.java
deleted file mode 100644
index e458673..000
---
a/modules/extdata/p2p/src/main/java/org/gridgain/grid/tests/p2p/GridExternalCacheQueryReducerClosure.java
+++ /dev/null
@@ -1,39 +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.gridgain.grid.tests.p2p;
-
-import org.apache.ignite.lang.*;
-import org.apache.ignite.resources.*;
-
-import java.util.*;
-
-/**
- * Closure that returns cache query reducer, which uses
- * {@link GridP2PAwareTestUserResource}.
- */
-public class GridExternalCacheQueryReducerClosure implements
IgniteReducer, Integer> {
-
incubator-ignite git commit: IGNITE-35 Fixed suite.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-35 88d705d00 -> 55bbebcb3
IGNITE-35 Fixed suite.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/55bbebcb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/55bbebcb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/55bbebcb
Branch: refs/heads/ignite-35
Commit: 55bbebcb3610821a2639c9615280fd8a3db9a3ae
Parents: 88d705d
Author: nikolay_tikhonov
Authored: Wed Jan 21 11:36:13 2015 +0300
Committer: nikolay_tikhonov
Committed: Wed Jan 21 11:36:13 2015 +0300
--
.../java/org/gridgain/testsuites/GridCacheQuerySelfTestSuite.java | 1 -
1 file changed, 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/55bbebcb/modules/indexing/src/test/java/org/gridgain/testsuites/GridCacheQuerySelfTestSuite.java
--
diff --git
a/modules/indexing/src/test/java/org/gridgain/testsuites/GridCacheQuerySelfTestSuite.java
b/modules/indexing/src/test/java/org/gridgain/testsuites/GridCacheQuerySelfTestSuite.java
index 1f57044..f5dd95d 100644
---
a/modules/indexing/src/test/java/org/gridgain/testsuites/GridCacheQuerySelfTestSuite.java
+++
b/modules/indexing/src/test/java/org/gridgain/testsuites/GridCacheQuerySelfTestSuite.java
@@ -41,7 +41,6 @@ public class GridCacheQuerySelfTestSuite extends TestSuite {
// Queries tests.
suite.addTestSuite(GridCacheQueryLoadSelfTest.class);
suite.addTestSuite(GridCacheQueryMetricsSelfTest.class);
-suite.addTestSuite(GridCacheQueryUserResourceSelfTest.class);
suite.addTestSuite(GridCacheLocalQuerySelfTest.class);
suite.addTestSuite(GridCacheLocalAtomicQuerySelfTest.class);
suite.addTestSuite(GridCacheReplicatedQuerySelfTest.class);
[04/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43
Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0f33ffc3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0f33ffc3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0f33ffc3 Branch: refs/heads/ignite-99 Commit: 0f33ffc3d50e959026533a386486e9422414f29a Parents: 2f5d4d8 bb32d46 Author: sboikov Authored: Tue Jan 13 16:05:51 2015 +0300 Committer: sboikov Committed: Tue Jan 13 16:05:51 2015 +0300 -- .../java/org/apache/ignite/IgniteCache.java | 39 ++--- .../processors/cache/IgniteCacheProxy.java | 124 +- .../GridCacheLoadOnlyStoreAdapterSelfTest.java | 5 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 2 +- .../cache/GridCacheAbstractSelfTest.java| 4 +- .../dht/GridCacheGlobalLoadTest.java| 163 +++ .../GridCachePartitionedLoadCacheSelfTest.java | 20 ++- .../junits/common/GridCommonAbstractTest.java | 7 + .../bamboo/GridDataGridTestSuite.java | 1 + 9 files changed, 328 insertions(+), 37 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0f33ffc3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0f33ffc3/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0f33ffc3/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java --
[06/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43
Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8f8f6ef5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8f8f6ef5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8f8f6ef5 Branch: refs/heads/ignite-99 Commit: 8f8f6ef58257b39a87317d7c2f0b4fcc802eaac0 Parents: 0f33ffc 83fb794 Author: sboikov Authored: Wed Jan 14 11:38:38 2015 +0300 Committer: sboikov Committed: Wed Jan 14 11:38:38 2015 +0300 -- .../services/javax.cache.spi.CachingProvider| 1 + .../org/apache/ignite/IgniteCacheMXBean.java| 72 .../org/apache/ignite/IgniteCacheManager.java | 372 +++ .../apache/ignite/IgniteCachingProvider.java| 189 ++ .../processors/cache/IgniteCacheProxy.java | 35 +- .../grid/cache/GridCacheConfiguration.java | 11 +- .../org/gridgain/grid/cache/GridCacheEntry.java | 3 +- .../org/gridgain/grid/kernal/GridGainEx.java| 2 +- .../processors/cache/CacheInvokeEntry.java | 3 + .../processors/cache/GridCacheEntryImpl.java| 8 + .../cache/GridCacheEvictionEntry.java | 8 + .../cache/GridCacheFilterEvaluationEntry.java | 8 + .../cache/query/GridCacheQueryManager.java | 8 + .../GridCacheContinuousQueryEntry.java | 8 + .../grid/kernal/tck/TCKMBeanServerBuilder.java | 118 ++ .../cache/IgniteCachingProviderSelfTest.java| 131 +++ .../dht/GridCacheAtomicNearCacheSelfTest.java | 1 + .../cache/eviction/GridCacheMockEntry.java | 8 + .../hadoop/jobtracker/GridHadoopJobTracker.java | 7 +- 19 files changed, 978 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f8f6ef5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f8f6ef5/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheConfiguration.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8f8f6ef5/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java --
[37/50] [abbrv] incubator-ignite git commit: #IGNITE-53: check weak queue in iterator holder on access.
#IGNITE-53: check weak queue in iterator holder on access.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0b48f37c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0b48f37c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0b48f37c
Branch: refs/heads/ignite-99
Commit: 0b48f37c2f4fed67dc6fa9a827a1a3b37f159ac6
Parents: 9a5dcb3
Author: ivasilinets
Authored: Mon Jan 19 17:35:34 2015 +0400
Committer: ivasilinets
Committed: Mon Jan 19 17:35:34 2015 +0400
--
.../gridgain/grid/kernal/processors/cache/GridCacheGateway.java| 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0b48f37c/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheGateway.java
--
diff --git
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheGateway.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheGateway.java
index bb04ae0..b6a0ec8 100644
---
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheGateway.java
+++
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheGateway.java
@@ -87,6 +87,8 @@ public class GridCacheGateway {
*/
@Nullable public GridCacheProjectionImpl enter(@Nullable
GridCacheProjectionImpl prj) {
try {
+ctx.itHolder().checkWeakQueue();
+
GridCacheAdapter cache = ctx.cache();
GridCachePreloader preldr = cache != null ?
cache.preloader() : null;
[14/50] [abbrv] incubator-ignite git commit: IGNITE-59 Support lock, lockAll: Fix tests.
IGNITE-59 Support lock, lockAll: Fix tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ea40627f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ea40627f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ea40627f
Branch: refs/heads/ignite-99
Commit: ea40627f70dd511991a6f8239cb2e345e36cad2c
Parents: caf8808
Author: sevdokimov
Authored: Thu Jan 15 19:09:14 2015 +0300
Committer: sevdokimov
Committed: Thu Jan 15 19:09:14 2015 +0300
--
.../distributed/GridCacheLockAbstractTest.java | 31 +++-
.../near/GridCachePartitionedLockSelfTest.java | 6 ++--
2 files changed, 15 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea40627f/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java
index fd77a1d..639534b 100644
---
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java
+++
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java
@@ -49,10 +49,10 @@ public abstract class GridCacheLockAbstractTest extends
GridCommonAbstractTest {
private static Ignite ignite2;
/** (for convenience). */
-private static GridCache cache1;
+private static IgniteCache cache1;
/** (for convenience). */
-private static GridCache cache2;
+private static IgniteCache cache2;
/** Ip-finder. */
private static TcpDiscoveryIpFinder ipFinder = new
TcpDiscoveryVmIpFinder(true);
@@ -104,8 +104,8 @@ public abstract class GridCacheLockAbstractTest extends
GridCommonAbstractTest {
ignite1 = startGrid(1);
ignite2 = startGrid(2);
-cache1 = ignite1.cache(null);
-cache2 = ignite2.cache(null);
+cache1 = ignite1.jcache(null);
+cache2 = ignite2.jcache(null);
}
/** {@inheritDoc} */
@@ -127,8 +127,8 @@ public abstract class GridCacheLockAbstractTest extends
GridCommonAbstractTest {
cache2.flagsOn(GridCacheFlag.SYNC_COMMIT).removeAll();
-assert cache1.isEmpty() : "Cache is not empty: " + cache1.entrySet();
-assert cache2.isEmpty() : "Cache is not empty: " + cache2.entrySet();
+assert cache1.size() == 0 : "Cache is not empty: " + cache1;
+assert cache2.size() == 0 : "Cache is not empty: " + cache2;
}
/**
@@ -172,9 +172,6 @@ public abstract class GridCacheLockAbstractTest extends
GridCommonAbstractTest {
*/
@SuppressWarnings({"TooBroadScope"})
public void testLockSingleThread() throws Exception {
-final IgniteCache cache1 = ignite1.jcache(null);
-final IgniteCache cache2 = ignite1.jcache(null);
-
int k = 1;
String v = String.valueOf(k);
@@ -208,9 +205,6 @@ public abstract class GridCacheLockAbstractTest extends
GridCommonAbstractTest {
*/
@SuppressWarnings({"TooBroadScope"})
public void testLock() throws Exception {
-final IgniteCache cache1 = ignite1.jcache(null);
-final IgniteCache cache2 = ignite1.jcache(null);
-
final int kv = 1;
final CountDownLatch l1 = new CountDownLatch(1);
@@ -299,9 +293,6 @@ public abstract class GridCacheLockAbstractTest extends
GridCommonAbstractTest {
* @throws Exception If test failed.
*/
public void testLockAndPut() throws Exception {
-final IgniteCache cache1 = ignite1.jcache(null);
-final IgniteCache cache2 = ignite1.jcache(null);
-
final CountDownLatch l1 = new CountDownLatch(1);
final CountDownLatch l2 = new CountDownLatch(1);
@@ -388,7 +379,7 @@ public abstract class GridCacheLockAbstractTest extends
GridCommonAbstractTest {
public void testLockTimeoutTwoThreads() throws Exception {
int keyCnt = 1;
-final Collection keys = new ArrayList<>(keyCnt);
+final Set keys = new HashSet<>();
for (int i = 1; i <= keyCnt; i++)
keys.add(i);
@@ -400,7 +391,7 @@ public abstract class GridCacheLockAbstractTest extends
GridCommonAbstractTest {
@Nullable @Override public Object call() throws Exception {
info("Before lock for keys.");
-assert cache1.lockAll(keys, 0);
+cache1.lockAll(keys).lock();
info("After lock for keys.");
@@ -428,7 +419,7 @@
[22/50] [abbrv] incubator-ignite git commit: Merge branch 'ignite-1' into ignite-59
Merge branch 'ignite-1' into ignite-59 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3975c101 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3975c101 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3975c101 Branch: refs/heads/ignite-99 Commit: 3975c10114a11637d0aa13a41ab7710d78ab04b5 Parents: ae20d10 80b986f Author: sevdokimov Authored: Mon Jan 19 13:01:11 2015 +0300 Committer: sevdokimov Committed: Mon Jan 19 13:01:11 2015 +0300 -- .../processors/cache/CacheInvokeEntry.java | 14 ++ .../processors/cache/GridCacheMapEntry.java | 17 ++- .../cache/transactions/IgniteTxAdapter.java | 22 +++- .../grid/kernal/visor/query/VisorQueryTask.java | 53 .../java/org/gridgain/grid/p2p/p2p.properties | 17 --- 5 files changed, 82 insertions(+), 41 deletions(-) --
[24/50] [abbrv] incubator-ignite git commit: # IGNITE-59 Support lock, lockAll.
# IGNITE-59 Support lock, lockAll.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9d4476d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9d4476d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9d4476d9
Branch: refs/heads/ignite-99
Commit: 9d4476d988715b237665774f28ec799dc127c07f
Parents: 3975c10
Author: sevdokimov
Authored: Mon Jan 19 13:35:02 2015 +0300
Committer: sevdokimov
Committed: Mon Jan 19 13:35:02 2015 +0300
--
.../main/java/org/apache/ignite/CacheLock.java | 87
.../java/org/apache/ignite/IgniteCache.java | 4 +-
.../processors/cache/IgniteCacheProxy.java | 32 ++-
3 files changed, 118 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9d4476d9/modules/core/src/main/java/org/apache/ignite/CacheLock.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/CacheLock.java
b/modules/core/src/main/java/org/apache/ignite/CacheLock.java
new file mode 100644
index 000..50fc5d2
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/CacheLock.java
@@ -0,0 +1,87 @@
+/*
+ * 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;
+
+import org.apache.ignite.lang.*;
+import org.apache.ignite.transactions.*;
+import org.gridgain.grid.cache.*;
+
+import java.util.concurrent.*;
+import java.util.concurrent.locks.*;
+
+/**
+ * Lock associated with some cache keys.
+ */
+public interface CacheLock extends Lock {
+/**
+ * Checks if any node owns a lock for the keys associated this lock.
+ *
+ * This is a local in-VM operation and does not involve any network trips
+ * or access to persistent storage in any way.
+ *
+ * @return {@code True} if lock is owned by some node.
+ * @see {@link IgniteCache#isLocked(Object)}
+ */
+public boolean isLocked();
+
+/**
+ * Checks if current thread owns a lock the keys associated this lock.
+ *
+ * This is a local in-VM operation and does not involve any network trips
+ * or access to persistent storage in any way.
+ *
+ * @return {@code True} if key is locked by current thread.
+ * @see {@link IgniteCache#isLockedByThread(Object)}
+ */
+public boolean isLockedByThread();
+
+/**
+ * Asynchronously acquires lock on a cached object with given keys
associated this lock.
+ * Transactions
+ * Locks are not transactional and should not be used from within
transactions. If you do
+ * need explicit locking within transaction, then you should use
+ * {@link IgniteTxConcurrency#PESSIMISTIC} concurrency control for
transaction
+ * which will acquire explicit locks for relevant cache operations.
+ * Cache Flags
+ * This method is not available if any of the following flags are set on
projection:
+ * {@link GridCacheFlag#LOCAL}, {@link GridCacheFlag#READ}.
+ *
+ * @return Future for the lock operation. The future will return {@code
true}.
+ */
+public IgniteFuture lockAsync();
+
+/**
+ * Asynchronously acquires lock on a cached object with given keys
associated this lock.
+ * Transactions
+ * Locks are not transactional and should not be used from within
transactions. If you do
+ * need explicit locking within transaction, then you should use
+ * {@link IgniteTxConcurrency#PESSIMISTIC} concurrency control for
transaction
+ * which will acquire explicit locks for relevant cache operations.
+ * Cache Flags
+ * This method is not available if any of the following flags are set on
projection:
+ * {@link GridCacheFlag#LOCAL}, {@link GridCacheFlag#READ}.
+ *
+ * @param timeout Timeout in milliseconds to wait for lock to be acquired
+ * ({@code '0'} for no expiration, {@code -1} for immediate failure if
+ * lock cannot be acquired immediately).
+ * @param unit the time unit
[13/50] [abbrv] incubator-ignite git commit: IGNITE-59 Support lock, lockAll: Fix tests.
IGNITE-59 Support lock, lockAll: Fix tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/caf88085
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/caf88085
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/caf88085
Branch: refs/heads/ignite-99
Commit: caf880856bb5398571e3348958899db8dbd67f59
Parents: 79c51ec
Author: sevdokimov
Authored: Thu Jan 15 19:02:31 2015 +0300
Committer: sevdokimov
Committed: Thu Jan 15 19:02:31 2015 +0300
--
.../cache/GridCacheAbstractFullApiSelfTest.java | 115 +--
.../cache/GridCacheBasicApiAbstractTest.java| 8 +-
.../GridCacheLocalMultithreadedSelfTest.java| 28 +++--
3 files changed, 49 insertions(+), 102 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/caf88085/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 4447383..2fb802b 100644
---
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache;
+import com.google.common.collect.*;
import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
@@ -278,11 +279,13 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
*/
public void testRemoveInExplicitLocks() throws Exception {
if (lockingEnabled()) {
-GridCache cache = cache();
+IgniteCache cache = jcache();
cache.put("a", 1);
-cache.lockAll(F.asList("a", "b", "c", "d"), 0);
+Lock lock = cache.lockAll(ImmutableSet.of("a", "b", "c", "d"));
+
+lock.lock();
try {
cache.remove("a");
@@ -291,7 +294,7 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
cache.putAll(F.asMap("b", 2, "c", 3, "d", 4));
}
finally {
-cache.unlockAll(F.asList("a", "b", "c", "d"));
+lock.unlock();
}
}
}
@@ -3693,109 +3696,47 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
@SuppressWarnings("BusyWait")
public void testLockUnlockAll() throws Exception {
if (lockingEnabled()) {
-cache().put("key1", 1);
-cache().put("key2", 2);
+IgniteCache cache = jcache();
-assert !cache().isLocked("key1");
-assert !cache().isLocked("key2");
+cache.put("key1", 1);
+cache.put("key2", 2);
+
+assert !cache.isLocked("key1");
+assert !cache.isLocked("key2");
-cache().lockAll(F.asList("key1", "key2"), 0);
+cache.lockAll(ImmutableSet.of("key1", "key2")).lock();
-assert cache().isLocked("key1");
-assert cache().isLocked("key2");
+assert cache.isLocked("key1");
+assert cache.isLocked("key2");
-cache().unlockAll(F.asList("key1", "key2"));
+cache.lockAll(ImmutableSet.of("key1", "key2")).unlock();
for (int i = 0; i < 100; i++)
-if (cache().isLocked("key1") || cache().isLocked("key2"))
+if (cache.isLocked("key1") || cache.isLocked("key2"))
Thread.sleep(10);
else
break;
-assert !cache().isLocked("key1");
-assert !cache().isLocked("key2");
+assert !cache.isLocked("key1");
+assert !cache.isLocked("key2");
-cache().lockAll(F.asList("key1", "key2"), 0);
+Lock lock = cache.lockAll(ImmutableSet.of("key1", "key2"));
-assert cache().isLocked("key1");
-assert cache().isLocked("key2");
+lock.lock();
-cache().unlockAll(F.asList("key1", "key2"));
+assert cache.isLocked("key1");
+assert cache.isLocked("key2");
+
+lock.unlock();
for (int i = 0; i < 100; i++)
-if (cache().isLocked("key1") || cache().isLocked("key2"))
+if (cache.isLocked("key1") || cache.isLocked("key2"))
Thread.sleep(10);
el
[34/50] [abbrv] incubator-ignite git commit: # Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43
# Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4a64d435
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4a64d435
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4a64d435
Branch: refs/heads/ignite-99
Commit: 4a64d435441a2b45fb12e53c7c3c1305128b3918
Parents: 0652276
Author: sboikov
Authored: Mon Jan 19 15:26:18 2015 +0300
Committer: sboikov
Committed: Mon Jan 19 15:26:18 2015 +0300
--
.../grid/kernal/processors/continuous/GridContinuousProcessor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4a64d435/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java
--
diff --git
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java
index fa121a5..6ec86a5 100644
---
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java
+++
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java
@@ -696,7 +696,7 @@ public class GridContinuousProcessor extends
GridProcessorAdapter {
throw e;
}
-fut.get(ackTimeout);
+fut.get();
}
else {
Collection toSnd = info.add(obj);
[28/50] [abbrv] incubator-ignite git commit: Merge branch 'ignite-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-53
Merge branch 'ignite-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-53 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/45eed74b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/45eed74b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/45eed74b Branch: refs/heads/ignite-99 Commit: 45eed74b602f488b07183e9f19886a756647916d Parents: aca475f 9223d38 Author: Yakov Zhdanov Authored: Mon Jan 19 13:47:17 2015 +0300 Committer: Yakov Zhdanov Committed: Mon Jan 19 13:47:17 2015 +0300 -- --
[35/50] [abbrv] incubator-ignite git commit: IGNITE-59 Support lock, lockAll. Fix 'interrupt' problem.
IGNITE-59 Support lock, lockAll. Fix 'interrupt' problem.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0379c59f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0379c59f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0379c59f
Branch: refs/heads/ignite-99
Commit: 0379c59f7bafb27b8722aa17cbf64aca36cbfd74
Parents: 9d4476d
Author: sevdokimov
Authored: Mon Jan 19 16:20:08 2015 +0300
Committer: sevdokimov
Committed: Mon Jan 19 16:20:08 2015 +0300
--
.../processors/cache/IgniteCacheProxy.java | 55 --
.../processors/cache/GridCacheAdapter.java | 20 -
.../cache/GridCacheBasicApiAbstractTest.java| 79
3 files changed, 129 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0379c59f/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 bd5d6ee..64e86dd 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
@@ -295,30 +295,13 @@ public class IgniteCacheProxy extends
IgniteAsyncSupportAdapter implements
try {
delegate.lockAll(keys, 0);
}
-catch (GridInterruptedException ignored) {
-
-}
catch (IgniteCheckedException e) {
throw new CacheException(e.getMessage(), e);
}
}
@Override public void lockInterruptibly() throws
InterruptedException {
-if (Thread.interrupted())
-throw new InterruptedException();
-
-try {
-delegate.lockAll(keys, 0);
-}
-catch (GridInterruptedException e) {
-if (e.getCause() instanceof InterruptedException)
-throw (InterruptedException)e.getCause();
-
-throw new InterruptedException();
-}
-catch (IgniteCheckedException e) {
-throw new CacheException(e.getMessage(), e);
-}
+tryLock(-1, TimeUnit.MILLISECONDS);
}
@Override public boolean tryLock() {
@@ -331,14 +314,38 @@ public class IgniteCacheProxy extends
IgniteAsyncSupportAdapter implements
}
@Override public boolean tryLock(long time, TimeUnit unit) throws
InterruptedException {
+if (Thread.interrupted())
+throw new InterruptedException();
+
try {
-return delegate.lockAll(keys, unit.toMillis(time));
-}
-catch (GridInterruptedException e) {
-if (e.getCause() instanceof InterruptedException)
-throw (InterruptedException)e.getCause();
+IgniteFuture fut = null;
-throw new InterruptedException();
+try {
+if (time <= 0)
+return delegate.lockAll(keys, -1);
+
+fut = delegate.lockAllAsync(keys, time <= 0 ? -1 :
unit.toMillis(time));
+
+return fut.get();
+}
+catch (GridInterruptedException e) {
+if (fut != null) {
+if (!fut.cancel()) {
+if (fut.isDone()) {
+Boolean res = fut.get();
+
+Thread.currentThread().interrupt();
+
+return res;
+}
+}
+}
+
+if (e.getCause() instanceof InterruptedException)
+throw (InterruptedException)e.getCause();
+
+throw new InterruptedException();
+}
}
catch (IgniteCheckedException e) {
throw new CacheException(e.getMessage(), e);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0379c59f/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
--
diff
[38/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-59' into ignite-59
Merge remote-tracking branch 'origin/ignite-59' into ignite-59 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/521ac9e2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/521ac9e2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/521ac9e2 Branch: refs/heads/ignite-99 Commit: 521ac9e264b0375827b6318666802525623bae5d Parents: d787b5f 0379c59 Author: Yakov Zhdanov Authored: Mon Jan 19 16:50:38 2015 +0300 Committer: Yakov Zhdanov Committed: Mon Jan 19 16:50:38 2015 +0300 -- .../processors/cache/IgniteCacheProxy.java | 55 -- .../processors/cache/GridCacheAdapter.java | 20 - .../cache/GridCacheBasicApiAbstractTest.java| 79 3 files changed, 129 insertions(+), 25 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/521ac9e2/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java --
[31/50] [abbrv] incubator-ignite git commit: # Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43
# Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fd5e15c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fd5e15c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fd5e15c9
Branch: refs/heads/ignite-99
Commit: fd5e15c9313631dfb27b255156896566c97f7810
Parents: 2a2eb5a 9223d38
Author: sboikov
Authored: Mon Jan 19 14:45:01 2015 +0300
Committer: sboikov
Committed: Mon Jan 19 14:45:01 2015 +0300
--
.../ignite/portables/PortableRawReader.java | 2 +-
.../grid/dotnet/GridDotNetConfiguration.java| 14 +++-
.../dotnet/GridDotNetPortableConfiguration.java | 28 +++-
.../GridDotNetPortableTypeConfiguration.java| 15 +---
.../org/gridgain/grid/kernal/GridGainEx.java| 76 ++--
.../grid/kernal/GridNodeAttributes.java | 5 +-
.../processors/cache/GridCacheAdapter.java | 18 +++--
.../processors/cache/GridCacheContext.java | 2 +-
.../processors/cache/GridCacheEntryImpl.java| 2 +-
.../GridCacheContinuousQueryAdapter.java| 5 ++
.../GridCacheContinuousQueryFilterEx.java | 32 +
.../GridCacheContinuousQueryHandler.java| 17 -
.../GridCacheContinuousQueryListener.java | 5 ++
.../GridCacheContinuousQueryManager.java| 71 --
.../interop/GridInteropProcessorAdapter.java| 3 -
15 files changed, 201 insertions(+), 94 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd5e15c9/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd5e15c9/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
--
diff --cc
modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
index 228dfa5,a7ff429..5ab83e1
---
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
+++
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
@@@ -283,8 -262,7 +291,8 @@@ class GridCacheContinuousQueryHandlerhttp://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd5e15c9/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java
--
diff --cc
modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java
index c3a4dfe,2d8e106..6e1eac3
---
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java
+++
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java
@@@ -298,14 -126,12 +298,15 @@@ public class GridCacheContinuousQueryMa
* @param lsnrId Listener ID.
* @param lsnr Listener.
* @param internal Internal flag.
+ * @param entryLsnr {@code True} if query created for {@link
CacheEntryListener}.
* @return Whether listener was actually registered.
*/
+ @SuppressWarnings("UnusedParameters")
-boolean registerListener(UUID nodeId, UUID lsnrId,
GridCacheContinuousQueryListener lsnr, boolean internal) {
-ListenerInfo info = new ListenerInfo<>(lsnr);
+boolean registerListener(UUID lsnrId,
+GridCacheContinuousQueryListener lsnr,
+boolean internal,
+boolean entryLsnr) {
+ListenerInfo info = new ListenerInfo<>(lsnr, entryLsnr);
boolean added;
@@@ -354,31 -190,35 +365,45 @@@
assert info != null;
- Set> entries;
+ GridCacheProjectionImpl oldPrj = null;
- if (cctx.isReplicated())
- entries = internal ? cctx.cache().entrySetx() :
- cctx.cache().entrySet();
- else
- entries = internal ? cctx.cache().primaryEntrySetx() :
- cctx.cache().primaryEntrySet();
+ try {
+ if (keepPortable) {
+ oldPrj = cctx.projectionPerCall();
- boolean evt = !internal &&
cctx.gridEvents().isRecordable(EVT_CACHE_QUERY_OBJECT_READ);
+ cctx.projectionPerCall(cctx.cache().keepPortable0());
+ }
- for (GridCacheEntry e : entries) {
- Gr
[16/50] [abbrv] incubator-ignite git commit: IGNITE-59 Support lock, lockAll: Fix tests.
IGNITE-59 Support lock, lockAll: Fix tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ae20d109
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ae20d109
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ae20d109
Branch: refs/heads/ignite-99
Commit: ae20d1091516fefe147d71c2b71615b2251aae39
Parents: 5e24d63
Author: sevdokimov
Authored: Fri Jan 16 13:35:34 2015 +0300
Committer: sevdokimov
Committed: Fri Jan 16 13:35:34 2015 +0300
--
.../internal/processors/cache/IgniteCacheProxy.java | 10 +-
.../processors/cache/GridCacheBasicApiAbstractTest.java | 6 --
.../near/GridCachePartitionedLockSelfTest.java| 5 +++--
.../cache/local/GridCacheLocalLockSelfTest.java | 2 +-
4 files changed, 13 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae20d109/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 055827b..0c98124 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
@@ -273,7 +273,7 @@ public class IgniteCacheProxy extends
IgniteAsyncSupportAdapter implements
}
catch (IgniteCheckedException e) {
-throw new CacheException(e);
+throw new CacheException(e.getMessage(), e);
}
}
@@ -291,7 +291,7 @@ public class IgniteCacheProxy extends
IgniteAsyncSupportAdapter implements
throw new InterruptedException();
}
catch (IgniteCheckedException e) {
-throw new CacheException(e);
+throw new CacheException(e.getMessage(), e);
}
}
@@ -300,7 +300,7 @@ public class IgniteCacheProxy extends
IgniteAsyncSupportAdapter implements
return delegate.lockAll(keys, -1);
}
catch (IgniteCheckedException e) {
-throw new CacheException(e);
+throw new CacheException(e.getMessage(), e);
}
}
@@ -315,7 +315,7 @@ public class IgniteCacheProxy extends
IgniteAsyncSupportAdapter implements
throw new InterruptedException();
}
catch (IgniteCheckedException e) {
-throw new CacheException(e);
+throw new CacheException(e.getMessage(), e);
}
}
@@ -324,7 +324,7 @@ public class IgniteCacheProxy extends
IgniteAsyncSupportAdapter implements
delegate.unlockAll(keys);
}
catch (IgniteCheckedException e) {
-throw new CacheException(e);
+throw new CacheException(e.getMessage(), e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ae20d109/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicApiAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicApiAbstractTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicApiAbstractTest.java
index 2e5d00e..62f64ca 100644
---
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicApiAbstractTest.java
+++
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicApiAbstractTest.java
@@ -41,6 +41,7 @@ import static org.apache.ignite.events.IgniteEventType.*;
/**
* Test cases for multi-threaded tests.
*/
+@SuppressWarnings("LockAcquiredButNotSafelyReleased")
public abstract class GridCacheBasicApiAbstractTest extends
GridCommonAbstractTest {
/** Grid. */
private Ignite ignite;
@@ -129,6 +130,8 @@ public abstract class GridCacheBasicApiAbstractTest extends
GridCommonAbstractTe
Lock lock = cache.lock(1);
+lock.lock();
+
assert cache.isLocked(1);
assert cache.isLockedByThread(1);
@@ -182,7 +185,7 @@ public abstract class GridCacheBasicApiAbstractTest extends
GridCommonAbstractTe
assert cache.isLockedByThread(key);
try {
-
[41/50] [abbrv] incubator-ignite git commit: # IGNITE-59 Support lock, lockAll. Fix javadoc problems.
# IGNITE-59 Support lock, lockAll. Fix javadoc problems.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/afe86664
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/afe86664
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/afe86664
Branch: refs/heads/ignite-99
Commit: afe86664c948cf90bcf16246beefdc42a5478792
Parents: 2c76212
Author: sevdokimov
Authored: Mon Jan 19 17:35:01 2015 +0300
Committer: sevdokimov
Committed: Mon Jan 19 17:35:01 2015 +0300
--
.../src/main/java/org/apache/ignite/CacheLock.java | 15 +++
.../main/java/org/apache/ignite/IgniteCache.java| 16
2 files changed, 23 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afe86664/modules/core/src/main/java/org/apache/ignite/CacheLock.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/CacheLock.java
b/modules/core/src/main/java/org/apache/ignite/CacheLock.java
index 50fc5d2..9be14e0 100644
--- a/modules/core/src/main/java/org/apache/ignite/CacheLock.java
+++ b/modules/core/src/main/java/org/apache/ignite/CacheLock.java
@@ -29,7 +29,7 @@ import java.util.concurrent.locks.*;
*/
public interface CacheLock extends Lock {
/**
- * Checks if any node owns a lock for the keys associated this lock.
+ * Checks if any node holds lock on at least one key associated with this
{@code CacheLock}.
*
* This is a local in-VM operation and does not involve any network trips
* or access to persistent storage in any way.
@@ -40,7 +40,7 @@ public interface CacheLock extends Lock {
public boolean isLocked();
/**
- * Checks if current thread owns a lock the keys associated this lock.
+ * Checks if current thread holds lock on at least one key associated with
this {@code CacheLock}.
*
* This is a local in-VM operation and does not involve any network trips
* or access to persistent storage in any way.
@@ -51,7 +51,7 @@ public interface CacheLock extends Lock {
public boolean isLockedByThread();
/**
- * Asynchronously acquires lock on a cached object with given keys
associated this lock.
+ * Asynchronously acquires lock on a cached object with keys associated
with this {@code CacheLock}.
* Transactions
* Locks are not transactional and should not be used from within
transactions. If you do
* need explicit locking within transaction, then you should use
@@ -66,7 +66,7 @@ public interface CacheLock extends Lock {
public IgniteFuture lockAsync();
/**
- * Asynchronously acquires lock on a cached object with given keys
associated this lock.
+ * Asynchronously acquires lock on a cached object with given keys
associated with this {@code CacheLock}.
* Transactions
* Locks are not transactional and should not be used from within
transactions. If you do
* need explicit locking within transaction, then you should use
@@ -76,10 +76,9 @@ public interface CacheLock extends Lock {
* This method is not available if any of the following flags are set on
projection:
* {@link GridCacheFlag#LOCAL}, {@link GridCacheFlag#READ}.
*
- * @param timeout Timeout in milliseconds to wait for lock to be acquired
- * ({@code '0'} for no expiration, {@code -1} for immediate failure if
- * lock cannot be acquired immediately).
- * @param unit the time unit of the {@code timeout} argument.
+ * @param timeout The maximum time to wait for the lock. If the time is
less than or equal to zero, the method will
+ * not wait at all.
+ * @param unit The time unit of the {@code timeout} argument.
* @return Future for the lock operation. The future will return {@code
true} whenever locks are acquired before
* timeout is expired, {@code false} otherwise.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/afe86664/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index d900c12..884e665 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -180,8 +180,24 @@ public interface IgniteCache extends
javax.cache.Cache, IgniteAsyncS
*/
public void removeAll(IgnitePredicate> filter) throws
CacheException;
+/**
+ * Return a {@link CacheLock} instance associated with passed key.
+ * This method does not acquire lock
[43/50] [abbrv] incubator-ignite git commit: #IGNITE-53: Add test on clearing iterators.
#IGNITE-53: Add test on clearing iterators.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/eb745313
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/eb745313
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/eb745313
Branch: refs/heads/ignite-99
Commit: eb7453139fa5d1249098920a96863c7640600221
Parents: 0b48f37
Author: ivasilinets
Authored: Mon Jan 19 19:03:23 2015 +0300
Committer: ivasilinets
Committed: Mon Jan 19 19:03:23 2015 +0300
--
.../cache/GridCacheAbstractFullApiSelfTest.java | 55 +++-
1 file changed, 54 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eb745313/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 849e4fc..d0e8d34 100644
---
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -18,6 +18,7 @@
package org.gridgain.grid.kernal.processors.cache;
import com.google.common.collect.*;
+import junit.framework.*;
import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
@@ -25,8 +26,10 @@ import org.apache.ignite.events.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.spi.swapspace.inmemory.*;
import org.apache.ignite.transactions.*;
+import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.*;
+import org.gridgain.grid.kernal.processors.cache.query.*;
import org.gridgain.grid.util.lang.*;
import org.gridgain.grid.util.typedef.*;
import org.gridgain.grid.util.typedef.internal.*;
@@ -5084,7 +5087,7 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
assertFalse(cache.iterator().hasNext());
-final int SIZE = 100;
+final int SIZE = 1000;
Map entries = new HashMap<>();
@@ -5100,6 +5103,8 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
checkIteratorRemove(cache, entries);
+checkIteratorEmpty(cache);
+
}
/**
@@ -5203,6 +5208,54 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
}
/**
+ * Checks iterators are cleared.
+ */
+private void checkIteratorsCleared() {
+for (int j = 0; j < gridCount(); j++) {
+
+GridCacheQueryManager queries = context(j).queries();
+
+Map map = GridTestUtils.getFieldValue(queries,
GridCacheQueryManager.class, "qryIters");
+
+for (Object obj : map.values())
+assertEquals("Iterators not removed for grid " + j, 0, ((Map)
obj).size());
+}
+}
+
+/**
+ * Checks iterators are cleared after using.
+ */
+private void checkIteratorEmpty(IgniteCache cache) throws
GridInterruptedException, InterruptedException {
+int cnt = 5;
+
+for (int i = 0; i < cnt; ++i) {
+Iterator> iter = cache.iterator();
+
+iter.next();
+
+assert iter.hasNext();
+}
+
+System.gc();
+
+for (int i = 0; i < 10; i++) {
+try {
+cache.size(); // Trigger weak queue poll.
+
+checkIteratorsCleared();
+}
+catch (AssertionFailedError e) {
+if (i == 9)
+throw e;
+
+log.info("Set iterators not cleared, will wait");
+
+Thread.sleep(500);
+}
+}
+}
+
+/**
* @param cache Cache.
* @param cnt Keys count.
* @return Collection of keys for which given cache is primary.
[42/50] [abbrv] incubator-ignite git commit: # IGNITE-59 Support lock, lockAll. Fix javadoc problems.
# IGNITE-59 Support lock, lockAll. Fix javadoc problems.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3f7dc7da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3f7dc7da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3f7dc7da
Branch: refs/heads/ignite-99
Commit: 3f7dc7dac334b0e4a1ae25b3180dbf3929c3d43b
Parents: afe8666
Author: sevdokimov
Authored: Mon Jan 19 17:49:28 2015 +0300
Committer: sevdokimov
Committed: Mon Jan 19 17:49:28 2015 +0300
--
.../src/main/java/org/apache/ignite/IgniteCache.java | 11 +++
1 file changed, 7 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3f7dc7da/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index 884e665..93bd108 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -30,6 +30,7 @@ import javax.cache.configuration.*;
import javax.cache.expiry.*;
import javax.cache.processor.*;
import java.util.*;
+import java.util.concurrent.*;
import java.util.concurrent.locks.*;
/**
@@ -182,21 +183,23 @@ public interface IgniteCache extends
javax.cache.Cache, IgniteAsyncS
/**
* Return a {@link CacheLock} instance associated with passed key.
- * This method does not acquire lock immediately, you have to call
something like {@link CacheLock#lock()} on
- * returned instance.
+ * This method does not acquire lock immediately, you have to call
appropriate method on returned instance.
*
* @param key Key for lock.
* @return New lock instance associated with passed key.
+ * @see CacheLock#lock()
+ * @see CacheLock#tryLock(long, TimeUnit)
*/
public CacheLock lock(K key);
/**
* Return a {@link CacheLock} instance associated with passed keys.
- * This method does not acquire lock immediately, you have to call
something like {@link CacheLock#lock()} on
- * returned instance.
+ * This method does not acquire lock immediately, you have to call
appropriate method on returned instance.
*
* @param keys Keys for lock.
* @return New lock instance associated with passed key.
+ * @see CacheLock#lock()
+ * @see CacheLock#tryLock(long, TimeUnit)
*/
public CacheLock lockAll(Collection keys);
[17/50] [abbrv] incubator-ignite git commit: interop .Net: Merge from sp31 (without .Net component).
interop .Net: Merge from sp31 (without .Net component).
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c0c28abd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c0c28abd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c0c28abd
Branch: refs/heads/ignite-99
Commit: c0c28abdd32c9fe63866f28044aecbe3386c868f
Parents: 725d79f
Author: vozerov-gridgain
Authored: Fri Jan 16 17:21:12 2015 +0400
Committer: vozerov-gridgain
Committed: Fri Jan 16 17:21:12 2015 +0400
--
.../ignite/portables/PortableRawReader.java | 2 +-
.../grid/dotnet/GridDotNetConfiguration.java| 14 +++-
.../dotnet/GridDotNetPortableConfiguration.java | 28 +++-
.../GridDotNetPortableTypeConfiguration.java| 15 +---
.../org/gridgain/grid/kernal/GridGainEx.java| 76 ++--
.../grid/kernal/GridNodeAttributes.java | 5 +-
.../processors/cache/GridCacheAdapter.java | 15 +++-
.../processors/cache/GridCacheContext.java | 2 +-
.../processors/cache/GridCacheEntryImpl.java| 2 +-
.../GridCacheContinuousQueryAdapter.java| 13 +++-
.../GridCacheContinuousQueryFilterEx.java | 32 +
.../GridCacheContinuousQueryHandler.java| 17 -
.../GridCacheContinuousQueryHandlerV3.java | 61
.../GridCacheContinuousQueryHandlerV4.java | 61
.../GridCacheContinuousQueryListener.java | 5 ++
.../GridCacheContinuousQueryManager.java| 55 ++
.../interop/GridInteropProcessorAdapter.java| 3 -
17 files changed, 318 insertions(+), 88 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c0c28abd/modules/core/src/main/java/org/apache/ignite/portables/PortableRawReader.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/portables/PortableRawReader.java
b/modules/core/src/main/java/org/apache/ignite/portables/PortableRawReader.java
index 67e9b13..5801aa8 100644
---
a/modules/core/src/main/java/org/apache/ignite/portables/PortableRawReader.java
+++
b/modules/core/src/main/java/org/apache/ignite/portables/PortableRawReader.java
@@ -112,7 +112,7 @@ public interface PortableRawReader {
* @return Object.
* @throws PortableException In case of error.
*/
-@Nullable public Object readObject() throws PortableException;
+@Nullable public T readObject() throws PortableException;
/**
* @return Byte array.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c0c28abd/modules/core/src/main/java/org/gridgain/grid/dotnet/GridDotNetConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/gridgain/grid/dotnet/GridDotNetConfiguration.java
b/modules/core/src/main/java/org/gridgain/grid/dotnet/GridDotNetConfiguration.java
index 07a1a0d..a8a595d 100644
---
a/modules/core/src/main/java/org/gridgain/grid/dotnet/GridDotNetConfiguration.java
+++
b/modules/core/src/main/java/org/gridgain/grid/dotnet/GridDotNetConfiguration.java
@@ -41,7 +41,8 @@ public class GridDotNetConfiguration implements
PortableMarshalAware {
/**
* Copy constructor.
- * @param cfg configuration to copy.
+ *
+ * @param cfg Configuration to copy.
*/
public GridDotNetConfiguration(GridDotNetConfiguration cfg) {
if (cfg.getPortableConfiguration() != null)
@@ -80,6 +81,15 @@ public class GridDotNetConfiguration implements
PortableMarshalAware {
this.assemblies = assemblies;
}
+/**
+ * Copy configuration.
+ *
+ * @return Copied configuration.
+ */
+public GridDotNetConfiguration copy() {
+return new GridDotNetConfiguration(this);
+}
+
/** {@inheritDoc} */
@Override public void writePortable(PortableWriter writer) throws
PortableException {
PortableRawWriter rawWriter = writer.rawWriter();
@@ -92,7 +102,7 @@ public class GridDotNetConfiguration implements
PortableMarshalAware {
@Override public void readPortable(PortableReader reader) throws
PortableException {
PortableRawReader rawReader = reader.rawReader();
-portableCfg = (GridDotNetPortableConfiguration)rawReader.readObject();
+portableCfg = rawReader.readObject();
assemblies = (List)rawReader.readCollection();
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c0c28abd/modules/core/src/main/java/org/gridgain/grid/dotnet/GridDotNetPortableConfiguration.java
--
diff --git
a/modules/core/src/main/java/org/gridgain/grid/dotnet/GridDotNetPortableConfiguration.java
b/modules/
[25/50] [abbrv] incubator-ignite git commit: ignite-53: merge from ignite-1
ignite-53: merge from ignite-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/05b32952
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/05b32952
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/05b32952
Branch: refs/heads/ignite-99
Commit: 05b329528598a99ac5d87623a9a304edcd11c408
Parents: ae4cbca 1a2e7d4
Author: Yakov Zhdanov
Authored: Mon Jan 19 13:42:54 2015 +0300
Committer: Yakov Zhdanov
Committed: Mon Jan 19 13:42:54 2015 +0300
--
LICENSE.txt | 202 ++
apache-2.0.txt | 202 --
.../java/org/apache/ignite/IgniteCache.java | 4 +-
.../processors/cache/IgniteCacheProxy.java | 76 +-
.../ignite/portables/PortableRawReader.java | 2 +-
.../grid/dotnet/GridDotNetConfiguration.java| 14 +-
.../dotnet/GridDotNetPortableConfiguration.java | 28 +-
.../GridDotNetPortableTypeConfiguration.java| 15 +-
.../org/gridgain/grid/kernal/GridGainEx.java| 76 --
.../grid/kernal/GridNodeAttributes.java | 5 +-
.../processors/cache/CacheInvokeEntry.java | 14 +
.../processors/cache/GridCacheAdapter.java | 18 +-
.../processors/cache/GridCacheContext.java | 2 +-
.../processors/cache/GridCacheEntryImpl.java| 2 +-
.../processors/cache/GridCacheMapEntry.java | 17 +-
.../GridCacheContinuousQueryAdapter.java| 13 +-
.../GridCacheContinuousQueryFilterEx.java | 32 +++
.../GridCacheContinuousQueryHandler.java| 17 +-
.../GridCacheContinuousQueryHandlerV3.java | 61 +
.../GridCacheContinuousQueryHandlerV4.java | 61 +
.../GridCacheContinuousQueryListener.java | 5 +
.../GridCacheContinuousQueryManager.java| 55 +++-
.../cache/transactions/IgniteTxAdapter.java | 22 +-
.../interop/GridInteropProcessorAdapter.java| 3 -
.../tcp/GridCacheDhtLockBackupSelfTest.java | 18 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 271 ---
.../cache/GridCacheBasicApiAbstractTest.java| 91 ---
.../GridCacheFinishPartitionsSelfTest.java | 22 +-
.../GridCacheGroupLockAbstractSelfTest.java | 24 +-
.../cache/GridCacheNestedTxAbstractTest.java| 28 +-
.../GridCacheOffHeapTieredAbstractSelfTest.java | 38 +--
.../distributed/GridCacheLockAbstractTest.java | 40 +--
.../GridCacheMultiNodeLockAbstractTest.java | 144 +++---
.../dht/GridCacheColocatedDebugTest.java| 26 +-
...dCachePartitionedTopologyChangeSelfTest.java | 8 +-
.../near/GridCacheNearMultiNodeSelfTest.java| 16 +-
.../near/GridCacheNearOneNodeSelfTest.java | 39 +--
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 42 ---
.../near/GridCacheNearReadersSelfTest.java | 14 +-
...titionedExplicitLockNodeFailureSelfTest.java | 1 +
.../near/GridCachePartitionedLockSelfTest.java | 11 +-
.../GridCacheEvictionLockUnlockSelfTest.java| 7 +-
.../cache/local/GridCacheLocalLockSelfTest.java | 36 +--
.../GridCacheLocalMultithreadedSelfTest.java| 42 +--
.../ggfs/GridGgfsMetaManagerSelfTest.java | 6 +-
45 files changed, 1036 insertions(+), 834 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/05b32952/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/05b32952/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
--
diff --cc
modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index a44acd1,2fb802b..9e4a368
---
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@@ -5251,128 -5076,15 +5077,141 @@@ public abstract class GridCacheAbstract
}
/**
+ * @throws Exception If failed.
+ */
+public void testIgniteCacheIterator() throws Exception {
+IgniteCache cache = jcache(0);
+
+assertFalse(cache.iterator().hasNext());
+
+final int SIZE = 100;
+
+Map entries = new HashMap<>();
+
+for (int i = 0; i < SIZE; ++i) {
+cache.put(Integer.toString(i), i);
+
+entries.put(Integer.toString(i), i);
+}
+
+checkIteratorHasNext();
+
+checkIteratorCache(entries);
+
+checkIteratorRemove(cache, entries);
+
+}
[15/50] [abbrv] incubator-ignite git commit: IGNITE-59 Support lock, lockAll: Fix tests.
IGNITE-59 Support lock, lockAll: Fix tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5e24d63e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5e24d63e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5e24d63e
Branch: refs/heads/ignite-99
Commit: 5e24d63e49abdb3cbebdf4e51b653542df7e0942
Parents: ea40627
Author: sevdokimov
Authored: Fri Jan 16 13:13:02 2015 +0300
Committer: sevdokimov
Committed: Fri Jan 16 13:13:02 2015 +0300
--
.../cache/distributed/GridCacheLockAbstractTest.java | 2 +-
.../cache/distributed/near/GridCacheNearMultiNodeSelfTest.java | 2 +-
.../cache/distributed/near/GridCacheNearOneNodeSelfTest.java | 4 ++--
.../kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java| 6 --
4 files changed, 8 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e24d63e/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java
index 639534b..44c86e5 100644
---
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java
+++
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java
@@ -352,7 +352,7 @@ public abstract class GridCacheLockAbstractTest extends
GridCommonAbstractTest {
info("Put key-value pair into cache: 1='2'");
-assertEquals("2", cache1.remove(1));
+assertEquals("2", cache1.getAndRemove(1));
l2.countDown();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e24d63e/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
index f63d2d7..56549e9 100644
---
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
+++
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
@@ -761,7 +761,7 @@ public class GridCacheNearMultiNodeSelfTest extends
GridCommonAbstractTest {
try {
assertEquals(val, near.get(key));
-assertEquals(val, near.remove(key));
+assertEquals(val, near.getAndRemove(key));
assertNull(near.localPeek(key));
assertNull(dht(primaryGrid(key)).peek(key));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e24d63e/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
index 25adeea..0e583e5 100644
---
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
+++
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
@@ -213,7 +213,7 @@ public class GridCacheNearOneNodeSelfTest extends
GridCommonAbstractTest {
assertEquals("1", dht().peek(1));
assertEquals("1", near.get(1));
-assertEquals("1", near.remove(1));
+assertEquals("1", near.getAndRemove(1));
assertNull(near.localPeek(1));
assertNull(dht().peek(1));
@@ -248,7 +248,7 @@ public class GridCacheNearOneNodeSelfTest extends
GridCommonAbstractTest {
try {
assertEquals("1", near.get(1));
-assertEquals("1", near.remove(1));
+assertEquals("1", near.getAndRemove(1));
assertNull(near.localPeek(1));
assertNull(dht().peek(1));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e24d63e/modules/core/src/test/java
[39/50] [abbrv] incubator-ignite git commit: ignite-59: review
ignite-59: 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/fd03d80c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fd03d80c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fd03d80c
Branch: refs/heads/ignite-99
Commit: fd03d80ce9f09e639050bf40a00f212c2892c8b1
Parents: 521ac9e
Author: Yakov Zhdanov
Authored: Mon Jan 19 17:01:52 2015 +0300
Committer: Yakov Zhdanov
Committed: Mon Jan 19 17:01:52 2015 +0300
--
.../processors/cache/GridCacheBasicApiAbstractTest.java | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd03d80c/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicApiAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicApiAbstractTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicApiAbstractTest.java
index 0910d42..3352356 100644
---
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicApiAbstractTest.java
+++
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicApiAbstractTest.java
@@ -168,14 +168,14 @@ public abstract class GridCacheBasicApiAbstractTest
extends GridCommonAbstractTe
public void testInterruptLock() throws InterruptedException {
final IgniteCache cache = ignite.jcache(null);
-//cache.put(1, "a");
-
cache.lock(1).lock();
final AtomicBoolean isOk = new AtomicBoolean(false);
Thread t = new Thread(new Runnable() {
@Override public void run() {
+assertFalse(cache.lock(1).isLockedByThread());
+
cache.lock(1).lock();
try {
@@ -205,12 +205,9 @@ public abstract class GridCacheBasicApiAbstractTest
extends GridCommonAbstractTe
/**
*
*/
-public void _testInterruptLockWithTimeout() throws InterruptedException {
+public void testInterruptLockWithTimeout() throws InterruptedException {
final IgniteCache cache = ignite.jcache(null);
-//cache.put(1, "a");
-//cache.put(2, "b");
-
cache.lock(2).lock();
final AtomicBoolean isOk = new AtomicBoolean(false);
[47/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-53
Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-53 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/add3600f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/add3600f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/add3600f Branch: refs/heads/ignite-99 Commit: add3600f29c5dcff5eb6cc14d7f7f8992ec5c62f Parents: 222721b cd86285 Author: ivasilinets Authored: Tue Jan 20 11:26:20 2015 +0300 Committer: ivasilinets Committed: Tue Jan 20 11:26:20 2015 +0300 -- .../main/java/org/apache/ignite/CacheLock.java | 86 .../java/org/apache/ignite/IgniteCache.java | 23 +- .../processors/cache/IgniteCacheProxy.java | 83 +-- .../processors/cache/GridCacheAdapter.java | 20 - .../cache/GridCacheBasicApiAbstractTest.java| 80 ++ 5 files changed, 264 insertions(+), 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/add3600f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java --
[29/50] [abbrv] incubator-ignite git commit: ignite-53: merge from ignite-1
ignite-53: merge from ignite-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d8034003
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d8034003
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d8034003
Branch: refs/heads/ignite-99
Commit: d80340035818ae26c240694909d9e359c40823ab
Parents: 45eed74
Author: Yakov Zhdanov
Authored: Mon Jan 19 14:27:41 2015 +0300
Committer: Yakov Zhdanov
Committed: Mon Jan 19 14:27:41 2015 +0300
--
.../ignite/internal/processors/cache/IgniteCacheProxy.java| 5 +++--
.../gridgain/grid/kernal/processors/cache/CacheEntryImpl.java | 2 +-
.../processors/cache/CacheWeakQueryIteratorsHolder.java | 7 +--
.../kernal/processors/cache/query/GridCacheQueryAdapter.java | 1 -
4 files changed, 9 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d8034003/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 6e82660..3ac11be 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
@@ -74,7 +74,8 @@ public class IgniteCacheProxy extends
IgniteAsyncSupportAdapter implements
public IgniteCacheProxy(GridCacheContext ctx,
GridCacheProjectionEx delegate,
@Nullable GridCacheProjectionImpl prj,
-boolean async) {
+boolean async
+) {
super(async);
assert ctx != null;
@@ -84,7 +85,7 @@ public class IgniteCacheProxy extends
IgniteAsyncSupportAdapter implements
this.delegate = delegate;
this.prj = prj;
-this.itHolder = new CacheWeakQueryIteratorsHolder,
Map.Entry>(ctx.logger(IgniteCacheProxy.class)) {
+itHolder = new CacheWeakQueryIteratorsHolder, Map.Entry>(ctx.logger(IgniteCacheProxy.class)) {
@Override protected Entry convert(Map.Entry e) {
return new CacheEntryImpl<>(e.getKey(), e.getValue());
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d8034003/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheEntryImpl.java
--
diff --git
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheEntryImpl.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheEntryImpl.java
index 3a7a546..c742470 100644
---
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheEntryImpl.java
+++
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheEntryImpl.java
@@ -52,7 +52,7 @@ public class CacheEntryImpl implements Cache.Entry {
@SuppressWarnings("unchecked")
@Override public T unwrap(Class cls) {
if (!cls.equals(getClass()))
-throw new IllegalArgumentException("Unwrapping is not supported: "
+ cls);
+throw new IllegalArgumentException("Unwrapping to class is not
supported: " + cls);
return (T)this;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d8034003/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheWeakQueryIteratorsHolder.java
--
diff --git
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheWeakQueryIteratorsHolder.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheWeakQueryIteratorsHolder.java
index eaa65be..1459927 100644
---
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheWeakQueryIteratorsHolder.java
+++
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheWeakQueryIteratorsHolder.java
@@ -55,7 +55,9 @@ public abstract class CacheWeakQueryIteratorsHolder {
public WeakQueryFutureIterator iterator(GridCacheQueryFuture fut) {
WeakQueryFutureIterator it = new WeakQueryFutureIterator(fut);
-futs.put(it.weakReference(), fut);
+GridCacheQueryFuture old = futs.put(it.weakReference(), fut);
+
+assert old == null;
return it;
}
@@ -75,7 +77,8 @@ public abstract class CacheWeakQueryIteratorsHolder {
* Closes unreachable iterators.
*/
public void checkWeakQueue() {
-for (Reference itRef =
refQueue.poll(); itRef != null; itRef = refQueue.poll()
[30/50] [abbrv] incubator-ignite git commit: Merge branches 'ignite-1' and 'ignite-59' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-59
Merge branches 'ignite-1' and 'ignite-59' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-59 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d787b5f9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d787b5f9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d787b5f9 Branch: refs/heads/ignite-99 Commit: d787b5f97feec9e368bcf1dc136d6ec0b3054c94 Parents: 9d4476d 9223d38 Author: Yakov Zhdanov Authored: Mon Jan 19 14:31:10 2015 +0300 Committer: Yakov Zhdanov Committed: Mon Jan 19 14:31:10 2015 +0300 -- LICENSE.txt | 202 +++ apache-2.0.txt | 202 --- .../ignite/portables/PortableRawReader.java | 2 +- .../grid/dotnet/GridDotNetConfiguration.java| 14 +- .../dotnet/GridDotNetPortableConfiguration.java | 28 +-- .../GridDotNetPortableTypeConfiguration.java| 15 +- .../org/gridgain/grid/kernal/GridGainEx.java| 76 +-- .../grid/kernal/GridNodeAttributes.java | 5 +- .../processors/cache/GridCacheAdapter.java | 18 +- .../processors/cache/GridCacheContext.java | 2 +- .../processors/cache/GridCacheEntryImpl.java| 2 +- .../GridCacheContinuousQueryAdapter.java| 13 +- .../GridCacheContinuousQueryFilterEx.java | 32 +++ .../GridCacheContinuousQueryHandler.java| 17 +- .../GridCacheContinuousQueryHandlerV3.java | 61 ++ .../GridCacheContinuousQueryHandlerV4.java | 61 ++ .../GridCacheContinuousQueryListener.java | 5 + .../GridCacheContinuousQueryManager.java| 55 +++-- .../interop/GridInteropProcessorAdapter.java| 3 - 19 files changed, 522 insertions(+), 291 deletions(-) --
[27/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1
Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9223d38d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9223d38d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9223d38d Branch: refs/heads/ignite-99 Commit: 9223d38d2443d2be2403b7c55cff053974ade032 Parents: 4c20cad 1a2e7d4 Author: Yakov Zhdanov Authored: Mon Jan 19 13:44:27 2015 +0300 Committer: Yakov Zhdanov Committed: Mon Jan 19 13:44:27 2015 +0300 -- .../ignite/portables/PortableRawReader.java | 2 +- .../grid/dotnet/GridDotNetConfiguration.java| 14 +++- .../dotnet/GridDotNetPortableConfiguration.java | 28 +++- .../GridDotNetPortableTypeConfiguration.java| 15 +--- .../org/gridgain/grid/kernal/GridGainEx.java| 76 ++-- .../grid/kernal/GridNodeAttributes.java | 5 +- .../processors/cache/GridCacheAdapter.java | 18 +++-- .../processors/cache/GridCacheContext.java | 2 +- .../processors/cache/GridCacheEntryImpl.java| 2 +- .../GridCacheContinuousQueryAdapter.java| 13 +++- .../GridCacheContinuousQueryFilterEx.java | 32 + .../GridCacheContinuousQueryHandler.java| 17 - .../GridCacheContinuousQueryHandlerV3.java | 61 .../GridCacheContinuousQueryHandlerV4.java | 61 .../GridCacheContinuousQueryListener.java | 5 ++ .../GridCacheContinuousQueryManager.java| 55 ++ .../interop/GridInteropProcessorAdapter.java| 3 - 17 files changed, 320 insertions(+), 89 deletions(-) --
[44/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-53
Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-53 Conflicts: 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/5ee94421 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5ee94421 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5ee94421 Branch: refs/heads/ignite-99 Commit: 5ee944211cf344f6f57a102579cc9dcd89b5b092 Parents: eb74531 4a64d43 Author: ivasilinets Authored: Mon Jan 19 19:35:35 2015 +0300 Committer: ivasilinets Committed: Mon Jan 19 19:35:35 2015 +0300 -- .../apache/ignite/cache/CacheEntryEvent.java| 53 +- .../processors/cache/IgniteCacheProxy.java |3 +- .../grid/cache/GridCacheConfiguration.java |1 + .../cache/query/GridCacheContinuousQuery.java | 10 +- .../grid/kernal/GridEventConsumeHandler.java|2 +- .../processors/cache/GridCacheMapEntry.java | 70 +- .../processors/cache/GridCacheProcessor.java|1 - .../GridCacheDataStructuresManager.java |6 +- .../GridCacheContinuousQueryAdapter.java| 42 +- .../GridCacheContinuousQueryEntry.java | 61 +- .../GridCacheContinuousQueryHandler.java| 96 +- .../GridCacheContinuousQueryHandlerV2.java | 83 -- .../GridCacheContinuousQueryHandlerV3.java | 61 -- .../GridCacheContinuousQueryHandlerV4.java | 61 -- .../GridCacheContinuousQueryManager.java| 513 - .../continuous/GridContinuousMessage.java | 52 +- .../continuous/GridContinuousMessageType.java |5 +- .../continuous/GridContinuousProcessor.java | 181 +++- .../service/GridServiceProcessor.java |4 +- .../IgniteCacheEntryListenerAbstractTest.java | 1005 ++ ...IgniteCacheEntryListenerAtomicLocalTest.java | 49 + ...eCacheEntryListenerAtomicReplicatedTest.java | 32 + .../IgniteCacheEntryListenerAtomicTest.java | 55 + ...eCacheEntryListenerEagerTtlDisabledTest.java | 30 + .../IgniteCacheEntryListenerTxLocalTest.java| 49 + ...gniteCacheEntryListenerTxReplicatedTest.java | 32 + .../cache/IgniteCacheEntryListenerTxTest.java | 49 + .../junits/common/GridCommonAbstractTest.java | 13 + .../bamboo/GridDataGridTestSuite.java |8 + 29 files changed, 2298 insertions(+), 329 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5ee94421/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java --
[45/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-59' into ignite-1
Merge remote-tracking branch 'remotes/origin/ignite-59' into ignite-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cd862850 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cd862850 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cd862850 Branch: refs/heads/ignite-99 Commit: cd862850f17429b9d9f7bbf89f111b62034e65cc Parents: 4a64d43 3f7dc7d Author: sevdokimov Authored: Mon Jan 19 19:35:40 2015 +0300 Committer: sevdokimov Committed: Mon Jan 19 19:35:40 2015 +0300 -- .../main/java/org/apache/ignite/CacheLock.java | 86 .../java/org/apache/ignite/IgniteCache.java | 23 +- .../processors/cache/IgniteCacheProxy.java | 83 +-- .../processors/cache/GridCacheAdapter.java | 20 - .../cache/GridCacheBasicApiAbstractTest.java| 80 ++ 5 files changed, 264 insertions(+), 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd862850/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java --
[08/50] [abbrv] incubator-ignite git commit: ignite-43 add dynamically registered listener to configuration
ignite-43 add dynamically registered listener to configuration
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/52e6b9c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/52e6b9c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/52e6b9c9
Branch: refs/heads/ignite-99
Commit: 52e6b9c909c4c6ae159e9c1d126e4101300e041d
Parents: fc0b5e8
Author: sboikov
Authored: Wed Jan 14 13:12:12 2015 +0300
Committer: sboikov
Committed: Wed Jan 14 13:14:16 2015 +0300
--
.../processors/cache/IgniteCacheProxy.java | 14 +++--
.../GridCacheContinuousQueryEntry.java | 7 +++
.../GridCacheContinuousQueryHandler.java| 2 +-
.../GridCacheContinuousQueryManager.java| 17 ++-
.../IgniteCacheEntryListenerAbstractTest.java | 22 +---
...IgniteCacheEntryListenerAtomicLocalTest.java | 22 +---
...eCacheEntryListenerAtomicReplicatedTest.java | 22 +---
.../IgniteCacheEntryListenerAtomicTest.java | 22 +---
...eCacheEntryListenerEagerTtlDisabledTest.java | 22 +---
.../IgniteCacheEntryListenerTxLocalTest.java| 22 +---
...gniteCacheEntryListenerTxReplicatedTest.java | 22 +---
.../cache/IgniteCacheEntryListenerTxTest.java | 22 +---
12 files changed, 152 insertions(+), 64 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52e6b9c9/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 31264ba..c507989 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
@@ -699,7 +699,17 @@ public class IgniteCacheProxy extends
IgniteAsyncSupportAdapter implements
/** {@inheritDoc} */
@Override public void clear() {
// TODO IGNITE-1.
-throw new UnsupportedOperationException();
+GridCacheProjectionImpl prev = gate.enter(prj);
+
+try {
+delegate.globalClearAll(0);
+}
+catch (IgniteCheckedException e) {
+throw cacheException(e);
+}
+finally {
+gate.leave(prev);
+}
}
/** {@inheritDoc} */
@@ -822,7 +832,7 @@ public class IgniteCacheProxy extends
IgniteAsyncSupportAdapter implements
GridCacheProjectionImpl prev = gate.enter(prj);
try {
-ctx.continuousQueries().registerCacheEntryListener(lsnrCfg);
+ctx.continuousQueries().registerCacheEntryListener(lsnrCfg, true);
}
catch (IgniteCheckedException e) {
throw cacheException(e);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52e6b9c9/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java
--
diff --git
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java
index 8511910..40a39e8 100644
---
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java
+++
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java
@@ -147,6 +147,13 @@ public class GridCacheContinuousQueryEntry
implements GridCacheEntry
}
/**
+ * @return {@code True} if old value is set.
+ */
+boolean hasOldValue() {
+return oldVal != null || (oldValBytes != null &&
!oldValBytes.isNull());
+}
+
+/**
* @return {@code True} if entry expired.
*/
public EventType eventType() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52e6b9c9/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
--
diff --git
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandle
[20/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43
Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2a2eb5a3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2a2eb5a3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2a2eb5a3 Branch: refs/heads/ignite-99 Commit: 2a2eb5a3f2c162378067d398391413abcaf87ac1 Parents: 09df7de 6dd8b40 Author: sboikov Authored: Mon Jan 19 10:41:09 2015 +0400 Committer: sboikov Committed: Mon Jan 19 10:41:09 2015 +0400 -- LICENSE.txt | 202 ++ apache-2.0.txt | 202 -- .../java/org/apache/ignite/IgniteCache.java | 4 +- .../processors/cache/IgniteCacheProxy.java | 76 +- .../processors/cache/GridCacheMapEntry.java | 2 +- .../grid/kernal/visor/query/VisorQueryTask.java | 53 ++-- .../tcp/GridCacheDhtLockBackupSelfTest.java | 18 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 271 --- .../cache/GridCacheBasicApiAbstractTest.java| 91 --- .../GridCacheFinishPartitionsSelfTest.java | 22 +- .../GridCacheGroupLockAbstractSelfTest.java | 24 +- .../cache/GridCacheNestedTxAbstractTest.java| 28 +- .../GridCacheOffHeapTieredAbstractSelfTest.java | 38 +-- .../distributed/GridCacheLockAbstractTest.java | 40 +-- .../GridCacheMultiNodeLockAbstractTest.java | 144 +++--- .../dht/GridCacheColocatedDebugTest.java| 26 +- ...dCachePartitionedTopologyChangeSelfTest.java | 8 +- .../near/GridCacheNearMultiNodeSelfTest.java| 16 +- .../near/GridCacheNearOneNodeSelfTest.java | 39 +-- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 42 --- .../near/GridCacheNearReadersSelfTest.java | 14 +- ...titionedExplicitLockNodeFailureSelfTest.java | 1 + .../near/GridCachePartitionedLockSelfTest.java | 11 +- .../GridCacheEvictionLockUnlockSelfTest.java| 7 +- .../cache/local/GridCacheLocalLockSelfTest.java | 36 +-- .../GridCacheLocalMultithreadedSelfTest.java| 42 +-- .../ggfs/GridGgfsMetaManagerSelfTest.java | 6 +- .../java/org/gridgain/grid/p2p/p2p.properties | 17 -- 28 files changed, 699 insertions(+), 781 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a2eb5a3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a2eb5a3/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java --
[36/50] [abbrv] incubator-ignite git commit: #IGNITE-53: Move CacheWeakQueryIteratorsHolder to context.
#IGNITE-53: Move CacheWeakQueryIteratorsHolder to context.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9a5dcb3a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9a5dcb3a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9a5dcb3a
Branch: refs/heads/ignite-99
Commit: 9a5dcb3a4a4c964ff4c53bf57a791170b310ff0c
Parents: d803400
Author: ivasilinets
Authored: Mon Jan 19 17:31:18 2015 +0400
Committer: ivasilinets
Committed: Mon Jan 19 17:31:18 2015 +0400
--
.../processors/cache/IgniteCacheProxy.java | 28 +--
.../cache/CacheIteratorConverter.java | 39 +++
.../cache/CacheWeakQueryIteratorsHolder.java| 50
.../processors/cache/GridCacheContext.java | 12 +
.../cache/datastructures/GridCacheSetImpl.java | 32 ++---
5 files changed, 100 insertions(+), 61 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a5dcb3a/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 3ac11be..46fbfb4 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
@@ -25,6 +25,7 @@ import org.apache.ignite.lang.*;
import org.apache.ignite.resources.*;
import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
+import org.gridgain.grid.cache.query.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.processors.cache.*;
import org.gridgain.grid.util.tostring.*;
@@ -62,9 +63,6 @@ public class IgniteCacheProxy extends
IgniteAsyncSupportAdapter implements
/** Projection. */
private GridCacheProjectionImpl prj;
-/** Iterator holder. */
-private final CacheWeakQueryIteratorsHolder, Map.Entry>
itHolder;
-
/**
* @param ctx Context.
* @param delegate Delegate.
@@ -85,16 +83,6 @@ public class IgniteCacheProxy extends
IgniteAsyncSupportAdapter implements
this.delegate = delegate;
this.prj = prj;
-itHolder = new CacheWeakQueryIteratorsHolder, Map.Entry>(ctx.logger(IgniteCacheProxy.class)) {
-@Override protected Entry convert(Map.Entry e) {
-return new CacheEntryImpl<>(e.getKey(), e.getValue());
-}
-
-@Override protected void remove(Entry item) {
-IgniteCacheProxy.this.remove(item.getKey());
-}
-};
-
gate = ctx.gate();
}
@@ -942,9 +930,19 @@ public class IgniteCacheProxy extends
IgniteAsyncSupportAdapter implements
GridCacheProjectionImpl prev = gate.enter(prj);
try {
-itHolder.checkWeakQueue();
+ctx.itHolder().checkWeakQueue();
+
+GridCacheQueryFuture> fut =
delegate.queries().createScanQuery(null).execute();
-return
itHolder.iterator(delegate.queries().createScanQuery(null).execute());
+return ctx.itHolder().iterator(fut, new
CacheIteratorConverter, Map.Entry>() {
+@Override protected Entry convert(Map.Entry e) {
+return new CacheEntryImpl<>(e.getKey(), e.getValue());
+}
+
+@Override protected void remove(Entry item) {
+IgniteCacheProxy.this.remove(item.getKey());
+}
+});
}
finally {
gate.leave(prev);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9a5dcb3a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheIteratorConverter.java
--
diff --git
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheIteratorConverter.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheIteratorConverter.java
new file mode 100644
index 000..466460d
--- /dev/null
+++
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheIteratorConverter.java
@@ -0,0 +1,39 @@
+/*
+ * 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
[01/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43
Repository: incubator-ignite Updated Branches: refs/heads/ignite-99 060bede0e -> fc4e8a942 Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/311bbddc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/311bbddc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/311bbddc Branch: refs/heads/ignite-99 Commit: 311bbddc051181f50e299567c47c1b1ac9746e08 Parents: 13740b7 aceb586 Author: sboikov Authored: Tue Jan 13 09:27:15 2015 +0300 Committer: sboikov Committed: Tue Jan 13 09:27:15 2015 +0300 -- .../org/apache/ignite/IgniteSystemProperties.java | 13 + .../spi/communication/tcp/TcpCommunicationSpi.java | 8 +--- .../main/java/org/gridgain/grid/util/GridUtils.java | 16 .../bamboo/GridCacheFailoverTestSuite.java | 3 ++- 4 files changed, 36 insertions(+), 4 deletions(-) --
[11/50] [abbrv] incubator-ignite git commit: # IGNITE-59 Support lock, lockAll.
# IGNITE-59 Support lock, lockAll.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c3387597
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c3387597
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c3387597
Branch: refs/heads/ignite-99
Commit: c3387597b7744668b4c9e81e3b145fef6e01c585
Parents: da0235b
Author: sevdokimov
Authored: Wed Jan 14 18:58:35 2015 +0300
Committer: sevdokimov
Committed: Wed Jan 14 18:58:35 2015 +0300
--
.../java/org/apache/ignite/IgniteCache.java | 4 +-
.../processors/cache/IgniteCacheProxy.java | 76 ++--
2 files changed, 73 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3387597/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index 2988005..f4aa3d5 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -180,9 +180,9 @@ public interface IgniteCache extends
javax.cache.Cache, IgniteAsyncS
*/
public void removeAll(IgnitePredicate> filter) throws
CacheException;
-public Lock lock(K key) throws CacheException;
+public Lock lock(K key);
-public Lock lockAll(Set keys) throws CacheException;
+public Lock lockAll(Set keys);
/**
* Checks if any node owns a lock for this key.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3387597/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 f95cd2a..055827b 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
@@ -23,6 +23,7 @@ import org.apache.ignite.cache.query.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.resources.*;
+import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.processors.cache.*;
@@ -258,14 +259,79 @@ public class IgniteCacheProxy extends
IgniteAsyncSupportAdapter implements
/** {@inheritDoc} */
@Override public Lock lock(K key) throws CacheException {
-// TODO IGNITE-1.
-throw new UnsupportedOperationException();
+return lockAll(Collections.singleton(key));
}
/** {@inheritDoc} */
-@Override public Lock lockAll(Set keys) throws CacheException
{
-// TODO IGNITE-1.
-throw new UnsupportedOperationException();
+@Override public Lock lockAll(final Set keys) {
+return new Lock() {
+@Override public void lock() {
+try {
+delegate.lockAll(keys, 0);
+}
+catch (GridInterruptedException ignored) {
+
+}
+catch (IgniteCheckedException e) {
+throw new CacheException(e);
+}
+}
+
+@Override public void lockInterruptibly() throws
InterruptedException {
+if (Thread.interrupted())
+throw new InterruptedException();
+
+try {
+delegate.lockAll(keys, 0);
+}
+catch (GridInterruptedException e) {
+if (e.getCause() instanceof InterruptedException)
+throw (InterruptedException)e.getCause();
+
+throw new InterruptedException();
+}
+catch (IgniteCheckedException e) {
+throw new CacheException(e);
+}
+}
+
+@Override public boolean tryLock() {
+try {
+return delegate.lockAll(keys, -1);
+}
+catch (IgniteCheckedException e) {
+throw new CacheException(e);
+}
+}
+
+@Override public boolean tryLock(long time, TimeUnit unit) throws
InterruptedException {
+try {
+return delegate.lockAll(keys, unit.toMillis(time));
+}
+catch (GridInterruptedException e) {
+
[46/50] [abbrv] incubator-ignite git commit: #IGNITE-53: Change log on U.log
#IGNITE-53: Change log on U.log
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/222721bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/222721bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/222721bf
Branch: refs/heads/ignite-99
Commit: 222721bfe5637af4e97a85c1f6c69b4561350a80
Parents: 5ee9442
Author: ivasilinets
Authored: Mon Jan 19 19:45:51 2015 +0300
Committer: ivasilinets
Committed: Mon Jan 19 19:45:51 2015 +0300
--
.../kernal/processors/cache/CacheWeakQueryIteratorsHolder.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/222721bf/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheWeakQueryIteratorsHolder.java
--
diff --git
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheWeakQueryIteratorsHolder.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheWeakQueryIteratorsHolder.java
index 2980663..f955695 100644
---
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheWeakQueryIteratorsHolder.java
+++
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheWeakQueryIteratorsHolder.java
@@ -20,6 +20,7 @@ package org.gridgain.grid.kernal.processors.cache;
import org.apache.ignite.*;
import org.gridgain.grid.cache.query.*;
import org.gridgain.grid.util.*;
+import org.gridgain.grid.util.typedef.internal.*;
import org.jdk8.backport.*;
import java.lang.ref.*;
@@ -88,7 +89,7 @@ public class CacheWeakQueryIteratorsHolder {
fut.cancel();
}
catch (IgniteCheckedException e) {
-log.error("Failed to close iterator.", e);
+U.error(log, "Failed to close iterator.", e);
}
}
}
@@ -102,7 +103,7 @@ public class CacheWeakQueryIteratorsHolder {
fut.cancel();
}
catch (IgniteCheckedException e) {
-log.error("Failed to close iterator.", e);
+U.error(log, "Failed to close iterator.", e);
}
}
[19/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'origin/ignite-1' into ignite-1
Merge remote-tracking branch 'origin/ignite-1' into ignite-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6dd8b40f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6dd8b40f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6dd8b40f Branch: refs/heads/ignite-99 Commit: 6dd8b40f36411c41870adb20e6d6f6c26d4f7c33 Parents: 062b899 80b986f Author: Dmitiry Setrakyan Authored: Fri Jan 16 12:03:21 2015 -0800 Committer: Dmitiry Setrakyan Committed: Fri Jan 16 12:03:21 2015 -0800 -- .../java/org/apache/ignite/IgniteCache.java | 4 +- .../processors/cache/IgniteCacheProxy.java | 76 +- .../processors/cache/CacheInvokeEntry.java | 14 + .../processors/cache/GridCacheMapEntry.java | 17 +- .../cache/transactions/IgniteTxAdapter.java | 22 +- .../grid/kernal/visor/query/VisorQueryTask.java | 53 ++-- .../tcp/GridCacheDhtLockBackupSelfTest.java | 18 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 271 --- .../cache/GridCacheBasicApiAbstractTest.java| 91 --- .../GridCacheFinishPartitionsSelfTest.java | 22 +- .../GridCacheGroupLockAbstractSelfTest.java | 24 +- .../cache/GridCacheNestedTxAbstractTest.java| 28 +- .../GridCacheOffHeapTieredAbstractSelfTest.java | 38 +-- .../distributed/GridCacheLockAbstractTest.java | 40 +-- .../GridCacheMultiNodeLockAbstractTest.java | 144 +++--- .../dht/GridCacheColocatedDebugTest.java| 26 +- ...dCachePartitionedTopologyChangeSelfTest.java | 8 +- .../near/GridCacheNearMultiNodeSelfTest.java| 16 +- .../near/GridCacheNearOneNodeSelfTest.java | 39 +-- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 42 --- .../near/GridCacheNearReadersSelfTest.java | 14 +- ...titionedExplicitLockNodeFailureSelfTest.java | 1 + .../near/GridCachePartitionedLockSelfTest.java | 11 +- .../GridCacheEvictionLockUnlockSelfTest.java| 7 +- .../cache/local/GridCacheLocalLockSelfTest.java | 36 +-- .../GridCacheLocalMultithreadedSelfTest.java| 42 +-- .../ggfs/GridGgfsMetaManagerSelfTest.java | 6 +- .../java/org/gridgain/grid/p2p/p2p.properties | 17 -- 28 files changed, 546 insertions(+), 581 deletions(-) --
[26/50] [abbrv] incubator-ignite git commit: ignite-53: merge from ignite-1
ignite-53: merge from ignite-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/aca475f0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/aca475f0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/aca475f0 Branch: refs/heads/ignite-99 Commit: aca475f0729690a0bfb8bc2a7cf74b15be668022 Parents: 05b3295 Author: Yakov Zhdanov Authored: Mon Jan 19 13:44:13 2015 +0300 Committer: Yakov Zhdanov Committed: Mon Jan 19 13:44:13 2015 +0300 -- .../processors/cache/GridCacheAbstractFullApiSelfTest.java | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aca475f0/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java -- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java index 9e4a368..849e4fc 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java @@ -23,9 +23,9 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.configuration.*; import org.apache.ignite.events.*; import org.apache.ignite.lang.*; +import org.apache.ignite.spi.swapspace.inmemory.*; import org.apache.ignite.transactions.*; import org.gridgain.grid.cache.*; -import org.apache.ignite.spi.swapspace.inmemory.*; import org.gridgain.grid.kernal.*; import org.gridgain.grid.util.lang.*; import org.gridgain.grid.util.typedef.*; @@ -42,12 +42,12 @@ import java.util.concurrent.atomic.*; import java.util.concurrent.locks.*; import static java.util.concurrent.TimeUnit.*; -import static org.gridgain.grid.cache.GridCacheMode.*; -import static org.gridgain.grid.cache.GridCachePeekMode.*; +import static org.apache.ignite.events.IgniteEventType.*; import static org.apache.ignite.transactions.IgniteTxConcurrency.*; import static org.apache.ignite.transactions.IgniteTxIsolation.*; import static org.apache.ignite.transactions.IgniteTxState.*; -import static org.apache.ignite.events.IgniteEventType.*; +import static org.gridgain.grid.cache.GridCacheMode.*; +import static org.gridgain.grid.cache.GridCachePeekMode.*; import static org.gridgain.testframework.GridTestUtils.*; /**
[21/50] [abbrv] incubator-ignite git commit: Merge ignite-1 into sprint-1
Merge ignite-1 into sprint-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/1a2e7d47 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1a2e7d47 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1a2e7d47 Branch: refs/heads/ignite-99 Commit: 1a2e7d4751a58e7bb516746ab3b247425fdab642 Parents: c0c28ab 6dd8b40 Author: nikolay_tikhonov Authored: Mon Jan 19 10:03:51 2015 +0300 Committer: nikolay_tikhonov Committed: Mon Jan 19 10:03:51 2015 +0300 -- LICENSE.txt | 202 apache-2.0.txt | 202 .../examples/datagrid/CacheApiExample.java | 63 +- .../datagrid/CachePopularNumbersExample.java| 17 +- .../ScalarCachePopularNumbersExample.scala | 17 +- .../services/javax.cache.spi.CachingProvider| 1 + .../java/org/apache/ignite/IgniteCache.java | 215 - .../org/apache/ignite/IgniteCacheMXBean.java| 72 ++ .../org/apache/ignite/IgniteCacheManager.java | 372 .../apache/ignite/IgniteCachingProvider.java| 189 .../cache/CachePartialUpdateException.java | 36 + .../dataload/IgniteDataLoadCacheUpdater.java| 7 +- .../processors/cache/IgniteCacheProxy.java | 701 -- .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../grid/cache/GridCacheConfiguration.java | 43 +- .../org/gridgain/grid/cache/GridCacheEntry.java | 24 +- .../org/gridgain/grid/cache/GridCacheFlag.java | 5 +- .../grid/cache/GridCacheInterceptor.java| 8 +- .../cache/GridCachePartialUpdateException.java | 1 + .../grid/cache/GridCacheProjection.java | 186 .../org/gridgain/grid/kernal/GridGainEx.java| 2 +- .../kernal/managers/GridManagerAdapter.java | 26 +- .../processors/cache/CacheInvokeEntry.java | 89 ++ .../processors/cache/CacheInvokeResult.java | 96 ++ .../processors/cache/GridCacheAdapter.java | 533 --- .../processors/cache/GridCacheContext.java | 31 +- .../processors/cache/GridCacheEntryEx.java | 30 +- .../processors/cache/GridCacheEntryImpl.java| 18 +- .../cache/GridCacheEvictionEntry.java | 18 +- .../cache/GridCacheFilterEvaluationEntry.java | 18 +- .../processors/cache/GridCacheMapEntry.java | 464 + .../processors/cache/GridCacheMessage.java | 71 +- .../processors/cache/GridCacheProcessor.java| 24 +- .../processors/cache/GridCacheProjectionEx.java | 86 +- .../cache/GridCacheProjectionImpl.java | 171 ++-- .../processors/cache/GridCacheProxyImpl.java| 147 +-- .../processors/cache/GridCacheReturn.java | 57 +- .../processors/cache/GridCacheStoreManager.java | 7 +- .../cache/GridCacheTransformComputeClosure.java | 76 -- .../cache/GridCacheUpdateAtomicResult.java | 20 +- .../kernal/processors/cache/GridCacheUtils.java | 25 +- .../cache/IgniteCacheExpiryPolicy.java | 65 ++ .../GridAtomicCacheQueueImpl.java | 44 +- .../GridCacheDataStructuresManager.java | 7 +- .../datastructures/GridCacheQueueAdapter.java | 229 +++-- .../GridTransactionalCacheQueueImpl.java| 112 ++- .../distributed/GridCacheTtlUpdateRequest.java | 492 ++ .../GridDistributedCacheAdapter.java| 18 +- .../GridDistributedLockResponse.java| 19 +- .../GridDistributedTxRemoteAdapter.java | 52 +- .../IgniteExternalizableExpiryPolicy.java | 166 .../distributed/dht/GridDhtCacheAdapter.java| 238 - .../cache/distributed/dht/GridDhtGetFuture.java | 70 +- .../distributed/dht/GridDhtLockFuture.java | 18 +- .../distributed/dht/GridDhtLockRequest.java | 50 +- .../dht/GridDhtTransactionalCacheAdapter.java | 57 +- .../distributed/dht/GridDhtTxFinishFuture.java | 22 + .../distributed/dht/GridDhtTxFinishRequest.java | 95 ++ .../cache/distributed/dht/GridDhtTxLocal.java | 9 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 64 +- .../cache/distributed/dht/GridDhtTxRemote.java | 29 +- .../dht/GridPartitionedGetFuture.java | 33 +- .../dht/atomic/GridDhtAtomicCache.java | 685 ++--- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 54 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 440 ++--- .../dht/atomic/GridNearAtomicUpdateFuture.java | 61 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 210 ++-- .../atomic/GridNearAtomicUpdateResponse.java| 135 ++- .../dht/colocated/GridDhtColocatedCache.java| 139 ++- .../colocated/GridDhtColocatedLockFuture.java | 91 +- .../distributed/near/GridNearAtomicCache.java | 106 ++- .../distributed/near/GridNearCacheAdapter.java | 41 +- .../distributed/near/GridNearCacheEntry.java| 19 +- .../distributed/near/GridNearGetF
[49/50] [abbrv] incubator-ignite git commit: #IGNITE-53: wip
#IGNITE-53: wip
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/83a571bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/83a571bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/83a571bc
Branch: refs/heads/ignite-99
Commit: 83a571bc8d5bea30d2b81114857ebaad25972961
Parents: c500eda
Author: ivasilinets
Authored: Tue Jan 20 14:48:59 2015 +0300
Committer: ivasilinets
Committed: Tue Jan 20 14:48:59 2015 +0300
--
.../ignite/internal/processors/cache/IgniteCacheProxy.java | 8 +++-
.../processors/cache/GridCacheAbstractFullApiSelfTest.java | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83a571bc/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 fbf6904..e3f60df 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
@@ -982,7 +982,13 @@ public class IgniteCacheProxy extends
IgniteAsyncSupportAdapter implements
try {
ctx.itHolder().checkWeakQueue();
-GridCacheQueryFuture> fut =
delegate.queries().createScanQuery(null).execute();
+GridCacheQuery> query =
delegate.queries().createScanQuery(null);
+
+query.includeBackups(false);
+query.enableDedup(true);
+query.keepAll(false);
+
+GridCacheQueryFuture> fut = query.execute();
return ctx.itHolder().iterator(fut, new
CacheIteratorConverter, Map.Entry>() {
@Override protected Entry convert(Map.Entry e) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83a571bc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index d0e8d34..7367cb8 100644
---
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -5087,7 +5087,7 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
assertFalse(cache.iterator().hasNext());
-final int SIZE = 1000;
+final int SIZE = 2;
Map entries = new HashMap<>();
[02/50] [abbrv] incubator-ignite git commit: ignite-43
ignite-43
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/48dd7fbf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/48dd7fbf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/48dd7fbf
Branch: refs/heads/ignite-99
Commit: 48dd7fbf68771633a4db5986a0173eb82cf7ea6e
Parents: 311bbdd
Author: sboikov
Authored: Tue Jan 13 10:14:20 2015 +0300
Committer: sboikov
Committed: Tue Jan 13 11:55:54 2015 +0300
--
.../processors/cache/GridCacheMapEntry.java | 2 +-
.../processors/cache/GridCacheProcessor.java| 1 -
.../GridCacheDataStructuresManager.java | 3 +-
.../GridCacheContinuousQueryAdapter.java| 44 +++
.../GridCacheContinuousQueryEntry.java | 46 +--
.../GridCacheContinuousQueryHandler.java| 52 +---
.../GridCacheContinuousQueryHandlerV2.java | 83
.../GridCacheContinuousQueryListener.java | 3 +-
.../GridCacheContinuousQueryManager.java| 126 +++
.../continuous/GridContinuousProcessor.java | 4 +-
.../service/GridServiceProcessor.java | 4 +-
.../IgniteCacheEntryListenerAbstractTest.java | 118 +++--
12 files changed, 250 insertions(+), 236 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/48dd7fbf/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java
--
diff --git
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java
index aee3806..b80f729 100644
---
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java
+++
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java
@@ -3016,7 +3016,7 @@ public abstract class GridCacheMapEntry implements
GridCacheEntryEx
drReplicate(drType, val, valBytes, ver);
if (!skipQryNtf) {
-if (cctx.affinity().primary(cctx.localNode(), key, topVer)
|| cctx.isReplicated()) {
+if (cctx.isReplicated() ||
cctx.affinity().primary(cctx.localNode(), key, topVer)) {
cctx.continuousQueries().onEntryUpdate(this,
key,
val,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/48dd7fbf/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java
--
diff --git
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java
index 46755c6..6dfd00a 100644
---
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java
+++
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java
@@ -43,7 +43,6 @@ import org.gridgain.grid.util.typedef.*;
import org.gridgain.grid.util.typedef.internal.*;
import org.jetbrains.annotations.*;
-import javax.cache.configuration.*;
import javax.management.*;
import java.util.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/48dd7fbf/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheDataStructuresManager.java
--
diff --git
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheDataStructuresManager.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheDataStructuresManager.java
index 384329b..c756492 100644
---
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheDataStructuresManager.java
+++
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheDataStructuresManager.java
@@ -682,7 +682,8 @@ public final class GridCacheDataStructuresManager
extends GridCacheManager
queueQry.execute(cctx.isLocal() || cctx.isReplicated() ?
cctx.grid().forLocal() : null,
true,
false,
-false);
+false,
+true);
}
GridCacheQueueProxy queue = queuesMap.get(header.id());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/48dd7fbf/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
--
[03/50] [abbrv] incubator-ignite git commit: # ignite-43
# ignite-43
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2f5d4d8a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2f5d4d8a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2f5d4d8a
Branch: refs/heads/ignite-99
Commit: 2f5d4d8a4a76a41f04d642594197df915459ef8d
Parents: 48dd7fb
Author: sboikov
Authored: Tue Jan 13 12:47:33 2015 +0300
Committer: sboikov
Committed: Tue Jan 13 12:47:33 2015 +0300
--
.../cache/IgniteCacheEntryListenerAbstractTest.java | 15 +++
1 file changed, 15 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2f5d4d8a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
index b35e1a8..f63ab9d 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
@@ -12,6 +12,8 @@ package org.apache.ignite.internal.processors.cache;
import org.apache.ignite.*;
import org.apache.ignite.lang.*;
import org.gridgain.grid.cache.*;
+import org.gridgain.grid.kernal.*;
+import org.gridgain.grid.kernal.processors.continuous.*;
import org.gridgain.grid.util.lang.*;
import org.gridgain.grid.util.typedef.internal.*;
import org.gridgain.testframework.*;
@@ -61,6 +63,19 @@ public abstract class IgniteCacheEntryListenerAbstractTest
extends IgniteCacheAb
return cfg;
}
+/** {@inheritDoc} */
+@Override protected void afterTest() throws Exception {
+super.afterTest();
+
+for (int i = 0; i < gridCount(); i++) {
+GridContinuousProcessor proc =
((GridKernal)grid(i)).context().continuous();
+
+ConcurrentMap syncMsgFuts =
GridTestUtils.getFieldValue(proc, "syncMsgFuts");
+
+assertEquals(0, syncMsgFuts.size());
+}
+}
+
/**
* @throws Exception If failed.
*/
[07/50] [abbrv] incubator-ignite git commit: # ignite-43 skip update if EntryProcessor does not modify entry
# ignite-43 skip update if EntryProcessor does not modify entry
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fc0b5e8b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fc0b5e8b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fc0b5e8b
Branch: refs/heads/ignite-99
Commit: fc0b5e8b34a927eb9cf59efa5db16069c55980c9
Parents: 8f8f6ef
Author: sboikov
Authored: Wed Jan 14 12:50:28 2015 +0300
Committer: sboikov
Committed: Wed Jan 14 12:50:28 2015 +0300
--
.../processors/cache/IgniteCacheProxy.java | 25 -
.../processors/cache/CacheInvokeEntry.java | 14 +
.../processors/cache/GridCacheMapEntry.java | 15 ++
.../GridCacheContinuousQueryManager.java| 4 +-
.../cache/transactions/IgniteTxAdapter.java | 22 +++-
.../IgniteCacheEntryListenerAbstractTest.java | 57 +++-
6 files changed, 130 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0b5e8b/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 ac015e8..31264ba 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
@@ -850,7 +850,30 @@ public class IgniteCacheProxy extends
IgniteAsyncSupportAdapter implements
/** {@inheritDoc} */
@Override public Iterator> iterator() {
// TODO IGNITE-1.
-throw new UnsupportedOperationException();
+GridCacheProjectionImpl prev = gate.enter(prj);
+
+try {
+return F.iterator(delegate, new C1, Entry>() {
+@Override public Entry apply(final GridCacheEntry
e) {
+return new Entry() {
+@Override public K getKey() {
+return e.getKey();
+}
+
+@Override public V getValue() {
+return e.getValue();
+}
+
+@Override public T unwrap(Class clazz) {
+throw new IllegalArgumentException();
+}
+};
+}
+}, false);
+}
+finally {
+gate.leave(prev);
+}
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0b5e8b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheInvokeEntry.java
--
diff --git
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheInvokeEntry.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheInvokeEntry.java
index c9ca244..ab7dfc4 100644
---
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheInvokeEntry.java
+++
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/CacheInvokeEntry.java
@@ -26,6 +26,9 @@ public class CacheInvokeEntry implements
MutableEntry {
@GridToStringInclude
private V val;
+/** */
+private boolean modified;
+
/**
* @param key Key.
* @param val Value.
@@ -43,6 +46,8 @@ public class CacheInvokeEntry implements
MutableEntry {
/** {@inheritDoc} */
@Override public void remove() {
val = null;
+
+modified = true;
}
/** {@inheritDoc} */
@@ -51,6 +56,8 @@ public class CacheInvokeEntry implements
MutableEntry {
throw new NullPointerException();
this.val = val;
+
+modified = true;
}
/** {@inheritDoc} */
@@ -68,6 +75,13 @@ public class CacheInvokeEntry implements
MutableEntry {
throw new IllegalArgumentException();
}
+/**
+ * @return {@code True} if {@link #setValue} or {@link #remove was called}.
+ */
+public boolean modified() {
+return modified;
+}
+
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(CacheInvokeEntry.class, this);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc0b5e8b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java
--
diff --git
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCach
[12/50] [abbrv] incubator-ignite git commit: IGNITE-59 Support lock, lockAll: Fix tests.
IGNITE-59 Support lock, lockAll: Fix tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/79c51ec1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/79c51ec1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/79c51ec1
Branch: refs/heads/ignite-99
Commit: 79c51ec16a33e2b6dec02585ab43e8c1c027b5a5
Parents: c338759
Author: sevdokimov
Authored: Thu Jan 15 18:43:28 2015 +0300
Committer: sevdokimov
Committed: Thu Jan 15 18:43:28 2015 +0300
--
.../tcp/GridCacheDhtLockBackupSelfTest.java | 18 +--
.../cache/GridCacheAbstractFullApiSelfTest.java | 156 ---
.../cache/GridCacheBasicApiAbstractTest.java| 79 +-
.../GridCacheFinishPartitionsSelfTest.java | 22 +--
.../GridCacheGroupLockAbstractSelfTest.java | 24 +--
.../cache/GridCacheNestedTxAbstractTest.java| 28 ++--
.../GridCacheOffHeapTieredAbstractSelfTest.java | 38 +
.../distributed/GridCacheLockAbstractTest.java | 25 ++-
.../GridCacheMultiNodeLockAbstractTest.java | 144 -
.../dht/GridCacheColocatedDebugTest.java| 26 ++--
...dCachePartitionedTopologyChangeSelfTest.java | 8 +-
.../near/GridCacheNearMultiNodeSelfTest.java| 14 +-
.../near/GridCacheNearOneNodeSelfTest.java | 35 +++--
...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 42 -
.../near/GridCacheNearReadersSelfTest.java | 14 +-
...titionedExplicitLockNodeFailureSelfTest.java | 1 +
.../near/GridCachePartitionedLockSelfTest.java | 2 +-
.../GridCacheEvictionLockUnlockSelfTest.java| 7 +-
.../cache/local/GridCacheLocalLockSelfTest.java | 34 ++--
.../GridCacheLocalMultithreadedSelfTest.java| 14 +-
20 files changed, 322 insertions(+), 409 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79c51ec1/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
index 5d9c289..54157c2 100644
---
a/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/spi/communication/tcp/GridCacheDhtLockBackupSelfTest.java
@@ -113,8 +113,8 @@ public class GridCacheDhtLockBackupSelfTest extends
GridCommonAbstractTest {
}
// Now, grid1 is always primary node for key 1.
-final GridCache cache1 = ignite1.cache(null);
-final GridCache cache2 = ignite2.cache(null);
+final IgniteCache cache1 = ignite1.jcache(null);
+final IgniteCache cache2 = ignite2.jcache(null);
info(">>> Primary: " + ignite1.cluster().localNode().id());
info(">>> Backup: " + ignite2.cluster().localNode().id());
@@ -125,7 +125,7 @@ public class GridCacheDhtLockBackupSelfTest extends
GridCommonAbstractTest {
@Nullable @Override public Object call() throws Exception {
info("Before lock for key: " + kv);
-assert cache1.lock(kv, 0L);
+cache1.lock(kv).lock();
info("After lock for key: " + kv);
@@ -144,7 +144,7 @@ public class GridCacheDhtLockBackupSelfTest extends
GridCommonAbstractTest {
finally {
Thread.sleep(1000);
-cache1.unlockAll(Collections.singleton(kv));
+cache1.lockAll(Collections.singleton(kv)).unlock();
info("Unlocked key in thread 1: " + kv);
}
@@ -161,7 +161,7 @@ public class GridCacheDhtLockBackupSelfTest extends
GridCommonAbstractTest {
l1.await();
-assert cache2.lock(kv, 0L);
+cache2.lock(kv).lock();
try {
String v = cache2.get(kv);
@@ -170,7 +170,7 @@ public class GridCacheDhtLockBackupSelfTest extends
GridCommonAbstractTest {
assertEquals(Integer.toString(kv), v);
}
finally {
-cache2.unlockAll(Collections.singleton(kv));
+cache2.lockAll(Collections.singleton(kv)).unlock();
info("Unlocked key in thread 2: " + kv);
}
@@ -193,12 +193,12 @@ public class GridCacheDhtLockBackupSelfTest extends
GridCommonAbstractTest {
info("Remove all completed");
-if (!cache2.isEmpty()) {
-String failMsg = cache2.entrySet().toString();
+if (cache2.size() > 0) {
+S
incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-53' into ignite-99
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-99 fc4e8a942 -> aecaa0bc5
Merge remote-tracking branch 'remotes/origin/ignite-53' into ignite-99
Conflicts:
modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.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/aecaa0bc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/aecaa0bc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/aecaa0bc
Branch: refs/heads/ignite-99
Commit: aecaa0bc54797b153e9e923a82786acec34fd92d
Parents: fc4e8a9
Author: ivasilinets
Authored: Wed Jan 21 12:34:58 2015 +0300
Committer: ivasilinets
Committed: Wed Jan 21 12:34:58 2015 +0300
--
.../src/main/java/org/apache/ignite/IgniteCache.java | 4
.../cache/GridCacheAbstractFullApiSelfTest.java | 14 +++---
.../junits/common/GridCommonAbstractTest.java | 2 +-
3 files changed, 8 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aecaa0bc/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index da3dd5a..46fa38a 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -46,10 +46,6 @@ import java.util.concurrent.locks.*;
* data based on the optionally passed in arguments.
*
*
- * Method {@link #affinity()} provides {@link
org.apache.ignite.cache.affinity.CacheAffinityFunction} service for information
on
- * data partitioning and mapping keys to grid nodes responsible for
caching those keys.
- *
- *
* Method {@link #dataStructures()} provides {@link
org.gridgain.grid.cache.datastructures.GridCacheDataStructures} service for
* creating and working with distributed concurrent data structures, such
as
* {@link IgniteAtomicLong}, {@link IgniteAtomicReference}, {@link
org.gridgain.grid.cache.datastructures.GridCacheQueue}, etc.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/aecaa0bc/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index 7367cb8..3f351cb 100644
---
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -1065,7 +1065,7 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
assertEquals(exp, cache.get("key"));
for (int i = 0; i < gridCount(); i++) {
-if (cache(i).affinity().isPrimaryOrBackup(grid(i).localNode(),
"key"))
+if (affinity(i).isPrimaryOrBackup(grid(i).localNode(), "key"))
assertEquals(exp, peek(cache(i), "key"));
}
}
@@ -2329,7 +2329,7 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
GridCacheEntryEx entry = cctx.isNear() ?
cctx.near().dht().peekEx(key) :
cctx.cache().peekEx(key);
-if
(cache().affinity().mapKeyToPrimaryAndBackups(key).contains(grid(g).localNode()))
{
+if
(affinity(0).mapKeyToPrimaryAndBackups(key).contains(grid(g).localNode())) {
assertNotNull(entry);
assertTrue(entry.deleted());
}
@@ -2363,7 +2363,7 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
for (int i = 0; i < cnt; i++) {
String key = String.valueOf(i);
-if
(cache().affinity().mapKeyToPrimaryAndBackups(key).contains(grid(g).localNode()))
+if
(affinity(0).mapKeyToPrimaryAndBackups(key).contains(grid(g).localNode()))
assertEquals((Integer)i, cache(g).peek(key));
else
assertNull(cache(g).peek(key));
@@ -3025,7 +3025,7 @@ public abstract class GridCacheAbstractFullApiSelfTest
extends GridCacheAbstract
List keys = new ArrayList<>();
for (int k = 0; k < 2; k++) {
-while (!grid.cache(null).affinity().isPrimary(grid.l
[33/50] [abbrv] incubator-ignite git commit: # Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43
# Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/06522768
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/06522768
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/06522768
Branch: refs/heads/ignite-99
Commit: 0652276891f862074ad62d714c3ed157ae526da5
Parents: b637672
Author: sboikov
Authored: Mon Jan 19 14:51:58 2015 +0300
Committer: sboikov
Committed: Mon Jan 19 14:51:58 2015 +0300
--
.../cache/query/continuous/GridCacheContinuousQueryHandler.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/06522768/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
--
diff --git
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
index d77baaa..8e094f8 100644
---
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
+++
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
@@ -82,7 +82,7 @@ class GridCacheContinuousQueryHandler implements
GridContinuousHandler {
/** Task name hash code. */
private int taskHash;
-/** */
+/** Keep portable flag. */
private boolean keepPortable;
/**
[09/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/apache/ignite/cache/CacheEntryEvent.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheConfiguration.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/gridgain/grid/cache/query/GridCacheContinuousQuery.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/gridgain/grid/kernal/GridEventConsumeHandler.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheDataStructuresManager.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxAdapter.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousMessage.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousMessageType.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java --
[05/50] [abbrv] incubator-ignite git commit: Merge branches 'ignite-1' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1
Merge branches 'ignite-1' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/40399e90 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/40399e90 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/40399e90 Branch: refs/heads/ignite-99 Commit: 40399e9070c5bb1513c838a15a1c9a8d7b3f4dfd Parents: bb32d46 58eda2e Author: Yakov Zhdanov Authored: Tue Jan 13 17:35:14 2015 +0300 Committer: Yakov Zhdanov Committed: Tue Jan 13 17:35:14 2015 +0300 -- .../examples/ScalarCacheAffinityExample1.scala | 3 ++ .../examples/ScalarCacheAffinityExample2.scala | 3 ++ .../ScalarCacheAffinitySimpleExample.scala | 10 +-- .../scalar/examples/ScalarCacheExample.scala| 12 ++-- .../ScalarCachePopularNumbersExample.scala | 3 ++ .../examples/ScalarCacheQueryExample.scala | 3 ++ .../examples/ScalarSnowflakeSchemaExample.scala | 22 +++ pom.xml | 29 +--- 8 files changed, 70 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/40399e90/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCachePopularNumbersExample.scala --
[50/50] [abbrv] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-53' into ignite-99
Merge remote-tracking branch 'remotes/origin/ignite-53' into ignite-99 Conflicts: modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheAbstractFullApiSelfTest.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/fc4e8a94 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fc4e8a94 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fc4e8a94 Branch: refs/heads/ignite-99 Commit: fc4e8a9428abd2c2a796126223398072353ee50e Parents: 060bede 83a571b Author: ivasilinets Authored: Wed Jan 21 12:33:23 2015 +0300 Committer: ivasilinets Committed: Wed Jan 21 12:33:23 2015 +0300 -- LICENSE.txt | 202 apache-2.0.txt | 202 .../main/java/org/apache/ignite/CacheLock.java | 86 ++ .../java/org/apache/ignite/IgniteCache.java | 23 +- .../apache/ignite/cache/CacheEntryEvent.java| 53 +- .../processors/cache/IgniteCacheProxy.java | 147 ++- .../ignite/portables/PortableRawReader.java |2 +- .../grid/cache/GridCacheConfiguration.java |1 + .../cache/query/GridCacheContinuousQuery.java | 10 +- .../grid/dotnet/GridDotNetConfiguration.java| 14 +- .../dotnet/GridDotNetPortableConfiguration.java | 28 +- .../GridDotNetPortableTypeConfiguration.java| 15 +- .../grid/kernal/GridEventConsumeHandler.java|2 +- .../org/gridgain/grid/kernal/GridGainEx.java| 76 +- .../grid/kernal/GridNodeAttributes.java |5 +- .../kernal/processors/cache/CacheEntryImpl.java |2 +- .../cache/CacheIteratorConverter.java | 39 + .../cache/CacheWeakQueryIteratorsHolder.java| 62 +- .../processors/cache/GridCacheAdapter.java | 38 +- .../processors/cache/GridCacheContext.java | 14 +- .../processors/cache/GridCacheEntryImpl.java|2 +- .../processors/cache/GridCacheGateway.java |2 + .../processors/cache/GridCacheMapEntry.java | 70 +- .../processors/cache/GridCacheProcessor.java|1 - .../GridCacheDataStructuresManager.java |6 +- .../cache/datastructures/GridCacheSetImpl.java | 32 +- .../cache/query/GridCacheQueryAdapter.java |1 - .../GridCacheContinuousQueryAdapter.java| 45 +- .../GridCacheContinuousQueryEntry.java | 61 +- .../GridCacheContinuousQueryFilterEx.java | 32 + .../GridCacheContinuousQueryHandler.java| 97 +- .../GridCacheContinuousQueryHandlerV2.java | 83 -- .../GridCacheContinuousQueryListener.java |5 + .../GridCacheContinuousQueryManager.java| 564 +- .../continuous/GridContinuousMessage.java | 52 +- .../continuous/GridContinuousMessageType.java |5 +- .../continuous/GridContinuousProcessor.java | 181 +++- .../interop/GridInteropProcessorAdapter.java|3 - .../service/GridServiceProcessor.java |4 +- .../IgniteCacheEntryListenerAbstractTest.java | 1005 ++ ...IgniteCacheEntryListenerAtomicLocalTest.java | 49 + ...eCacheEntryListenerAtomicReplicatedTest.java | 32 + .../IgniteCacheEntryListenerAtomicTest.java | 55 + ...eCacheEntryListenerEagerTtlDisabledTest.java | 30 + .../IgniteCacheEntryListenerTxLocalTest.java| 49 + ...gniteCacheEntryListenerTxReplicatedTest.java | 32 + .../cache/IgniteCacheEntryListenerTxTest.java | 49 + .../cache/GridCacheAbstractFullApiSelfTest.java | 201 +++- .../cache/GridCacheBasicApiAbstractTest.java| 80 ++ .../junits/common/GridCommonAbstractTest.java | 13 + .../bamboo/GridDataGridTestSuite.java |8 + 51 files changed, 3277 insertions(+), 593 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc4e8a94/modules/core/src/main/java/org/apache/ignite/IgniteCache.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc4e8a94/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheConfiguration.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc4e8a94/modules/core/src/main/java/org/gridgain/grid/kernal/GridGainEx.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc4e8a94/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fc4e8a94/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheEntryImpl.java ---
[32/50] [abbrv] incubator-ignite git commit: # Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43
# Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b6376728
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b6376728
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b6376728
Branch: refs/heads/ignite-99
Commit: b6376728d81f3ffb6e4dd07f13979b14b0cb3695
Parents: fd5e15c
Author: sboikov
Authored: Mon Jan 19 14:47:43 2015 +0300
Committer: sboikov
Committed: Mon Jan 19 14:47:43 2015 +0300
--
.../GridCacheContinuousQueryAdapter.java| 3 ++-
.../GridCacheContinuousQueryHandler.java| 20 +++-
2 files changed, 13 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b6376728/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
--
diff --git
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
index 6657ce7..b852932 100644
---
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
+++
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
@@ -303,7 +303,8 @@ public class GridCacheContinuousQueryAdapter
implements GridCacheContinuou
entryLsnr,
sync,
oldVal,
-taskNameHash);
+taskNameHash,
+keepPortable);
routineId = ctx.kernalContext().continuous().startRoutine(hnd,
bufSize,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b6376728/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
--
diff --git
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
index 5ab83e1..d77baaa 100644
---
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
+++
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
@@ -82,6 +82,9 @@ class GridCacheContinuousQueryHandler implements
GridContinuousHandler {
/** Task name hash code. */
private int taskHash;
+/** */
+private boolean keepPortable;
+
/**
* Required by {@link Externalizable}.
*/
@@ -112,7 +115,8 @@ class GridCacheContinuousQueryHandler implements
GridContinuousHandler {
boolean entryLsnr,
boolean sync,
boolean oldVal,
-int taskHash) {
+int taskHash,
+boolean keepPortable) {
assert topic != null;
assert cb != null;
assert !sync || entryLsnr;
@@ -127,6 +131,7 @@ class GridCacheContinuousQueryHandler implements
GridContinuousHandler {
this.sync = sync;
this.oldVal = oldVal;
this.taskHash = taskHash;
+this.keepPortable = keepPortable;
}
/** {@inheritDoc} */
@@ -292,7 +297,7 @@ class GridCacheContinuousQueryHandler implements
GridContinuousHandler {
/** {@inheritDoc} */
@Override public void onListenerRegistered(UUID routineId,
GridKernalContext ctx) {
if (!entryLsnr)
-manager(ctx).iterate(internal, routineId, keepPortable());
+manager(ctx).iterate(internal, routineId, keepPortable);
}
/** {@inheritDoc} */
@@ -425,6 +430,8 @@ class GridCacheContinuousQueryHandler implements
GridContinuousHandler {
out.writeBoolean(oldVal);
out.writeInt(taskHash);
+
+out.writeBoolean(keepPortable);
}
/** {@inheritDoc} */
@@ -456,6 +463,8 @@ class GridCacheContinuousQueryHandler implements
GridContinuousHandler {
oldVal = in.readBoolean();
taskHash = in.readInt();
+
+keepPortable = in.readBoolean();
}
/**
@@ -469,13 +478,6 @@ class GridCacheContinuousQueryHandler implements
GridContinuousHandler {
}
/**
- * @return Keep portable flag.
- */
-protected boolean keepPortable() {
-return false;
-}
-
-/**
* Deployable object.
*/
private static class Deployable
[18/50] [abbrv] incubator-ignite git commit: Renamed license file according to Apache standards.
Renamed license file according to Apache standards. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/062b899d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/062b899d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/062b899d Branch: refs/heads/ignite-99 Commit: 062b899d449404732aa8b55d07ea594fd2a754a2 Parents: da0235b Author: Dmitiry Setrakyan Authored: Fri Jan 16 12:02:36 2015 -0800 Committer: Dmitiry Setrakyan Committed: Fri Jan 16 12:02:36 2015 -0800 -- LICENSE.txt| 202 apache-2.0.txt | 202 2 files changed, 202 insertions(+), 202 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/062b899d/LICENSE.txt -- diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100755 index 000..d645695 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free,
[48/50] [abbrv] incubator-ignite git commit: #IGNITE-53: wip
#IGNITE-53: wip
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c500eda6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c500eda6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c500eda6
Branch: refs/heads/ignite-99
Commit: c500eda65bb2aa96360027b96dac0169c8c979dc
Parents: add3600
Author: ivasilinets
Authored: Tue Jan 20 11:27:36 2015 +0300
Committer: ivasilinets
Committed: Tue Jan 20 11:27:36 2015 +0300
--
.../processors/cache/IgniteCacheProxy.java | 30
1 file changed, 24 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c500eda6/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 9d9392a..fbf6904 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
@@ -946,15 +946,33 @@ public class IgniteCacheProxy extends
IgniteAsyncSupportAdapter implements
}
/** {@inheritDoc} */
-@Override public void
registerCacheEntryListener(CacheEntryListenerConfiguration
cacheEntryLsnrConfiguration) {
-// TODO IGNITE-1.
-throw new UnsupportedOperationException();
+@Override public void
registerCacheEntryListener(CacheEntryListenerConfiguration lsnrCfg) {
+GridCacheProjectionImpl prev = gate.enter(prj);
+
+try {
+ctx.continuousQueries().registerCacheEntryListener(lsnrCfg, true);
+}
+catch (IgniteCheckedException e) {
+throw cacheException(e);
+}
+finally {
+gate.leave(prev);
+}
}
/** {@inheritDoc} */
-@Override public void
deregisterCacheEntryListener(CacheEntryListenerConfiguration
cacheEntryLsnrConfiguration) {
-// TODO IGNITE-1.
-throw new UnsupportedOperationException();
+@Override public void
deregisterCacheEntryListener(CacheEntryListenerConfiguration lsnrCfg) {
+GridCacheProjectionImpl prev = gate.enter(prj);
+
+try {
+ctx.continuousQueries().deregisterCacheEntryListener(lsnrCfg);
+}
+catch (IgniteCheckedException e) {
+throw cacheException(e);
+}
+finally {
+gate.leave(prev);
+}
}
/** {@inheritDoc} */
[40/50] [abbrv] incubator-ignite git commit: IGNITE-59 Support lock, lockAll. Fix test's problems.
IGNITE-59 Support lock, lockAll. Fix test's problems.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2c76212f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2c76212f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2c76212f
Branch: refs/heads/ignite-99
Commit: 2c76212f255c8e83028a3b285c71374bd738f5bc
Parents: fd03d80
Author: sevdokimov
Authored: Mon Jan 19 17:14:59 2015 +0300
Committer: sevdokimov
Committed: Mon Jan 19 17:14:59 2015 +0300
--
.../ignite/internal/processors/cache/IgniteCacheProxy.java | 6 +++---
.../processors/cache/GridCacheBasicApiAbstractTest.java | 8 ++--
2 files changed, 9 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2c76212f/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 64e86dd..0506c5c 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
@@ -318,12 +318,12 @@ public class IgniteCacheProxy extends
IgniteAsyncSupportAdapter implements
throw new InterruptedException();
try {
+if (time <= 0)
+return delegate.lockAll(keys, -1);
+
IgniteFuture fut = null;
try {
-if (time <= 0)
-return delegate.lockAll(keys, -1);
-
fut = delegate.lockAllAsync(keys, time <= 0 ? -1 :
unit.toMillis(time));
return fut.get();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2c76212f/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicApiAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicApiAbstractTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicApiAbstractTest.java
index 3352356..66e9cb4 100644
---
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicApiAbstractTest.java
+++
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicApiAbstractTest.java
@@ -193,6 +193,8 @@ public abstract class GridCacheBasicApiAbstractTest extends
GridCommonAbstractTe
t.start();
+Thread.sleep(100);
+
t.interrupt();
cache.lock(1).unlock();
@@ -225,12 +227,14 @@ public abstract class GridCacheBasicApiAbstractTest
extends GridCommonAbstractTe
t.start();
-t.interrupt();
+Thread.sleep(100);
-cache.lock(2).unlock();
+t.interrupt();
t.join();
+cache.lock(2).unlock();
+
assertFalse(cache.lock(1).isLocked());
assertFalse(cache.lock(2).isLocked());
incubator-ignite git commit: #IGNITE-86: Do not write log if nothing was undeployed or it was system cache.
Repository: incubator-ignite Updated Branches: refs/heads/ignite-86 [created] edf0b1851 #IGNITE-86: Do not write log if nothing was undeployed or it was system 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/edf0b185 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/edf0b185 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/edf0b185 Branch: refs/heads/ignite-86 Commit: edf0b1851ed95f6819f038e0e870f932af977004 Parents: cd86285 Author: ivasilinets Authored: Tue Jan 20 16:24:35 2015 +0300 Committer: ivasilinets Committed: Tue Jan 20 16:24:35 2015 +0300 -- .../grid/kernal/processors/cache/GridCacheDeploymentManager.java | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/edf0b185/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentManager.java -- diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentManager.java b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentManager.java index 92052f5..58fe292 100644 --- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentManager.java +++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheDeploymentManager.java @@ -298,6 +298,9 @@ public class GridCacheDeploymentManager extends GridCacheSharedManagerAdap cacheCtx.near().dht().context().swap().onUndeploy(leftNodeId, ldr) : cacheCtx.swap().onUndeploy(leftNodeId, ldr); +if (keys.size() == 0 || cacheCtx.system()) +continue; + U.quietAndWarn(log, ""); U.quietAndWarn( log,
[2/2] incubator-ignite git commit: # ignite-42
# ignite-42 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/25f7984a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/25f7984a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/25f7984a Branch: refs/heads/ignite-42 Commit: 25f7984a2a581d94fac6bc282cc9f8fb8097c3b7 Parents: ee7bb3f Author: sboikov Authored: Wed Jan 21 10:28:40 2015 +0300 Committer: sboikov Committed: Wed Jan 21 12:36:45 2015 +0300 -- .../integration/GridClientAbstractSelfTest.java | 1 + .../apache/ignite/cache/CacheConfiguration.java | 18 + .../apache/ignite/cache/store/CacheStore.java | 12 + .../processors/cache/GridCacheAttributes.java | 44 +- .../processors/cache/GridCacheContext.java | 7 + .../processors/cache/GridCacheMapEntry.java | 4 +- .../processors/cache/GridCacheProcessor.java| 17 +- .../processors/cache/GridCacheStoreManager.java | 78 ++-- .../dht/atomic/GridDhtAtomicCache.java | 6 +- .../local/atomic/GridLocalAtomicCache.java | 4 +- .../transactions/IgniteTxLocalAdapter.java | 5 +- ...CacheJdbcBlobStoreMultithreadedSelfTest.java | 1 + .../cache/IgniteCacheAbstractTest.java | 1 + .../IgniteCacheAtomicStoreSessionTest.java | 55 +++ .../IgniteCacheLoaderWriterAbstractTest.java| 157 +++ .../IgniteCacheStoreSessionAbstractTest.java| 303 + .../IgniteCacheStoreSessionTest.java| 435 --- .../IgniteCacheTxStoreSessionTest.java | 285 .../GridCacheLoadOnlyStoreAdapterSelfTest.java | 1 + .../cache/GridCacheAbstractSelfTest.java| 1 + .../cache/GridCacheBasicStoreAbstractTest.java | 1 + ...acheBasicStoreMultithreadedAbstractTest.java | 1 + ...idCacheConfigurationConsistencySelfTest.java | 5 + ...idCacheGetAndTransformStoreAbstractTest.java | 1 + .../GridCacheGroupLockAbstractSelfTest.java | 1 + .../cache/GridCacheLifecycleAwareSelfTest.java | 1 + .../cache/GridCachePartitionedWritesTest.java | 1 + .../cache/GridCacheReloadSelfTest.java | 1 + .../cache/GridCacheStorePutxSelfTest.java | 1 + .../cache/GridCacheSwapReloadSelfTest.java | 2 + .../GridCacheWriteBehindStoreAbstractTest.java | 1 + ...BehindStorePartitionedMultiNodeSelfTest.java | 1 + .../IgniteTxExceptionAbstractSelfTest.java | 1 + .../IgniteTxStoreExceptionAbstractSelfTest.java | 1 + ...actQueueFailoverDataConsistencySelfTest.java | 1 + ...CacheAtomicReferenceApiSelfAbstractTest.java | 2 + .../GridCacheClientModesAbstractSelfTest.java | 2 + ...chePartitionedReloadAllAbstractSelfTest.java | 1 + .../IgniteTxPreloadAbstractTest.java| 6 +- ...heAbstractTransformWriteThroughSelfTest.java | 1 + .../dht/GridCacheColocatedDebugTest.java| 1 + .../near/GridCacheGetStoreErrorSelfTest.java| 1 + .../near/GridCacheNearOneNodeSelfTest.java | 1 + .../GridCacheNearPartitionedClearSelfTest.java | 1 + ...ePartitionedBasicStoreMultiNodeSelfTest.java | 1 + .../GridCachePartitionedLoadCacheSelfTest.java | 1 + .../GridCachePartitionedStorePutSelfTest.java | 1 + .../near/GridPartitionedBackupLoadSelfTest.java | 1 + .../GridCacheBatchEvictUnswapSelfTest.java | 1 + .../GridCacheEmptyEntriesAbstractSelfTest.java | 1 + .../GridCacheEvictionTouchSelfTest.java | 1 + .../local/GridCacheLocalLoadAllSelfTest.java| 1 + ...ridCacheContinuousQueryAbstractSelfTest.java | 1 + .../GridCacheWriteBehindStoreLoadTest.java | 1 + .../loadtests/hashmap/GridCacheTestContext.java | 8 +- .../swap/GridSwapEvictAllBenchmark.java | 1 + .../bamboo/GridDataGridTestSuite.java | 5 +- .../cache/GridCacheAbstractQuerySelfTest.java | 1 + .../cache/GridCacheQueryLoadSelfTest.java | 1 + 59 files changed, 921 insertions(+), 576 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractSelfTest.java -- diff --git a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractSelfTest.java b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractSelfTest.java index 6eb6184..9cc1fc2 100644 --- a/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractSelfTest.java +++ b/modules/clients/src/test/java/org/gridgain/client/integration/GridClientAbstractSelfTest.java @@ -266,6 +266,7 @@ public abstract class GridClientAbstractSelfTest extends GridCommonAbstractTest cfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactor
[1/2] incubator-ignite git commit: # ignite-42
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-42 ee7bb3fd6 -> 25f7984a2
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java
index 0a988db..2a7be3b 100644
---
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java
+++
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheGroupLockAbstractSelfTest.java
@@ -92,6 +92,7 @@ public abstract class GridCacheGroupLockAbstractSelfTest
extends GridCommonAbstr
});
cacheCfg.setReadThrough(true);
cacheCfg.setWriteThrough(true);
+cacheCfg.setLoadPreviousValue(true);
cfg.setCacheConfiguration(cacheCfg);
cfg.setCacheSanityCheckEnabled(sanityCheckEnabled());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLifecycleAwareSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLifecycleAwareSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLifecycleAwareSelfTest.java
index a5b5b9c..adc547c 100644
---
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLifecycleAwareSelfTest.java
+++
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheLifecycleAwareSelfTest.java
@@ -287,6 +287,7 @@ public class GridCacheLifecycleAwareSelfTest extends
GridAbstractLifecycleAwareS
ccfg.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store));
ccfg.setReadThrough(true);
ccfg.setWriteThrough(true);
+ccfg.setLoadPreviousValue(true);
lifecycleAwares.add(store.lifecycleAware);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedWritesTest.java
--
diff --git
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedWritesTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedWritesTest.java
index f068e6d..8251a6c 100644
---
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedWritesTest.java
+++
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCachePartitionedWritesTest.java
@@ -66,6 +66,7 @@ public class GridCachePartitionedWritesTest extends
GridCommonAbstractTest {
cc.setCacheStoreFactory(new FactoryBuilder.SingletonFactory(store));
cc.setReadThrough(true);
cc.setWriteThrough(true);
+cc.setLoadPreviousValue(true);
c.setCacheConfiguration(cc);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReloadSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReloadSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReloadSelfTest.java
index aa8521a..513a1dc 100644
---
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReloadSelfTest.java
+++
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheReloadSelfTest.java
@@ -98,6 +98,7 @@ public class GridCacheReloadSelfTest extends
GridCommonAbstractTest {
cacheCfg.setCacheStoreFactory(new
FactoryBuilder.SingletonFactory(store));
cacheCfg.setReadThrough(true);
cacheCfg.setWriteThrough(true);
+cacheCfg.setLoadPreviousValue(true);
if (cacheMode == PARTITIONED)
cacheCfg.setBackups(1);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/25f7984a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStorePutxSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStorePutxSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStorePutxSelfTest.java
index ab2d284..19b4b67 100644
---
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheStorePutxSelf
[1/2] incubator-ignite git commit: Ignite-107 anonymous classes *ComputeJobAdapter became static classes
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-107 [created] 000c2d02c
Ignite-107
anonymous classes *ComputeJobAdapter became static classes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/52b8967f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/52b8967f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/52b8967f
Branch: refs/heads/ignite-107
Commit: 52b8967f2ec3a1914a6059dcf31f9e3e57bbfe79
Parents: 841ec8d
Author: avinogradov
Authored: Wed Jan 21 12:38:19 2015 +0300
Committer: avinogradov
Committed: Wed Jan 21 12:38:19 2015 +0300
--
.../closure/GridClosureProcessor.java | 326 ++-
.../GridMasterLeaveAwareComputeJobAdapter.java | 5 +-
2 files changed, 244 insertions(+), 87 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/52b8967f/modules/core/src/main/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessor.java
--
diff --git
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessor.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessor.java
index 9817fd6..47f5f5a 100644
---
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessor.java
+++
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/closure/GridClosureProcessor.java
@@ -36,6 +36,9 @@ import org.gridgain.grid.util.worker.*;
import org.jdk8.backport.*;
import org.jetbrains.annotations.*;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
import java.util.*;
import java.util.concurrent.*;
@@ -971,17 +974,8 @@ public class GridClosureProcessor extends
GridProcessorAdapter {
private ComputeJob job(final IgniteClosure job, @Nullable
final T arg) {
A.notNull(job, "job");
-if (job instanceof ComputeJobMasterLeaveAware) {
-return new GridMasterLeaveAwareComputeJobAdapter() {
-@Nullable @Override public Object execute() {
-return job.apply(arg);
-}
-
-@Override public void onMasterNodeLeft(ComputeTaskSession ses)
throws IgniteCheckedException {
-((ComputeJobMasterLeaveAware)job).onMasterNodeLeft(ses);
-}
-};
-}
+if (job instanceof ComputeJobMasterLeaveAware)
+return new C1<>(job, arg);
else {
return new ComputeJobAdapter() {
@Nullable @Override public Object execute() {
@@ -1001,22 +995,8 @@ public class GridClosureProcessor extends
GridProcessorAdapter {
private ComputeJob job(final Callable c) {
A.notNull(c, "job");
-if (c instanceof ComputeJobMasterLeaveAware) {
-return new GridMasterLeaveAwareComputeJobAdapter() {
-@Override public Object execute() {
-try {
-return c.call();
-}
-catch (Exception e) {
-throw new IgniteException(e);
-}
-}
-
-@Override public void onMasterNodeLeft(ComputeTaskSession ses)
throws IgniteCheckedException {
-((ComputeJobMasterLeaveAware)c).onMasterNodeLeft(ses);
-}
-};
-}
+if (c instanceof ComputeJobMasterLeaveAware)
+return new C2(c);
else {
return new ComputeJobAdapter() {
@Override public Object execute() {
@@ -1043,30 +1023,8 @@ public class GridClosureProcessor extends
GridProcessorAdapter {
private ComputeJob job(final Callable c, @Nullable final String
cacheName, final Object affKey) {
A.notNull(c, "job");
-if (c instanceof ComputeJobMasterLeaveAware) {
-return new GridMasterLeaveAwareComputeJobAdapter() {
-/** */
-@GridCacheName
-private final String cn = cacheName;
-
-/** */
-@GridCacheAffinityKeyMapped
-private final Object ak = affKey;
-
-@Override public Object execute() {
-try {
-return c.call();
-}
-catch (Exception e) {
-throw new IgniteException(e);
-}
-}
-
-@Override public void onMasterNodeLeft(ComputeTaskSession ses)
throws IgniteCheckedException {
-((ComputeJobMasterLeaveAware)c).onMasterNodeLeft(ses);
-}
-};
-
[2/2] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-107
Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-107 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/000c2d02 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/000c2d02 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/000c2d02 Branch: refs/heads/ignite-107 Commit: 000c2d02c23ef7a90f79591bb5241797ccbb1233 Parents: 52b8967 1a2d2ca Author: avinogradov Authored: Wed Jan 21 12:40:16 2015 +0300 Committer: avinogradov Committed: Wed Jan 21 12:40:16 2015 +0300 -- .../main/java/org/apache/ignite/CacheLock.java | 61 .../java/org/apache/ignite/IgniteCache.java | 1 - .../java/org/apache/ignite/cache/CacheLock.java | 62 .../processors/cache/CacheLockAsyncImpl.java| 2 +- .../processors/cache/CacheLockImpl.java | 1 + .../cache/GridCacheAbstractFullApiSelfTest.java | 1 + .../GridCacheMultiNodeLockAbstractTest.java | 3 +- .../dht/GridCacheColocatedDebugTest.java| 1 + .../near/GridCachePartitionedLockSelfTest.java | 2 +- .../GridCacheLocalMultithreadedSelfTest.java| 1 + .../grid/cache/spring/GridSpringCache.java | 185 +++ .../cache/spring/GridSpringCacheManager.java| 190 ++- .../spring/GridSpringDynamicCacheManager.java | 316 +++ .../spring/GridSpringCacheManagerSelfTest.java | 2 +- .../GridSpringDynamicCacheManagerSelfTest.java | 218 + .../GridSpringDynamicCacheTestService.java | 62 .../cache/spring/spring-dynamic-caching.xml | 43 +++ .../testsuites/bamboo/GridSpringTestSuite.java | 1 + 18 files changed, 915 insertions(+), 237 deletions(-) --
incubator-ignite git commit: Ignite-90 Some classes headers fixed
Repository: incubator-ignite Updated Branches: refs/heads/ignite-90 [created] ffe7e70ef Ignite-90 Some classes headers fixed Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ffe7e70e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ffe7e70e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ffe7e70e Branch: refs/heads/ignite-90 Commit: ffe7e70ef4acaa46e49bcbdb47c0c1d14e4c260f Parents: 841ec8d Author: avinogradov Authored: Wed Jan 21 12:50:44 2015 +0300 Committer: avinogradov Committed: Wed Jan 21 12:50:44 2015 +0300 -- .../cache/CachePartialUpdateException.java | 22 +--- .../processors/cache/CacheInvokeEntry.java | 22 +--- .../processors/cache/CacheInvokeResult.java | 22 +--- .../cache/IgniteCacheExpiryPolicy.java | 22 +--- .../distributed/GridCacheTtlUpdateRequest.java | 22 +--- .../IgniteExternalizableExpiryPolicy.java | 22 +--- .../cache/IgniteCacheAbstractTest.java | 22 +--- .../cache/IgniteCacheAtomicInvokeTest.java | 22 +--- .../cache/IgniteCacheAtomicLocalInvokeTest.java | 22 +--- ...niteCacheAtomicLocalWithStoreInvokeTest.java | 22 +--- .../IgniteCacheAtomicNearEnabledInvokeTest.java | 22 +--- ...eCacheAtomicPrimaryWriteOrderInvokeTest.java | 22 +--- ...micPrimaryWriteOrderWithStoreInvokeTest.java | 22 +--- .../cache/IgniteCacheInvokeAbstractTest.java| 22 +--- .../cache/IgniteCacheTxInvokeTest.java | 22 +--- .../cache/IgniteCacheTxLocalInvokeTest.java | 22 +--- .../IgniteCacheTxNearEnabledInvokeTest.java | 22 +--- .../IgniteCacheAtomicExpiryPolicyTest.java | 22 +--- .../IgniteCacheAtomicLocalExpiryPolicyTest.java | 22 +--- ...AtomicPrimaryWriteOrderExpiryPolicyTest.java | 22 +--- ...maryWriteOrderWithStoreExpiryPolicyTest.java | 22 +--- ...teCacheAtomicReplicatedExpiryPolicyTest.java | 22 +--- ...iteCacheAtomicWithStoreExpiryPolicyTest.java | 22 +--- .../IgniteCacheExpiryPolicyAbstractTest.java| 22 +--- .../IgniteCacheExpiryPolicyTestSuite.java | 22 +--- .../expiry/IgniteCacheTxExpiryPolicyTest.java | 22 +--- .../IgniteCacheTxLocalExpiryPolicyTest.java | 22 +--- ...IgniteCacheTxReplicatedExpiryPolicyTest.java | 22 +--- .../IgniteCacheTxWithStoreExpiryPolicyTest.java | 22 +--- .../dht/GridCacheGlobalLoadTest.java| 22 +--- 30 files changed, 450 insertions(+), 210 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ffe7e70e/modules/core/src/main/java/org/apache/ignite/cache/CachePartialUpdateException.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CachePartialUpdateException.java b/modules/core/src/main/java/org/apache/ignite/cache/CachePartialUpdateException.java index 08ce72e..427f387 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CachePartialUpdateException.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CachePartialUpdateException.java @@ -1,10 +1,18 @@ -/* @java.file.header */ - -/* __ ___ - * __ /___(_)__ /__ /__ (_)___ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ /_ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \/ /_/ /_/ \_,__/ \/ \__,_/ /_/ /_/ /_/ +/* + * 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.cache; http://git-wip-us.apache.org/repos
[2/2] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-90' into sprint-1
Merge remote-tracking branch 'remotes/origin/ignite-90' into sprint-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/bfbb6d24 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bfbb6d24 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bfbb6d24 Branch: refs/heads/sprint-1 Commit: bfbb6d24e7f7ee216a331660f83f115a3faa0ec7 Parents: 1a2d2ca ffe7e70 Author: avinogradov Authored: Wed Jan 21 13:10:15 2015 +0300 Committer: avinogradov Committed: Wed Jan 21 13:10:15 2015 +0300 -- .../cache/CachePartialUpdateException.java | 22 +--- .../processors/cache/CacheInvokeEntry.java | 22 +--- .../processors/cache/CacheInvokeResult.java | 22 +--- .../cache/IgniteCacheExpiryPolicy.java | 22 +--- .../distributed/GridCacheTtlUpdateRequest.java | 22 +--- .../IgniteExternalizableExpiryPolicy.java | 22 +--- .../cache/IgniteCacheAbstractTest.java | 22 +--- .../cache/IgniteCacheAtomicInvokeTest.java | 22 +--- .../cache/IgniteCacheAtomicLocalInvokeTest.java | 22 +--- ...niteCacheAtomicLocalWithStoreInvokeTest.java | 22 +--- .../IgniteCacheAtomicNearEnabledInvokeTest.java | 22 +--- ...eCacheAtomicPrimaryWriteOrderInvokeTest.java | 22 +--- ...micPrimaryWriteOrderWithStoreInvokeTest.java | 22 +--- .../cache/IgniteCacheInvokeAbstractTest.java| 22 +--- .../cache/IgniteCacheTxInvokeTest.java | 22 +--- .../cache/IgniteCacheTxLocalInvokeTest.java | 22 +--- .../IgniteCacheTxNearEnabledInvokeTest.java | 22 +--- .../IgniteCacheAtomicExpiryPolicyTest.java | 22 +--- .../IgniteCacheAtomicLocalExpiryPolicyTest.java | 22 +--- ...AtomicPrimaryWriteOrderExpiryPolicyTest.java | 22 +--- ...maryWriteOrderWithStoreExpiryPolicyTest.java | 22 +--- ...teCacheAtomicReplicatedExpiryPolicyTest.java | 22 +--- ...iteCacheAtomicWithStoreExpiryPolicyTest.java | 22 +--- .../IgniteCacheExpiryPolicyAbstractTest.java| 22 +--- .../IgniteCacheExpiryPolicyTestSuite.java | 22 +--- .../expiry/IgniteCacheTxExpiryPolicyTest.java | 22 +--- .../IgniteCacheTxLocalExpiryPolicyTest.java | 22 +--- ...IgniteCacheTxReplicatedExpiryPolicyTest.java | 22 +--- .../IgniteCacheTxWithStoreExpiryPolicyTest.java | 22 +--- .../dht/GridCacheGlobalLoadTest.java| 22 +--- 30 files changed, 450 insertions(+), 210 deletions(-) --
[1/2] incubator-ignite git commit: Ignite-90 Some classes headers fixed
Repository: incubator-ignite Updated Branches: refs/heads/sprint-1 1a2d2ca1e -> bfbb6d24e Ignite-90 Some classes headers fixed Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ffe7e70e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ffe7e70e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ffe7e70e Branch: refs/heads/sprint-1 Commit: ffe7e70ef4acaa46e49bcbdb47c0c1d14e4c260f Parents: 841ec8d Author: avinogradov Authored: Wed Jan 21 12:50:44 2015 +0300 Committer: avinogradov Committed: Wed Jan 21 12:50:44 2015 +0300 -- .../cache/CachePartialUpdateException.java | 22 +--- .../processors/cache/CacheInvokeEntry.java | 22 +--- .../processors/cache/CacheInvokeResult.java | 22 +--- .../cache/IgniteCacheExpiryPolicy.java | 22 +--- .../distributed/GridCacheTtlUpdateRequest.java | 22 +--- .../IgniteExternalizableExpiryPolicy.java | 22 +--- .../cache/IgniteCacheAbstractTest.java | 22 +--- .../cache/IgniteCacheAtomicInvokeTest.java | 22 +--- .../cache/IgniteCacheAtomicLocalInvokeTest.java | 22 +--- ...niteCacheAtomicLocalWithStoreInvokeTest.java | 22 +--- .../IgniteCacheAtomicNearEnabledInvokeTest.java | 22 +--- ...eCacheAtomicPrimaryWriteOrderInvokeTest.java | 22 +--- ...micPrimaryWriteOrderWithStoreInvokeTest.java | 22 +--- .../cache/IgniteCacheInvokeAbstractTest.java| 22 +--- .../cache/IgniteCacheTxInvokeTest.java | 22 +--- .../cache/IgniteCacheTxLocalInvokeTest.java | 22 +--- .../IgniteCacheTxNearEnabledInvokeTest.java | 22 +--- .../IgniteCacheAtomicExpiryPolicyTest.java | 22 +--- .../IgniteCacheAtomicLocalExpiryPolicyTest.java | 22 +--- ...AtomicPrimaryWriteOrderExpiryPolicyTest.java | 22 +--- ...maryWriteOrderWithStoreExpiryPolicyTest.java | 22 +--- ...teCacheAtomicReplicatedExpiryPolicyTest.java | 22 +--- ...iteCacheAtomicWithStoreExpiryPolicyTest.java | 22 +--- .../IgniteCacheExpiryPolicyAbstractTest.java| 22 +--- .../IgniteCacheExpiryPolicyTestSuite.java | 22 +--- .../expiry/IgniteCacheTxExpiryPolicyTest.java | 22 +--- .../IgniteCacheTxLocalExpiryPolicyTest.java | 22 +--- ...IgniteCacheTxReplicatedExpiryPolicyTest.java | 22 +--- .../IgniteCacheTxWithStoreExpiryPolicyTest.java | 22 +--- .../dht/GridCacheGlobalLoadTest.java| 22 +--- 30 files changed, 450 insertions(+), 210 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ffe7e70e/modules/core/src/main/java/org/apache/ignite/cache/CachePartialUpdateException.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CachePartialUpdateException.java b/modules/core/src/main/java/org/apache/ignite/cache/CachePartialUpdateException.java index 08ce72e..427f387 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CachePartialUpdateException.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CachePartialUpdateException.java @@ -1,10 +1,18 @@ -/* @java.file.header */ - -/* __ ___ - * __ /___(_)__ /__ /__ (_)___ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ /_ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \/ /_/ /_/ \_,__/ \/ \__,_/ /_/ /_/ /_/ +/* + * 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.cache; http://git-wip-us.apache.org/repo
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-90 [deleted] ffe7e70ef
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-32 [deleted] 11e5506b5
[3/3] incubator-ignite git commit: # IGNITE-32: Initial commit.
# IGNITE-32: Initial commit. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/410f9e5e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/410f9e5e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/410f9e5e Branch: refs/heads/ignite-32 Commit: 410f9e5e448fce21a59fc94031dd52d3a9bb8d4b Parents: ee7bb3f Author: AKuznetsov Authored: Wed Jan 21 17:40:11 2015 +0700 Committer: AKuznetsov Committed: Wed Jan 21 17:40:11 2015 +0700 -- .../ignite/cache/store/jdbc/JdbcCacheStore.java | 1160 +++ .../cache/store/jdbc/JdbcPojoCacheStore.java| 188 ++ .../store/jdbc/dialect/BasicJdbcDialect.java| 267 +++ .../cache/store/jdbc/dialect/DB2Dialect.java| 68 + .../cache/store/jdbc/dialect/H2Dialect.java | 41 + .../cache/store/jdbc/dialect/MySQLDialect.java | 48 + .../cache/store/jdbc/dialect/OracleDialect.java | 72 + .../store/jdbc/dialect/SQLServerDialect.java| 67 + .../cache/store/jdbc/dialect/package.html | 24 + .../query/GridCacheQueryTypeDescriptor.java | 135 ++ .../cache/query/GridCacheQueryTypeMetadata.java | 147 +- ...AbstractCacheStoreMultithreadedSelfTest.java | 127 ++ .../PojoCacheStoreMultitreadedSelfTest.java | 106 + .../store/jdbc/PojoCacheStoreSelfTest.java | 551 + .../cache/store/jdbc/model/Organization.java| 153 ++ .../cache/store/jdbc/model/OrganizationKey.java | 96 + .../ignite/cache/store/jdbc/model/Person.java | 153 ++ .../cache/store/jdbc/model/PersonKey.java | 96 + .../ignite/cache/store/jdbc/model/package.html | 24 + modules/schema-load/pom.xml | 91 + .../main/java/media/data_connection_48x48.png | Bin 0 -> 4443 bytes .../src/main/java/media/error_48x48.png | Bin 0 -> 4349 bytes .../src/main/java/media/ignite_128x128.png | Bin 0 -> 4917 bytes .../src/main/java/media/ignite_16x16.png| Bin 0 -> 608 bytes .../src/main/java/media/ignite_24x24.png| Bin 0 -> 930 bytes .../src/main/java/media/ignite_32x32.png| Bin 0 -> 1203 bytes .../src/main/java/media/ignite_48x48.png| Bin 0 -> 1868 bytes .../src/main/java/media/ignite_64x64.png| Bin 0 -> 2453 bytes .../src/main/java/media/information_48x48.png | Bin 0 -> 4102 bytes .../src/main/java/media/navigate_down_24x24.png | Bin 0 -> 861 bytes .../src/main/java/media/navigate_up_24x24.png | Bin 0 -> 852 bytes .../src/main/java/media/question_48x48.png | Bin 0 -> 3857 bytes .../src/main/java/media/sign_warning_48x48.png | Bin 0 -> 2988 bytes .../schema-load/src/main/java/media/style.css | 58 + .../src/main/java/media/text_tree_48x48.png | Bin 0 -> 2567 bytes .../ignite/schema/generator/PojoGenerator.java | 316 +++ .../ignite/schema/generator/XmlGenerator.java | 320 +++ .../ignite/schema/ui/ConfirmCallable.java | 81 + .../org/apache/ignite/schema/ui/Controls.java | 377 .../org/apache/ignite/schema/ui/GridPaneEx.java | 177 ++ .../org/apache/ignite/schema/ui/MessageBox.java | 238 +++ .../apache/ignite/schema/ui/ModalDialog.java| 50 + .../apache/ignite/schema/ui/SchemaLoadApp.java | 1898 ++ pom.xml |1 + 44 files changed, 7119 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/410f9e5e/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcCacheStore.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcCacheStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcCacheStore.java new file mode 100644 index 000..3de4ae4 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcCacheStore.java @@ -0,0 +1,1160 @@ +/* + * 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.cache.store.jdbc; + +import org.
[1/3] incubator-ignite git commit: # IGNITE-32: Initial commit.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-32 [created] 410f9e5e4
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/410f9e5e/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/GridPaneEx.java
--
diff --git
a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/GridPaneEx.java
b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/GridPaneEx.java
new file mode 100644
index 000..be1aae9
--- /dev/null
+++
b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/GridPaneEx.java
@@ -0,0 +1,177 @@
+/*
+ * 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.schema.ui;
+
+import javafx.geometry.*;
+import javafx.scene.*;
+import javafx.scene.control.*;
+import javafx.scene.layout.*;
+
+/**
+ * Utility extension of {@code GridPane}.
+ */
+public class GridPaneEx extends GridPane {
+/** Current column. */
+private int col;
+
+/** Current row. */
+private int row;
+
+/**
+ * Create pane.
+ */
+public GridPaneEx() {
+setAlignment(Pos.TOP_LEFT);
+setHgap(5);
+setVgap(10);
+}
+
+/**
+ * Add default column.
+ */
+public void addColumn() {
+getColumnConstraints().add(new ColumnConstraints());
+}
+
+/**
+ * Add column with constraints and horizontal grow priority for the column.
+ *
+ * @param min Column minimum size.
+ * @param pref Column preferred size.
+ * @param max Column max size.
+ * @param hgrow Column horizontal grow priority.
+ */
+public void addColumn(double min, double pref, double max, Priority hgrow)
{
+ColumnConstraints cc = new ColumnConstraints(min, pref, max);
+
+cc.setHgrow(hgrow);
+
+getColumnConstraints().add(cc);
+}
+
+/**
+ * Add default row.
+ */
+public void addRow() {
+getRowConstraints().add(new RowConstraints());
+}
+
+/**
+ * Add default rows.
+ *
+ * @param n Number of rows to add.
+ */
+public void addRows(int n) {
+for (int i = 0; i < n; i++)
+addRow();
+}
+
+/**
+ * Add row with constraints and vertical grow priority for the row.
+ *
+ * @param min Row minimum size.
+ * @param pref Row preferred size.
+ * @param max Row max size.
+ * @param vgrow Row vertical grow priority.
+ */
+public void addRow(double min, double pref, double max, Priority vgrow) {
+RowConstraints rc = new RowConstraints(min, pref, max);
+
+rc.setVgrow(vgrow);
+
+getRowConstraints().add(rc);
+}
+
+/**
+ * Wrap to next row.
+ */
+public void wrap() {
+col = 0;
+
+row++;
+}
+
+/**
+ * Skip columns.
+ *
+ * @param span How many columns should be skipped.
+ */
+public void skip(int span) {
+add(new Label(""), span);
+}
+
+/**
+ * Move to next column.
+ */
+private void nextCol(int span) {
+col += span;
+
+if (col >= getColumnConstraints().size())
+wrap();
+}
+
+/**
+ * Add control to grid pane.
+ *
+ * @param ctrl Control to add.
+ * @param span How many columns control should take.
+ * @return Added control.
+ */
+public T add(T ctrl, int span) {
+add(ctrl, col, row, span, 1);
+
+nextCol(span);
+
+return ctrl;
+}
+
+/**
+ * Add control to grid pane.
+ *
+ * @param ctrl Control to add.
+ * @return Added control.
+ */
+public T add(T ctrl) {
+return add(ctrl, 1);
+}
+
+/**
+ * Add control with label.
+ *
+ * @param text Label text.
+ * @param ctrl Control to add.
+ * @param span How many columns control should take.
+ * @return Added control.
+ */
+public T addLabeled(String text, T ctrl, int span) {
+add(new Label(text));
+
+return add(ctrl, span);
+}
+
+/**
+ * Add control with label.
+ *
+ * @param text Label text.
+ * @param ctrl Control to add.
+ * @return Added control.
+ */
+public T addLabeled(String tex
[2/3] incubator-ignite git commit: # IGNITE-32: Initial commit.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/410f9e5e/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/PojoCacheStoreMultitreadedSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/PojoCacheStoreMultitreadedSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/PojoCacheStoreMultitreadedSelfTest.java
new file mode 100644
index 000..f2688d3
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/PojoCacheStoreMultitreadedSelfTest.java
@@ -0,0 +1,106 @@
+/*
+ * 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.cache.store.jdbc;
+
+import org.apache.ignite.*;
+import org.apache.ignite.cache.*;
+import org.apache.ignite.configuration.*;
+import org.apache.ignite.spi.discovery.tcp.*;
+import org.gridgain.grid.cache.query.*;
+import org.gridgain.grid.util.typedef.*;
+import org.h2.jdbcx.*;
+import org.springframework.beans.*;
+import org.springframework.beans.factory.xml.*;
+import org.springframework.context.support.*;
+import org.springframework.core.io.*;
+
+import java.io.*;
+import java.net.*;
+import java.util.*;
+
+import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
+import static org.gridgain.grid.cache.GridCacheMode.*;
+
+/**
+ *
+ */
+public class PojoCacheStoreMultitreadedSelfTest extends
AbstractCacheStoreMultithreadedSelfTest {
+/** {@inheritDoc} */
+@Override protected JdbcPojoCacheStore store() throws Exception {
+JdbcPojoCacheStore store = new JdbcPojoCacheStore();
+
+store.setDataSource(JdbcConnectionPool.create(DFLT_CONN_URL, "sa",
""));
+
+UrlResource metaUrl;
+
+try {
+metaUrl = new UrlResource(new
File("modules/core/src/test/config/store/auto/all.xml").toURI().toURL());
+}
+catch (MalformedURLException e) {
+throw new IgniteCheckedException("Failed to resolve metadata path
[err=" + e.getMessage() + ']', e);
+}
+
+try {
+GenericApplicationContext springCtx = new
GenericApplicationContext();
+
+new
XmlBeanDefinitionReader(springCtx).loadBeanDefinitions(metaUrl);
+
+springCtx.refresh();
+
+Collection typeMetadata =
+
springCtx.getBeansOfType(GridCacheQueryTypeMetadata.class).values();
+
+store.setTypeMetadata(typeMetadata);
+}
+catch (BeansException e) {
+if (X.hasCause(e, ClassNotFoundException.class))
+throw new IgniteCheckedException("Failed to instantiate Spring
XML application context " +
+"(make sure all classes used in Spring configuration are
present at CLASSPATH) " +
+"[springUrl=" + metaUrl + ']', e);
+else
+throw new IgniteCheckedException("Failed to instantiate Spring
XML application context [springUrl=" +
+metaUrl + ", err=" + e.getMessage() + ']', e);
+}
+
+return store;
+}
+
+/** {@inheritDoc} */
+@Override protected IgniteConfiguration getConfiguration(String gridName)
throws Exception {
+IgniteConfiguration c = super.getConfiguration(gridName);
+
+TcpDiscoverySpi disco = new TcpDiscoverySpi();
+
+disco.setIpFinder(IP_FINDER);
+
+c.setDiscoverySpi(disco);
+
+CacheConfiguration cc = defaultCacheConfiguration();
+
+cc.setCacheMode(PARTITIONED);
+cc.setAtomicityMode(ATOMIC);
+cc.setSwapEnabled(false);
+cc.setWriteBehindEnabled(false);
+
+// TODO: IGNITE-32 FIXME cc.setStore(store);
+
+c.setCacheConfiguration(cc);
+
+return c;
+}
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/410f9e5e/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/PojoCacheStoreSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/PojoCacheStoreSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/PojoCacheStoreSelfTest.java
new file mode 1006
[2/2] incubator-ignite git commit: Merge branches 'ignite-73' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-73
Merge branches 'ignite-73' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-73 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/53c727a7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/53c727a7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/53c727a7 Branch: refs/heads/sprint-1 Commit: 53c727a7440ed68ae1636cc67f7c4d414a904e08 Parents: ab8b24a bfbb6d2 Author: S.Vladykin Authored: Wed Jan 21 14:14:54 2015 +0300 Committer: S.Vladykin Committed: Wed Jan 21 14:14:54 2015 +0300 -- LICENSE.txt | 202 apache-2.0.txt | 202 assembly/release-base.xml |2 +- .../examples/datagrid/CacheApiExample.java | 63 +- .../datagrid/CachePopularNumbersExample.java| 17 +- .../ScalarCachePopularNumbersExample.scala | 17 +- .../services/javax.cache.spi.CachingProvider|1 + .../java/org/apache/ignite/IgniteCache.java | 235 +++- .../org/apache/ignite/IgniteCacheMXBean.java| 72 ++ .../org/apache/ignite/IgniteCacheManager.java | 372 +++ .../apache/ignite/IgniteCachingProvider.java| 189 .../apache/ignite/cache/CacheEntryEvent.java| 53 +- .../java/org/apache/ignite/cache/CacheLock.java | 62 ++ .../cache/CachePartialUpdateException.java | 44 + .../dataload/IgniteDataLoadCacheUpdater.java|7 +- .../processors/cache/CacheLockAsyncImpl.java| 141 +++ .../processors/cache/CacheLockImpl.java | 177 +++ .../processors/cache/IgniteCacheProxy.java | 693 ++-- .../ignite/portables/PortableRawReader.java |2 +- .../communication/tcp/TcpCommunicationSpi.java |2 +- .../grid/cache/GridCacheConfiguration.java | 44 +- .../org/gridgain/grid/cache/GridCacheEntry.java | 24 +- .../org/gridgain/grid/cache/GridCacheFlag.java |5 +- .../grid/cache/GridCacheInterceptor.java|8 +- .../cache/GridCachePartialUpdateException.java |1 + .../grid/cache/GridCacheProjection.java | 186 .../cache/query/GridCacheContinuousQuery.java | 10 +- .../grid/dotnet/GridDotNetConfiguration.java| 14 +- .../dotnet/GridDotNetPortableConfiguration.java | 28 +- .../GridDotNetPortableTypeConfiguration.java| 15 +- .../grid/kernal/GridEventConsumeHandler.java|2 +- .../org/gridgain/grid/kernal/GridGainEx.java| 78 +- .../grid/kernal/GridNodeAttributes.java |5 +- .../kernal/managers/GridManagerAdapter.java | 26 +- .../processors/cache/CacheInvokeEntry.java | 97 ++ .../processors/cache/CacheInvokeResult.java | 104 ++ .../processors/cache/GridCacheAdapter.java | 566 +++--- .../processors/cache/GridCacheContext.java | 33 +- .../processors/cache/GridCacheEntryEx.java | 30 +- .../processors/cache/GridCacheEntryImpl.java| 20 +- .../cache/GridCacheEvictionEntry.java | 18 +- .../cache/GridCacheFilterEvaluationEntry.java | 18 +- .../processors/cache/GridCacheMapEntry.java | 534 ++ .../processors/cache/GridCacheMessage.java | 71 +- .../processors/cache/GridCacheProcessor.java| 25 +- .../processors/cache/GridCacheProjectionEx.java | 86 +- .../cache/GridCacheProjectionImpl.java | 171 +-- .../processors/cache/GridCacheProxyImpl.java| 147 +-- .../processors/cache/GridCacheReturn.java | 57 +- .../processors/cache/GridCacheStoreManager.java |7 +- .../cache/GridCacheTransformComputeClosure.java | 76 -- .../cache/GridCacheUpdateAtomicResult.java | 20 +- .../kernal/processors/cache/GridCacheUtils.java | 25 +- .../cache/IgniteCacheExpiryPolicy.java | 73 ++ .../GridAtomicCacheQueueImpl.java | 44 +- .../GridCacheDataStructuresManager.java | 13 +- .../datastructures/GridCacheQueueAdapter.java | 229 ++-- .../GridTransactionalCacheQueueImpl.java| 112 +- .../distributed/GridCacheTtlUpdateRequest.java | 500 + .../GridDistributedCacheAdapter.java| 18 +- .../GridDistributedLockResponse.java| 19 +- .../GridDistributedTxRemoteAdapter.java | 52 +- .../IgniteExternalizableExpiryPolicy.java | 174 +++ .../distributed/dht/GridDhtCacheAdapter.java| 238 - .../cache/distributed/dht/GridDhtGetFuture.java | 70 +- .../distributed/dht/GridDhtLockFuture.java | 18 +- .../distributed/dht/GridDhtLockRequest.java | 50 +- .../dht/GridDhtTransactionalCacheAdapter.java | 57 +- .../distributed/dht/GridDhtTxFinishFuture.java | 22 + .../distributed/dht/GridDhtTxFinishRequest.java | 95 ++ .../cache/distributed/dht/GridDhtTxLocal.java |9 +- .../distributed/dht/GridDhtTxLoc
[1/2] incubator-ignite git commit: ignite-73 - file set
Repository: incubator-ignite
Updated Branches:
refs/heads/sprint-1 bfbb6d24e -> 53c727a74
ignite-73 - file set
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ab8b24ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ab8b24ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ab8b24ae
Branch: refs/heads/sprint-1
Commit: ab8b24ae8f54b5d63c91d3683ab7f158c44f1bf0
Parents: 725d79f
Author: S.Vladykin
Authored: Thu Jan 15 20:51:57 2015 +0300
Committer: S.Vladykin
Committed: Thu Jan 15 20:51:57 2015 +0300
--
.../hadoop/v2/GridHadoopV2JobResourceManager.java | 13 ++---
1 file changed, 6 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ab8b24ae/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2JobResourceManager.java
--
diff --git
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2JobResourceManager.java
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2JobResourceManager.java
index 2ac04ba..8555088 100644
---
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2JobResourceManager.java
+++
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/v2/GridHadoopV2JobResourceManager.java
@@ -22,7 +22,6 @@ import org.apache.hadoop.mapred.*;
import org.apache.hadoop.mapreduce.MRJobConfig;
import org.apache.hadoop.util.*;
import org.apache.ignite.*;
-import org.gridgain.grid.*;
import org.gridgain.grid.hadoop.*;
import org.gridgain.grid.kernal.processors.hadoop.fs.*;
import org.gridgain.grid.util.typedef.*;
@@ -52,8 +51,8 @@ public class GridHadoopV2JobResourceManager {
/** Class path list. */
private URL[] clsPath;
-/** List of local resources. */
-private final Collection rsrcList = new ArrayList<>();
+/** Set of local resources. */
+private final Collection rsrcSet = new HashSet<>();
/** Staging directory to delivery job jar and config to the work nodes. */
private Path stagingDir;
@@ -129,8 +128,8 @@ public class GridHadoopV2JobResourceManager {
clsPathUrls.add(jarJobFile.toURI().toURL());
-rsrcList.add(jarJobFile);
-rsrcList.add(new File(jobLocDir, "job.xml"));
+rsrcSet.add(jarJobFile);
+rsrcSet.add(new File(jobLocDir, "job.xml"));
processFiles(jobLocDir, ctx.getCacheFiles(), download, false,
null, MRJobConfig.CACHE_LOCALFILES);
processFiles(jobLocDir, ctx.getCacheArchives(), download,
true, null, MRJobConfig.CACHE_LOCALARCHIVES);
@@ -192,7 +191,7 @@ public class GridHadoopV2JobResourceManager {
res.add(locName);
-rsrcList.add(dstPath);
+rsrcSet.add(dstPath);
if (clsPathUrls != null)
clsPathUrls.add(dstPath.toURI().toURL());
@@ -257,7 +256,7 @@ public class GridHadoopV2JobResourceManager {
if (!path.mkdir())
throw new IOException("Failed to create directory: " + path);
-for (File resource : rsrcList) {
+for (File resource : rsrcSet) {
File symLink = new File(path, resource.getName());
try {
[1/2] incubator-ignite git commit: ignite-98
Repository: incubator-ignite
Updated Branches:
refs/heads/sprint-1 53c727a74 -> 2888b995a
ignite-98
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8fdf79da
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8fdf79da
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8fdf79da
Branch: refs/heads/sprint-1
Commit: 8fdf79da491a44f30f69fa8d35068e4bdc0195d4
Parents: 725d79f
Author: S.Vladykin
Authored: Fri Jan 16 14:43:47 2015 +0300
Committer: S.Vladykin
Committed: Fri Jan 16 14:43:47 2015 +0300
--
docs/core-site.gridgain.xml | 21
.../counter/GridHadoopFSCounterWriter.java | 4 ++--
.../counter/GridHadoopPerformanceCounter.java | 18 ++---
.../grid/hadoop/GridHadoopTestUtils.java| 20 +--
.../hadoop/GridHadoopCommandLineTest.java | 2 +-
.../hadoop/GridHadoopMapReduceTest.java | 5 +++--
6 files changed, 60 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8fdf79da/docs/core-site.gridgain.xml
--
diff --git a/docs/core-site.gridgain.xml b/docs/core-site.gridgain.xml
index 56cc7b4..40d4ade 100644
--- a/docs/core-site.gridgain.xml
+++ b/docs/core-site.gridgain.xml
@@ -65,4 +65,25 @@
dfs.client.block.write.replace-datanode-on-failure.policy
NEVER
+
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8fdf79da/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/counter/GridHadoopFSCounterWriter.java
--
diff --git
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/counter/GridHadoopFSCounterWriter.java
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/counter/GridHadoopFSCounterWriter.java
index 25a6857..c276f5f 100644
---
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/counter/GridHadoopFSCounterWriter.java
+++
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/counter/GridHadoopFSCounterWriter.java
@@ -38,13 +38,13 @@ public class GridHadoopFSCounterWriter implements
GridHadoopCounterWriter {
private static final String DEFAULT_USER_NAME = "anonymous";
/** */
-private static final String COUNTER_WRITER_DIR_PROPERTY =
"gridgain.counters.fswriter.directory";
+public static final String COUNTER_WRITER_DIR_PROPERTY =
"gridgain.counters.fswriter.directory";
/** */
private static final String USER_MACRO = "${USER}";
/** */
-private static final String DEFAULT_COUNTER_WRITER_DIR = "/users/" +
USER_MACRO;
+private static final String DEFAULT_COUNTER_WRITER_DIR = "/user/" +
USER_MACRO;
/** {@inheritDoc} */
@Override public void write(GridHadoopJobInfo jobInfo, GridHadoopJobId
jobId, GridHadoopCounters cntrs)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8fdf79da/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/counter/GridHadoopPerformanceCounter.java
--
diff --git
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/counter/GridHadoopPerformanceCounter.java
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/counter/GridHadoopPerformanceCounter.java
index c503c42..d95cea3 100644
---
a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/counter/GridHadoopPerformanceCounter.java
+++
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/processors/hadoop/counter/GridHadoopPerformanceCounter.java
@@ -118,9 +118,21 @@ public class GridHadoopPerformanceCounter extends
GridHadoopCounterAdapter {
* @return String contains necessary event information.
*/
private String eventName(GridHadoopTaskInfo info, String evtType) {
+return eventName(info.type().toString(), info.taskNumber(), evtType);
+}
+
+/**
+ * Generate name that consists of some event information.
+ *
+ * @param taskType Task type.
+ * @param taskNum Number of the task.
+ * @param evtType The type of the event.
+ * @return String contains necessary event information.
+ */
+private String eventName(String taskType, int taskNum, String evtType) {
assert nodeId != null;
-return info.type() + " " + info.taskNumber() + " " + evtType + " " +
nodeId;
+return taskType + " " + taskNum + " " + evtType + " " + nodeId;
}
/**
@@ -151,8 +163,8 @@ public class GridHadoopPerformanceCounter extends
GridHadoopCounterAdapte
[2/2] incubator-ignite git commit: Merge branches 'ignite-98' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-98
Merge branches 'ignite-98' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-98 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2888b995 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2888b995 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2888b995 Branch: refs/heads/sprint-1 Commit: 2888b995aec6eacb698c997d57b81f085fd2c044 Parents: 8fdf79d 53c727a Author: S.Vladykin Authored: Wed Jan 21 14:17:13 2015 +0300 Committer: S.Vladykin Committed: Wed Jan 21 14:17:13 2015 +0300 -- LICENSE.txt | 202 apache-2.0.txt | 202 assembly/release-base.xml |2 +- .../examples/datagrid/CacheApiExample.java | 63 +- .../datagrid/CachePopularNumbersExample.java| 17 +- .../ScalarCachePopularNumbersExample.scala | 17 +- .../services/javax.cache.spi.CachingProvider|1 + .../java/org/apache/ignite/IgniteCache.java | 235 +++- .../org/apache/ignite/IgniteCacheMXBean.java| 72 ++ .../org/apache/ignite/IgniteCacheManager.java | 372 +++ .../apache/ignite/IgniteCachingProvider.java| 189 .../apache/ignite/cache/CacheEntryEvent.java| 53 +- .../java/org/apache/ignite/cache/CacheLock.java | 62 ++ .../cache/CachePartialUpdateException.java | 44 + .../dataload/IgniteDataLoadCacheUpdater.java|7 +- .../processors/cache/CacheLockAsyncImpl.java| 141 +++ .../processors/cache/CacheLockImpl.java | 177 +++ .../processors/cache/IgniteCacheProxy.java | 693 ++-- .../ignite/portables/PortableRawReader.java |2 +- .../communication/tcp/TcpCommunicationSpi.java |2 +- .../grid/cache/GridCacheConfiguration.java | 44 +- .../org/gridgain/grid/cache/GridCacheEntry.java | 24 +- .../org/gridgain/grid/cache/GridCacheFlag.java |5 +- .../grid/cache/GridCacheInterceptor.java|8 +- .../cache/GridCachePartialUpdateException.java |1 + .../grid/cache/GridCacheProjection.java | 186 .../cache/query/GridCacheContinuousQuery.java | 10 +- .../grid/dotnet/GridDotNetConfiguration.java| 14 +- .../dotnet/GridDotNetPortableConfiguration.java | 28 +- .../GridDotNetPortableTypeConfiguration.java| 15 +- .../grid/kernal/GridEventConsumeHandler.java|2 +- .../org/gridgain/grid/kernal/GridGainEx.java| 78 +- .../grid/kernal/GridNodeAttributes.java |5 +- .../kernal/managers/GridManagerAdapter.java | 26 +- .../processors/cache/CacheInvokeEntry.java | 97 ++ .../processors/cache/CacheInvokeResult.java | 104 ++ .../processors/cache/GridCacheAdapter.java | 566 +++--- .../processors/cache/GridCacheContext.java | 33 +- .../processors/cache/GridCacheEntryEx.java | 30 +- .../processors/cache/GridCacheEntryImpl.java| 20 +- .../cache/GridCacheEvictionEntry.java | 18 +- .../cache/GridCacheFilterEvaluationEntry.java | 18 +- .../processors/cache/GridCacheMapEntry.java | 534 ++ .../processors/cache/GridCacheMessage.java | 71 +- .../processors/cache/GridCacheProcessor.java| 25 +- .../processors/cache/GridCacheProjectionEx.java | 86 +- .../cache/GridCacheProjectionImpl.java | 171 +-- .../processors/cache/GridCacheProxyImpl.java| 147 +-- .../processors/cache/GridCacheReturn.java | 57 +- .../processors/cache/GridCacheStoreManager.java |7 +- .../cache/GridCacheTransformComputeClosure.java | 76 -- .../cache/GridCacheUpdateAtomicResult.java | 20 +- .../kernal/processors/cache/GridCacheUtils.java | 25 +- .../cache/IgniteCacheExpiryPolicy.java | 73 ++ .../GridAtomicCacheQueueImpl.java | 44 +- .../GridCacheDataStructuresManager.java | 13 +- .../datastructures/GridCacheQueueAdapter.java | 229 ++-- .../GridTransactionalCacheQueueImpl.java| 112 +- .../distributed/GridCacheTtlUpdateRequest.java | 500 + .../GridDistributedCacheAdapter.java| 18 +- .../GridDistributedLockResponse.java| 19 +- .../GridDistributedTxRemoteAdapter.java | 52 +- .../IgniteExternalizableExpiryPolicy.java | 174 +++ .../distributed/dht/GridDhtCacheAdapter.java| 238 - .../cache/distributed/dht/GridDhtGetFuture.java | 70 +- .../distributed/dht/GridDhtLockFuture.java | 18 +- .../distributed/dht/GridDhtLockRequest.java | 50 +- .../dht/GridDhtTransactionalCacheAdapter.java | 57 +- .../distributed/dht/GridDhtTxFinishFuture.java | 22 + .../distributed/dht/GridDhtTxFinishRequest.java | 95 ++ .../cache/distributed/dht/GridDhtTxLocal.java |9 +- .../distributed/dht/GridDhtTxLoc
[1/2] incubator-ignite git commit: ignite-100
Repository: incubator-ignite
Updated Branches:
refs/heads/sprint-1 2888b995a -> 09c52dd7d
ignite-100
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2af57da6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2af57da6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2af57da6
Branch: refs/heads/sprint-1
Commit: 2af57da6eaa49ea0281d739048036061576dd3df
Parents: c0c28ab
Author: S.Vladykin
Authored: Fri Jan 16 17:58:12 2015 +0300
Committer: S.Vladykin
Committed: Fri Jan 16 17:58:12 2015 +0300
--
...heGgfsPerBlockLruEvictionPolicySelfTest.java | 15 ++--
.../ggfs/GridGgfsAbstractSelfTest.java | 20 --
.../ggfs/GridGgfsMetricsSelfTest.java | 10 +--
.../processors/ggfs/GridGgfsModesSelfTest.java | 6 +-
...IpcEndpointRegistrationAbstractSelfTest.java | 33 ++---
...dpointRegistrationOnLinuxAndMacSelfTest.java | 6 +-
...pcEndpointRegistrationOnWindowsSelfTest.java | 4 +-
...idIpcServerEndpointDeserializerSelfTest.java | 76 ++--
.../testframework/GridGgfsTestUtils.java| 55 --
.../grid/ggfs/GridGgfsEventsTestSuite.java | 26 ---
...dGgfsHadoop20FileSystemAbstractSelfTest.java | 9 ++-
...doop20FileSystemLoopbackPrimarySelfTest.java | 11 ++-
...sHadoop20FileSystemShmemPrimarySelfTest.java | 11 ++-
.../GridGgfsHadoopDualAbstractSelfTest.java | 19 +++--
...ridGgfsHadoopFileSystemAbstractSelfTest.java | 15 ++--
.../GridGgfsHadoopFileSystemClientSelfTest.java | 6 +-
...idGgfsHadoopFileSystemHandshakeSelfTest.java | 7 +-
...ridGgfsHadoopFileSystemIpcCacheSelfTest.java | 7 +-
...GgfsHadoopFileSystemLoggerStateSelfTest.java | 7 +-
...adoopFileSystemLoopbackAbstractSelfTest.java | 9 ++-
...fsHadoopFileSystemSecondaryModeSelfTest.java | 12 +++-
...fsHadoopFileSystemShmemAbstractSelfTest.java | 7 +-
.../ggfs/GridGgfsNearOnlyMultiNodeSelfTest.java | 7 +-
23 files changed, 198 insertions(+), 180 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2af57da6/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java
--
diff --git
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java
index 7d78f94..9a87319 100644
---
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java
+++
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridCacheGgfsPerBlockLruEvictionPolicySelfTest.java
@@ -49,14 +49,11 @@ public class GridCacheGgfsPerBlockLruEvictionPolicySelfTest
extends GridGgfsComm
/** Primary GGFS name. */
private static final String GGFS_SECONDARY = "ggfs-secondary";
-/** Secondary file system URI. */
-private static final String SECONDARY_URI =
"ggfs://ggfs-secondary:grid-secondary@127.0.0.1:11500/";
-
-/** Secondary file system configuration path. */
-private static final String SECONDARY_CFG =
"modules/core/src/test/config/hadoop/core-site-loopback-secondary.xml";
-
-/** Secondary file system REST endpoint configuration string. */
-private static final String SECONDARY_REST_CFG = "{type:'tcp',
port:11500}";
+/** Secondary file system REST endpoint configuration map. */
+private static final Map SECONDARY_REST_CFG = new
HashMap() {{
+put("type", "tcp");
+put("port", "11500");
+}};
/** File working in PRIMARY mode. */
public static final IgniteFsPath FILE = new IgniteFsPath("/file");
@@ -159,7 +156,7 @@ public class GridCacheGgfsPerBlockLruEvictionPolicySelfTest
extends GridGgfsComm
ggfsCfg.setName(GGFS_SECONDARY);
ggfsCfg.setBlockSize(512);
ggfsCfg.setDefaultMode(PRIMARY);
-
ggfsCfg.setIpcEndpointConfiguration(GridGgfsTestUtils.jsonToMap(SECONDARY_REST_CFG));
+ggfsCfg.setIpcEndpointConfiguration(SECONDARY_REST_CFG);
GridCacheConfiguration dataCacheCfg = defaultCacheConfiguration();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2af57da6/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsAbstractSelfTest.java
index 2eb429b..0c252dc 100644
---
a/modules/core/src/test/java/org/gridga
[2/2] incubator-ignite git commit: Merge branches 'ignite-100' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-100
Merge branches 'ignite-100' and 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-100 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/09c52dd7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/09c52dd7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/09c52dd7 Branch: refs/heads/sprint-1 Commit: 09c52dd7d297de4fdf24fa57e7fe26f97417e4ee Parents: 2af57da 2888b99 Author: S.Vladykin Authored: Wed Jan 21 14:20:19 2015 +0300 Committer: S.Vladykin Committed: Wed Jan 21 14:20:19 2015 +0300 -- LICENSE.txt | 202 apache-2.0.txt | 202 assembly/release-base.xml |2 +- docs/core-site.gridgain.xml | 21 + .../examples/datagrid/CacheApiExample.java | 63 +- .../datagrid/CachePopularNumbersExample.java| 17 +- .../ScalarCachePopularNumbersExample.scala | 17 +- .../services/javax.cache.spi.CachingProvider|1 + .../java/org/apache/ignite/IgniteCache.java | 235 +++- .../org/apache/ignite/IgniteCacheMXBean.java| 72 ++ .../org/apache/ignite/IgniteCacheManager.java | 372 +++ .../apache/ignite/IgniteCachingProvider.java| 189 .../apache/ignite/cache/CacheEntryEvent.java| 53 +- .../java/org/apache/ignite/cache/CacheLock.java | 62 ++ .../cache/CachePartialUpdateException.java | 44 + .../dataload/IgniteDataLoadCacheUpdater.java|7 +- .../processors/cache/CacheLockAsyncImpl.java| 141 +++ .../processors/cache/CacheLockImpl.java | 177 +++ .../processors/cache/IgniteCacheProxy.java | 693 ++-- .../communication/tcp/TcpCommunicationSpi.java |2 +- .../grid/cache/GridCacheConfiguration.java | 44 +- .../org/gridgain/grid/cache/GridCacheEntry.java | 24 +- .../org/gridgain/grid/cache/GridCacheFlag.java |5 +- .../grid/cache/GridCacheInterceptor.java|8 +- .../cache/GridCachePartialUpdateException.java |1 + .../grid/cache/GridCacheProjection.java | 186 .../cache/query/GridCacheContinuousQuery.java | 10 +- .../grid/kernal/GridEventConsumeHandler.java|2 +- .../org/gridgain/grid/kernal/GridGainEx.java|2 +- .../kernal/managers/GridManagerAdapter.java | 26 +- .../processors/cache/CacheInvokeEntry.java | 97 ++ .../processors/cache/CacheInvokeResult.java | 104 ++ .../processors/cache/GridCacheAdapter.java | 553 +++--- .../processors/cache/GridCacheContext.java | 31 +- .../processors/cache/GridCacheEntryEx.java | 30 +- .../processors/cache/GridCacheEntryImpl.java| 18 +- .../cache/GridCacheEvictionEntry.java | 18 +- .../cache/GridCacheFilterEvaluationEntry.java | 18 +- .../processors/cache/GridCacheMapEntry.java | 534 ++ .../processors/cache/GridCacheMessage.java | 71 +- .../processors/cache/GridCacheProcessor.java| 25 +- .../processors/cache/GridCacheProjectionEx.java | 86 +- .../cache/GridCacheProjectionImpl.java | 171 +-- .../processors/cache/GridCacheProxyImpl.java| 147 +-- .../processors/cache/GridCacheReturn.java | 57 +- .../processors/cache/GridCacheStoreManager.java |7 +- .../cache/GridCacheTransformComputeClosure.java | 76 -- .../cache/GridCacheUpdateAtomicResult.java | 20 +- .../kernal/processors/cache/GridCacheUtils.java | 25 +- .../cache/IgniteCacheExpiryPolicy.java | 73 ++ .../GridAtomicCacheQueueImpl.java | 44 +- .../GridCacheDataStructuresManager.java | 13 +- .../datastructures/GridCacheQueueAdapter.java | 229 ++-- .../GridTransactionalCacheQueueImpl.java| 112 +- .../distributed/GridCacheTtlUpdateRequest.java | 500 + .../GridDistributedCacheAdapter.java| 18 +- .../GridDistributedLockResponse.java| 19 +- .../GridDistributedTxRemoteAdapter.java | 52 +- .../IgniteExternalizableExpiryPolicy.java | 174 +++ .../distributed/dht/GridDhtCacheAdapter.java| 238 - .../cache/distributed/dht/GridDhtGetFuture.java | 70 +- .../distributed/dht/GridDhtLockFuture.java | 18 +- .../distributed/dht/GridDhtLockRequest.java | 50 +- .../dht/GridDhtTransactionalCacheAdapter.java | 57 +- .../distributed/dht/GridDhtTxFinishFuture.java | 22 + .../distributed/dht/GridDhtTxFinishRequest.java | 95 ++ .../cache/distributed/dht/GridDhtTxLocal.java |9 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 64 +- .../cache/distributed/dht/GridDhtTxRemote.java | 29 +- .../dht/GridPartitionedGetFuture.java | 33 +- .../dht/atomic/GridDhtAtomicCache.java | 685 +--- .../dht/atomic/GridDh
[2/6] incubator-ignite git commit: Mvn package phase fix. License filename was changed to another. Now reference to this file fixed
Mvn package phase fix. License filename was changed to another. Now reference to this file fixed Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/841ec8df Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/841ec8df Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/841ec8df Branch: refs/heads/ignite-42 Commit: 841ec8dffbe6c56ee4d3baf566981abf4434f563 Parents: f4ab031 Author: avinogradov Authored: Tue Jan 20 17:42:24 2015 +0300 Committer: avinogradov Committed: Tue Jan 20 17:50:04 2015 +0300 -- assembly/release-base.xml | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/841ec8df/assembly/release-base.xml -- diff --git a/assembly/release-base.xml b/assembly/release-base.xml index 7e160b6..5881729 100644 --- a/assembly/release-base.xml +++ b/assembly/release-base.xml @@ -23,6 +23,11 @@ http://maven.apache.org/xsd/component-1.1.2.xsd";> +LICENSE.txt +/ + + + config/gridgain-log4j.xml /config
[6/6] incubator-ignite git commit: # ignite-42
# ignite-42
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f4da39a5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f4da39a5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f4da39a5
Branch: refs/heads/ignite-42
Commit: f4da39a5b48a46d24417238565a737dc84722e09
Parents: ed72ac1
Author: sboikov
Authored: Wed Jan 21 14:18:42 2015 +0300
Committer: sboikov
Committed: Wed Jan 21 14:21:13 2015 +0300
--
.../transactions/IgniteTxLocalAdapter.java | 14 +
.../IgniteCacheEntryListenerAbstractTest.java | 2 +-
...IgniteCacheAtomicLocalNoReadThroughTest.java | 49
...CacheAtomicNearEnabledNoReadThroughTest.java | 32 +++
.../IgniteCacheAtomicNoReadThroughTest.java | 35 ++-
.../IgniteCacheNoReadThroughAbstractTest.java | 272 ++-
.../IgniteCacheTxLocalNoReadThroughTest.java| 49
...niteCacheTxNearEnabledNoReadThroughTest.java | 32 +++
.../IgniteCacheTxNoReadThroughTest.java | 49
.../bamboo/GridDataGridTestSuite.java | 7 +
10 files changed, 536 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f4da39a5/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxLocalAdapter.java
--
diff --git
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxLocalAdapter.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxLocalAdapter.java
index 11cd1af..06ee6b0 100644
---
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxLocalAdapter.java
+++
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxLocalAdapter.java
@@ -312,6 +312,13 @@ public abstract class IgniteTxLocalAdapter extends
IgniteTxAdapter
) {
if (!async) {
try {
+if (!cacheCtx.readThrough()) {
+for (K key : keys)
+c.apply(key, null);
+
+return new GridFinishedFuture<>(cctx.kernalContext(),
false);
+}
+
return new GridFinishedFuture<>(cctx.kernalContext(),
cacheCtx.store().loadAllFromStore(this, keys, c));
}
@@ -323,6 +330,13 @@ public abstract class IgniteTxLocalAdapter extends
IgniteTxAdapter
return cctx.kernalContext().closure().callLocalSafe(
new GPC() {
@Override public Boolean call() throws Exception {
+if (!cacheCtx.readThrough()) {
+for (K key : keys)
+c.apply(key, null);
+
+return false;
+}
+
return
cacheCtx.store().loadAllFromStore(IgniteTxLocalAdapter.this, keys, c);
}
},
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f4da39a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
index f8927ad..7d3e2c9 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAbstractTest.java
@@ -842,7 +842,7 @@ public abstract class IgniteCacheEntryListenerAbstractTest
extends IgniteCacheAb
}
/**
- * @return Value for configuration property {@link
GridCacheConfiguration#isEagerTtl()}.
+ * @return Value for configuration property {@link
CacheConfiguration#isEagerTtl()}.
*/
protected boolean eagerTtl() {
return true;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f4da39a5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalNoReadThroughTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalNoReadThroughTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicLocalNoReadThroughTest.java
new file mode 100644
index 000..2a87d10
--- /dev/null
+++
b
[5/6] incubator-ignite git commit: # ignite-42
# ignite-42
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ed72ac1e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ed72ac1e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ed72ac1e
Branch: refs/heads/ignite-42
Commit: ed72ac1ef416aae1cf2d445f5c4c85cd8aefabeb
Parents: 25f7984 1a2d2ca
Author: sboikov
Authored: Wed Jan 21 13:14:26 2015 +0300
Committer: sboikov
Committed: Wed Jan 21 13:14:26 2015 +0300
--
assembly/release-base.xml | 2 +-
.../main/java/org/apache/ignite/CacheLock.java | 61
.../java/org/apache/ignite/IgniteCache.java | 1 -
.../java/org/apache/ignite/cache/CacheLock.java | 62
.../processors/cache/CacheLockAsyncImpl.java| 2 +-
.../processors/cache/CacheLockImpl.java | 1 +
.../IgniteCacheAtomicNoReadThroughTest.java | 24 ++
.../IgniteCacheNoReadThroughAbstractTest.java | 24 ++
.../GridCacheMultiNodeLockAbstractTest.java | 3 +-
.../dht/GridCacheColocatedDebugTest.java| 2 +-
.../grid/cache/spring/GridSpringCache.java | 185 +++
.../cache/spring/GridSpringCacheManager.java| 190 ++-
.../spring/GridSpringDynamicCacheManager.java | 316 +++
.../spring/GridSpringCacheManagerSelfTest.java | 2 +-
.../GridSpringDynamicCacheManagerSelfTest.java | 218 +
.../GridSpringDynamicCacheTestService.java | 62
.../cache/spring/spring-dynamic-caching.xml | 43 +++
.../testsuites/bamboo/GridSpringTestSuite.java | 1 +
18 files changed, 961 insertions(+), 238 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ed72ac1e/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ed72ac1e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoReadThroughTest.java
--
diff --cc
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoReadThroughTest.java
index 000,000..bd6bef4
new file mode 100644
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheAtomicNoReadThroughTest.java
@@@ -1,0 -1,0 +1,24 @@@
++/*
++ * 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.integration;
++
++/**
++ * TODO
++ */
++public class IgniteCacheAtomicNoReadThroughTest {
++}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ed72ac1e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java
--
diff --cc
modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java
index 000,000..0284b26
new file mode 100644
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/integration/IgniteCacheNoReadThroughAbstractTest.java
@@@ -1,0 -1,0 +1,24 @@@
++/*
++ * 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
[1/6] incubator-ignite git commit: IGNITE-62 (Fix project build after project migration) Remove broken link in release-base.xml (cherry picked from commit 1164ff2)
Repository: incubator-ignite Updated Branches: refs/heads/ignite-42 25f7984a2 -> f4da39a5b IGNITE-62 (Fix project build after project migration) Remove broken link in release-base.xml (cherry picked from commit 1164ff2) Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f4ab0318 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f4ab0318 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f4ab0318 Branch: refs/heads/ignite-42 Commit: f4ab03180fffa9719da3753ff01a7a32952fa996 Parents: 2860388 Author: sevdokimov Authored: Tue Jan 20 15:39:22 2015 +0300 Committer: sevdokimov Committed: Tue Jan 20 14:40:10 2015 +0300 -- assembly/release-base.xml | 5 - 1 file changed, 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f4ab0318/assembly/release-base.xml -- diff --git a/assembly/release-base.xml b/assembly/release-base.xml index 9822cc4..7e160b6 100644 --- a/assembly/release-base.xml +++ b/assembly/release-base.xml @@ -23,11 +23,6 @@ http://maven.apache.org/xsd/component-1.1.2.xsd";> -apache-2.0.txt -/ - - - config/gridgain-log4j.xml /config
[4/6] incubator-ignite git commit: # Spring cache fixes
# Spring cache fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1a2d2ca1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1a2d2ca1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1a2d2ca1
Branch: refs/heads/ignite-42
Commit: 1a2d2ca1e5b008b5dbab1e73513ac61bd9bbcdd9
Parents: b7db215
Author: Valentin Kulichenko
Authored: Tue Jan 20 23:24:59 2015 -0800
Committer: Valentin Kulichenko
Committed: Tue Jan 20 23:24:59 2015 -0800
--
.../grid/cache/spring/GridSpringCache.java | 185 +++
.../cache/spring/GridSpringCacheManager.java| 190 ++-
.../spring/GridSpringDynamicCacheManager.java | 316 +++
.../spring/GridSpringCacheManagerSelfTest.java | 2 +-
.../GridSpringDynamicCacheManagerSelfTest.java | 218 +
.../GridSpringDynamicCacheTestService.java | 62
.../cache/spring/spring-dynamic-caching.xml | 43 +++
.../testsuites/bamboo/GridSpringTestSuite.java | 1 +
8 files changed, 846 insertions(+), 171 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a2d2ca1/modules/spring/src/main/java/org/gridgain/grid/cache/spring/GridSpringCache.java
--
diff --git
a/modules/spring/src/main/java/org/gridgain/grid/cache/spring/GridSpringCache.java
b/modules/spring/src/main/java/org/gridgain/grid/cache/spring/GridSpringCache.java
new file mode 100644
index 000..74baf53
--- /dev/null
+++
b/modules/spring/src/main/java/org/gridgain/grid/cache/spring/GridSpringCache.java
@@ -0,0 +1,185 @@
+/*
+ * 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.gridgain.grid.cache.spring;
+
+import org.apache.ignite.*;
+import org.apache.ignite.lang.*;
+import org.gridgain.grid.cache.*;
+import org.gridgain.grid.util.typedef.*;
+import org.springframework.cache.*;
+import org.springframework.cache.support.*;
+
+import java.io.*;
+
+/**
+ * Spring cache implementation.
+ */
+class GridSpringCache implements Cache, Serializable {
+/** */
+private String name;
+
+/** */
+private Ignite ignite;
+
+/** */
+private GridCacheProjection cache;
+
+/** */
+private IgniteClosure keyFactory;
+
+/**
+ * @param name Cache name.
+ * @param ignite Ignite instance.
+ * @param cache Cache.
+ * @param keyFactory Key factory.
+ */
+GridSpringCache(String name, Ignite ignite, GridCacheProjection
cache,
+IgniteClosure keyFactory) {
+assert cache != null;
+
+this.name = name;
+this.ignite = ignite;
+this.cache = (GridCacheProjection)cache;
+this.keyFactory = keyFactory != null ? keyFactory : F.identity();
+}
+
+/** {@inheritDoc} */
+@Override public String getName() {
+return name;
+}
+
+/** {@inheritDoc} */
+@Override public Object getNativeCache() {
+return cache;
+}
+
+/** {@inheritDoc} */
+@Override public ValueWrapper get(Object key) {
+try {
+Object val = cache.get(keyFactory.apply(key));
+
+return val != null ? new SimpleValueWrapper(val) : null;
+}
+catch (IgniteCheckedException e) {
+throw new IgniteException("Failed to get value from cache
[cacheName=" + cache.name() +
+", key=" + key + ']', e);
+}
+}
+
+/** {@inheritDoc} */
+@Override public T get(Object key, Class type) {
+try {
+Object val = cache.get(keyFactory.apply(key));
+
+if (val != null && type != null && !type.isInstance(val))
+throw new IllegalStateException("Cached value is not of
required type [cacheName=" + cache.name() +
+", key=" + key + ", val=" + val + ", requiredType=" + type
+ ']');
+
+return (T)val;
+}
+catch (IgniteCheckedException e) {
+throw new IgniteException("Failed to get value from cache
[cacheName=" + cache.n
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-98 [deleted] 8fdf79da4
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-100 [deleted] 2af57da6e
[3/6] incubator-ignite git commit: IGNITE-59 Move CacheLock to org.apache.ignite.cache package.
IGNITE-59 Move CacheLock to org.apache.ignite.cache package.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b7db2154
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b7db2154
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b7db2154
Branch: refs/heads/ignite-42
Commit: b7db215475729a5bfa71851d2d1692b13f3df383
Parents: 841ec8d
Author: Sergey Evdokimov
Authored: Wed Jan 21 00:08:26 2015 +0300
Committer: Sergey Evdokimov
Committed: Wed Jan 21 00:08:26 2015 +0300
--
.../main/java/org/apache/ignite/CacheLock.java | 61 ---
.../java/org/apache/ignite/IgniteCache.java | 1 -
.../java/org/apache/ignite/cache/CacheLock.java | 62
.../processors/cache/CacheLockAsyncImpl.java| 2 +-
.../processors/cache/CacheLockImpl.java | 1 +
.../cache/GridCacheAbstractFullApiSelfTest.java | 1 +
.../GridCacheMultiNodeLockAbstractTest.java | 3 +-
.../dht/GridCacheColocatedDebugTest.java| 1 +
.../near/GridCachePartitionedLockSelfTest.java | 2 +-
.../GridCacheLocalMultithreadedSelfTest.java| 1 +
10 files changed, 69 insertions(+), 66 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7db2154/modules/core/src/main/java/org/apache/ignite/CacheLock.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/CacheLock.java
b/modules/core/src/main/java/org/apache/ignite/CacheLock.java
deleted file mode 100644
index f395261..000
--- a/modules/core/src/main/java/org/apache/ignite/CacheLock.java
+++ /dev/null
@@ -1,61 +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;
-
-import org.apache.ignite.lang.*;
-
-import java.util.concurrent.*;
-import java.util.concurrent.locks.*;
-
-/**
- * Lock associated with some cache keys.
- */
-public interface CacheLock extends Lock, IgniteAsyncSupport {
-/**
- * Checks if any node holds lock on at least one key associated with this
{@code CacheLock}.
- *
- * This is a local in-VM operation and does not involve any network trips
- * or access to persistent storage in any way.
- *
- * @return {@code True} if lock is owned by some node.
- * @see {@link IgniteCache#isLocked(Object)}
- */
-public boolean isLocked();
-
-/**
- * Checks if current thread holds lock on at least one key associated with
this {@code CacheLock}.
- *
- * This is a local in-VM operation and does not involve any network trips
- * or access to persistent storage in any way.
- *
- * @return {@code True} if key is locked by current thread.
- * @see {@link IgniteCache#isLockedByThread(Object)}
- */
-public boolean isLockedByThread();
-
-/** {@inheritDoc} */
-@IgniteAsyncSupported
-@Override public void lock();
-
-/** {@inheritDoc} */
-@IgniteAsyncSupported
-@Override public boolean tryLock(long time, TimeUnit unit) throws
InterruptedException;
-
-/** {@inheritDoc} */
-@Override public CacheLock enableAsync();
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7db2154/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index 93bd108..1398ebe 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -31,7 +31,6 @@ import javax.cache.expiry.*;
import javax.cache.processor.*;
import java.util.*;
import java.util.concurrent.*;
-import java.util.concurrent.locks.*;
/**
* Main entry point for all Data Grid APIs. You can get a named cache
by calling {@link Ignite#cache(String)}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7db2154/modules/core/
Git Push Summary
Repository: incubator-ignite Updated Branches: refs/heads/ignite-73 [deleted] ab8b24ae8
[2/6] incubator-ignite git commit: IGNITE-59 Move CacheLock to org.apache.ignite.cache package.
IGNITE-59 Move CacheLock to org.apache.ignite.cache package.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b7db2154
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b7db2154
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b7db2154
Branch: refs/heads/ignite-94
Commit: b7db215475729a5bfa71851d2d1692b13f3df383
Parents: 841ec8d
Author: Sergey Evdokimov
Authored: Wed Jan 21 00:08:26 2015 +0300
Committer: Sergey Evdokimov
Committed: Wed Jan 21 00:08:26 2015 +0300
--
.../main/java/org/apache/ignite/CacheLock.java | 61 ---
.../java/org/apache/ignite/IgniteCache.java | 1 -
.../java/org/apache/ignite/cache/CacheLock.java | 62
.../processors/cache/CacheLockAsyncImpl.java| 2 +-
.../processors/cache/CacheLockImpl.java | 1 +
.../cache/GridCacheAbstractFullApiSelfTest.java | 1 +
.../GridCacheMultiNodeLockAbstractTest.java | 3 +-
.../dht/GridCacheColocatedDebugTest.java| 1 +
.../near/GridCachePartitionedLockSelfTest.java | 2 +-
.../GridCacheLocalMultithreadedSelfTest.java| 1 +
10 files changed, 69 insertions(+), 66 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7db2154/modules/core/src/main/java/org/apache/ignite/CacheLock.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/CacheLock.java
b/modules/core/src/main/java/org/apache/ignite/CacheLock.java
deleted file mode 100644
index f395261..000
--- a/modules/core/src/main/java/org/apache/ignite/CacheLock.java
+++ /dev/null
@@ -1,61 +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;
-
-import org.apache.ignite.lang.*;
-
-import java.util.concurrent.*;
-import java.util.concurrent.locks.*;
-
-/**
- * Lock associated with some cache keys.
- */
-public interface CacheLock extends Lock, IgniteAsyncSupport {
-/**
- * Checks if any node holds lock on at least one key associated with this
{@code CacheLock}.
- *
- * This is a local in-VM operation and does not involve any network trips
- * or access to persistent storage in any way.
- *
- * @return {@code True} if lock is owned by some node.
- * @see {@link IgniteCache#isLocked(Object)}
- */
-public boolean isLocked();
-
-/**
- * Checks if current thread holds lock on at least one key associated with
this {@code CacheLock}.
- *
- * This is a local in-VM operation and does not involve any network trips
- * or access to persistent storage in any way.
- *
- * @return {@code True} if key is locked by current thread.
- * @see {@link IgniteCache#isLockedByThread(Object)}
- */
-public boolean isLockedByThread();
-
-/** {@inheritDoc} */
-@IgniteAsyncSupported
-@Override public void lock();
-
-/** {@inheritDoc} */
-@IgniteAsyncSupported
-@Override public boolean tryLock(long time, TimeUnit unit) throws
InterruptedException;
-
-/** {@inheritDoc} */
-@Override public CacheLock enableAsync();
-}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7db2154/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index 93bd108..1398ebe 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -31,7 +31,6 @@ import javax.cache.expiry.*;
import javax.cache.processor.*;
import java.util.*;
import java.util.concurrent.*;
-import java.util.concurrent.locks.*;
/**
* Main entry point for all Data Grid APIs. You can get a named cache
by calling {@link Ignite#cache(String)}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b7db2154/modules/core/
[1/6] incubator-ignite git commit: Mvn package phase fix. License filename was changed to another. Now reference to this file fixed
Repository: incubator-ignite Updated Branches: refs/heads/ignite-94 2597403bb -> 5761c4571 Mvn package phase fix. License filename was changed to another. Now reference to this file fixed Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/841ec8df Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/841ec8df Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/841ec8df Branch: refs/heads/ignite-94 Commit: 841ec8dffbe6c56ee4d3baf566981abf4434f563 Parents: f4ab031 Author: avinogradov Authored: Tue Jan 20 17:42:24 2015 +0300 Committer: avinogradov Committed: Tue Jan 20 17:50:04 2015 +0300 -- assembly/release-base.xml | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/841ec8df/assembly/release-base.xml -- diff --git a/assembly/release-base.xml b/assembly/release-base.xml index 7e160b6..5881729 100644 --- a/assembly/release-base.xml +++ b/assembly/release-base.xml @@ -23,6 +23,11 @@ http://maven.apache.org/xsd/component-1.1.2.xsd";> +LICENSE.txt +/ + + + config/gridgain-log4j.xml /config
[3/6] incubator-ignite git commit: # Spring cache fixes
# Spring cache fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1a2d2ca1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1a2d2ca1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1a2d2ca1
Branch: refs/heads/ignite-94
Commit: 1a2d2ca1e5b008b5dbab1e73513ac61bd9bbcdd9
Parents: b7db215
Author: Valentin Kulichenko
Authored: Tue Jan 20 23:24:59 2015 -0800
Committer: Valentin Kulichenko
Committed: Tue Jan 20 23:24:59 2015 -0800
--
.../grid/cache/spring/GridSpringCache.java | 185 +++
.../cache/spring/GridSpringCacheManager.java| 190 ++-
.../spring/GridSpringDynamicCacheManager.java | 316 +++
.../spring/GridSpringCacheManagerSelfTest.java | 2 +-
.../GridSpringDynamicCacheManagerSelfTest.java | 218 +
.../GridSpringDynamicCacheTestService.java | 62
.../cache/spring/spring-dynamic-caching.xml | 43 +++
.../testsuites/bamboo/GridSpringTestSuite.java | 1 +
8 files changed, 846 insertions(+), 171 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1a2d2ca1/modules/spring/src/main/java/org/gridgain/grid/cache/spring/GridSpringCache.java
--
diff --git
a/modules/spring/src/main/java/org/gridgain/grid/cache/spring/GridSpringCache.java
b/modules/spring/src/main/java/org/gridgain/grid/cache/spring/GridSpringCache.java
new file mode 100644
index 000..74baf53
--- /dev/null
+++
b/modules/spring/src/main/java/org/gridgain/grid/cache/spring/GridSpringCache.java
@@ -0,0 +1,185 @@
+/*
+ * 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.gridgain.grid.cache.spring;
+
+import org.apache.ignite.*;
+import org.apache.ignite.lang.*;
+import org.gridgain.grid.cache.*;
+import org.gridgain.grid.util.typedef.*;
+import org.springframework.cache.*;
+import org.springframework.cache.support.*;
+
+import java.io.*;
+
+/**
+ * Spring cache implementation.
+ */
+class GridSpringCache implements Cache, Serializable {
+/** */
+private String name;
+
+/** */
+private Ignite ignite;
+
+/** */
+private GridCacheProjection cache;
+
+/** */
+private IgniteClosure keyFactory;
+
+/**
+ * @param name Cache name.
+ * @param ignite Ignite instance.
+ * @param cache Cache.
+ * @param keyFactory Key factory.
+ */
+GridSpringCache(String name, Ignite ignite, GridCacheProjection
cache,
+IgniteClosure keyFactory) {
+assert cache != null;
+
+this.name = name;
+this.ignite = ignite;
+this.cache = (GridCacheProjection)cache;
+this.keyFactory = keyFactory != null ? keyFactory : F.identity();
+}
+
+/** {@inheritDoc} */
+@Override public String getName() {
+return name;
+}
+
+/** {@inheritDoc} */
+@Override public Object getNativeCache() {
+return cache;
+}
+
+/** {@inheritDoc} */
+@Override public ValueWrapper get(Object key) {
+try {
+Object val = cache.get(keyFactory.apply(key));
+
+return val != null ? new SimpleValueWrapper(val) : null;
+}
+catch (IgniteCheckedException e) {
+throw new IgniteException("Failed to get value from cache
[cacheName=" + cache.name() +
+", key=" + key + ']', e);
+}
+}
+
+/** {@inheritDoc} */
+@Override public T get(Object key, Class type) {
+try {
+Object val = cache.get(keyFactory.apply(key));
+
+if (val != null && type != null && !type.isInstance(val))
+throw new IllegalStateException("Cached value is not of
required type [cacheName=" + cache.name() +
+", key=" + key + ", val=" + val + ", requiredType=" + type
+ ']');
+
+return (T)val;
+}
+catch (IgniteCheckedException e) {
+throw new IgniteException("Failed to get value from cache
[cacheName=" + cache.n
[5/6] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-90' into sprint-1
Merge remote-tracking branch 'remotes/origin/ignite-90' into sprint-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/bfbb6d24 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/bfbb6d24 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/bfbb6d24 Branch: refs/heads/ignite-94 Commit: bfbb6d24e7f7ee216a331660f83f115a3faa0ec7 Parents: 1a2d2ca ffe7e70 Author: avinogradov Authored: Wed Jan 21 13:10:15 2015 +0300 Committer: avinogradov Committed: Wed Jan 21 13:10:15 2015 +0300 -- .../cache/CachePartialUpdateException.java | 22 +--- .../processors/cache/CacheInvokeEntry.java | 22 +--- .../processors/cache/CacheInvokeResult.java | 22 +--- .../cache/IgniteCacheExpiryPolicy.java | 22 +--- .../distributed/GridCacheTtlUpdateRequest.java | 22 +--- .../IgniteExternalizableExpiryPolicy.java | 22 +--- .../cache/IgniteCacheAbstractTest.java | 22 +--- .../cache/IgniteCacheAtomicInvokeTest.java | 22 +--- .../cache/IgniteCacheAtomicLocalInvokeTest.java | 22 +--- ...niteCacheAtomicLocalWithStoreInvokeTest.java | 22 +--- .../IgniteCacheAtomicNearEnabledInvokeTest.java | 22 +--- ...eCacheAtomicPrimaryWriteOrderInvokeTest.java | 22 +--- ...micPrimaryWriteOrderWithStoreInvokeTest.java | 22 +--- .../cache/IgniteCacheInvokeAbstractTest.java| 22 +--- .../cache/IgniteCacheTxInvokeTest.java | 22 +--- .../cache/IgniteCacheTxLocalInvokeTest.java | 22 +--- .../IgniteCacheTxNearEnabledInvokeTest.java | 22 +--- .../IgniteCacheAtomicExpiryPolicyTest.java | 22 +--- .../IgniteCacheAtomicLocalExpiryPolicyTest.java | 22 +--- ...AtomicPrimaryWriteOrderExpiryPolicyTest.java | 22 +--- ...maryWriteOrderWithStoreExpiryPolicyTest.java | 22 +--- ...teCacheAtomicReplicatedExpiryPolicyTest.java | 22 +--- ...iteCacheAtomicWithStoreExpiryPolicyTest.java | 22 +--- .../IgniteCacheExpiryPolicyAbstractTest.java| 22 +--- .../IgniteCacheExpiryPolicyTestSuite.java | 22 +--- .../expiry/IgniteCacheTxExpiryPolicyTest.java | 22 +--- .../IgniteCacheTxLocalExpiryPolicyTest.java | 22 +--- ...IgniteCacheTxReplicatedExpiryPolicyTest.java | 22 +--- .../IgniteCacheTxWithStoreExpiryPolicyTest.java | 22 +--- .../dht/GridCacheGlobalLoadTest.java| 22 +--- 30 files changed, 450 insertions(+), 210 deletions(-) --
[4/6] incubator-ignite git commit: Ignite-90 Some classes headers fixed
Ignite-90 Some classes headers fixed Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ffe7e70e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ffe7e70e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ffe7e70e Branch: refs/heads/ignite-94 Commit: ffe7e70ef4acaa46e49bcbdb47c0c1d14e4c260f Parents: 841ec8d Author: avinogradov Authored: Wed Jan 21 12:50:44 2015 +0300 Committer: avinogradov Committed: Wed Jan 21 12:50:44 2015 +0300 -- .../cache/CachePartialUpdateException.java | 22 +--- .../processors/cache/CacheInvokeEntry.java | 22 +--- .../processors/cache/CacheInvokeResult.java | 22 +--- .../cache/IgniteCacheExpiryPolicy.java | 22 +--- .../distributed/GridCacheTtlUpdateRequest.java | 22 +--- .../IgniteExternalizableExpiryPolicy.java | 22 +--- .../cache/IgniteCacheAbstractTest.java | 22 +--- .../cache/IgniteCacheAtomicInvokeTest.java | 22 +--- .../cache/IgniteCacheAtomicLocalInvokeTest.java | 22 +--- ...niteCacheAtomicLocalWithStoreInvokeTest.java | 22 +--- .../IgniteCacheAtomicNearEnabledInvokeTest.java | 22 +--- ...eCacheAtomicPrimaryWriteOrderInvokeTest.java | 22 +--- ...micPrimaryWriteOrderWithStoreInvokeTest.java | 22 +--- .../cache/IgniteCacheInvokeAbstractTest.java| 22 +--- .../cache/IgniteCacheTxInvokeTest.java | 22 +--- .../cache/IgniteCacheTxLocalInvokeTest.java | 22 +--- .../IgniteCacheTxNearEnabledInvokeTest.java | 22 +--- .../IgniteCacheAtomicExpiryPolicyTest.java | 22 +--- .../IgniteCacheAtomicLocalExpiryPolicyTest.java | 22 +--- ...AtomicPrimaryWriteOrderExpiryPolicyTest.java | 22 +--- ...maryWriteOrderWithStoreExpiryPolicyTest.java | 22 +--- ...teCacheAtomicReplicatedExpiryPolicyTest.java | 22 +--- ...iteCacheAtomicWithStoreExpiryPolicyTest.java | 22 +--- .../IgniteCacheExpiryPolicyAbstractTest.java| 22 +--- .../IgniteCacheExpiryPolicyTestSuite.java | 22 +--- .../expiry/IgniteCacheTxExpiryPolicyTest.java | 22 +--- .../IgniteCacheTxLocalExpiryPolicyTest.java | 22 +--- ...IgniteCacheTxReplicatedExpiryPolicyTest.java | 22 +--- .../IgniteCacheTxWithStoreExpiryPolicyTest.java | 22 +--- .../dht/GridCacheGlobalLoadTest.java| 22 +--- 30 files changed, 450 insertions(+), 210 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ffe7e70e/modules/core/src/main/java/org/apache/ignite/cache/CachePartialUpdateException.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CachePartialUpdateException.java b/modules/core/src/main/java/org/apache/ignite/cache/CachePartialUpdateException.java index 08ce72e..427f387 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CachePartialUpdateException.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CachePartialUpdateException.java @@ -1,10 +1,18 @@ -/* @java.file.header */ - -/* __ ___ - * __ /___(_)__ /__ /__ (_)___ - * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \ - * / /_/ / _ /_ / / /_/ / / /_/ / / /_/ / _ / _ / / / - * \/ /_/ /_/ \_,__/ \/ \__,_/ /_/ /_/ /_/ +/* + * 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.cache; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ffe7e70e/modules/core/src/main/java/org/gridgain/grid/kernal/proc
[6/6] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-94
Merge remote-tracking branch 'remotes/origin/sprint-1' into ignite-94 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5761c457 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5761c457 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5761c457 Branch: refs/heads/ignite-94 Commit: 5761c45716a2cb0d6cdc796b343ae86e72cfb31c Parents: 2597403 bfbb6d2 Author: avinogradov Authored: Wed Jan 21 14:30:31 2015 +0300 Committer: avinogradov Committed: Wed Jan 21 14:30:31 2015 +0300 -- assembly/release-base.xml | 5 + .../main/java/org/apache/ignite/CacheLock.java | 61 .../java/org/apache/ignite/IgniteCache.java | 1 - .../java/org/apache/ignite/cache/CacheLock.java | 62 .../cache/CachePartialUpdateException.java | 22 +- .../processors/cache/CacheLockAsyncImpl.java| 2 +- .../processors/cache/CacheLockImpl.java | 1 + .../processors/cache/CacheInvokeEntry.java | 22 +- .../processors/cache/CacheInvokeResult.java | 22 +- .../cache/IgniteCacheExpiryPolicy.java | 22 +- .../distributed/GridCacheTtlUpdateRequest.java | 22 +- .../IgniteExternalizableExpiryPolicy.java | 22 +- .../cache/IgniteCacheAbstractTest.java | 22 +- .../cache/IgniteCacheAtomicInvokeTest.java | 22 +- .../cache/IgniteCacheAtomicLocalInvokeTest.java | 22 +- ...niteCacheAtomicLocalWithStoreInvokeTest.java | 22 +- .../IgniteCacheAtomicNearEnabledInvokeTest.java | 22 +- ...eCacheAtomicPrimaryWriteOrderInvokeTest.java | 22 +- ...micPrimaryWriteOrderWithStoreInvokeTest.java | 22 +- .../cache/IgniteCacheInvokeAbstractTest.java| 22 +- .../cache/IgniteCacheTxInvokeTest.java | 22 +- .../cache/IgniteCacheTxLocalInvokeTest.java | 22 +- .../IgniteCacheTxNearEnabledInvokeTest.java | 22 +- .../IgniteCacheAtomicExpiryPolicyTest.java | 22 +- .../IgniteCacheAtomicLocalExpiryPolicyTest.java | 22 +- ...AtomicPrimaryWriteOrderExpiryPolicyTest.java | 22 +- ...maryWriteOrderWithStoreExpiryPolicyTest.java | 22 +- ...teCacheAtomicReplicatedExpiryPolicyTest.java | 22 +- ...iteCacheAtomicWithStoreExpiryPolicyTest.java | 22 +- .../IgniteCacheExpiryPolicyAbstractTest.java| 22 +- .../IgniteCacheExpiryPolicyTestSuite.java | 22 +- .../expiry/IgniteCacheTxExpiryPolicyTest.java | 22 +- .../IgniteCacheTxLocalExpiryPolicyTest.java | 22 +- ...IgniteCacheTxReplicatedExpiryPolicyTest.java | 22 +- .../IgniteCacheTxWithStoreExpiryPolicyTest.java | 22 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 1 + .../GridCacheMultiNodeLockAbstractTest.java | 3 +- .../dht/GridCacheColocatedDebugTest.java| 1 + .../dht/GridCacheGlobalLoadTest.java| 22 +- .../near/GridCachePartitionedLockSelfTest.java | 2 +- .../GridCacheLocalMultithreadedSelfTest.java| 1 + .../grid/cache/spring/GridSpringCache.java | 185 +++ .../cache/spring/GridSpringCacheManager.java| 190 ++- .../spring/GridSpringDynamicCacheManager.java | 316 +++ .../spring/GridSpringCacheManagerSelfTest.java | 2 +- .../GridSpringDynamicCacheManagerSelfTest.java | 218 + .../GridSpringDynamicCacheTestService.java | 62 .../cache/spring/spring-dynamic-caching.xml | 43 +++ .../testsuites/bamboo/GridSpringTestSuite.java | 1 + 49 files changed, 1370 insertions(+), 447 deletions(-) --
[42/48] incubator-ignite git commit: IGNITE-62 (Fix project build after project migration) Remove broken link in release-base.xml (cherry picked from commit 1164ff2)
IGNITE-62 (Fix project build after project migration) Remove broken link in release-base.xml (cherry picked from commit 1164ff2) Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f4ab0318 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f4ab0318 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f4ab0318 Branch: refs/heads/ignite-65 Commit: f4ab03180fffa9719da3753ff01a7a32952fa996 Parents: 2860388 Author: sevdokimov Authored: Tue Jan 20 15:39:22 2015 +0300 Committer: sevdokimov Committed: Tue Jan 20 14:40:10 2015 +0300 -- assembly/release-base.xml | 5 - 1 file changed, 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f4ab0318/assembly/release-base.xml -- diff --git a/assembly/release-base.xml b/assembly/release-base.xml index 9822cc4..7e160b6 100644 --- a/assembly/release-base.xml +++ b/assembly/release-base.xml @@ -23,11 +23,6 @@ http://maven.apache.org/xsd/component-1.1.2.xsd";> -apache-2.0.txt -/ - - - config/gridgain-log4j.xml /config
[19/48] incubator-ignite git commit: IGNITE-59 Support lock, lockAll: Fix tests.
IGNITE-59 Support lock, lockAll: Fix tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5e24d63e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5e24d63e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5e24d63e
Branch: refs/heads/ignite-65
Commit: 5e24d63e49abdb3cbebdf4e51b653542df7e0942
Parents: ea40627
Author: sevdokimov
Authored: Fri Jan 16 13:13:02 2015 +0300
Committer: sevdokimov
Committed: Fri Jan 16 13:13:02 2015 +0300
--
.../cache/distributed/GridCacheLockAbstractTest.java | 2 +-
.../cache/distributed/near/GridCacheNearMultiNodeSelfTest.java | 2 +-
.../cache/distributed/near/GridCacheNearOneNodeSelfTest.java | 4 ++--
.../kernal/processors/ggfs/GridGgfsMetaManagerSelfTest.java| 6 --
4 files changed, 8 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e24d63e/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java
index 639534b..44c86e5 100644
---
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java
+++
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheLockAbstractTest.java
@@ -352,7 +352,7 @@ public abstract class GridCacheLockAbstractTest extends
GridCommonAbstractTest {
info("Put key-value pair into cache: 1='2'");
-assertEquals("2", cache1.remove(1));
+assertEquals("2", cache1.getAndRemove(1));
l2.countDown();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e24d63e/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
index f63d2d7..56549e9 100644
---
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
+++
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearMultiNodeSelfTest.java
@@ -761,7 +761,7 @@ public class GridCacheNearMultiNodeSelfTest extends
GridCommonAbstractTest {
try {
assertEquals(val, near.get(key));
-assertEquals(val, near.remove(key));
+assertEquals(val, near.getAndRemove(key));
assertNull(near.localPeek(key));
assertNull(dht(primaryGrid(key)).peek(key));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e24d63e/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
index 25adeea..0e583e5 100644
---
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
+++
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/near/GridCacheNearOneNodeSelfTest.java
@@ -213,7 +213,7 @@ public class GridCacheNearOneNodeSelfTest extends
GridCommonAbstractTest {
assertEquals("1", dht().peek(1));
assertEquals("1", near.get(1));
-assertEquals("1", near.remove(1));
+assertEquals("1", near.getAndRemove(1));
assertNull(near.localPeek(1));
assertNull(dht().peek(1));
@@ -248,7 +248,7 @@ public class GridCacheNearOneNodeSelfTest extends
GridCommonAbstractTest {
try {
assertEquals("1", near.get(1));
-assertEquals("1", near.remove(1));
+assertEquals("1", near.getAndRemove(1));
assertNull(near.localPeek(1));
assertNull(dht().peek(1));
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/5e24d63e/modules/core/src/test/java
[08/48] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43
Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0f33ffc3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0f33ffc3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0f33ffc3 Branch: refs/heads/ignite-65 Commit: 0f33ffc3d50e959026533a386486e9422414f29a Parents: 2f5d4d8 bb32d46 Author: sboikov Authored: Tue Jan 13 16:05:51 2015 +0300 Committer: sboikov Committed: Tue Jan 13 16:05:51 2015 +0300 -- .../java/org/apache/ignite/IgniteCache.java | 39 ++--- .../processors/cache/IgniteCacheProxy.java | 124 +- .../GridCacheLoadOnlyStoreAdapterSelfTest.java | 5 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 2 +- .../cache/GridCacheAbstractSelfTest.java| 4 +- .../dht/GridCacheGlobalLoadTest.java| 163 +++ .../GridCachePartitionedLoadCacheSelfTest.java | 20 ++- .../junits/common/GridCommonAbstractTest.java | 7 + .../bamboo/GridDataGridTestSuite.java | 1 + 9 files changed, 328 insertions(+), 37 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0f33ffc3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0f33ffc3/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0f33ffc3/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java --
[02/48] incubator-ignite git commit: # ignite-43
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9f02315/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAtomicReplicatedTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAtomicReplicatedTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAtomicReplicatedTest.java
new file mode 100644
index 000..e97c0a6
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAtomicReplicatedTest.java
@@ -0,0 +1,24 @@
+/* @java.file.header */
+
+/* __ ___
+ * __ /___(_)__ /__ /__ (_)___
+ * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
+ * / /_/ / _ /_ / / /_/ / / /_/ / / /_/ / _ / _ / / /
+ * \/ /_/ /_/ \_,__/ \/ \__,_/ /_/ /_/ /_/
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.gridgain.grid.cache.*;
+
+import static org.gridgain.grid.cache.GridCacheMode.*;
+
+/**
+ *
+ */
+public class IgniteCacheEntryListenerAtomicReplicatedTest extends
IgniteCacheEntryListenerAtomicTest {
+/** {@inheritDoc} */
+@Override protected GridCacheMode cacheMode() {
+return REPLICATED;
+}
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9f02315/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAtomicTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAtomicTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAtomicTest.java
new file mode 100644
index 000..3f96744
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerAtomicTest.java
@@ -0,0 +1,47 @@
+/* @java.file.header */
+
+/* __ ___
+ * __ /___(_)__ /__ /__ (_)___
+ * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
+ * / /_/ / _ /_ / / /_/ / / /_/ / / /_/ / _ / _ / / /
+ * \/ /_/ /_/ \_,__/ \/ \__,_/ /_/ /_/ /_/
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.gridgain.grid.cache.*;
+
+import static org.gridgain.grid.cache.GridCacheAtomicWriteOrderMode.*;
+import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
+import static org.gridgain.grid.cache.GridCacheDistributionMode.*;
+import static org.gridgain.grid.cache.GridCacheMode.*;
+
+/**
+ *
+ */
+public class IgniteCacheEntryListenerAtomicTest extends
IgniteCacheEntryListenerAbstractTest {
+/** {@inheritDoc} */
+@Override protected int gridCount() {
+return 3;
+}
+
+/** {@inheritDoc} */
+@Override protected GridCacheMode cacheMode() {
+return PARTITIONED;
+}
+
+/** {@inheritDoc} */
+@Override protected GridCacheAtomicityMode atomicityMode() {
+return ATOMIC;
+}
+
+/** {@inheritDoc} */
+@Override protected GridCacheAtomicWriteOrderMode atomicWriteOrderMode() {
+return PRIMARY;
+}
+
+/** {@inheritDoc} */
+@Override protected GridCacheDistributionMode distributionMode() {
+return PARTITIONED_ONLY;
+}
+}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9f02315/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerTxLocalTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerTxLocalTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerTxLocalTest.java
new file mode 100644
index 000..86ed67d
--- /dev/null
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheEntryListenerTxLocalTest.java
@@ -0,0 +1,41 @@
+/* @java.file.header */
+
+/* __ ___
+ * __ /___(_)__ /__ /__ (_)___
+ * _ / __ __ ___/__ / _ __ / _ / __ _ __ `/__ / __ __ \
+ * / /_/ / _ /_ / / /_/ / / /_/ / / /_/ / _ / _ / / /
+ * \/ /_/ /_/ \_,__/ \/ \__,_/ /_/ /_/ /_/
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.gridgain.grid.cache.*;
+
+import static org.gridgain.grid.cache.GridCacheAtomicityMode.*;
+import static org.gridgain.grid.cache.GridCacheDistributionMode.*;
+import static org.gridgain.grid.cache.GridCacheMode.*;
+
+/**
+ *
+ */
+public class IgniteC
[26/48] incubator-ignite git commit: Merge branches 'ignite-1' and 'ignite-59' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-59
Merge branches 'ignite-1' and 'ignite-59' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-59 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d787b5f9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d787b5f9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d787b5f9 Branch: refs/heads/ignite-65 Commit: d787b5f97feec9e368bcf1dc136d6ec0b3054c94 Parents: 9d4476d 9223d38 Author: Yakov Zhdanov Authored: Mon Jan 19 14:31:10 2015 +0300 Committer: Yakov Zhdanov Committed: Mon Jan 19 14:31:10 2015 +0300 -- LICENSE.txt | 202 +++ apache-2.0.txt | 202 --- .../ignite/portables/PortableRawReader.java | 2 +- .../grid/dotnet/GridDotNetConfiguration.java| 14 +- .../dotnet/GridDotNetPortableConfiguration.java | 28 +-- .../GridDotNetPortableTypeConfiguration.java| 15 +- .../org/gridgain/grid/kernal/GridGainEx.java| 76 +-- .../grid/kernal/GridNodeAttributes.java | 5 +- .../processors/cache/GridCacheAdapter.java | 18 +- .../processors/cache/GridCacheContext.java | 2 +- .../processors/cache/GridCacheEntryImpl.java| 2 +- .../GridCacheContinuousQueryAdapter.java| 13 +- .../GridCacheContinuousQueryFilterEx.java | 32 +++ .../GridCacheContinuousQueryHandler.java| 17 +- .../GridCacheContinuousQueryHandlerV3.java | 61 ++ .../GridCacheContinuousQueryHandlerV4.java | 61 ++ .../GridCacheContinuousQueryListener.java | 5 + .../GridCacheContinuousQueryManager.java| 55 +++-- .../interop/GridInteropProcessorAdapter.java| 3 - 19 files changed, 522 insertions(+), 291 deletions(-) --
[03/48] incubator-ignite git commit: # ignite-43
# ignite-43
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f9f02315
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f9f02315
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f9f02315
Branch: refs/heads/ignite-65
Commit: f9f02315992b046106b8fad38b14c37887e6103c
Parents: dc3faef
Author: sboikov
Authored: Wed Dec 31 12:03:37 2014 +0300
Committer: sboikov
Committed: Wed Dec 31 15:53:08 2014 +0300
--
.../apache/ignite/cache/CacheEntryEvent.java| 29 +-
.../processors/cache/IgniteCacheProxy.java | 323 +--
.../grid/cache/GridCacheConfiguration.java | 1 +
.../cache/query/GridCacheContinuousQuery.java | 10 +-
.../grid/kernal/GridEventConsumeHandler.java| 4 +-
.../processors/cache/GridCacheMapEntry.java | 49 +-
.../processors/cache/GridCacheProcessor.java| 2 +-
.../GridCacheDataStructuresManager.java | 2 +-
.../GridCacheContinuousQueryAdapter.java| 39 +-
.../GridCacheContinuousQueryEntry.java | 28 +-
.../GridCacheContinuousQueryHandler.java| 23 +-
.../GridCacheContinuousQueryHandlerV2.java | 12 +-
.../GridCacheContinuousQueryManager.java| 498 -
.../service/GridServiceProcessor.java | 4 +-
.../IgniteCacheEntryListenerAbstractTest.java | 535 +--
...IgniteCacheEntryListenerAtomicLocalTest.java | 41 ++
...eCacheEntryListenerAtomicReplicatedTest.java | 24 +
.../IgniteCacheEntryListenerAtomicTest.java | 47 ++
.../IgniteCacheEntryListenerTxLocalTest.java| 41 ++
...gniteCacheEntryListenerTxReplicatedTest.java | 24 +
.../cache/IgniteCacheEntryListenerTxTest.java | 41 ++
.../bamboo/GridDataGridTestSuite.java | 7 +
22 files changed, 1341 insertions(+), 443 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9f02315/modules/core/src/main/java/org/apache/ignite/cache/CacheEntryEvent.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/CacheEntryEvent.java
b/modules/core/src/main/java/org/apache/ignite/cache/CacheEntryEvent.java
index b3a4f52..b480ca4 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheEntryEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheEntryEvent.java
@@ -10,7 +10,7 @@
package org.apache.ignite.cache;
import org.apache.ignite.*;
-import org.apache.ignite.events.*;
+import org.gridgain.grid.cache.query.*;
import javax.cache.event.*;
@@ -19,52 +19,49 @@ import javax.cache.event.*;
*/
public class CacheEntryEvent extends
javax.cache.event.CacheEntryEvent {
/** */
-private final IgniteCacheEvent evt;
+private final GridCacheContinuousQueryEntry e;
/**
* @param src Cache.
* @param type Event type.
- * @param evt Ignite event.
+ * @param e Ignite event.
*/
-public CacheEntryEvent(IgniteCache src, EventType type, IgniteCacheEvent
evt) {
+public CacheEntryEvent(IgniteCache src, EventType type,
GridCacheContinuousQueryEntry e) {
super(src, type);
-this.evt = evt;
+this.e = e;
}
/** {@inheritDoc} */
-@SuppressWarnings("unchecked")
@Override public V getOldValue() {
-return (V)evt.oldValue();
+return e.getOldValue();
}
/** {@inheritDoc} */
@Override public boolean isOldValueAvailable() {
-return evt.hasOldValue();
+return e.getOldValue() != null;
}
/** {@inheritDoc} */
@Override public K getKey() {
-return evt.key();
+return e.getKey();
}
/** {@inheritDoc} */
-@SuppressWarnings("unchecked")
@Override public V getValue() {
-return (V)evt.newValue();
+return e.getValue();
}
/** {@inheritDoc} */
-@SuppressWarnings("unchecked")
@Override public T unwrap(Class cls) {
-if (cls.equals(IgniteCacheEvent.class))
-return (T)evt;
-
throw new IllegalArgumentException();
}
/** {@inheritDoc} */
@Override public String toString() {
-return "CacheEntryEvent [evtType=" + getEventType() + ", evt=" + evt +
']';
+return "CacheEntryEvent [evtType=" + getEventType() +
+", key=" + getKey() +
+", val=" + getValue() +
+", oldVal=" + getOldValue() + ']';
}
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f9f02315/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/IgniteC
[41/48] incubator-ignite git commit: # IGNITE-59 Support lock, lockAll. Fix tests.
# IGNITE-59 Support lock, lockAll. Fix tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/28603886
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/28603886
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/28603886
Branch: refs/heads/ignite-65
Commit: 286038862f5b148315232a7c56ae0430306e2a8e
Parents: cbb74d6
Author: sevdokimov
Authored: Tue Jan 20 13:10:07 2015 +0300
Committer: sevdokimov
Committed: Tue Jan 20 13:10:07 2015 +0300
--
.../processors/cache/CacheLockAsyncImpl.java| 7 ++--
.../GridCacheMultiNodeLockAbstractTest.java | 4 +--
.../GridCacheLocalMultithreadedSelfTest.java| 35 ++--
3 files changed, 15 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/28603886/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockAsyncImpl.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockAsyncImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockAsyncImpl.java
index 4b058bd..5005982 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockAsyncImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockAsyncImpl.java
@@ -40,7 +40,7 @@ class CacheLockAsyncImpl implements CacheLock {
private final Collection keys;
/** Future for previous asynchronous operation. */
-protected ThreadLocal> curFut;
+protected final ThreadLocal> curFut = new ThreadLocal<>();
/**
* @param delegate Delegate.
@@ -95,10 +95,7 @@ class CacheLockAsyncImpl implements CacheLock {
/** {@inheritDoc} */
@Override public boolean tryLock(long time, TimeUnit unit) {
-if (time <= 0)
-return tryLock();
-
-IgniteFuture fut = delegate.lockAllAsync(keys,
unit.toMillis(time));
+IgniteFuture fut = delegate.lockAllAsync(keys, time <= 0 ? -1
: unit.toMillis(time));
curFut.set(fut);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/28603886/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java
index 257d260..1188022 100644
---
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java
+++
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/distributed/GridCacheMultiNodeLockAbstractTest.java
@@ -532,9 +532,9 @@ public abstract class GridCacheMultiNodeLockAbstractTest
extends GridCommonAbstr
checkRemoteLocked(cache2, keys1);
-lock2_2.tryLock(-1, TimeUnit.MILLISECONDS);
+lock2_2.enableAsync().tryLock(-1, TimeUnit.MILLISECONDS);
-IgniteFuture f2 = lock2_2.future();
+IgniteFuture f2 = lock2_2.enableAsync().future();
assert !f2.get();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/28603886/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java
--
diff --git
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java
index cc79f38..452dc48 100644
---
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java
+++
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/local/GridCacheLocalMultithreadedSelfTest.java
@@ -17,6 +17,7 @@
package org.gridgain.grid.kernal.processors.cache.local;
+import com.google.common.collect.*;
import org.apache.ignite.*;
import org.apache.ignite.configuration.*;
import org.apache.ignite.lang.*;
@@ -37,7 +38,7 @@ import static org.gridgain.grid.cache.GridCacheMode.*;
*/
public class GridCacheLocalMultithreadedSelfTest extends
GridCommonAbstractTest {
/** Cache. */
-private GridCache cache;
+private IgniteCache cache;
/**
* Start grid by default.
@@ -50,7 +51,7 @@ public class GridCacheLocalMultithreadedSelfTest extends
GridCommonAbstractTest
[27/48] incubator-ignite git commit: # Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43
# Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fd5e15c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fd5e15c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fd5e15c9
Branch: refs/heads/ignite-65
Commit: fd5e15c9313631dfb27b255156896566c97f7810
Parents: 2a2eb5a 9223d38
Author: sboikov
Authored: Mon Jan 19 14:45:01 2015 +0300
Committer: sboikov
Committed: Mon Jan 19 14:45:01 2015 +0300
--
.../ignite/portables/PortableRawReader.java | 2 +-
.../grid/dotnet/GridDotNetConfiguration.java| 14 +++-
.../dotnet/GridDotNetPortableConfiguration.java | 28 +++-
.../GridDotNetPortableTypeConfiguration.java| 15 +---
.../org/gridgain/grid/kernal/GridGainEx.java| 76 ++--
.../grid/kernal/GridNodeAttributes.java | 5 +-
.../processors/cache/GridCacheAdapter.java | 18 +++--
.../processors/cache/GridCacheContext.java | 2 +-
.../processors/cache/GridCacheEntryImpl.java| 2 +-
.../GridCacheContinuousQueryAdapter.java| 5 ++
.../GridCacheContinuousQueryFilterEx.java | 32 +
.../GridCacheContinuousQueryHandler.java| 17 -
.../GridCacheContinuousQueryListener.java | 5 ++
.../GridCacheContinuousQueryManager.java| 71 --
.../interop/GridInteropProcessorAdapter.java| 3 -
15 files changed, 201 insertions(+), 94 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd5e15c9/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd5e15c9/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
--
diff --cc
modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
index 228dfa5,a7ff429..5ab83e1
---
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
+++
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
@@@ -283,8 -262,7 +291,8 @@@ class GridCacheContinuousQueryHandlerhttp://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fd5e15c9/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java
--
diff --cc
modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java
index c3a4dfe,2d8e106..6e1eac3
---
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java
+++
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java
@@@ -298,14 -126,12 +298,15 @@@ public class GridCacheContinuousQueryMa
* @param lsnrId Listener ID.
* @param lsnr Listener.
* @param internal Internal flag.
+ * @param entryLsnr {@code True} if query created for {@link
CacheEntryListener}.
* @return Whether listener was actually registered.
*/
+ @SuppressWarnings("UnusedParameters")
-boolean registerListener(UUID nodeId, UUID lsnrId,
GridCacheContinuousQueryListener lsnr, boolean internal) {
-ListenerInfo info = new ListenerInfo<>(lsnr);
+boolean registerListener(UUID lsnrId,
+GridCacheContinuousQueryListener lsnr,
+boolean internal,
+boolean entryLsnr) {
+ListenerInfo info = new ListenerInfo<>(lsnr, entryLsnr);
boolean added;
@@@ -354,31 -190,35 +365,45 @@@
assert info != null;
- Set> entries;
+ GridCacheProjectionImpl oldPrj = null;
- if (cctx.isReplicated())
- entries = internal ? cctx.cache().entrySetx() :
- cctx.cache().entrySet();
- else
- entries = internal ? cctx.cache().primaryEntrySetx() :
- cctx.cache().primaryEntrySet();
+ try {
+ if (keepPortable) {
+ oldPrj = cctx.projectionPerCall();
- boolean evt = !internal &&
cctx.gridEvents().isRecordable(EVT_CACHE_QUERY_OBJECT_READ);
+ cctx.projectionPerCall(cctx.cache().keepPortable0());
+ }
- for (GridCacheEntry e : entries) {
- Gr
[15/48] incubator-ignite git commit: # IGNITE-59 Support lock, lockAll.
# IGNITE-59 Support lock, lockAll.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c3387597
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c3387597
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c3387597
Branch: refs/heads/ignite-65
Commit: c3387597b7744668b4c9e81e3b145fef6e01c585
Parents: da0235b
Author: sevdokimov
Authored: Wed Jan 14 18:58:35 2015 +0300
Committer: sevdokimov
Committed: Wed Jan 14 18:58:35 2015 +0300
--
.../java/org/apache/ignite/IgniteCache.java | 4 +-
.../processors/cache/IgniteCacheProxy.java | 76 ++--
2 files changed, 73 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3387597/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
index 2988005..f4aa3d5 100644
--- a/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
+++ b/modules/core/src/main/java/org/apache/ignite/IgniteCache.java
@@ -180,9 +180,9 @@ public interface IgniteCache extends
javax.cache.Cache, IgniteAsyncS
*/
public void removeAll(IgnitePredicate> filter) throws
CacheException;
-public Lock lock(K key) throws CacheException;
+public Lock lock(K key);
-public Lock lockAll(Set keys) throws CacheException;
+public Lock lockAll(Set keys);
/**
* Checks if any node owns a lock for this key.
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c3387597/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 f95cd2a..055827b 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
@@ -23,6 +23,7 @@ import org.apache.ignite.cache.query.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.lang.*;
import org.apache.ignite.resources.*;
+import org.gridgain.grid.*;
import org.gridgain.grid.cache.*;
import org.gridgain.grid.kernal.*;
import org.gridgain.grid.kernal.processors.cache.*;
@@ -258,14 +259,79 @@ public class IgniteCacheProxy extends
IgniteAsyncSupportAdapter implements
/** {@inheritDoc} */
@Override public Lock lock(K key) throws CacheException {
-// TODO IGNITE-1.
-throw new UnsupportedOperationException();
+return lockAll(Collections.singleton(key));
}
/** {@inheritDoc} */
-@Override public Lock lockAll(Set keys) throws CacheException
{
-// TODO IGNITE-1.
-throw new UnsupportedOperationException();
+@Override public Lock lockAll(final Set keys) {
+return new Lock() {
+@Override public void lock() {
+try {
+delegate.lockAll(keys, 0);
+}
+catch (GridInterruptedException ignored) {
+
+}
+catch (IgniteCheckedException e) {
+throw new CacheException(e);
+}
+}
+
+@Override public void lockInterruptibly() throws
InterruptedException {
+if (Thread.interrupted())
+throw new InterruptedException();
+
+try {
+delegate.lockAll(keys, 0);
+}
+catch (GridInterruptedException e) {
+if (e.getCause() instanceof InterruptedException)
+throw (InterruptedException)e.getCause();
+
+throw new InterruptedException();
+}
+catch (IgniteCheckedException e) {
+throw new CacheException(e);
+}
+}
+
+@Override public boolean tryLock() {
+try {
+return delegate.lockAll(keys, -1);
+}
+catch (IgniteCheckedException e) {
+throw new CacheException(e);
+}
+}
+
+@Override public boolean tryLock(long time, TimeUnit unit) throws
InterruptedException {
+try {
+return delegate.lockAll(keys, unit.toMillis(time));
+}
+catch (GridInterruptedException e) {
+
[13/48] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/apache/ignite/cache/CacheEntryEvent.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/gridgain/grid/cache/GridCacheConfiguration.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/gridgain/grid/cache/query/GridCacheContinuousQuery.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/gridgain/grid/kernal/GridEventConsumeHandler.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheMapEntry.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheProcessor.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/datastructures/GridCacheDataStructuresManager.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryEntry.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryManager.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/transactions/IgniteTxAdapter.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousMessage.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousMessageType.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/gridgain/grid/kernal/processors/continuous/GridContinuousProcessor.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/main/java/org/gridgain/grid/kernal/processors/service/GridServiceProcessor.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/test/java/org/gridgain/testframework/junits/common/GridCommonAbstractTest.java -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/09df7dea/modules/core/src/test/java/org/gridgain/testsuites/bamboo/GridDataGridTestSuite.java --
[09/48] incubator-ignite git commit: Merge branches 'ignite-1' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1
Merge branches 'ignite-1' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/40399e90 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/40399e90 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/40399e90 Branch: refs/heads/ignite-65 Commit: 40399e9070c5bb1513c838a15a1c9a8d7b3f4dfd Parents: bb32d46 58eda2e Author: Yakov Zhdanov Authored: Tue Jan 13 17:35:14 2015 +0300 Committer: Yakov Zhdanov Committed: Tue Jan 13 17:35:14 2015 +0300 -- .../examples/ScalarCacheAffinityExample1.scala | 3 ++ .../examples/ScalarCacheAffinityExample2.scala | 3 ++ .../ScalarCacheAffinitySimpleExample.scala | 10 +-- .../scalar/examples/ScalarCacheExample.scala| 12 ++-- .../ScalarCachePopularNumbersExample.scala | 3 ++ .../examples/ScalarCacheQueryExample.scala | 3 ++ .../examples/ScalarSnowflakeSchemaExample.scala | 22 +++ pom.xml | 29 +--- 8 files changed, 70 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/40399e90/examples/src/main/scala/org/gridgain/scalar/examples/ScalarCachePopularNumbersExample.scala --
[34/48] incubator-ignite git commit: IGNITE-59 Support lock, lockAll. Fix test's problems.
IGNITE-59 Support lock, lockAll. Fix test's problems.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2c76212f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2c76212f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2c76212f
Branch: refs/heads/ignite-65
Commit: 2c76212f255c8e83028a3b285c71374bd738f5bc
Parents: fd03d80
Author: sevdokimov
Authored: Mon Jan 19 17:14:59 2015 +0300
Committer: sevdokimov
Committed: Mon Jan 19 17:14:59 2015 +0300
--
.../ignite/internal/processors/cache/IgniteCacheProxy.java | 6 +++---
.../processors/cache/GridCacheBasicApiAbstractTest.java | 8 ++--
2 files changed, 9 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2c76212f/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 64e86dd..0506c5c 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
@@ -318,12 +318,12 @@ public class IgniteCacheProxy extends
IgniteAsyncSupportAdapter implements
throw new InterruptedException();
try {
+if (time <= 0)
+return delegate.lockAll(keys, -1);
+
IgniteFuture fut = null;
try {
-if (time <= 0)
-return delegate.lockAll(keys, -1);
-
fut = delegate.lockAllAsync(keys, time <= 0 ? -1 :
unit.toMillis(time));
return fut.get();
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2c76212f/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicApiAbstractTest.java
--
diff --git
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicApiAbstractTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicApiAbstractTest.java
index 3352356..66e9cb4 100644
---
a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicApiAbstractTest.java
+++
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheBasicApiAbstractTest.java
@@ -193,6 +193,8 @@ public abstract class GridCacheBasicApiAbstractTest extends
GridCommonAbstractTe
t.start();
+Thread.sleep(100);
+
t.interrupt();
cache.lock(1).unlock();
@@ -225,12 +227,14 @@ public abstract class GridCacheBasicApiAbstractTest
extends GridCommonAbstractTe
t.start();
-t.interrupt();
+Thread.sleep(100);
-cache.lock(2).unlock();
+t.interrupt();
t.join();
+cache.lock(2).unlock();
+
assertFalse(cache.lock(1).isLocked());
assertFalse(cache.lock(2).isLocked());
[24/48] incubator-ignite git commit: # IGNITE-59 Support lock, lockAll.
# IGNITE-59 Support lock, lockAll.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9d4476d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9d4476d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9d4476d9
Branch: refs/heads/ignite-65
Commit: 9d4476d988715b237665774f28ec799dc127c07f
Parents: 3975c10
Author: sevdokimov
Authored: Mon Jan 19 13:35:02 2015 +0300
Committer: sevdokimov
Committed: Mon Jan 19 13:35:02 2015 +0300
--
.../main/java/org/apache/ignite/CacheLock.java | 87
.../java/org/apache/ignite/IgniteCache.java | 4 +-
.../processors/cache/IgniteCacheProxy.java | 32 ++-
3 files changed, 118 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9d4476d9/modules/core/src/main/java/org/apache/ignite/CacheLock.java
--
diff --git a/modules/core/src/main/java/org/apache/ignite/CacheLock.java
b/modules/core/src/main/java/org/apache/ignite/CacheLock.java
new file mode 100644
index 000..50fc5d2
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/CacheLock.java
@@ -0,0 +1,87 @@
+/*
+ * 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;
+
+import org.apache.ignite.lang.*;
+import org.apache.ignite.transactions.*;
+import org.gridgain.grid.cache.*;
+
+import java.util.concurrent.*;
+import java.util.concurrent.locks.*;
+
+/**
+ * Lock associated with some cache keys.
+ */
+public interface CacheLock extends Lock {
+/**
+ * Checks if any node owns a lock for the keys associated this lock.
+ *
+ * This is a local in-VM operation and does not involve any network trips
+ * or access to persistent storage in any way.
+ *
+ * @return {@code True} if lock is owned by some node.
+ * @see {@link IgniteCache#isLocked(Object)}
+ */
+public boolean isLocked();
+
+/**
+ * Checks if current thread owns a lock the keys associated this lock.
+ *
+ * This is a local in-VM operation and does not involve any network trips
+ * or access to persistent storage in any way.
+ *
+ * @return {@code True} if key is locked by current thread.
+ * @see {@link IgniteCache#isLockedByThread(Object)}
+ */
+public boolean isLockedByThread();
+
+/**
+ * Asynchronously acquires lock on a cached object with given keys
associated this lock.
+ * Transactions
+ * Locks are not transactional and should not be used from within
transactions. If you do
+ * need explicit locking within transaction, then you should use
+ * {@link IgniteTxConcurrency#PESSIMISTIC} concurrency control for
transaction
+ * which will acquire explicit locks for relevant cache operations.
+ * Cache Flags
+ * This method is not available if any of the following flags are set on
projection:
+ * {@link GridCacheFlag#LOCAL}, {@link GridCacheFlag#READ}.
+ *
+ * @return Future for the lock operation. The future will return {@code
true}.
+ */
+public IgniteFuture lockAsync();
+
+/**
+ * Asynchronously acquires lock on a cached object with given keys
associated this lock.
+ * Transactions
+ * Locks are not transactional and should not be used from within
transactions. If you do
+ * need explicit locking within transaction, then you should use
+ * {@link IgniteTxConcurrency#PESSIMISTIC} concurrency control for
transaction
+ * which will acquire explicit locks for relevant cache operations.
+ * Cache Flags
+ * This method is not available if any of the following flags are set on
projection:
+ * {@link GridCacheFlag#LOCAL}, {@link GridCacheFlag#READ}.
+ *
+ * @param timeout Timeout in milliseconds to wait for lock to be acquired
+ * ({@code '0'} for no expiration, {@code -1} for immediate failure if
+ * lock cannot be acquired immediately).
+ * @param unit the time unit
[28/48] incubator-ignite git commit: # Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43
# Merge remote-tracking branch 'remotes/origin/ignite-1' into ignite-43
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b6376728
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b6376728
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b6376728
Branch: refs/heads/ignite-65
Commit: b6376728d81f3ffb6e4dd07f13979b14b0cb3695
Parents: fd5e15c
Author: sboikov
Authored: Mon Jan 19 14:47:43 2015 +0300
Committer: sboikov
Committed: Mon Jan 19 14:47:43 2015 +0300
--
.../GridCacheContinuousQueryAdapter.java| 3 ++-
.../GridCacheContinuousQueryHandler.java| 20 +++-
2 files changed, 13 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b6376728/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
--
diff --git
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
index 6657ce7..b852932 100644
---
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
+++
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryAdapter.java
@@ -303,7 +303,8 @@ public class GridCacheContinuousQueryAdapter
implements GridCacheContinuou
entryLsnr,
sync,
oldVal,
-taskNameHash);
+taskNameHash,
+keepPortable);
routineId = ctx.kernalContext().continuous().startRoutine(hnd,
bufSize,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b6376728/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
--
diff --git
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
index 5ab83e1..d77baaa 100644
---
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
+++
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
@@ -82,6 +82,9 @@ class GridCacheContinuousQueryHandler implements
GridContinuousHandler {
/** Task name hash code. */
private int taskHash;
+/** */
+private boolean keepPortable;
+
/**
* Required by {@link Externalizable}.
*/
@@ -112,7 +115,8 @@ class GridCacheContinuousQueryHandler implements
GridContinuousHandler {
boolean entryLsnr,
boolean sync,
boolean oldVal,
-int taskHash) {
+int taskHash,
+boolean keepPortable) {
assert topic != null;
assert cb != null;
assert !sync || entryLsnr;
@@ -127,6 +131,7 @@ class GridCacheContinuousQueryHandler implements
GridContinuousHandler {
this.sync = sync;
this.oldVal = oldVal;
this.taskHash = taskHash;
+this.keepPortable = keepPortable;
}
/** {@inheritDoc} */
@@ -292,7 +297,7 @@ class GridCacheContinuousQueryHandler implements
GridContinuousHandler {
/** {@inheritDoc} */
@Override public void onListenerRegistered(UUID routineId,
GridKernalContext ctx) {
if (!entryLsnr)
-manager(ctx).iterate(internal, routineId, keepPortable());
+manager(ctx).iterate(internal, routineId, keepPortable);
}
/** {@inheritDoc} */
@@ -425,6 +430,8 @@ class GridCacheContinuousQueryHandler implements
GridContinuousHandler {
out.writeBoolean(oldVal);
out.writeInt(taskHash);
+
+out.writeBoolean(keepPortable);
}
/** {@inheritDoc} */
@@ -456,6 +463,8 @@ class GridCacheContinuousQueryHandler implements
GridContinuousHandler {
oldVal = in.readBoolean();
taskHash = in.readInt();
+
+keepPortable = in.readBoolean();
}
/**
@@ -469,13 +478,6 @@ class GridCacheContinuousQueryHandler implements
GridContinuousHandler {
}
/**
- * @return Keep portable flag.
- */
-protected boolean keepPortable() {
-return false;
-}
-
-/**
* Deployable object.
*/
private static class Deployable
[37/48] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-59' into ignite-1
Merge remote-tracking branch 'remotes/origin/ignite-59' into ignite-1 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cd862850 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cd862850 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cd862850 Branch: refs/heads/ignite-65 Commit: cd862850f17429b9d9f7bbf89f111b62034e65cc Parents: 4a64d43 3f7dc7d Author: sevdokimov Authored: Mon Jan 19 19:35:40 2015 +0300 Committer: sevdokimov Committed: Mon Jan 19 19:35:40 2015 +0300 -- .../main/java/org/apache/ignite/CacheLock.java | 86 .../java/org/apache/ignite/IgniteCache.java | 23 +- .../processors/cache/IgniteCacheProxy.java | 83 +-- .../processors/cache/GridCacheAdapter.java | 20 - .../cache/GridCacheBasicApiAbstractTest.java| 80 ++ 5 files changed, 264 insertions(+), 28 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd862850/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java --
