Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-1239 [deleted] 8fae522f6
ignite git commit: ignite-808 Fixed GridDhtTxPrepareFuture.onEntriesLocked
Repository: ignite Updated Branches: refs/heads/ignite-808 [created] 7aaeecbd4 ignite-808 Fixed GridDhtTxPrepareFuture.onEntriesLocked Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7aaeecbd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7aaeecbd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7aaeecbd Branch: refs/heads/ignite-808 Commit: 7aaeecbd497d216e6a8823079eec572b3563ca70 Parents: b56b15c Author: sboikov Authored: Thu Sep 24 10:22:26 2015 +0300 Committer: sboikov Committed: Thu Sep 24 10:22:26 2015 +0300 -- .../distributed/dht/GridDhtTxPrepareFuture.java | 6 ++- .../IgniteTxPreloadAbstractTest.java| 43 .../replicated/GridReplicatedTxPreloadTest.java | 2 - .../testsuites/IgniteCacheTestSuite4.java | 7 4 files changed, 37 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/7aaeecbd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java index 81cc272..761bbb0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java @@ -318,7 +318,11 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuturehttp://git-wip-us.apache.org/repos/asf/ignite/blob/7aaeecbd/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java index 939b4a6..0a7845b 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteTxPreloadAbstractTest.java @@ -24,6 +24,7 @@ import java.util.Set; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicInteger; import javax.cache.processor.EntryProcessor; +import javax.cache.processor.EntryProcessorResult; import javax.cache.processor.MutableEntry; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteTransactions; @@ -65,6 +66,7 @@ public abstract class IgniteTxPreloadAbstractTest extends GridCacheAbstractSelfT /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception { +// No-op. } /** {@inheritDoc} */ @@ -78,7 +80,7 @@ public abstract class IgniteTxPreloadAbstractTest extends GridCacheAbstractSelfT public void testRemoteTxPreloading() throws Exception { IgniteCache cache = jcache(0); -for (int i = 0; i < 1; i++) +for (int i = 0; i < 10_000; i++) cache.put(String.valueOf(i), 0); final AtomicInteger gridIdx = new AtomicInteger(1); @@ -104,31 +106,36 @@ public abstract class IgniteTxPreloadAbstractTest extends GridCacheAbstractSelfT for (int i = 0; i < 10; i++) keys.add(String.valueOf(i * 1000)); -cache.invokeAll(keys, new EntryProcessor() { -@Override public Void process(MutableEntry e, Object... args) { -Integer val = e.getValue(); +Map> resMap = cache.invokeAll(keys, +new EntryProcessor() { +@Override public Integer process(MutableEntry e, Object... args) { +Integer val = e.getValue(); -if (val == null) { -keyNotLoaded = true; +if (val == null) { +keyNotLoaded = true; -e.setValue(1); +e.setValue(1); -return null; -} +return null; +} -e.setValue(val + 1); +e.setValue(val + 1); -return null; +return val; +} } -}); +); assertFalse(keyNotLoaded); -fut.get(); +for (String key : keys) { +EntryProcessorResult res = resMap.get(k
Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-1365 [deleted] 5dbe1ddbf
Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-1090 [created] b56b15cda
[3/3] ignite git commit: ignite-1090 debug
ignite-1090 debug Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/75f14c7b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/75f14c7b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/75f14c7b Branch: refs/heads/ignite-1090 Commit: 75f14c7b86c2f3382658399ae4b393bb9c22011c Parents: 782a0ec Author: sboikov Authored: Thu Sep 24 11:16:38 2015 +0300 Committer: sboikov Committed: Thu Sep 24 11:16:38 2015 +0300 -- .../GridCachePartitionedOptimisticTxNodeRestartTest.java | 6 -- .../ignite/testsuites/IgniteCacheRestartTestSuite.java | 8 +++- 2 files changed, 3 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/75f14c7b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java index a458aa7..9316c2f 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedOptimisticTxNodeRestartTest.java @@ -33,12 +33,6 @@ import static org.apache.ignite.transactions.TransactionConcurrency.OPTIMISTIC; */ public class GridCachePartitionedOptimisticTxNodeRestartTest extends GridCacheAbstractNodeRestartSelfTest { /** {@inheritDoc} */ -@Override protected void beforeTest() throws Exception { -if (nearEnabled()) -fail("https://issues.apache.org/jira/browse/IGNITE-1090";); -} - -/** {@inheritDoc} */ @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { IgniteConfiguration c = super.getConfiguration(gridName); http://git-wip-us.apache.org/repos/asf/ignite/blob/75f14c7b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java index a6bd785..10cd548 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheRestartTestSuite.java @@ -35,12 +35,10 @@ public class IgniteCacheRestartTestSuite extends TestSuite { public static TestSuite suite() throws Exception { TestSuite suite = new TestSuite("Cache Restart Test Suite"); -suite.addTestSuite(GridCachePartitionedNodeRestartTest.class); suite.addTestSuite(GridCachePartitionedOptimisticTxNodeRestartTest.class); -suite.addTestSuite(GridCacheReplicatedNodeRestartSelfTest.class); - suite.addTestSuite(GridCachePartitionedNearDisabledOptimisticTxNodeRestartTest.class); - -suite.addTestSuite(IgniteCacheCreateRestartSelfTest.class); + suite.addTestSuite(GridCachePartitionedOptimisticTxNodeRestartTest.class); + suite.addTestSuite(GridCachePartitionedOptimisticTxNodeRestartTest.class); + suite.addTestSuite(GridCachePartitionedOptimisticTxNodeRestartTest.class); return suite; }
[1/3] ignite git commit: IGNITE-1537 - Disallow near optimistic TX future to complete early.
Repository: ignite Updated Branches: refs/heads/ignite-1090 b56b15cda -> 75f14c7b8 IGNITE-1537 - Disallow near optimistic TX future to complete early. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b6f5b311 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b6f5b311 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b6f5b311 Branch: refs/heads/ignite-1090 Commit: b6f5b311ac20e932fbc7773a519c38b1aed6fa41 Parents: 6f3ef6a Author: Alexey Goncharuk Authored: Wed Sep 23 15:23:00 2015 -0700 Committer: Alexey Goncharuk Committed: Wed Sep 23 15:23:00 2015 -0700 -- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../near/GridNearOptimisticTxPrepareFuture.java | 134 +++-- .../cache/local/GridLocalCacheEntry.java| 6 + .../IgniteCacheCreatePutMultiNodeSelfTest.java | 150 +++ .../testsuites/IgniteCacheTestSuite4.java | 2 + 5 files changed, 249 insertions(+), 45 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/b6f5b311/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java index 81cc272..1ed7fd9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java @@ -423,7 +423,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuturehttp://git-wip-us.apache.org/repos/asf/ignite/blob/b6f5b311/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java index 25028c4..aa5e1cb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java @@ -51,6 +51,7 @@ import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.C1; import org.apache.ignite.internal.util.typedef.CI1; import org.apache.ignite.internal.util.typedef.F; +import org.apache.ignite.internal.util.typedef.P1; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.S; @@ -71,9 +72,8 @@ import static org.apache.ignite.transactions.TransactionState.PREPARING; */ public class GridNearOptimisticTxPrepareFuture extends GridNearTxPrepareFutureAdapter implements GridCacheMvccFuture { -/** */ -@GridToStringInclude -private Collection lockKeys = new GridConcurrentHashSet<>(); + +private KeyLockFuture keyLockFut = new KeyLockFuture(); /** * @param cctx Context. @@ -91,10 +91,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearTxPrepareFutureAd log.debug("Transaction future received owner changed callback: " + entry); if ((entry.context().isNear() || entry.context().isLocal()) && owner != null && tx.hasWriteKey(entry.txKey())) { -lockKeys.remove(entry.txKey()); - -// This will check for locks. -onDone(); +keyLockFut.onKeyLocked(entry.txKey()); return true; } @@ -178,24 +175,6 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearTxPrepareFutureAd } } -/** - * @return {@code True} if all locks are owned. - */ -private boolean checkLocks() { -boolean locked = lockKeys.isEmpty(); - -if (locked) { -if (log.isDebugEnabled()) -log.debug("All locks are acquired for near prepare future: " + this); -} -else { -if (log.isDebugEnabled()) -log.debug("Still waiting for locks [fut=" + this + ", keys=" + lockKeys + ']'); -} - -return locked; -} - /** {@inheritDoc} */ @Override public void onResult(UUID nodeId, GridNearTxP
[2/3] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1537' into ignite-1090
Merge remote-tracking branch 'remotes/origin/ignite-1537' into ignite-1090 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/782a0ec9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/782a0ec9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/782a0ec9 Branch: refs/heads/ignite-1090 Commit: 782a0ec982ccad155ede42af3b5a210e232ee412 Parents: b56b15c b6f5b31 Author: sboikov Authored: Thu Sep 24 10:57:48 2015 +0300 Committer: sboikov Committed: Thu Sep 24 10:57:48 2015 +0300 -- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../near/GridNearOptimisticTxPrepareFuture.java | 134 +++-- .../cache/local/GridLocalCacheEntry.java| 6 + .../IgniteCacheCreatePutMultiNodeSelfTest.java | 150 +++ .../testsuites/IgniteCacheTestSuite4.java | 2 + 5 files changed, 249 insertions(+), 45 deletions(-) --
Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-1282-debug [created] ecc60aae0
ignite git commit: Debug.
Repository: ignite Updated Branches: refs/heads/ignite-1282 ecc60aae0 -> 64e890c0a Debug. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/64e890c0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/64e890c0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/64e890c0 Branch: refs/heads/ignite-1282 Commit: 64e890c0abe44658901c5b5d4f9981caa1e0cf9e Parents: ecc60aa Author: vozerov-gridgain Authored: Thu Sep 24 11:41:26 2015 +0300 Committer: vozerov-gridgain Committed: Thu Sep 24 11:41:26 2015 +0300 -- modules/platforms/cpp/core/src/ignition.cpp | 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/64e890c0/modules/platforms/cpp/core/src/ignition.cpp -- diff --git a/modules/platforms/cpp/core/src/ignition.cpp b/modules/platforms/cpp/core/src/ignition.cpp index a0e3367..d5d414d 100644 --- a/modules/platforms/cpp/core/src/ignition.cpp +++ b/modules/platforms/cpp/core/src/ignition.cpp @@ -163,6 +163,8 @@ namespace ignite failed = true; } +else +std::cout << "JVM LIB LOC: " << jvmLib << std::endl; if (!failed) { if (!LoadJvmLibrary(jvmLib)) @@ -191,6 +193,8 @@ namespace ignite else home = ResolveIgniteHome(NULL, &homeFound); +std::cout << "IGNITE_HOME: " << home << std::endl; + // 3. Create classpath. std::string cp; @@ -205,6 +209,8 @@ namespace ignite if (!cp.empty()) { +std::cout << "CLASSPATH: " << cp << std::endl; + // 4. Start JVM if needed. JniErrorInfo jniErr;
ignite git commit: Debug (2).
Repository: ignite Updated Branches: refs/heads/ignite-1282 64e890c0a -> ac23b2192 Debug (2). Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ac23b219 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ac23b219 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ac23b219 Branch: refs/heads/ignite-1282 Commit: ac23b2192df49d393044359055f9800f658836bd Parents: 64e890c Author: vozerov-gridgain Authored: Thu Sep 24 11:50:17 2015 +0300 Committer: vozerov-gridgain Committed: Thu Sep 24 11:50:17 2015 +0300 -- modules/platforms/cpp/common/src/java.cpp | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/ac23b219/modules/platforms/cpp/common/src/java.cpp -- diff --git a/modules/platforms/cpp/common/src/java.cpp b/modules/platforms/cpp/common/src/java.cpp index d08a90d..e30c312 100644 --- a/modules/platforms/cpp/common/src/java.cpp +++ b/modules/platforms/cpp/common/src/java.cpp @@ -692,6 +692,8 @@ namespace ignite jint res = JNI_CreateJavaVM(jvm, reinterpret_cast(env), &args); +std::cout << "JVM CREATE RES: " << res << std::endl; + delete[] opts0; if (res != JNI_OK)
ignite git commit: Debug (2).
Repository: ignite Updated Branches: refs/heads/ignite-1282 ac23b2192 -> f12232fe7 Debug (2). Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f12232fe Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f12232fe Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f12232fe Branch: refs/heads/ignite-1282 Commit: f12232fe707c84b631bace642797b9309a703e76 Parents: ac23b21 Author: vozerov-gridgain Authored: Thu Sep 24 11:51:09 2015 +0300 Committer: vozerov-gridgain Committed: Thu Sep 24 11:51:09 2015 +0300 -- modules/platforms/cpp/core/src/ignition.cpp | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/f12232fe/modules/platforms/cpp/core/src/ignition.cpp -- diff --git a/modules/platforms/cpp/core/src/ignition.cpp b/modules/platforms/cpp/core/src/ignition.cpp index d5d414d..3d2eb43 100644 --- a/modules/platforms/cpp/core/src/ignition.cpp +++ b/modules/platforms/cpp/core/src/ignition.cpp @@ -27,7 +27,6 @@ #include "ignite/impl/utils.h" #include "ignite/ignition.h" -using namespace ignite::common::concurrent; using namespace ignite::common::java; using namespace ignite::impl; using namespace ignite::impl::utils;
ignite git commit: Debug (2).
Repository: ignite Updated Branches: refs/heads/ignite-1282 f12232fe7 -> 593074692 Debug (2). Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/59307469 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/59307469 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/59307469 Branch: refs/heads/ignite-1282 Commit: 593074692aa35dfeace351f533934fb69dc1e8a6 Parents: f12232f Author: vozerov-gridgain Authored: Thu Sep 24 11:55:54 2015 +0300 Committer: vozerov-gridgain Committed: Thu Sep 24 11:55:54 2015 +0300 -- modules/platforms/cpp/core/src/ignition.cpp | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/59307469/modules/platforms/cpp/core/src/ignition.cpp -- diff --git a/modules/platforms/cpp/core/src/ignition.cpp b/modules/platforms/cpp/core/src/ignition.cpp index 3d2eb43..d5d414d 100644 --- a/modules/platforms/cpp/core/src/ignition.cpp +++ b/modules/platforms/cpp/core/src/ignition.cpp @@ -27,6 +27,7 @@ #include "ignite/impl/utils.h" #include "ignite/ignition.h" +using namespace ignite::common::concurrent; using namespace ignite::common::java; using namespace ignite::impl; using namespace ignite::impl::utils;
ignite git commit: Debug (3).
Repository: ignite Updated Branches: refs/heads/ignite-1282 593074692 -> a0c7004fc Debug (3). Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a0c7004f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a0c7004f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a0c7004f Branch: refs/heads/ignite-1282 Commit: a0c7004fcaf640817d61dec7d3798243dad9a1b4 Parents: 5930746 Author: vozerov-gridgain Authored: Thu Sep 24 12:08:04 2015 +0300 Committer: vozerov-gridgain Committed: Thu Sep 24 12:08:04 2015 +0300 -- modules/platforms/cpp/core/src/ignition.cpp | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/a0c7004f/modules/platforms/cpp/core/src/ignition.cpp -- diff --git a/modules/platforms/cpp/core/src/ignition.cpp b/modules/platforms/cpp/core/src/ignition.cpp index d5d414d..f293c83 100644 --- a/modules/platforms/cpp/core/src/ignition.cpp +++ b/modules/platforms/cpp/core/src/ignition.cpp @@ -219,6 +219,11 @@ namespace ignite int optsLen; char** opts = CreateJvmOptions(cfg, homeFound ? &home : NULL, cp, &optsLen); +for (int i = 0; i < optsLen; i++) +{ +std::cout << "OPTION: " << *(opts + i) << std::endl; +} + envTarget = new SharedPointer(env); SharedPointer ctx(
Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-1090 [deleted] 75f14c7b8
ignite git commit: Added test.
Repository: ignite Updated Branches: refs/heads/master b56b15cda -> 4b0c029ce Added test. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4b0c029c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4b0c029c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4b0c029c Branch: refs/heads/master Commit: 4b0c029cef4b351f0d389a171c30b7dcf8c1ca22 Parents: b56b15c Author: sboikov Authored: Thu Sep 24 12:19:28 2015 +0300 Committer: sboikov Committed: Thu Sep 24 12:19:28 2015 +0300 -- .../near/NearCacheMultithreadedUpdateTest.java | 217 +++ 1 file changed, 217 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/4b0c029c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java new file mode 100644 index 000..9d92724 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java @@ -0,0 +1,217 @@ +/* + * 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.distributed.near; + +import java.util.concurrent.Callable; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCache; +import org.apache.ignite.cache.CacheAtomicityMode; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.configuration.NearCacheConfiguration; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; + +import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; +import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; + +/** + * + */ +public class NearCacheMultithreadedUpdateTest extends GridCommonAbstractTest { +/** */ +private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + +/** */ +private boolean client; + +/** */ +private final int SRV_CNT = 3; + +/** {@inheritDoc} */ +@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { +IgniteConfiguration cfg = super.getConfiguration(gridName); + +((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder); + +cfg.setClientMode(client); + +return cfg; +} + +/** {@inheritDoc} */ +@Override protected void beforeTestsStarted() throws Exception { +super.beforeTestsStarted(); + +startGridsMultiThreaded(SRV_CNT); + +client = true; + +startGrid(SRV_CNT); + +client = false; +} + +/** {@inheritDoc} */ +@Override protected void afterTestsStopped() throws Exception { +super.afterTestsStopped(); + +stopAllGrids(); +} + +/** + * @throws Exception If failed. + */ +public void testUpdateMultithreadedTx() throws Exception { +updateMultithreaded(TRANSACTIONAL, false); +} + +/** + * @throws Exception If failed. + */ +public void testUpdateMultithreadedTxRestart() throws Exception { +updateMultithreaded(TRANSACTIONAL, true); +} + +/** + * @throws Excepti
ignite git commit: Fixed a bug in core-test project causing failures on TC.
Repository: ignite Updated Branches: refs/heads/ignite-1282 a0c7004fc -> a8f901573 Fixed a bug in core-test project causing failures on TC. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a8f90157 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a8f90157 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a8f90157 Branch: refs/heads/ignite-1282 Commit: a8f9015730d05e164bc904c7217c12d39f340946 Parents: a0c7004 Author: vozerov-gridgain Authored: Thu Sep 24 12:22:00 2015 +0300 Committer: vozerov-gridgain Committed: Thu Sep 24 12:22:00 2015 +0300 -- modules/platforms/cpp/core-test/project/vs/core-test.vcxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/a8f90157/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj -- diff --git a/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj b/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj index ca6ee1a..6323ac5 100644 --- a/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj +++ b/modules/platforms/cpp/core-test/project/vs/core-test.vcxproj @@ -158,7 +158,7 @@ true true $(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\core\include;$(ProjectDir)\..\..\..\core\os\win\include;$(ProjectDir)\..\..\include;$(BOOST_HOME) - NDEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;IGNITE_FRIEND;IGNITE_TESTS_32%(PreprocessorDefinitions) + NDEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;IGNITE_FRIEND;IGNITE_TESTS_32;%(PreprocessorDefinitions) Async
ignite git commit: The problem with Win32 build is fixed, reverting debug.
Repository: ignite Updated Branches: refs/heads/ignite-1282 a8f901573 -> 46107ffbe The problem with Win32 build is fixed, reverting debug. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/46107ffb Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/46107ffb Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/46107ffb Branch: refs/heads/ignite-1282 Commit: 46107ffbe2b0209a323f96d5268508e79454efbe Parents: a8f9015 Author: vozerov-gridgain Authored: Thu Sep 24 12:28:07 2015 +0300 Committer: vozerov-gridgain Committed: Thu Sep 24 12:28:07 2015 +0300 -- modules/platforms/cpp/common/src/java.cpp | 4 +--- modules/platforms/cpp/core/src/ignition.cpp | 13 + 2 files changed, 2 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/46107ffb/modules/platforms/cpp/common/src/java.cpp -- diff --git a/modules/platforms/cpp/common/src/java.cpp b/modules/platforms/cpp/common/src/java.cpp index e30c312..753b785 100644 --- a/modules/platforms/cpp/common/src/java.cpp +++ b/modules/platforms/cpp/common/src/java.cpp @@ -691,9 +691,7 @@ namespace ignite args.ignoreUnrecognized = 0; jint res = JNI_CreateJavaVM(jvm, reinterpret_cast(env), &args); - -std::cout << "JVM CREATE RES: " << res << std::endl; - + delete[] opts0; if (res != JNI_OK) http://git-wip-us.apache.org/repos/asf/ignite/blob/46107ffb/modules/platforms/cpp/core/src/ignition.cpp -- diff --git a/modules/platforms/cpp/core/src/ignition.cpp b/modules/platforms/cpp/core/src/ignition.cpp index f293c83..d55e2d8 100644 --- a/modules/platforms/cpp/core/src/ignition.cpp +++ b/modules/platforms/cpp/core/src/ignition.cpp @@ -163,8 +163,6 @@ namespace ignite failed = true; } -else -std::cout << "JVM LIB LOC: " << jvmLib << std::endl; if (!failed) { if (!LoadJvmLibrary(jvmLib)) @@ -193,8 +191,6 @@ namespace ignite else home = ResolveIgniteHome(NULL, &homeFound); -std::cout << "IGNITE_HOME: " << home << std::endl; - // 3. Create classpath. std::string cp; @@ -209,8 +205,6 @@ namespace ignite if (!cp.empty()) { -std::cout << "CLASSPATH: " << cp << std::endl; - // 4. Start JVM if needed. JniErrorInfo jniErr; @@ -218,12 +212,7 @@ namespace ignite int optsLen; char** opts = CreateJvmOptions(cfg, homeFound ? &home : NULL, cp, &optsLen); - -for (int i = 0; i < optsLen; i++) -{ -std::cout << "OPTION: " << *(opts + i) << std::endl; -} - + envTarget = new SharedPointer(env); SharedPointer ctx(
[2/2] ignite git commit: IGNITE-843 Tweak tooltips.
IGNITE-843 Tweak tooltips. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d4b583c4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d4b583c4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d4b583c4 Branch: refs/heads/ignite-843 Commit: d4b583c43a85bbb50caf5681146c185425890d35 Parents: ccda664 Author: vsisko Authored: Thu Sep 24 16:30:41 2015 +0700 Committer: Alexey Kuznetsov Committed: Thu Sep 24 16:30:41 2015 +0700 -- .../src/main/js/controllers/models/caches.json | 238 +++ .../main/js/controllers/models/clusters.json| 296 +-- .../main/js/controllers/models/metadata.json| 84 +++--- .../src/main/js/controllers/models/summary.json | 24 +- .../main/js/controllers/summary-controller.js | 18 +- .../main/js/views/configuration/summary.jade| 6 +- 6 files changed, 338 insertions(+), 328 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/d4b583c4/modules/control-center-web/src/main/js/controllers/models/caches.json -- diff --git a/modules/control-center-web/src/main/js/controllers/models/caches.json b/modules/control-center-web/src/main/js/controllers/models/caches.json index 40b4520..087cb1b 100644 --- a/modules/control-center-web/src/main/js/controllers/models/caches.json +++ b/modules/control-center-web/src/main/js/controllers/models/caches.json @@ -42,7 +42,7 @@ "placeholderEmpty": "No clusters configured", "items": "clusters", "tip": [ -"Select clusters to start in cluster or add a new cluster." +"Associate clusters with the current cache" ], "addLink": { "label": "Add cluster(s)", @@ -58,7 +58,7 @@ "placeholderEmpty": "No metadata configured", "items": "metadatas", "tip": [ -"Select cache type metadata to describe types in cache." +"Select cache type metadata to describe types in cache" ], "addLink": { "label": "Add metadata(s)", @@ -75,9 +75,9 @@ "tip": [ "Cache modes:", "", -" Partitioned - in this mode the overall key set will be divided into partitions and all partitions will be split equally between participating nodes.", -" Replicated - in this mode all the keys are distributed to all participating nodes.", -" Local - in this mode caches residing on different grid nodes will not know about each other.", +" Partitioned - in this mode the overall key set will be divided into partitions and all partitions will be split equally between participating nodes", +" Replicated - in this mode all the keys are distributed to all participating nodes", +" Local - in this mode caches residing on different grid nodes will not know about each other", "" ] }, @@ -91,8 +91,8 @@ "tip": [ "Atomicity:", "", -" Transactional - in this mode specified fully ACID-compliant transactional cache behavior.", -" Atomic - in this mode distributed transactions and distributed locking are not supported.", +" Transactional - in this mode specified fully ACID-compliant transactional cache behavior", +" Atomic - in this mode distributed transactions and distributed locking are not supported", "" ] }, @@ -104,7 +104,7 @@ "hide": "backupItem.cacheMode != 'PARTITIONED'", "placeholder": 0, "tip": [ -"Number of nodes used to back up single partition for partitioned cache." +"Number of nodes used to back up single partition for partitioned cache" ] }, { @@ -115,8 +115,8 @@ "placeholder": true, "hide": "!backupItem.backups || backupItem.cacheMode == 'LOCAL'", "tip": [ -"Flag indicating whether data can be read from backup.", -"If not set then always get data from primary node (never from backup)." +"Flag indicating whether data can be read from backup", +"If not set then always get data from primary node (never from backup)" ] }, { @@ -126,8 +126,8 @@ "model": "copyOnRead", "placeholder": true, "tip": [ -"Flag indicating whether copy of of the value stored in cache should be created for cache operation implying return value.", -"Also if this flag is set copies are created for values passed to CacheInterceptor and to CacheEntryProcessor." +"Flag indicatin
[1/2] ignite git commit: IGNITE-843 Tweak tooltips.
Repository: ignite Updated Branches: refs/heads/ignite-843 ccda6644e -> d4b583c43 http://git-wip-us.apache.org/repos/asf/ignite/blob/d4b583c4/modules/control-center-web/src/main/js/controllers/models/summary.json -- diff --git a/modules/control-center-web/src/main/js/controllers/models/summary.json b/modules/control-center-web/src/main/js/controllers/models/summary.json index e5c8687..88ad6b4 100644 --- a/modules/control-center-web/src/main/js/controllers/models/summary.json +++ b/modules/control-center-web/src/main/js/controllers/models/summary.json @@ -31,7 +31,7 @@ "model": "nearStartSize", "placeholder": 375000, "tip": [ -"Initial cache size for near cache which will be used to pre-create internal hash table after start." +"Initial cache size for near cache which will be used to pre-create internal hash table after start" ] }, { @@ -43,7 +43,7 @@ "placeholder": "Choose eviction policy", "items": "evictionPolicies", "tip": [ -"Cache expiration policy." +"Cache expiration policy" ], "details": { "LRU": { @@ -56,7 +56,7 @@ "model": "batchSize", "placeholder": 1, "tip": [ -"Number of entries to remove on shrink." +"Number of entries to remove on shrink" ] }, { @@ -66,7 +66,7 @@ "model": "maxMemorySize", "placeholder": 0, "tip": [ -"Maximum allowed cache size in bytes." +"Maximum allowed cache size in bytes" ] }, { @@ -76,7 +76,7 @@ "model": "maxSize", "placeholder": 10, "tip": [ -"Maximum allowed size of cache before entry will start getting evicted." +"Maximum allowed size of cache before entry will start getting evicted" ] } ] @@ -91,7 +91,7 @@ "model": "maxSize", "placeholder": 10, "tip": [ -"Maximum allowed size of cache before entry will start getting evicted." +"Maximum allowed size of cache before entry will start getting evicted" ] } ] @@ -106,7 +106,7 @@ "model": "batchSize", "placeholder": 1, "tip": [ -"Number of entries to remove on shrink." +"Number of entries to remove on shrink" ] }, { @@ -116,7 +116,7 @@ "model": "maxMemorySize", "placeholder": 0, "tip": [ -"Maximum allowed cache size in bytes." +"Maximum allowed cache size in bytes" ] }, { @@ -126,7 +126,7 @@ "model": "maxSize", "placeholder": 10, "tip": [ -"Maximum allowed size of cache before entry will start getting evicted." +"Maximum allowed size of cache before entry will start getting evicted" ] } ] @@ -141,7 +141,7 @@ "model": "batchSize", "placeholder": 1, "tip": [ -"Number of entries to remove on shrink." +"Number of entries to remove on shrink" ] }, { @@ -151,7 +151,7 @@ "model": "maxMemorySize", "placeholder": 0, "tip": [ -"Maximum allowed cache size in bytes." +"Maximum allowed cache size in bytes" ] }, { @@ -161,7 +161,7 @@ "model": "maxSize", "placeholder": 10, "tip": [ -"Maximum allowed size of cache before entry will start getting evicted." +"Maximum allowed size of cache before entry will start getting evicted" ] } ] http://git-wip-us.apache.org/repos/asf/ignite/blob/d4b583c4/modules/control-center-web/src/main/js/controllers/summary-controller.js -- diff --git a/modules/control-center-web/src/main/js/controllers/summary-controller.js b/modules/control-center-web/src/main/js/controllers/summary-controller.js index a41ee35..8fb3213 100644 --- a/modules/control-center-web/src/main/js/controllers/summary-controller.js +++ b/modules/control-center-web/src/main/js/controllers/summary-controller.js @@ -37,6 +37,8 @@ controlCenterModule.controller('summaryController', [ {value: undefined, label: 'Not set'} ]; +$scope.tabs = { activeTab: 0 }; + $scope.pojoClasses = function() {
ignite git commit: IGNITE-843 Fix for dropdown.
Repository: ignite Updated Branches: refs/heads/ignite-843 d4b583c43 -> e78a25546 IGNITE-843 Fix for dropdown. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e78a2554 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e78a2554 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e78a2554 Branch: refs/heads/ignite-843 Commit: e78a25546bd2d0dac2d656c398ebe1de7c29c5a7 Parents: d4b583c Author: Alexey Kuznetsov Authored: Thu Sep 24 16:35:25 2015 +0700 Committer: Alexey Kuznetsov Committed: Thu Sep 24 16:35:25 2015 +0700 -- .../src/main/js/views/configuration/summary.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/e78a2554/modules/control-center-web/src/main/js/views/configuration/summary.jade -- diff --git a/modules/control-center-web/src/main/js/views/configuration/summary.jade b/modules/control-center-web/src/main/js/views/configuration/summary.jade index 137975b..1e46694 100644 --- a/modules/control-center-web/src/main/js/views/configuration/summary.jade +++ b/modules/control-center-web/src/main/js/views/configuration/summary.jade @@ -72,7 +72,7 @@ block content .col-xs-2.col-sm-2.col-md-2 label POJO class: .col-xs-10.col-sm-10.col-md-10 - button.form-control(ng-model='configServer.pojoClass' bs-select bs-options='item for item in pojoClasses()' data-sort='false') + button.select-toggle.form-control(ng-model='configServer.pojoClass' bs-select bs-options='item for item in pojoClasses()') .col-xs-2.col-sm-2.col-md-2 label .col-xs-10.col-sm-10.col-md-10
ignite git commit: # IGNITE-843 Used ag-grid for sql table.
Repository: ignite Updated Branches: refs/heads/ignite-843 e78a25546 -> beb402755 # IGNITE-843 Used ag-grid for sql table. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/beb40275 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/beb40275 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/beb40275 Branch: refs/heads/ignite-843 Commit: beb40275520b65487ca1dd74e7e88dcbdae1315e Parents: e78a255 Author: Andrey Authored: Thu Sep 24 16:57:29 2015 +0700 Committer: Andrey Committed: Thu Sep 24 16:57:29 2015 +0700 -- .../src/main/js/controllers/common-module.js| 36 + .../src/main/js/controllers/sql-controller.js | 33 ++-- .../src/main/js/public/stylesheets/style.scss | 151 +++ .../src/main/js/views/sql/sql.jade | 57 +++ .../src/main/js/views/templates/layout.jade | 4 +- 5 files changed, 177 insertions(+), 104 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/beb40275/modules/control-center-web/src/main/js/controllers/common-module.js -- diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js index b33ce67..2b5dc10 100644 --- a/modules/control-center-web/src/main/js/controllers/common-module.js +++ b/modules/control-center-web/src/main/js/controllers/common-module.js @@ -16,7 +16,7 @@ */ var controlCenterModule = angular.module('ignite-web-control-center', -['ngAnimate', 'smart-table', 'mgcrea.ngStrap', 'ui.ace', 'ngSanitize', 'treeControl', 'darthwade.loading']); +['ngAnimate', 'smart-table', 'mgcrea.ngStrap', 'ui.ace', 'ngSanitize', 'treeControl', 'darthwade.loading', 'agGrid']); // Modal popup configuration. controlCenterModule.config(function ($modalProvider) { @@ -1803,40 +1803,6 @@ controlCenterModule.directive('onClickFocus', function ($focus) { }; }); -// FloatThead wrapper for AngularJS. -controlCenterModule.directive('floatThead', function ($timeout, $log) { -// Usage: -// Specify float-thead on any table element and optionally pass through a floatThead options object to initialize the library. -// Optionally specify st-safe-src to have the directive watch any objects for changes and call 'reflow' on floatThead. -// You can also manually trigger a reflow by triggering an event on the table element called 'update', eg: jQuery('.table').trigger('update'); -return { -require: '?stSafeSrc', -link: function (scope, element, attrs) { -jQuery(element).floatThead(scope.$eval(attrs.floatThead)); - -if (attrs.stSafeSrc) { -// Set $watch to do a deep watch on the ngModel (collection) by specifying true as a 3rd parameter -scope.$watch(attrs.stSafeSrc, function () { -jQuery(element).floatThead('reflow'); -}, true); -} else { -$log.info('floatThead: stSafeSrc not provided!'); -} - -element.bind('update', function () { -$timeout(function() { -jQuery(element).floatThead('reflow'); -}, 0); -}); - -element.bind('$destroy', function() { -jQuery(element).floatThead('destroy'); -}); -}, -restrict: 'A' -}; -}); - // Navigation bar controller. controlCenterModule.controller('activeLink', [ '$scope', function ($scope) { http://git-wip-us.apache.org/repos/asf/ignite/blob/beb40275/modules/control-center-web/src/main/js/controllers/sql-controller.js -- diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js index aad0eb0..6a51109 100644 --- a/modules/control-center-web/src/main/js/controllers/sql-controller.js +++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js @@ -40,14 +40,6 @@ controlCenterModule.controller('sqlController', $scope.exportDropdown = [{ 'text': 'Export all', 'click': 'exportAll(paragraph)'}]; -$scope.floatTheadOptions = { -autoReflow: true, -useAbsolutePositioning: true, -scrollContainer: function($table) { -return $table.closest(".sql-table-wrapper"); -} -}; - $scope.treeOptions = { nodeChildren: "children", dirSelectable: false, @@ -75,6 +67,14 @@ controlCenterModule.controller('sqlController', paragraph.nonEmpty = function () { return this.rows && this.rows.length > 0; }; + +Object.defineProperty(par
ignite git commit: Fixed test.
Repository: ignite Updated Branches: refs/heads/master 4b0c029ce -> f6ba3c3b4 Fixed test. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f6ba3c3b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f6ba3c3b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f6ba3c3b Branch: refs/heads/master Commit: f6ba3c3b4575c60f94ae4742b5d2d7bd2183f938 Parents: 4b0c029 Author: sboikov Authored: Thu Sep 24 12:56:19 2015 +0300 Committer: sboikov Committed: Thu Sep 24 12:56:19 2015 +0300 -- .../processors/cache/GridCacheVariableTopologySelfTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/f6ba3c3b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java index 7078843..80103c3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache; import java.util.Random; import java.util.concurrent.atomic.AtomicBoolean; +import javax.cache.CacheException; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteException; import org.apache.ignite.cache.CacheWriteSynchronizationMode; @@ -146,7 +147,7 @@ public class GridCacheVariableTopologySelfTest extends GridCommonAbstractTest { catch (TransactionRollbackException | ClusterTopologyException e) { info("Caught exception: " + e); } -catch (IgniteException e) { +catch (CacheException | IgniteException e) { if (X.hasCause(e, ClusterTopologyCheckedException.class)) info("Caught cache exception: " + e); else
ignite git commit: Fixed imports.
Repository: ignite Updated Branches: refs/heads/master f6ba3c3b4 -> ece340043 Fixed imports. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ece34004 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ece34004 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ece34004 Branch: refs/heads/master Commit: ece3400438709b2bac2ad9d206028b4bdb897073 Parents: f6ba3c3 Author: sboikov Authored: Thu Sep 24 13:09:15 2015 +0300 Committer: sboikov Committed: Thu Sep 24 13:09:15 2015 +0300 -- .../IgniteCacheFailoverTestSuite.java | 4 .../IgniteCacheFailoverTestSuite3.java | 23 +++- 2 files changed, 3 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/ece34004/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java index abc8765..c9e507d 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java @@ -33,18 +33,14 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtR import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheTxNodeFailureSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridNearCacheTxNodeFailureSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteAtomicLongChangingTopologySelfTest; -import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryAtomicSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryTransactionalSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheAtomicClientInvalidPartitionHandlingSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheAtomicClientRemoveFailureTest; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheAtomicInvalidPartitionHandlingSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheAtomicPrimaryWriteOrderRemoveFailureTest; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheAtomicRemoveFailureTest; -import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearRemoveFailureTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearRemoveFailureTest; -import org.apache.ignite.spi.communication.tcp.IgniteCacheSslStartStopSelfTest; import org.apache.ignite.testframework.GridTestUtils; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/ece34004/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java index 318db9e..0bde89a 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java @@ -18,18 +18,10 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; -import org.apache.ignite.internal.processors.cache.GridCacheIncrementTransformTest; -import org.apache.ignite.internal.processors.cache.IgniteCacheTopologySafeGetSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.*; -import org.apache.ignite.internal.processors.cache.distributed.dht.*; -import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*; -import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearRemoveFailureTest; -import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest; -import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearRemoveFailureTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryAtomicSelfTest; +import org.apache.ignite.i
[1/2] ignite git commit: Release notes
Repository: ignite Updated Branches: refs/heads/ignite-1.4 7db44f11f -> 59bc35a61 Release notes Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/60349316 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/60349316 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/60349316 Branch: refs/heads/ignite-1.4 Commit: 603493169e66e9bc6a9f9129b2a7709fab1a6419 Parents: 7db44f1 Author: Yakov Zhdanov Authored: Thu Sep 24 13:33:24 2015 +0300 Committer: Yakov Zhdanov Committed: Thu Sep 24 13:33:24 2015 +0300 -- RELEASE_NOTES.txt | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/60349316/RELEASE_NOTES.txt -- diff --git a/RELEASE_NOTES.txt b/RELEASE_NOTES.txt index d7097fd..cd0c2a2 100644 --- a/RELEASE_NOTES.txt +++ b/RELEASE_NOTES.txt @@ -7,6 +7,8 @@ Apache Ignite In-Memory Data Fabric 1.4 * Added support for log4j2. * Added versioned entry to cache API. * Added client node based JDBC driver implementation. +* Fixed consistency issue for custom events processing within discovery. +* Fixed race in cache swap/unswap logic. * Fixed IGNITE_HOME resolution with JBoss. * Fixed configuration file resolution on classpath. * Fixed MBean registration for caches.
[2/2] ignite git commit: minor - added space
minor - added space Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/59bc35a6 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/59bc35a6 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/59bc35a6 Branch: refs/heads/ignite-1.4 Commit: 59bc35a61571284c106fe4f67060eccb8b60faea Parents: 6034931 Author: Yakov Zhdanov Authored: Thu Sep 24 13:33:42 2015 +0300 Committer: Yakov Zhdanov Committed: Thu Sep 24 13:33:42 2015 +0300 -- .../ignite/internal/managers/discovery/GridDiscoveryManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/59bc35a6/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java index 3a09b2c..1801b9c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManager.java @@ -2437,7 +2437,7 @@ public class GridDiscoveryManager extends GridManagerAdapter { Map> cacheMap = new HashMap<>(allNodes.size(), 1.0f); Map> rmtCacheMap = new HashMap<>(allNodes.size(), 1.0f); -Map> dhtNodesMap =new HashMap<>(allNodes.size(), 1.0f); +Map> dhtNodesMap = new HashMap<>(allNodes.size(), 1.0f); Collection nodesWithCaches = new HashSet<>(allNodes.size()); Collection rmtNodesWithCaches = new HashSet<>(allNodes.size());
ignite git commit: # IGNITE-843 Fixed dropdown.
Repository: ignite Updated Branches: refs/heads/ignite-843 beb402755 -> 7c60be0d2 # IGNITE-843 Fixed dropdown. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7c60be0d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7c60be0d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7c60be0d Branch: refs/heads/ignite-843 Commit: 7c60be0d23b18f74ea0326f65cdcc2956ac68267 Parents: beb4027 Author: Andrey Authored: Thu Sep 24 17:37:57 2015 +0700 Committer: Andrey Committed: Thu Sep 24 17:37:57 2015 +0700 -- .../src/main/js/controllers/sql-controller.js | 4 ++- .../stylesheets/_bootstrap-variables.scss | 2 +- .../src/main/js/public/stylesheets/style.scss | 30 ++-- .../main/js/views/configuration/summary.jade| 2 +- .../src/main/js/views/sql/paragraph-rate.jade | 8 +++--- .../src/main/js/views/sql/sql.jade | 2 +- 6 files changed, 18 insertions(+), 30 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/7c60be0d/modules/control-center-web/src/main/js/controllers/sql-controller.js -- diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js index 6a51109..45eeb99 100644 --- a/modules/control-center-web/src/main/js/controllers/sql-controller.js +++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js @@ -348,7 +348,9 @@ controlCenterModule.controller('sqlController', paragraph.gridOptions.api.setRowData(res.rows); -paragraph.gridOptions.api.sizeColumnsToFit(); +setTimeout(function () { +paragraph.gridOptions.api.sizeColumnsToFit(); +}, 1); if (paragraph.result == 'none') paragraph.result = 'table'; http://git-wip-us.apache.org/repos/asf/ignite/blob/7c60be0d/modules/control-center-web/src/main/js/public/stylesheets/_bootstrap-variables.scss -- diff --git a/modules/control-center-web/src/main/js/public/stylesheets/_bootstrap-variables.scss b/modules/control-center-web/src/main/js/public/stylesheets/_bootstrap-variables.scss index 70925c7..d109b10 100644 --- a/modules/control-center-web/src/main/js/public/stylesheets/_bootstrap-variables.scss +++ b/modules/control-center-web/src/main/js/public/stylesheets/_bootstrap-variables.scss @@ -345,7 +345,7 @@ $screen-md-max: ($screen-lg-min - 1) !default; //** Number of columns in the grid. $grid-columns: 12 !default; //** Padding between columns. Gets divided in half for the left and right. -$grid-gutter-width: 30px !default; +$grid-gutter-width: 0 !default; // Navbar collapse //** Point at which the navbar becomes uncollapsed. $grid-float-breakpoint: $screen-sm-min !default; http://git-wip-us.apache.org/repos/asf/ignite/blob/7c60be0d/modules/control-center-web/src/main/js/public/stylesheets/style.scss -- diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss index d3c009b..7a8b393 100644 --- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss +++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss @@ -358,9 +358,6 @@ h1, h2, h3, h4, h5, h6 { display: inline-block; vertical-align: middle; float: none; - -padding-left: 0 !important; -padding-right: 0 !important; } input[type="checkbox"] { @@ -472,11 +469,6 @@ button.form-control { } .theme-line .paragraphs { -[class*="col-"] { -padding-left: 0; -padding-right: 0; -} - .panel-group .panel + .panel { margin-top: 30px; } @@ -581,11 +573,6 @@ button.form-control { .theme-line .panel-body { padding: 10px 20px; - -[class*="col-"] { -padding-left: 0 !important; -padding-right: 0 !important; -} } .theme-line .main-content a.customize { @@ -814,11 +801,6 @@ button.form-control { .theme-line table.sql-results { -[class*="col-"] { -padding-left: 0 !important; -padding-right: 0 !important; -} - margin: 0; td { @@ -1528,7 +1510,7 @@ button.dropdown-toggle { } button.select-toggle { -padding-right: 12px; +padding-right: 15px; } button.select-toggle::after { @@ -1542,12 +1524,16 @@ button.select-toggle::after { border-right: 0.3em solid transparent; border-left: 0.3em solid transparent; position: absolute; -right: 22px; +right: 5px
ignite git commit: schema-import examples fix
Repository: ignite Updated Branches: refs/heads/ignite-1.4 59bc35a61 -> 169066b98 schema-import examples fix Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/169066b9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/169066b9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/169066b9 Branch: refs/heads/ignite-1.4 Commit: 169066b98ae89cf9e5eba8872817f466947c5919 Parents: 59bc35a Author: Anton Vinogradov Authored: Thu Sep 24 14:33:26 2015 +0300 Committer: Anton Vinogradov Committed: Thu Sep 24 14:33:26 2015 +0300 -- examples/schema-import/pom.xml | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/169066b9/examples/schema-import/pom.xml -- diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml index d302606..fdbd631 100644 --- a/examples/schema-import/pom.xml +++ b/examples/schema-import/pom.xml @@ -26,13 +26,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 + +org.apache.ignite +ignite-parent +1 +../../parent + + UTF-8 -org.apache.ignite ignite-schema-import-demo -${project.version} +1.0.0-SNAPSHOT
ignite git commit: 1.4.0-SNAPSHOT
Repository: ignite Updated Branches: refs/heads/ignite-1.4 169066b98 -> fb9b14dbf 1.4.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fb9b14db Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fb9b14db Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fb9b14db Branch: refs/heads/ignite-1.4 Commit: fb9b14dbf9b8d66a9bfb3e2a4a02b4f43a5f5ac6 Parents: 169066b Author: Ignite Teamcity Authored: Thu Sep 24 14:38:34 2015 +0300 Committer: Ignite Teamcity Committed: Thu Sep 24 14:38:34 2015 +0300 -- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/fb9b14db/pom.xml -- diff --git a/pom.xml b/pom.xml index f70bf3a..6d10b42 100644 --- a/pom.xml +++ b/pom.xml @@ -303,7 +303,7 @@ - + @@ -325,7 +325,7 @@ - +
ignite git commit: 1.4.0-SNAPSHOT
Repository: ignite Updated Branches: refs/heads/ignite-1.4 b054fdc86 -> de12e9ab1 1.4.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/de12e9ab Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/de12e9ab Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/de12e9ab Branch: refs/heads/ignite-1.4 Commit: de12e9ab1f6d2525a12867e6c3eb540d648edf94 Parents: b054fdc Author: Ignite Teamcity Authored: Thu Sep 24 14:55:33 2015 +0300 Committer: Ignite Teamcity Committed: Thu Sep 24 14:55:33 2015 +0300 -- examples/schema-import/pom.xml | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/de12e9ab/examples/schema-import/pom.xml -- diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml index fce6f47..f51007a 100644 --- a/examples/schema-import/pom.xml +++ b/examples/schema-import/pom.xml @@ -20,10 +20,7 @@ -http://maven.apache.org/POM/4.0.0"; -xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; -xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 @@ -38,7 +35,7 @@ ignite-schema-import-demo -1.3.3-p7-SNAPSHOT +1.4.0-SNAPSHOT
ignite git commit: schema-import examples fix
Repository: ignite Updated Branches: refs/heads/ignite-1.4 fb9b14dbf -> b054fdc86 schema-import examples fix Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b054fdc8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b054fdc8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b054fdc8 Branch: refs/heads/ignite-1.4 Commit: b054fdc86c574e6ba50708cbbec6dce9265cadf3 Parents: fb9b14d Author: Anton Vinogradov Authored: Thu Sep 24 14:52:09 2015 +0300 Committer: Anton Vinogradov Committed: Thu Sep 24 14:52:09 2015 +0300 -- examples/schema-import/pom.xml | 2 +- pom.xml| 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/b054fdc8/examples/schema-import/pom.xml -- diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml index fdbd631..fce6f47 100644 --- a/examples/schema-import/pom.xml +++ b/examples/schema-import/pom.xml @@ -38,7 +38,7 @@ ignite-schema-import-demo -1.0.0-SNAPSHOT +1.3.3-p7-SNAPSHOT http://git-wip-us.apache.org/repos/asf/ignite/blob/b054fdc8/pom.xml -- diff --git a/pom.xml b/pom.xml index 6d10b42..a5b47d5 100644 --- a/pom.xml +++ b/pom.xml @@ -466,6 +466,7 @@ examples examples +examples/schema-import
[3/4] ignite git commit: schema-import examples fix (cherry picked from commit b054fdc)
schema-import examples fix (cherry picked from commit b054fdc) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dd7d4fac Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dd7d4fac Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dd7d4fac Branch: refs/heads/master Commit: dd7d4fac3a5f391b23c196a5d9951de9d3a762fa Parents: 94f5248 Author: Anton Vinogradov Authored: Thu Sep 24 15:17:15 2015 +0300 Committer: Anton Vinogradov Committed: Thu Sep 24 15:17:15 2015 +0300 -- examples/schema-import/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/dd7d4fac/examples/schema-import/pom.xml -- diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml index fce6f47..32ce869 100644 --- a/examples/schema-import/pom.xml +++ b/examples/schema-import/pom.xml @@ -38,7 +38,7 @@ ignite-schema-import-demo -1.3.3-p7-SNAPSHOT +1.5.0-SNAPSHOT
[1/4] ignite git commit: schema-import examples fix (cherry picked from commit 169066b)
Repository: ignite Updated Branches: refs/heads/master ece340043 -> 3c5758bab schema-import examples fix (cherry picked from commit 169066b) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/30f5b9ef Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/30f5b9ef Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/30f5b9ef Branch: refs/heads/master Commit: 30f5b9ef82fe9216fd89827977c601b8eb17db50 Parents: 1021d4e Author: Anton Vinogradov Authored: Thu Sep 24 14:33:26 2015 +0300 Committer: Anton Vinogradov Committed: Thu Sep 24 15:16:17 2015 +0300 -- examples/schema-import/pom.xml | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/30f5b9ef/examples/schema-import/pom.xml -- diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml index d302606..fdbd631 100644 --- a/examples/schema-import/pom.xml +++ b/examples/schema-import/pom.xml @@ -26,13 +26,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 + +org.apache.ignite +ignite-parent +1 +../../parent + + UTF-8 -org.apache.ignite ignite-schema-import-demo -${project.version} +1.0.0-SNAPSHOT
[4/4] ignite git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3c5758ba Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3c5758ba Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3c5758ba Branch: refs/heads/master Commit: 3c5758bab14b30b1dad7eb39d1c388e5f6956e0f Parents: dd7d4fa ece3400 Author: Anton Vinogradov Authored: Thu Sep 24 15:17:46 2015 +0300 Committer: Anton Vinogradov Committed: Thu Sep 24 15:17:46 2015 +0300 -- .../socket/WordsSocketStreamerServer.java | 5 +- .../org/apache/ignite/IgniteAtomicLong.java | 2 +- .../org/apache/ignite/IgniteFileSystem.java | 2 +- .../apache/ignite/cache/CacheAtomicityMode.java | 17 +- .../configuration/CacheConfiguration.java | 17 +- .../apache/ignite/internal/IgniteKernal.java| 4 +- .../cache/DynamicCacheDescriptor.java | 10 +- .../processors/cache/GridCacheAdapter.java | 8 +- .../processors/cache/GridCacheMapEntry.java | 51 +- .../GridCachePartitionExchangeManager.java | 6 + .../processors/cache/GridCacheProcessor.java| 28 +- .../cache/GridCacheSwapEntryImpl.java | 31 +- .../processors/cache/GridCacheSwapManager.java | 80 ++- .../processors/cache/IgniteCacheProxy.java | 4 +- .../continuous/CacheContinuousQueryManager.java | 66 +- .../continuous/GridContinuousProcessor.java | 3 +- .../datastreamer/DataStreamerImpl.java | 2 - .../internal/processors/igfs/IgfsImpl.java | 87 +-- .../processors/igfs/IgfsMetaManager.java| 193 +- .../org/apache/ignite/mxbean/IgniteMXBean.java | 8 +- .../communication/tcp/TcpCommunicationSpi.java | 7 +- .../discovery/DiscoverySpiCustomMessage.java| 12 +- .../ignite/spi/discovery/tcp/ServerImpl.java| 410 + .../spi/discovery/tcp/TcpDiscoveryImpl.java | 6 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../tcp/internal/TcpDiscoveryNodesRing.java | 94 +-- .../messages/TcpDiscoveryDiscardMessage.java| 15 +- .../TcpDiscoveryNodeAddFinishedMessage.java | 2 +- .../messages/TcpDiscoveryNodeAddedMessage.java | 19 +- .../org/apache/ignite/stream/StreamAdapter.java | 104 +++- .../stream/StreamMultipleTupleExtractor.java| 38 ++ .../stream/StreamSingleTupleExtractor.java | 40 ++ .../ignite/stream/StreamTupleExtractor.java | 20 +- .../ignite/stream/socket/SocketStreamer.java| 3 +- .../GridCacheAbstractRemoveFailureTest.java | 6 +- .../GridCacheVariableTopologySelfTest.java | 3 +- .../IgniteCacheEntryListenerAbstractTest.java | 65 +- .../distributed/CacheAffEarlySelfTest.java | 245 .../distributed/CacheAffinityEarlyTest.java | 168 + .../IgniteCachePutRetryAbstractSelfTest.java| 33 + ...GridCacheValueConsistencyAtomicSelfTest.java | 2 +- .../near/NearCacheMultithreadedUpdateTest.java | 217 +++ ...ontinuousQueryReplicatedOneNodeSelfTest.java | 120 .../processors/igfs/IgfsAbstractSelfTest.java | 201 -- .../igfs/IgfsClientCacheSelfTest.java | 15 +- .../igfs/IgfsMetaManagerSelfTest.java | 106 ++-- ...lientDiscoverySpiFailureTimeoutSelfTest.java | 139 - .../tcp/TcpClientDiscoverySpiSelfTest.java | 13 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 53 +- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 315 +- .../stream/socket/SocketStreamerSelfTest.java | 112 +++- .../IgniteCacheFailoverTestSuite.java | 4 - .../IgniteCacheFailoverTestSuite3.java | 23 +- .../testsuites/IgniteCacheTestSuite4.java | 2 + .../testsuites/IgniteHadoopTestSuite.java | 19 +- .../processors/query/h2/IgniteH2Indexing.java | 19 +- .../query/h2/opt/GridH2AbstractKeyValueRow.java | 54 +- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 11 +- .../query/h2/opt/GridH2RowDescriptor.java | 5 + .../processors/query/h2/opt/GridH2Table.java| 10 +- .../cache/CacheIndexStreamerTest.java | 37 +- .../processors/cache/GridCacheSwapSelfTest.java | 4 +- .../IgniteCacheQuerySelfTestSuite.java | 4 +- .../IgniteCacheWithIndexingTestSuite.java | 2 + modules/mqtt/pom.xml| 114 .../apache/ignite/stream/mqtt/MqttStreamer.java | 611 +++ .../stream/mqtt/IgniteMqttStreamerTest.java | 553 + .../mqtt/IgniteMqttStreamerTestSuite.java | 34 ++ .../Apache.Ignite.Core/Impl/IgniteManager.cs| 2 - modules/yardstick/config/ignite-base-config.xml | 2 +- pom.xml | 1 + 71 files changed, 3762 insertions(+), 958 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/3
[2/4] ignite git commit: schema-import examples fix (cherry picked from commit b054fdc)
schema-import examples fix (cherry picked from commit b054fdc) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/94f5248b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/94f5248b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/94f5248b Branch: refs/heads/master Commit: 94f5248b0e03f04c53f0c264a880803e20de2d3a Parents: 30f5b9e Author: Anton Vinogradov Authored: Thu Sep 24 14:52:09 2015 +0300 Committer: Anton Vinogradov Committed: Thu Sep 24 15:16:20 2015 +0300 -- examples/schema-import/pom.xml | 2 +- pom.xml| 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/94f5248b/examples/schema-import/pom.xml -- diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml index fdbd631..fce6f47 100644 --- a/examples/schema-import/pom.xml +++ b/examples/schema-import/pom.xml @@ -38,7 +38,7 @@ ignite-schema-import-demo -1.0.0-SNAPSHOT +1.3.3-p7-SNAPSHOT http://git-wip-us.apache.org/repos/asf/ignite/blob/94f5248b/pom.xml -- diff --git a/pom.xml b/pom.xml index b47958f..33689a4 100644 --- a/pom.xml +++ b/pom.xml @@ -466,6 +466,7 @@ examples examples +examples/schema-import
[1/2] ignite git commit: ignite-1540 Handle error in GridDhtAtomicUpdateFuture.onDone
Repository: ignite Updated Branches: refs/heads/master 3c5758bab -> 31c44054c ignite-1540 Handle error in GridDhtAtomicUpdateFuture.onDone Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1056a31f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1056a31f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1056a31f Branch: refs/heads/master Commit: 1056a31fc72ea25c8790e37f2621f3d6e1908c89 Parents: ece3400 Author: sboikov Authored: Thu Sep 24 15:52:17 2015 +0300 Committer: sboikov Committed: Thu Sep 24 15:52:17 2015 +0300 -- .../cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/1056a31f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java index 0cbad48..35b8e27 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java @@ -311,6 +311,11 @@ public class GridDhtAtomicUpdateFuture extends GridFutureAdapter if (super.onDone(res, err)) { cctx.mvcc().removeAtomicFuture(version()); +if (err != null) { +for (KeyCacheObject key : keys) +updateRes.addFailedKey(key, err); +} + if (updateReq.writeSynchronizationMode() == FULL_SYNC) completionCb.apply(updateReq, updateRes);
[2/2] ignite git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/31c44054 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/31c44054 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/31c44054 Branch: refs/heads/master Commit: 31c44054c25e03e95fb4a3e237bfa6bf273c59dd Parents: 1056a31 3c5758b Author: sboikov Authored: Thu Sep 24 15:52:40 2015 +0300 Committer: sboikov Committed: Thu Sep 24 15:52:40 2015 +0300 -- examples/schema-import/pom.xml | 10 -- pom.xml| 1 + 2 files changed, 9 insertions(+), 2 deletions(-) --
[06/10] ignite git commit: schema-import examples fix (cherry picked from commit b054fdc)
schema-import examples fix (cherry picked from commit b054fdc) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dd7d4fac Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dd7d4fac Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dd7d4fac Branch: refs/heads/ignite-808 Commit: dd7d4fac3a5f391b23c196a5d9951de9d3a762fa Parents: 94f5248 Author: Anton Vinogradov Authored: Thu Sep 24 15:17:15 2015 +0300 Committer: Anton Vinogradov Committed: Thu Sep 24 15:17:15 2015 +0300 -- examples/schema-import/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/dd7d4fac/examples/schema-import/pom.xml -- diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml index fce6f47..32ce869 100644 --- a/examples/schema-import/pom.xml +++ b/examples/schema-import/pom.xml @@ -38,7 +38,7 @@ ignite-schema-import-demo -1.3.3-p7-SNAPSHOT +1.5.0-SNAPSHOT
[09/10] ignite git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/31c44054 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/31c44054 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/31c44054 Branch: refs/heads/ignite-808 Commit: 31c44054c25e03e95fb4a3e237bfa6bf273c59dd Parents: 1056a31 3c5758b Author: sboikov Authored: Thu Sep 24 15:52:40 2015 +0300 Committer: sboikov Committed: Thu Sep 24 15:52:40 2015 +0300 -- examples/schema-import/pom.xml | 10 -- pom.xml| 1 + 2 files changed, 9 insertions(+), 2 deletions(-) --
[07/10] ignite git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3c5758ba Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3c5758ba Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3c5758ba Branch: refs/heads/ignite-808 Commit: 3c5758bab14b30b1dad7eb39d1c388e5f6956e0f Parents: dd7d4fa ece3400 Author: Anton Vinogradov Authored: Thu Sep 24 15:17:46 2015 +0300 Committer: Anton Vinogradov Committed: Thu Sep 24 15:17:46 2015 +0300 -- .../socket/WordsSocketStreamerServer.java | 5 +- .../org/apache/ignite/IgniteAtomicLong.java | 2 +- .../org/apache/ignite/IgniteFileSystem.java | 2 +- .../apache/ignite/cache/CacheAtomicityMode.java | 17 +- .../configuration/CacheConfiguration.java | 17 +- .../apache/ignite/internal/IgniteKernal.java| 4 +- .../cache/DynamicCacheDescriptor.java | 10 +- .../processors/cache/GridCacheAdapter.java | 8 +- .../processors/cache/GridCacheMapEntry.java | 51 +- .../GridCachePartitionExchangeManager.java | 6 + .../processors/cache/GridCacheProcessor.java| 28 +- .../cache/GridCacheSwapEntryImpl.java | 31 +- .../processors/cache/GridCacheSwapManager.java | 80 ++- .../processors/cache/IgniteCacheProxy.java | 4 +- .../continuous/CacheContinuousQueryManager.java | 66 +- .../continuous/GridContinuousProcessor.java | 3 +- .../datastreamer/DataStreamerImpl.java | 2 - .../internal/processors/igfs/IgfsImpl.java | 87 +-- .../processors/igfs/IgfsMetaManager.java| 193 +- .../org/apache/ignite/mxbean/IgniteMXBean.java | 8 +- .../communication/tcp/TcpCommunicationSpi.java | 7 +- .../discovery/DiscoverySpiCustomMessage.java| 12 +- .../ignite/spi/discovery/tcp/ServerImpl.java| 410 + .../spi/discovery/tcp/TcpDiscoveryImpl.java | 6 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../tcp/internal/TcpDiscoveryNodesRing.java | 94 +-- .../messages/TcpDiscoveryDiscardMessage.java| 15 +- .../TcpDiscoveryNodeAddFinishedMessage.java | 2 +- .../messages/TcpDiscoveryNodeAddedMessage.java | 19 +- .../org/apache/ignite/stream/StreamAdapter.java | 104 +++- .../stream/StreamMultipleTupleExtractor.java| 38 ++ .../stream/StreamSingleTupleExtractor.java | 40 ++ .../ignite/stream/StreamTupleExtractor.java | 20 +- .../ignite/stream/socket/SocketStreamer.java| 3 +- .../GridCacheAbstractRemoveFailureTest.java | 6 +- .../GridCacheVariableTopologySelfTest.java | 3 +- .../IgniteCacheEntryListenerAbstractTest.java | 65 +- .../distributed/CacheAffEarlySelfTest.java | 245 .../distributed/CacheAffinityEarlyTest.java | 168 + .../IgniteCachePutRetryAbstractSelfTest.java| 33 + ...GridCacheValueConsistencyAtomicSelfTest.java | 2 +- .../near/NearCacheMultithreadedUpdateTest.java | 217 +++ ...ontinuousQueryReplicatedOneNodeSelfTest.java | 120 .../processors/igfs/IgfsAbstractSelfTest.java | 201 -- .../igfs/IgfsClientCacheSelfTest.java | 15 +- .../igfs/IgfsMetaManagerSelfTest.java | 106 ++-- ...lientDiscoverySpiFailureTimeoutSelfTest.java | 139 - .../tcp/TcpClientDiscoverySpiSelfTest.java | 13 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 53 +- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 315 +- .../stream/socket/SocketStreamerSelfTest.java | 112 +++- .../IgniteCacheFailoverTestSuite.java | 4 - .../IgniteCacheFailoverTestSuite3.java | 23 +- .../testsuites/IgniteCacheTestSuite4.java | 2 + .../testsuites/IgniteHadoopTestSuite.java | 19 +- .../processors/query/h2/IgniteH2Indexing.java | 19 +- .../query/h2/opt/GridH2AbstractKeyValueRow.java | 54 +- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 11 +- .../query/h2/opt/GridH2RowDescriptor.java | 5 + .../processors/query/h2/opt/GridH2Table.java| 10 +- .../cache/CacheIndexStreamerTest.java | 37 +- .../processors/cache/GridCacheSwapSelfTest.java | 4 +- .../IgniteCacheQuerySelfTestSuite.java | 4 +- .../IgniteCacheWithIndexingTestSuite.java | 2 + modules/mqtt/pom.xml| 114 .../apache/ignite/stream/mqtt/MqttStreamer.java | 611 +++ .../stream/mqtt/IgniteMqttStreamerTest.java | 553 + .../mqtt/IgniteMqttStreamerTestSuite.java | 34 ++ .../Apache.Ignite.Core/Impl/IgniteManager.cs| 2 - modules/yardstick/config/ignite-base-config.xml | 2 +- pom.xml | 1 + 71 files changed, 3762 insertions(+), 958 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/bl
[10/10] ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-808
Merge remote-tracking branch 'remotes/origin/master' into ignite-808 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7d96b53a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7d96b53a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7d96b53a Branch: refs/heads/ignite-808 Commit: 7d96b53a4108991f2784c9993d68a209524fe599 Parents: 7aaeecb 31c4405 Author: sboikov Authored: Thu Sep 24 16:12:49 2015 +0300 Committer: sboikov Committed: Thu Sep 24 16:12:49 2015 +0300 -- examples/schema-import/pom.xml | 10 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 5 + .../GridCacheVariableTopologySelfTest.java | 3 +- .../near/NearCacheMultithreadedUpdateTest.java | 217 +++ .../IgniteCacheFailoverTestSuite.java | 4 - .../IgniteCacheFailoverTestSuite3.java | 23 +- pom.xml | 1 + 7 files changed, 236 insertions(+), 27 deletions(-) --
[01/10] ignite git commit: Added test.
Repository: ignite Updated Branches: refs/heads/ignite-808 7aaeecbd4 -> 7d96b53a4 Added test. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4b0c029c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4b0c029c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4b0c029c Branch: refs/heads/ignite-808 Commit: 4b0c029cef4b351f0d389a171c30b7dcf8c1ca22 Parents: b56b15c Author: sboikov Authored: Thu Sep 24 12:19:28 2015 +0300 Committer: sboikov Committed: Thu Sep 24 12:19:28 2015 +0300 -- .../near/NearCacheMultithreadedUpdateTest.java | 217 +++ 1 file changed, 217 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/4b0c029c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java new file mode 100644 index 000..9d92724 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java @@ -0,0 +1,217 @@ +/* + * 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.distributed.near; + +import java.util.concurrent.Callable; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCache; +import org.apache.ignite.cache.CacheAtomicityMode; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.configuration.NearCacheConfiguration; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; + +import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; +import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; + +/** + * + */ +public class NearCacheMultithreadedUpdateTest extends GridCommonAbstractTest { +/** */ +private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + +/** */ +private boolean client; + +/** */ +private final int SRV_CNT = 3; + +/** {@inheritDoc} */ +@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { +IgniteConfiguration cfg = super.getConfiguration(gridName); + +((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder); + +cfg.setClientMode(client); + +return cfg; +} + +/** {@inheritDoc} */ +@Override protected void beforeTestsStarted() throws Exception { +super.beforeTestsStarted(); + +startGridsMultiThreaded(SRV_CNT); + +client = true; + +startGrid(SRV_CNT); + +client = false; +} + +/** {@inheritDoc} */ +@Override protected void afterTestsStopped() throws Exception { +super.afterTestsStopped(); + +stopAllGrids(); +} + +/** + * @throws Exception If failed. + */ +public void testUpdateMultithreadedTx() throws Exception { +updateMultithreaded(TRANSACTIONAL, false); +} + +/** + * @throws Exception If failed. + */ +public void testUpdateMultithreadedTxRestart() throws Exception { +updateMultithreaded(TRANSACTIONAL, true); +} + +/** + * @throws
[05/10] ignite git commit: schema-import examples fix (cherry picked from commit b054fdc)
schema-import examples fix (cherry picked from commit b054fdc) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/94f5248b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/94f5248b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/94f5248b Branch: refs/heads/ignite-808 Commit: 94f5248b0e03f04c53f0c264a880803e20de2d3a Parents: 30f5b9e Author: Anton Vinogradov Authored: Thu Sep 24 14:52:09 2015 +0300 Committer: Anton Vinogradov Committed: Thu Sep 24 15:16:20 2015 +0300 -- examples/schema-import/pom.xml | 2 +- pom.xml| 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/94f5248b/examples/schema-import/pom.xml -- diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml index fdbd631..fce6f47 100644 --- a/examples/schema-import/pom.xml +++ b/examples/schema-import/pom.xml @@ -38,7 +38,7 @@ ignite-schema-import-demo -1.0.0-SNAPSHOT +1.3.3-p7-SNAPSHOT http://git-wip-us.apache.org/repos/asf/ignite/blob/94f5248b/pom.xml -- diff --git a/pom.xml b/pom.xml index b47958f..33689a4 100644 --- a/pom.xml +++ b/pom.xml @@ -466,6 +466,7 @@ examples examples +examples/schema-import
[03/10] ignite git commit: Fixed imports.
Fixed imports. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ece34004 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ece34004 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ece34004 Branch: refs/heads/ignite-808 Commit: ece3400438709b2bac2ad9d206028b4bdb897073 Parents: f6ba3c3 Author: sboikov Authored: Thu Sep 24 13:09:15 2015 +0300 Committer: sboikov Committed: Thu Sep 24 13:09:15 2015 +0300 -- .../IgniteCacheFailoverTestSuite.java | 4 .../IgniteCacheFailoverTestSuite3.java | 23 +++- 2 files changed, 3 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/ece34004/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java index abc8765..c9e507d 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java @@ -33,18 +33,14 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtR import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheTxNodeFailureSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridNearCacheTxNodeFailureSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteAtomicLongChangingTopologySelfTest; -import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryAtomicSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryTransactionalSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheAtomicClientInvalidPartitionHandlingSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheAtomicClientRemoveFailureTest; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheAtomicInvalidPartitionHandlingSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheAtomicPrimaryWriteOrderRemoveFailureTest; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheAtomicRemoveFailureTest; -import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearRemoveFailureTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearRemoveFailureTest; -import org.apache.ignite.spi.communication.tcp.IgniteCacheSslStartStopSelfTest; import org.apache.ignite.testframework.GridTestUtils; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/ece34004/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java index 318db9e..0bde89a 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java @@ -18,18 +18,10 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; -import org.apache.ignite.internal.processors.cache.GridCacheIncrementTransformTest; -import org.apache.ignite.internal.processors.cache.IgniteCacheTopologySafeGetSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.*; -import org.apache.ignite.internal.processors.cache.distributed.dht.*; -import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*; -import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearRemoveFailureTest; -import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest; -import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearRemoveFailureTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryAtomicSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryTransactionalSelfT
[04/10] ignite git commit: schema-import examples fix (cherry picked from commit 169066b)
schema-import examples fix (cherry picked from commit 169066b) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/30f5b9ef Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/30f5b9ef Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/30f5b9ef Branch: refs/heads/ignite-808 Commit: 30f5b9ef82fe9216fd89827977c601b8eb17db50 Parents: 1021d4e Author: Anton Vinogradov Authored: Thu Sep 24 14:33:26 2015 +0300 Committer: Anton Vinogradov Committed: Thu Sep 24 15:16:17 2015 +0300 -- examples/schema-import/pom.xml | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/30f5b9ef/examples/schema-import/pom.xml -- diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml index d302606..fdbd631 100644 --- a/examples/schema-import/pom.xml +++ b/examples/schema-import/pom.xml @@ -26,13 +26,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 + +org.apache.ignite +ignite-parent +1 +../../parent + + UTF-8 -org.apache.ignite ignite-schema-import-demo -${project.version} +1.0.0-SNAPSHOT
[02/10] ignite git commit: Fixed test.
Fixed test. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f6ba3c3b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f6ba3c3b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f6ba3c3b Branch: refs/heads/ignite-808 Commit: f6ba3c3b4575c60f94ae4742b5d2d7bd2183f938 Parents: 4b0c029 Author: sboikov Authored: Thu Sep 24 12:56:19 2015 +0300 Committer: sboikov Committed: Thu Sep 24 12:56:19 2015 +0300 -- .../processors/cache/GridCacheVariableTopologySelfTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/f6ba3c3b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java index 7078843..80103c3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache; import java.util.Random; import java.util.concurrent.atomic.AtomicBoolean; +import javax.cache.CacheException; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteException; import org.apache.ignite.cache.CacheWriteSynchronizationMode; @@ -146,7 +147,7 @@ public class GridCacheVariableTopologySelfTest extends GridCommonAbstractTest { catch (TransactionRollbackException | ClusterTopologyException e) { info("Caught exception: " + e); } -catch (IgniteException e) { +catch (CacheException | IgniteException e) { if (X.hasCause(e, ClusterTopologyCheckedException.class)) info("Caught cache exception: " + e); else
[08/10] ignite git commit: ignite-1540 Handle error in GridDhtAtomicUpdateFuture.onDone
ignite-1540 Handle error in GridDhtAtomicUpdateFuture.onDone Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1056a31f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1056a31f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1056a31f Branch: refs/heads/ignite-808 Commit: 1056a31fc72ea25c8790e37f2621f3d6e1908c89 Parents: ece3400 Author: sboikov Authored: Thu Sep 24 15:52:17 2015 +0300 Committer: sboikov Committed: Thu Sep 24 15:52:17 2015 +0300 -- .../cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/1056a31f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java index 0cbad48..35b8e27 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java @@ -311,6 +311,11 @@ public class GridDhtAtomicUpdateFuture extends GridFutureAdapter if (super.onDone(res, err)) { cctx.mvcc().removeAtomicFuture(version()); +if (err != null) { +for (KeyCacheObject key : keys) +updateRes.addFailedKey(key, err); +} + if (updateReq.writeSynchronizationMode() == FULL_SYNC) completionCb.apply(updateReq, updateRes);
ignite git commit: Changed IgniteCacheProcessProxy.localEntries to avoid issues with Cache.Entry serialization.
Repository: ignite Updated Branches: refs/heads/master 31c44054c -> bf7591b5e Changed IgniteCacheProcessProxy.localEntries to avoid issues with Cache.Entry serialization. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bf7591b5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bf7591b5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bf7591b5 Branch: refs/heads/master Commit: bf7591b5eb6323011a03c424362ab68f994cffc9 Parents: 31c4405 Author: sboikov Authored: Thu Sep 24 16:33:05 2015 +0300 Committer: sboikov Committed: Thu Sep 24 16:33:05 2015 +0300 -- .../testframework/junits/multijvm/IgniteCacheProcessProxy.java| 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/bf7591b5/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java index dfbb0ae..ac8c5af 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java @@ -43,6 +43,7 @@ import org.apache.ignite.cache.query.Query; import org.apache.ignite.cache.query.QueryCursor; import org.apache.ignite.cache.query.QueryMetrics; import org.apache.ignite.cluster.ClusterGroup; +import org.apache.ignite.internal.processors.cache.CacheEntryImpl; import org.apache.ignite.internal.util.future.IgniteFinishedFutureImpl; import org.apache.ignite.lang.IgniteBiPredicate; import org.apache.ignite.lang.IgniteCallable; @@ -209,7 +210,7 @@ public class IgniteCacheProcessProxy implements IgniteCache { Collection res = new ArrayList<>(); for (Entry e : cache().localEntries(peekModes)) -res.add(e); +res.add(new CacheEntryImpl(e.getKey(), e.getValue())); return res; }
ignite git commit: schema-import examples fix
Repository: ignite Updated Branches: refs/heads/ignite-1.4 de12e9ab1 -> 15d2f7625 schema-import examples fix Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/15d2f762 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/15d2f762 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/15d2f762 Branch: refs/heads/ignite-1.4 Commit: 15d2f7625a0822167ea969dc289c10385092b5d0 Parents: de12e9a Author: Anton Vinogradov Authored: Thu Sep 24 16:55:00 2015 +0300 Committer: Anton Vinogradov Committed: Thu Sep 24 16:55:00 2015 +0300 -- assembly/release-fabric.xml | 9 +++ examples/schema-import/pom-standalone.xml | 90 ++ pom.xml | 5 ++ 3 files changed, 104 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/15d2f762/assembly/release-fabric.xml -- diff --git a/assembly/release-fabric.xml b/assembly/release-fabric.xml index a8c4541..308853c 100644 --- a/assembly/release-fabric.xml +++ b/assembly/release-fabric.xml @@ -51,6 +51,12 @@ /examples pom.xml + + +examples/schema-import/pom-standalone.xml +/examples/schema-import +pom.xml + @@ -85,6 +91,9 @@ schema-import/** README.txt + +schema-import/pom*.xml + http://git-wip-us.apache.org/repos/asf/ignite/blob/15d2f762/examples/schema-import/pom-standalone.xml -- diff --git a/examples/schema-import/pom-standalone.xml b/examples/schema-import/pom-standalone.xml new file mode 100644 index 000..e443728 --- /dev/null +++ b/examples/schema-import/pom-standalone.xml @@ -0,0 +1,90 @@ + + + + + +http://maven.apache.org/POM/4.0.0"; +xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; +xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> +4.0.0 + + +UTF-8 + + +org.apache.ignite +ignite-schema-import-demo +to_be_replaced_by_ignite_version + + + +javax.cache +cache-api +1.0.0 + + + +org.apache.ignite +ignite-core +to_be_replaced_by_ignite_version + + + +org.apache.ignite +ignite-spring +to_be_replaced_by_ignite_version + + + +org.apache.ignite +ignite-log4j +to_be_replaced_by_ignite_version + + + +org.apache.ignite +ignite-indexing +to_be_replaced_by_ignite_version + + + + + + +src/main/java + +**/*.java + + + + + + +maven-compiler-plugin +3.1 + +1.7 +1.7 + + + + + http://git-wip-us.apache.org/repos/asf/ignite/blob/15d2f762/pom.xml -- diff --git a/pom.xml b/pom.xml index a5b47d5..6ddc443 100644 --- a/pom.xml +++ b/pom.xml @@ -299,6 +299,11 @@ + + + + +
Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-1282-debug [deleted] ecc60aae0
Git Push Summary
Repository: ignite Updated Tags: refs/tags/ignite-1.4.0-SNAPSHOT-rc1 [created] 7a11ff3aa
ignite git commit: schema-import examples fix
Repository: ignite Updated Branches: refs/heads/ignite-1.4 15d2f7625 -> a2c972bf5 schema-import examples fix Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a2c972bf Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a2c972bf Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a2c972bf Branch: refs/heads/ignite-1.4 Commit: a2c972bf5ef59ffd13d65eacc4356ea1ac65383c Parents: 15d2f76 Author: Anton Vinogradov Authored: Thu Sep 24 18:11:17 2015 +0300 Committer: Anton Vinogradov Committed: Thu Sep 24 18:11:17 2015 +0300 -- assembly/release-fabric.xml | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/a2c972bf/assembly/release-fabric.xml -- diff --git a/assembly/release-fabric.xml b/assembly/release-fabric.xml index 308853c..9f9fbb2 100644 --- a/assembly/release-fabric.xml +++ b/assembly/release-fabric.xml @@ -88,12 +88,11 @@ rest/** memcached/** -schema-import/** +schema-import/src/** +schema-import/bin/** +schema-import/README.txt README.txt - -schema-import/pom*.xml -
Git Push Summary
Repository: ignite Updated Tags: refs/tags/ignite-1.4.0-rc1 [created] 614f5b06f
Git Push Summary
Repository: ignite Updated Branches: refs/heads/ignite-1.4.1 [created] a2c972bf5
ignite git commit: 1.4.1-SNAPSHOT
Repository: ignite Updated Branches: refs/heads/ignite-1.4.1 a2c972bf5 -> e5e72ea0e 1.4.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e5e72ea0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e5e72ea0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e5e72ea0 Branch: refs/heads/ignite-1.4.1 Commit: e5e72ea0e0951af9200dc81e3b69a02c961ee2c2 Parents: a2c972b Author: Ignite Teamcity Authored: Thu Sep 24 18:57:10 2015 +0300 Committer: Ignite Teamcity Committed: Thu Sep 24 18:57:10 2015 +0300 -- examples/pom.xml | 2 +- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml| 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- modules/core/src/main/resources/ignite.properties| 2 +- modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml| 2 +- modules/indexing/pom.xml | 2 +- modules/jcl/pom.xml | 2 +- modules/jms11/pom.xml| 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml| 2 +- modules/log4j/pom.xml| 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml| 2 +- modules/platform/pom.xml | 2 +- modules/platform/src/main/cpp/common/configure.ac| 2 +- modules/platform/src/main/cpp/core-test/configure.ac | 2 +- modules/platform/src/main/cpp/core/configure.ac | 2 +- .../main/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs| 4 ++-- .../src/main/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs | 4 ++-- .../Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs | 4 ++-- .../dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs | 4 ++-- modules/rest-http/pom.xml| 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml| 2 +- modules/slf4j/pom.xml| 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml| 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml| 2 +- modules/urideploy/pom.xml| 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml| 2 +- modules/visor-plugins/pom.xml| 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml| 2 +- modules/yarn/pom.xml | 2 +- modules/zookeeper/pom.xml| 2 +- pom.xml | 2 +- 53 files changed, 57 insertions(+), 57 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/e5e72ea0/examples/pom.xml -- diff --git a/examples/pom.xml b/examples/pom.xml index 64e8be9..a2ac452 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -28,7 +28,7 @@ ignite-examples -
svn commit: r10631 - /dev/ignite/1.4.0-rc1/
Author: sboikov Date: Thu Sep 24 16:16:15 2015 New Revision: 10631 Log: new RC (1.4.0-rc1) Added: dev/ignite/1.4.0-rc1/ dev/ignite/1.4.0-rc1/apache-ignite-1.4.0-src.zip (with props) dev/ignite/1.4.0-rc1/apache-ignite-1.4.0-src.zip.asc dev/ignite/1.4.0-rc1/apache-ignite-1.4.0-src.zip.md5 dev/ignite/1.4.0-rc1/apache-ignite-1.4.0-src.zip.sha1 dev/ignite/1.4.0-rc1/apache-ignite-fabric-1.4.0-bin.zip (with props) dev/ignite/1.4.0-rc1/apache-ignite-fabric-1.4.0-bin.zip.asc dev/ignite/1.4.0-rc1/apache-ignite-fabric-1.4.0-bin.zip.md5 dev/ignite/1.4.0-rc1/apache-ignite-fabric-1.4.0-bin.zip.sha1 dev/ignite/1.4.0-rc1/apache-ignite-hadoop-1.4.0-bin.zip (with props) dev/ignite/1.4.0-rc1/apache-ignite-hadoop-1.4.0-bin.zip.asc dev/ignite/1.4.0-rc1/apache-ignite-hadoop-1.4.0-bin.zip.md5 dev/ignite/1.4.0-rc1/apache-ignite-hadoop-1.4.0-bin.zip.sha1 Added: dev/ignite/1.4.0-rc1/apache-ignite-1.4.0-src.zip == Binary file - no diff available. Propchange: dev/ignite/1.4.0-rc1/apache-ignite-1.4.0-src.zip -- svn:mime-type = application/octet-stream Added: dev/ignite/1.4.0-rc1/apache-ignite-1.4.0-src.zip.asc == --- dev/ignite/1.4.0-rc1/apache-ignite-1.4.0-src.zip.asc (added) +++ dev/ignite/1.4.0-rc1/apache-ignite-1.4.0-src.zip.asc Thu Sep 24 16:16:15 2015 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.10 (GNU/Linux) + +iQIcBAABAgAGBQJWBCDLAAoJEEDYklpZOnQ7Xi8P/jGJBvuJmmTNtsmXcCduCBLq +Kfg/PS3sVUEHGaRQohbVUniqbUzAuSzywFHzrEzFBjYxytiip8Xf703u4npfkdWn +BPi9lnwmh5vEzIIyLqDyS9syFvxIh9FzaS75sj1/KrE3HRsXfpQmgvg79SGaVaik +pmWbNbwGvLWutHLlSgl/OMw6i17KHAt91TcFcpVwGmpHr4e5YIpWRme+crXnznC8 +PDbJ4+g9M9Xn4oSsaHdHNjwlpCDyy4BRH93/NXqpnrMYvZPQpkIJ5lclmtYnqZLm +lagqgkhIFlUWji5+1M2p9PoZ6vVj/1qwQnvtqhy+79lh1mweUhYnBPZz4og0+A3Y +BP45zZKV08Dv6aJpxlhDuIqPelTgLrUYnuJMdW//5Stv6Bo1WdFWaqFvFgiFERLd +WDNzuMmteJO1FPJ28COlVaR8qDPC8HxYVRwcF7ex8SG8hlQZGLZdwKOOSrk9B/CS +Xi6Qe+X9Ozbmlqwj0Lc621yaV65cnNcj5cgK6l3ICRXGOB5ddJYgZ45a2pf4awB/ +EKQ8fVoeZKIA6s2DOLwZztvZM2CkQFtHBlTXgeAfWdQFvwP1nvc2DG4LJ+3cwAui +67VUA2XOgRd0IqeIrGstECRXmcijbNNa4E0GQPBOoynahzmXJZpcIVVkMWjqHYLL +p2LOOSKO8/X56LTMBTqf +=zCIi +-END PGP SIGNATURE- Added: dev/ignite/1.4.0-rc1/apache-ignite-1.4.0-src.zip.md5 == --- dev/ignite/1.4.0-rc1/apache-ignite-1.4.0-src.zip.md5 (added) +++ dev/ignite/1.4.0-rc1/apache-ignite-1.4.0-src.zip.md5 Thu Sep 24 16:16:15 2015 @@ -0,0 +1 @@ +8b31dee27e145a9045dc2d244c76a5e3 apache-ignite-1.4.0-src.zip \ No newline at end of file Added: dev/ignite/1.4.0-rc1/apache-ignite-1.4.0-src.zip.sha1 == --- dev/ignite/1.4.0-rc1/apache-ignite-1.4.0-src.zip.sha1 (added) +++ dev/ignite/1.4.0-rc1/apache-ignite-1.4.0-src.zip.sha1 Thu Sep 24 16:16:15 2015 @@ -0,0 +1 @@ +a1c38c789eb6b83dfb2b1fb6bf5b3fc4d2abb015 apache-ignite-1.4.0-src.zip \ No newline at end of file Added: dev/ignite/1.4.0-rc1/apache-ignite-fabric-1.4.0-bin.zip == Binary file - no diff available. Propchange: dev/ignite/1.4.0-rc1/apache-ignite-fabric-1.4.0-bin.zip -- svn:mime-type = application/octet-stream Added: dev/ignite/1.4.0-rc1/apache-ignite-fabric-1.4.0-bin.zip.asc == --- dev/ignite/1.4.0-rc1/apache-ignite-fabric-1.4.0-bin.zip.asc (added) +++ dev/ignite/1.4.0-rc1/apache-ignite-fabric-1.4.0-bin.zip.asc Thu Sep 24 16:16:15 2015 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1.4.10 (GNU/Linux) + +iQIcBAABAgAGBQJWBCDLAAoJEEDYklpZOnQ7Iz0QAJSyfGG+21fE/veveTcBmuj4 +dDrDVxrcAH+i7m1LCnmNgo5YI5z31iJsghXAaP+OqTeoesatfJ4EZf0G5YvlHT6g +iyxWjp9d4CPmkS0RGKMSViyjUw6OAXfpjYrMtU4djbDAnS1GVMAMUxhhduGKuNxD +YYubDrN0zQTophlisMGiB4nvKLCFG0TGanEzl91x6PCXOTQtg20ELjiPdg6r/1ls +e9o0G93deDQhEUILsM7kHT4K4i/vsdpFzywZy5Xx671XuXaK/ySZojZbXJvDXnL8 +YWGRtM66b1nCpCdvK2cUPOiB2pwvwAuLk3NH8D+Fk3Y/JHZSAwmqSjZW3e6MEDYV +1CTHsYK0DcFLAGrXLvfJ05o7ZN0byGGCZ3eT18pHE3LvUTxwYVW26JtXmw0OM2Ka +QYsuHOe6yw9TuTaD4ERX23OyqRIJ3B+IJB5Zfq2uSIfPu+ob0n+iNaU5pBiuoxdE +m7j3doid8RQQXH5dgcgwNt9DhTLC7ilVYDjqhz1MNFB6iXPtR1ptkKHUL2RPN8o4 +qs/1iNuX3rgye+UnOB0taXfevG9u8tzWUo70+/HeRbyR/xCWm1bArJDy5qm4jxML +NSgP0/13pTb9JdQdKDcQ+WsXbDDJy0bqCwpV9sJm3Eyl83kH4N4yCOV/zxpn9PsT +PFFCMnSVgT77EExlo3dH +=9Ufw +-END PGP SIGNATURE- Added: dev/ignite/1.4.0-rc1/apache-ignite-fabric-1.4.0-bin.zip.md5 == --- dev/ignite/1.4.0-rc1/apache-ignite-fabric-1.4.0-bin.zip.md5 (added) +++ dev/ignite/1.4.0-r
ignite git commit: IGNITE-843 WIP multi columns support.
Repository: ignite Updated Branches: refs/heads/ignite-843 7c60be0d2 -> a9c59f408 IGNITE-843 WIP multi columns support. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a9c59f40 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a9c59f40 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a9c59f40 Branch: refs/heads/ignite-843 Commit: a9c59f4082d4bc1508bd657a01aab6a2e0cbad6d Parents: 7c60be0 Author: AKuznetsov Authored: Fri Sep 25 01:00:06 2015 +0700 Committer: AKuznetsov Committed: Fri Sep 25 01:00:06 2015 +0700 -- .../src/main/js/controllers/common-module.js| 2 +- .../main/js/controllers/metadata-controller.js | 4 +- .../src/main/js/controllers/sql-controller.js | 141 ++- .../control-center-web/src/main/js/package.json | 2 +- .../src/main/js/public/stylesheets/style.scss | 37 + .../js/views/configuration/metadata-load.jade | 2 +- .../main/js/views/configuration/summary.jade| 4 +- .../src/main/js/views/includes/controls.jade| 10 +- .../src/main/js/views/settings/profile.jade | 2 +- .../src/main/js/views/sql/cache-metadata.jade | 2 +- .../src/main/js/views/sql/chart-settings.jade | 32 +++-- .../src/main/js/views/sql/notebook-new.jade | 6 +- .../src/main/js/views/sql/paragraph-rate.jade | 6 +- .../src/main/js/views/sql/sql.jade | 3 +- .../main/js/views/templates/agent-download.jade | 4 +- .../main/js/views/templates/batch-confirm.jade | 8 +- .../src/main/js/views/templates/clone.jade | 6 +- .../src/main/js/views/templates/confirm.jade| 6 +- .../src/main/js/views/templates/layout.jade | 2 + .../src/main/js/views/templates/message.jade| 4 +- .../js/views/templates/validation-error.jade| 2 +- 21 files changed, 199 insertions(+), 86 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/a9c59f40/modules/control-center-web/src/main/js/controllers/common-module.js -- diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js index 2b5dc10..6ae751b 100644 --- a/modules/control-center-web/src/main/js/controllers/common-module.js +++ b/modules/control-center-web/src/main/js/controllers/common-module.js @@ -16,7 +16,7 @@ */ var controlCenterModule = angular.module('ignite-web-control-center', -['ngAnimate', 'smart-table', 'mgcrea.ngStrap', 'ui.ace', 'ngSanitize', 'treeControl', 'darthwade.loading', 'agGrid']); +['ngAnimate', 'smart-table', 'mgcrea.ngStrap', 'ui.ace', 'ngSanitize', 'treeControl', 'darthwade.loading', 'agGrid', 'dndLists']); // Modal popup configuration. controlCenterModule.config(function ($modalProvider) { http://git-wip-us.apache.org/repos/asf/ignite/blob/a9c59f40/modules/control-center-web/src/main/js/controllers/metadata-controller.js -- diff --git a/modules/control-center-web/src/main/js/controllers/metadata-controller.js b/modules/control-center-web/src/main/js/controllers/metadata-controller.js index b1ed91a..16d9ca3 100644 --- a/modules/control-center-web/src/main/js/controllers/metadata-controller.js +++ b/modules/control-center-web/src/main/js/controllers/metadata-controller.js @@ -710,9 +710,9 @@ controlCenterModule.controller('metadataController', [ : 'New metadata'; }; -$scope.prepareNewItem = function () { +function prepareNewItem() { return {space: $scope.spaces[0]._id, caches: []}; -}; +} // Add new metadata. $scope.createItem = function () { http://git-wip-us.apache.org/repos/asf/ignite/blob/a9c59f40/modules/control-center-web/src/main/js/controllers/sql-controller.js -- diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js index 45eeb99..25cbe8e 100644 --- a/modules/control-center-web/src/main/js/controllers/sql-controller.js +++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js @@ -24,6 +24,45 @@ controlCenterModule.controller('sqlController', $scope.agentGoal = 'execute sql statements'; $scope.agentTestDriveOption = '--test-drive-sql'; +var chartSettingsParagraph = null; + +$scope.chartSettingsDragStart = function (paragraph) { +chartSettingsParagraph = paragraph; +}; + +$scope.removeKeyColumn = function (paragraph, index) { +paragraph.chartKeyCols.splice(index, 1); + +$scope.applyChartS
ignite git commit: IGNITE-1537 - Addressing review comments.
Repository: ignite Updated Branches: refs/heads/ignite-1537 b6f5b311a -> e4ce66bab IGNITE-1537 - Addressing review comments. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e4ce66ba Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e4ce66ba Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e4ce66ba Branch: refs/heads/ignite-1537 Commit: e4ce66bab0937835b177ba8c654dbf221aae2e1d Parents: b6f5b31 Author: Alexey Goncharuk Authored: Thu Sep 24 15:23:53 2015 -0700 Committer: Alexey Goncharuk Committed: Thu Sep 24 15:23:53 2015 -0700 -- .../near/GridNearOptimisticTxPrepareFuture.java | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/e4ce66ba/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java index aa5e1cb..5e62b33 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java @@ -429,7 +429,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearTxPrepareFutureAd prepare( tx.optimistic() && tx.serializable() ? tx.readEntries() : Collections.emptyList(), -tx.writeEntries()); +tx.writeEntries(), remap); markInitialized(); } @@ -441,8 +441,9 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearTxPrepareFutureAd /** * @param reads Read entries. * @param writes Write entries. + * @param remap Remap flag. */ -private void prepare(Iterable reads, Iterable writes) { +private void prepare(Iterable reads, Iterable writes, boolean remap) { AffinityTopologyVersion topVer = tx.topologyVersion(); assert topVer.topologyVersion() > 0; @@ -468,7 +469,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearTxPrepareFutureAd GridDistributedTxMapping cur = null; for (IgniteTxEntry read : reads) { -GridDistributedTxMapping updated = map(read, topVer, cur, false); +GridDistributedTxMapping updated = map(read, topVer, cur, false, remap); if (cur != updated) { mappings.offer(updated); @@ -485,7 +486,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearTxPrepareFutureAd } for (IgniteTxEntry write : writes) { -GridDistributedTxMapping updated = map(write, topVer, cur, true); +GridDistributedTxMapping updated = map(write, topVer, cur, true, remap); if (cur != updated) { mappings.offer(updated); @@ -628,7 +629,8 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearTxPrepareFutureAd IgniteTxEntry entry, AffinityTopologyVersion topVer, @Nullable GridDistributedTxMapping cur, -boolean waitLock +boolean waitLock, +boolean remap ) { GridCacheContext cacheCtx = entry.context(); @@ -654,7 +656,7 @@ public class GridNearOptimisticTxPrepareFuture extends GridNearTxPrepareFutureAd else entry.cached(cacheCtx.local().entryEx(entry.key(), topVer)); -if (cacheCtx.isNear() || cacheCtx.isLocal()) { +if (!remap && (cacheCtx.isNear() || cacheCtx.isLocal())) { if (waitLock && entry.explicitVersion() == null) keyLockFut.addLockKey(entry.txKey()); }
[02/50] ignite git commit: ignite-1.4 Fixed Visor cmd options.
ignite-1.4 Fixed Visor cmd options. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5cfb6e68 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5cfb6e68 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5cfb6e68 Branch: refs/heads/ignite-257 Commit: 5cfb6e6878dea2fa78d7593766035a5b535763a1 Parents: cd6a1d5 Author: Alexey Kuznetsov Authored: Thu Sep 17 16:24:25 2015 +0700 Committer: Alexey Kuznetsov Committed: Thu Sep 17 16:24:25 2015 +0700 -- .../main/scala/org/apache/ignite/visor/commands/VisorConsole.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/5cfb6e68/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala -- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala index 627f795..2abe8a7 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala @@ -91,7 +91,7 @@ class VisorConsole { println("-np - no pause on exit (pause by default).") println("-cfg= - connect with specified configuration.") println("-b=- batch mode with file.") -println("-e==cmd1;cmd2;...- batch mode with commands.") +println("-e=cmd1;cmd2;... - batch mode with commands.") visor.quit() }
[10/50] ignite git commit: Yardstick properties file fixed
Yardstick properties file fixed Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c28cec1c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c28cec1c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c28cec1c Branch: refs/heads/ignite-257 Commit: c28cec1cd3b893adb4b5168af86d67bf5a998854 Parents: b6139f8 Author: agura Authored: Fri Sep 18 14:50:19 2015 +0300 Committer: agura Committed: Fri Sep 18 14:50:19 2015 +0300 -- modules/yardstick/config/benchmark-put-indexed-val.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/c28cec1c/modules/yardstick/config/benchmark-put-indexed-val.properties -- diff --git a/modules/yardstick/config/benchmark-put-indexed-val.properties b/modules/yardstick/config/benchmark-put-indexed-val.properties index 8f3a505..e81ae6f 100644 --- a/modules/yardstick/config/benchmark-put-indexed-val.properties +++ b/modules/yardstick/config/benchmark-put-indexed-val.properties @@ -21,7 +21,7 @@ # JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false" # Uncomment to enable concurrent garbage collection (GC) if you encounter long GC pauses. -JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false" \ +JVM_OPTS=${JVM_OPTS}" -DIGNITE_QUIET=false \ -XX:+UseParNewGC \ -XX:+UseConcMarkSweepGC \ -XX:+UseTLAB \
[14/50] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4
Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8b94494a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8b94494a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8b94494a Branch: refs/heads/ignite-257 Commit: 8b94494a4817780961c203e0b2b52715baa3b6da Parents: 84a2300 7ccd0b3 Author: Yakov Zhdanov Authored: Fri Sep 18 23:16:10 2015 +0300 Committer: Yakov Zhdanov Committed: Fri Sep 18 23:16:10 2015 +0300 -- .../src/main/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs | 2 -- modules/yardstick/config/ignite-base-config.xml| 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) --
[31/50] ignite git commit: Added test.
Added test. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1942d758 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1942d758 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1942d758 Branch: refs/heads/ignite-257 Commit: 1942d75856ab6d317b743de71b53a29abf81316a Parents: ca2bce0 Author: sboikov Authored: Tue Sep 22 17:36:18 2015 +0300 Committer: sboikov Committed: Tue Sep 22 17:36:18 2015 +0300 -- .../IgniteCachePutRetryAbstractSelfTest.java| 33 1 file changed, 33 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/1942d758/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java index 943caeb..76f12c4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/IgniteCachePutRetryAbstractSelfTest.java @@ -168,6 +168,13 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst /** * @throws Exception If failed. */ +public void testGetAndPut() throws Exception { +checkRetry(Test.GET_AND_PUT, TestMemoryMode.HEAP, false); +} + +/** + * @throws Exception If failed. + */ public void testPutStoreEnabled() throws Exception { checkRetry(Test.PUT, TestMemoryMode.HEAP, true); } @@ -275,6 +282,29 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst break; } +case GET_AND_PUT: { +for (int i = 0; i < keysCnt; i++) +cache.put(i, 0); + +while (System.currentTimeMillis() < stopTime) { +Integer expOld = iter; + +Integer val = ++iter; + +for (int i = 0; i < keysCnt; i++) { +Integer old = cache.getAndPut(i, val); + +assertTrue("Unexpected old value [old=" + old + ", exp=" + expOld + ']', +expOld.equals(old) || val.equals(old)); +} + +for (int i = 0; i < keysCnt; i++) +assertEquals(val, cache.get(i)); +} + +break; +} + case PUT_ALL: { while (System.currentTimeMillis() < stopTime) { Integer val = ++iter; @@ -495,6 +525,9 @@ public abstract class IgniteCachePutRetryAbstractSelfTest extends GridCommonAbst PUT, /** */ +GET_AND_PUT, + +/** */ PUT_ALL, /** */
[45/50] ignite git commit: schema-import examples fix (cherry picked from commit b054fdc)
schema-import examples fix (cherry picked from commit b054fdc) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dd7d4fac Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dd7d4fac Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dd7d4fac Branch: refs/heads/ignite-257 Commit: dd7d4fac3a5f391b23c196a5d9951de9d3a762fa Parents: 94f5248 Author: Anton Vinogradov Authored: Thu Sep 24 15:17:15 2015 +0300 Committer: Anton Vinogradov Committed: Thu Sep 24 15:17:15 2015 +0300 -- examples/schema-import/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/dd7d4fac/examples/schema-import/pom.xml -- diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml index fce6f47..32ce869 100644 --- a/examples/schema-import/pom.xml +++ b/examples/schema-import/pom.xml @@ -38,7 +38,7 @@ ignite-schema-import-demo -1.3.3-p7-SNAPSHOT +1.5.0-SNAPSHOT
[28/50] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4
Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/39dace45 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/39dace45 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/39dace45 Branch: refs/heads/ignite-257 Commit: 39dace45c81aef7cb913fcf4f98a7d71e34beebd Parents: f0be45e a104087 Author: S.Vladykin Authored: Tue Sep 22 13:38:21 2015 +0300 Committer: S.Vladykin Committed: Tue Sep 22 13:38:21 2015 +0300 -- .../apache/ignite/cache/CacheAtomicityMode.java | 17 +-- .../processors/cache/GridCacheProcessor.java| 2 +- ...lientDiscoverySpiFailureTimeoutSelfTest.java | 118 ++- .../tcp/TcpClientDiscoverySpiSelfTest.java | 13 +- 4 files changed, 125 insertions(+), 25 deletions(-) --
[43/50] ignite git commit: schema-import examples fix (cherry picked from commit 169066b)
schema-import examples fix (cherry picked from commit 169066b) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/30f5b9ef Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/30f5b9ef Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/30f5b9ef Branch: refs/heads/ignite-257 Commit: 30f5b9ef82fe9216fd89827977c601b8eb17db50 Parents: 1021d4e Author: Anton Vinogradov Authored: Thu Sep 24 14:33:26 2015 +0300 Committer: Anton Vinogradov Committed: Thu Sep 24 15:16:17 2015 +0300 -- examples/schema-import/pom.xml | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/30f5b9ef/examples/schema-import/pom.xml -- diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml index d302606..fdbd631 100644 --- a/examples/schema-import/pom.xml +++ b/examples/schema-import/pom.xml @@ -26,13 +26,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> 4.0.0 + +org.apache.ignite +ignite-parent +1 +../../parent + + UTF-8 -org.apache.ignite ignite-schema-import-demo -${project.version} +1.0.0-SNAPSHOT
[49/50] ignite git commit: Changed IgniteCacheProcessProxy.localEntries to avoid issues with Cache.Entry serialization.
Changed IgniteCacheProcessProxy.localEntries to avoid issues with Cache.Entry serialization. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bf7591b5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bf7591b5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bf7591b5 Branch: refs/heads/ignite-257 Commit: bf7591b5eb6323011a03c424362ab68f994cffc9 Parents: 31c4405 Author: sboikov Authored: Thu Sep 24 16:33:05 2015 +0300 Committer: sboikov Committed: Thu Sep 24 16:33:05 2015 +0300 -- .../testframework/junits/multijvm/IgniteCacheProcessProxy.java| 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/bf7591b5/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java index dfbb0ae..ac8c5af 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/multijvm/IgniteCacheProcessProxy.java @@ -43,6 +43,7 @@ import org.apache.ignite.cache.query.Query; import org.apache.ignite.cache.query.QueryCursor; import org.apache.ignite.cache.query.QueryMetrics; import org.apache.ignite.cluster.ClusterGroup; +import org.apache.ignite.internal.processors.cache.CacheEntryImpl; import org.apache.ignite.internal.util.future.IgniteFinishedFutureImpl; import org.apache.ignite.lang.IgniteBiPredicate; import org.apache.ignite.lang.IgniteCallable; @@ -209,7 +210,7 @@ public class IgniteCacheProcessProxy implements IgniteCache { Collection res = new ArrayList<>(); for (Entry e : cache().localEntries(peekModes)) -res.add(e); +res.add(new CacheEntryImpl(e.getKey(), e.getValue())); return res; }
[42/50] ignite git commit: Fixed imports.
Fixed imports. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ece34004 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ece34004 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ece34004 Branch: refs/heads/ignite-257 Commit: ece3400438709b2bac2ad9d206028b4bdb897073 Parents: f6ba3c3 Author: sboikov Authored: Thu Sep 24 13:09:15 2015 +0300 Committer: sboikov Committed: Thu Sep 24 13:09:15 2015 +0300 -- .../IgniteCacheFailoverTestSuite.java | 4 .../IgniteCacheFailoverTestSuite3.java | 23 +++- 2 files changed, 3 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/ece34004/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java index abc8765..c9e507d 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java @@ -33,18 +33,14 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheDhtR import org.apache.ignite.internal.processors.cache.distributed.dht.GridCacheTxNodeFailureSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.GridNearCacheTxNodeFailureSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteAtomicLongChangingTopologySelfTest; -import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryAtomicSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryTransactionalSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheAtomicClientInvalidPartitionHandlingSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheAtomicClientRemoveFailureTest; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheAtomicInvalidPartitionHandlingSelfTest; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheAtomicPrimaryWriteOrderRemoveFailureTest; import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridCacheAtomicRemoveFailureTest; -import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.IgniteCachePutRetryAtomicPrimaryWriteOrderSelfTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearRemoveFailureTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest; import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearRemoveFailureTest; -import org.apache.ignite.spi.communication.tcp.IgniteCacheSslStartStopSelfTest; import org.apache.ignite.testframework.GridTestUtils; /** http://git-wip-us.apache.org/repos/asf/ignite/blob/ece34004/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java index 318db9e..0bde89a 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite3.java @@ -18,18 +18,10 @@ package org.apache.ignite.testsuites; import junit.framework.TestSuite; -import org.apache.ignite.internal.processors.cache.GridCacheIncrementTransformTest; -import org.apache.ignite.internal.processors.cache.IgniteCacheTopologySafeGetSelfTest; -import org.apache.ignite.internal.processors.cache.distributed.*; -import org.apache.ignite.internal.processors.cache.distributed.dht.*; -import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.*; -import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicNearRemoveFailureTest; -import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheAtomicPrimaryWriteOrderNearRemoveFailureTest; -import org.apache.ignite.internal.processors.cache.distributed.near.GridCacheNearRemoveFailureTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryAtomicSelfTest; +import org.apache.ignite.internal.processors.cache.distributed.dht.IgniteCachePutRetryTransactionalSelfT
[20/50] ignite git commit: IGNITE-535 Finish MQTT Streamer docs and tests. Upgrade latter to AMQ 5.12.0.
IGNITE-535 Finish MQTT Streamer docs and tests. Upgrade latter to AMQ 5.12.0. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/296dd6e7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/296dd6e7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/296dd6e7 Branch: refs/heads/ignite-257 Commit: 296dd6e7d86fe6d0914a9fbf8062632c04e4d22c Parents: f03f3a3 Author: Raul Kripalani Authored: Mon Sep 21 17:24:44 2015 +0100 Committer: Raul Kripalani Committed: Mon Sep 21 17:24:44 2015 +0100 -- modules/mqtt/pom.xml| 9 +- .../apache/ignite/stream/mqtt/MqttStreamer.java | 156 ++- .../stream/mqtt/IgniteMqttStreamerTest.java | 80 +- 3 files changed, 224 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/296dd6e7/modules/mqtt/pom.xml -- diff --git a/modules/mqtt/pom.xml b/modules/mqtt/pom.xml index 4b0b46c..21511e8 100644 --- a/modules/mqtt/pom.xml +++ b/modules/mqtt/pom.xml @@ -37,7 +37,7 @@ 1.0.2 -5.11.1 +5.12.0 2.0.0 @@ -69,13 +69,6 @@ org.apache.activemq -activemq-kahadb-store -${activemq.version} -test - - - -org.apache.activemq activemq-mqtt ${activemq.version} test http://git-wip-us.apache.org/repos/asf/ignite/blob/296dd6e7/modules/mqtt/src/main/java/org/apache/ignite/stream/mqtt/MqttStreamer.java -- diff --git a/modules/mqtt/src/main/java/org/apache/ignite/stream/mqtt/MqttStreamer.java b/modules/mqtt/src/main/java/org/apache/ignite/stream/mqtt/MqttStreamer.java index b86d385..f18ae42 100644 --- a/modules/mqtt/src/main/java/org/apache/ignite/stream/mqtt/MqttStreamer.java +++ b/modules/mqtt/src/main/java/org/apache/ignite/stream/mqtt/MqttStreamer.java @@ -62,12 +62,17 @@ import org.eclipse.paho.client.mqttv3.MqttMessage; * Specifying the subscriber's QoS for a single topic or for multiple topics. * Allows setting {@link MqttConnectOptions} to support features like last will testament, persistent * sessions, etc. - * Specifying the client ID. + * Specifying the client ID. A random one will be generated and maintained throughout reconnections if the user + * does not provide one. + * (Re-)Connection retries based on the guava-retrying library. Retry wait and retry stop policies + * can be configured. + * Blocking the start() method until connected for the first time. * * - * Note: features like durable subscriptions, last will testament, etc. must be configured via the + * Note: features like durable subscriptions, last will testament, etc. can be configured via the * {@link #connectOptions} property. * + * @see https://github.com/rholder/guava-retrying";>guava-retrying library * @author Raul Kripalani */ public class MqttStreamer extends StreamAdapter implements MqttCallback { @@ -75,46 +80,65 @@ public class MqttStreamer extends StreamAdapter impleme /** Logger. */ private IgniteLogger log; +/** The MQTT client object for internal use. */ private MqttClient client; +/** The broker URL, set by the user. */ private String brokerUrl; +/** The topic to subscribe to, if a single topic. */ private String topic; +/** The quality of service to use for a single topic subscription (optional). */ private Integer qualityOfService; +/** The topics to subscribe to, if many. */ private List topics; +/** The qualities of service to use for multiple topic subscriptions. If specified, it must contain the same + * number of elements as {@link #topics}. */ private List qualitiesOfService; -/** Client ID in case we're using durable subscribers. */ +/** The MQTT client ID (optional). */ private String clientId; +/** A configurable persistence mechanism. If not set, Paho will use its default. */ private MqttClientPersistence persistence; +/** The MQTT client connect options, where users can configured the last will and testament, durability, etc. */ private MqttConnectOptions connectOptions; -// disconnect parameters +/** Quiesce timeout on disconnection. */ private Integer disconnectQuiesceTimeout; +/** Whether to disconnect forcibly or not. */ private boolean disconnectForcibly; +/** If disconnecting forcibly, the timeout. */ private Integer disconnectForciblyTimeout; +/** The strategy to determine how long to wait between retry attempts. By default, this streamer uses a
[34/50] ignite git commit: IGNITE-586: Fixed IGFS rename problem causing corrupted file system structure.
IGNITE-586: Fixed IGFS rename problem causing corrupted file system structure. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b3bcf4ae Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b3bcf4ae Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b3bcf4ae Branch: refs/heads/ignite-257 Commit: b3bcf4aeecf9aa1bd6d19e94c8da7b09741f5410 Parents: 0a41ae5 Author: iveselovskiy Authored: Wed Sep 23 13:45:01 2015 +0300 Committer: vozerov-gridgain Committed: Wed Sep 23 13:45:01 2015 +0300 -- .../org/apache/ignite/IgniteFileSystem.java | 2 +- .../configuration/CacheConfiguration.java | 2 +- .../internal/processors/igfs/IgfsImpl.java | 87 ++-- .../processors/igfs/IgfsMetaManager.java| 193 -- .../processors/igfs/IgfsAbstractSelfTest.java | 201 ++- .../igfs/IgfsClientCacheSelfTest.java | 15 +- .../igfs/IgfsMetaManagerSelfTest.java | 106 +- .../testsuites/IgniteHadoopTestSuite.java | 19 +- 8 files changed, 409 insertions(+), 216 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/b3bcf4ae/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java b/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java index b02d0f1..a187a90 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteFileSystem.java @@ -451,7 +451,7 @@ public interface IgniteFileSystem extends IgniteAsyncSupport { * @return File information for specified path or {@code null} if such path does not exist. * @throws IgniteException In case of error. */ -public IgfsFile info(IgfsPath path) throws IgniteException; +@Nullable public IgfsFile info(IgfsPath path) throws IgniteException; /** * Gets used space in bytes. http://git-wip-us.apache.org/repos/asf/ignite/blob/b3bcf4ae/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java index 44a3fa9..6ac2b64 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java @@ -436,7 +436,7 @@ public class CacheConfiguration extends MutableConfiguration { * @return {@code this} for chaining. */ public CacheConfiguration setName(String name) { -A.ensure(name == null || !name.isEmpty(), "Name cannot be null or empty."); +A.ensure(name == null || !name.isEmpty(), "Name cannot be empty."); this.name = name; http://git-wip-us.apache.org/repos/asf/ignite/blob/b3bcf4ae/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java index 695db38..0dd0307 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/igfs/IgfsImpl.java @@ -472,8 +472,7 @@ public final class IgfsImpl implements IgfsEx { @SuppressWarnings("ConstantConditions") @Override public IgfsStatus globalSpace() { return safeOp(new Callable() { -@Override -public IgfsStatus call() throws Exception { +@Override public IgfsStatus call() throws Exception { IgniteBiTuple space = igfsCtx.kernalContext().grid().compute().execute( new IgfsGlobalSpaceTask(name()), null); @@ -560,7 +559,7 @@ public final class IgfsImpl implements IgfsEx { } /** {@inheritDoc} */ -@Override public IgfsFile info(final IgfsPath path) { +@Override @Nullable public IgfsFile info(final IgfsPath path) { A.notNull(path, "path"); return safeOp(new Callable() { @@ -692,64 +691,12 @@ public final class IgfsImpl implements IgfsEx { return null; } -IgfsPath destParent = dest.parent(); +IgfsFileInfo info = meta.move(src, dest); -// Resolve source file info. -FileDescriptor srcDesc = getFileDescriptor(src
[23/50] ignite git commit: IGNITE-1522 - Made cache entry listener configurations transient in cache configuration
IGNITE-1522 - Made cache entry listener configurations transient in cache configuration Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e51fb420 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e51fb420 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e51fb420 Branch: refs/heads/ignite-257 Commit: e51fb420d1284465c7cbe55a28c2374ddf67d495 Parents: 621eb0f Author: Valentin Kulichenko Authored: Mon Sep 21 23:29:20 2015 -0700 Committer: Valentin Kulichenko Committed: Mon Sep 21 23:29:20 2015 -0700 -- .../configuration/CacheConfiguration.java | 15 + .../IgniteCacheEntryListenerAbstractTest.java | 65 +++- 2 files changed, 79 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/e51fb420/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java index 7d1e14d..44a3fa9 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java @@ -19,6 +19,7 @@ package org.apache.ignite.configuration; import java.io.Serializable; import java.util.Collection; +import java.util.HashSet; import javax.cache.Cache; import javax.cache.configuration.CompleteConfiguration; import javax.cache.configuration.Factory; @@ -1799,6 +1800,20 @@ public class CacheConfiguration extends MutableConfiguration { return this; } +/** + * Creates a copy of current configuration and removes all cache entry listeners. + * They are executed only locally and should never be sent to remote nodes. + * + * @return Configuration object that will be serialized. + */ +protected Object writeReplace() { +CacheConfiguration cfg = new CacheConfiguration<>(this); + +cfg.listenerConfigurations = new HashSet<>(); + +return cfg; +} + /** {@inheritDoc} */ @Override public String toString() { return S.toString(CacheConfiguration.class, this); http://git-wip-us.apache.org/repos/asf/ignite/blob/e51fb420/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 78a6700..3fdd7fc 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 @@ -17,6 +17,10 @@ package org.apache.ignite.internal.processors.cache; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -32,11 +36,13 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicBoolean; import javax.cache.configuration.CacheEntryListenerConfiguration; import javax.cache.configuration.Factory; +import javax.cache.configuration.FactoryBuilder; import javax.cache.configuration.MutableCacheEntryListenerConfiguration; import javax.cache.event.CacheEntryCreatedListener; import javax.cache.event.CacheEntryEvent; import javax.cache.event.CacheEntryExpiredListener; import javax.cache.event.CacheEntryListener; +import javax.cache.event.CacheEntryListenerException; import javax.cache.event.CacheEntryRemovedListener; import javax.cache.event.CacheEntryUpdatedListener; import javax.cache.event.EventType; @@ -358,6 +364,34 @@ public abstract class IgniteCacheEntryListenerAbstractTest extends IgniteCacheAb } /** + * @throws Exception If failed. + */ +public void testSerialization() throws Exception { +if (cacheMode() == LOCAL) +return; + +AtomicBoolean serialized = new AtomicBoolean(); + +NonSerializableListener lsnr = new NonSerializableListener(serialized); + +jcache(0).registerCacheEntryListener(new MutableCacheEntryListenerConfiguration<>( +FactoryBuilder.factoryOf(lsnr), +null, +true, +false +)); + +try { +startGrid(gridCount()); +} +fi
[21/50] ignite git commit: IGNITE-535 Merge MQTT Streamer into master.
IGNITE-535 Merge MQTT Streamer into master. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/88acd318 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/88acd318 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/88acd318 Branch: refs/heads/ignite-257 Commit: 88acd318b84ce3bff8c061bb34718e0e5f7127fb Parents: 421a523 296dd6e Author: Raul Kripalani Authored: Mon Sep 21 17:26:04 2015 +0100 Committer: Raul Kripalani Committed: Mon Sep 21 17:26:04 2015 +0100 -- modules/mqtt/pom.xml| 114 .../apache/ignite/stream/mqtt/MqttStreamer.java | 611 +++ .../stream/mqtt/IgniteMqttStreamerTest.java | 553 + .../mqtt/IgniteMqttStreamerTestSuite.java | 34 ++ pom.xml | 1 + 5 files changed, 1313 insertions(+) --
[47/50] ignite git commit: ignite-1540 Handle error in GridDhtAtomicUpdateFuture.onDone
ignite-1540 Handle error in GridDhtAtomicUpdateFuture.onDone Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1056a31f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1056a31f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1056a31f Branch: refs/heads/ignite-257 Commit: 1056a31fc72ea25c8790e37f2621f3d6e1908c89 Parents: ece3400 Author: sboikov Authored: Thu Sep 24 15:52:17 2015 +0300 Committer: sboikov Committed: Thu Sep 24 15:52:17 2015 +0300 -- .../cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java | 5 + 1 file changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/1056a31f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java index 0cbad48..35b8e27 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java @@ -311,6 +311,11 @@ public class GridDhtAtomicUpdateFuture extends GridFutureAdapter if (super.onDone(res, err)) { cctx.mvcc().removeAtomicFuture(version()); +if (err != null) { +for (KeyCacheObject key : keys) +updateRes.addFailedKey(key, err); +} + if (updateReq.writeSynchronizationMode() == FULL_SYNC) completionCb.apply(updateReq, updateRes);
[40/50] ignite git commit: Added test.
Added test. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4b0c029c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4b0c029c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4b0c029c Branch: refs/heads/ignite-257 Commit: 4b0c029cef4b351f0d389a171c30b7dcf8c1ca22 Parents: b56b15c Author: sboikov Authored: Thu Sep 24 12:19:28 2015 +0300 Committer: sboikov Committed: Thu Sep 24 12:19:28 2015 +0300 -- .../near/NearCacheMultithreadedUpdateTest.java | 217 +++ 1 file changed, 217 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/4b0c029c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java new file mode 100644 index 000..9d92724 --- /dev/null +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/NearCacheMultithreadedUpdateTest.java @@ -0,0 +1,217 @@ +/* + * 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.distributed.near; + +import java.util.concurrent.Callable; +import java.util.concurrent.atomic.AtomicBoolean; +import java.util.concurrent.atomic.AtomicInteger; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCache; +import org.apache.ignite.cache.CacheAtomicityMode; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.configuration.NearCacheConfiguration; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; + +import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; +import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; +import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; + +/** + * + */ +public class NearCacheMultithreadedUpdateTest extends GridCommonAbstractTest { +/** */ +private static TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + +/** */ +private boolean client; + +/** */ +private final int SRV_CNT = 3; + +/** {@inheritDoc} */ +@Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { +IgniteConfiguration cfg = super.getConfiguration(gridName); + +((TcpDiscoverySpi)cfg.getDiscoverySpi()).setIpFinder(ipFinder); + +cfg.setClientMode(client); + +return cfg; +} + +/** {@inheritDoc} */ +@Override protected void beforeTestsStarted() throws Exception { +super.beforeTestsStarted(); + +startGridsMultiThreaded(SRV_CNT); + +client = true; + +startGrid(SRV_CNT); + +client = false; +} + +/** {@inheritDoc} */ +@Override protected void afterTestsStopped() throws Exception { +super.afterTestsStopped(); + +stopAllGrids(); +} + +/** + * @throws Exception If failed. + */ +public void testUpdateMultithreadedTx() throws Exception { +updateMultithreaded(TRANSACTIONAL, false); +} + +/** + * @throws Exception If failed. + */ +public void testUpdateMultithreadedTxRestart() throws Exception { +updateMultithreaded(TRANSACTIONAL, true); +} + +/** + * @throws Exception If failed. + */ +public void testUpdateMultithreadedAtomic() throws
[50/50] ignite git commit: IGNITE-257 - Merge from master.
IGNITE-257 - Merge from master. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/69f6f9b5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/69f6f9b5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/69f6f9b5 Branch: refs/heads/ignite-257 Commit: 69f6f9b511a5e11221ee86de083dea30eaa586c1 Parents: dce5792 bf7591b Author: Alexey Goncharuk Authored: Thu Sep 24 16:11:09 2015 -0700 Committer: Alexey Goncharuk Committed: Thu Sep 24 16:11:09 2015 -0700 -- RELEASE_NOTES.txt | 2 +- examples/config/filesystem/README.txt | 2 +- examples/config/filesystem/example-igfs.xml | 7 - examples/pom.xml| 2 +- examples/schema-import/pom.xml | 10 +- .../socket/WordsSocketStreamerServer.java | 5 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml| 2 +- .../org/apache/ignite/IgniteAtomicLong.java | 17 +- .../apache/ignite/IgniteAtomicReference.java| 9 +- .../org/apache/ignite/IgniteAtomicSequence.java | 9 +- .../org/apache/ignite/IgniteAtomicStamped.java | 13 +- .../org/apache/ignite/IgniteFileSystem.java | 2 +- .../apache/ignite/cache/CacheAtomicityMode.java | 17 +- .../configuration/CacheConfiguration.java | 17 +- .../configuration/NearCacheConfiguration.java | 18 +- .../ignite/configuration/TopologyValidator.java | 38 +- .../ignite/internal/GridKernalContext.java | 7 +- .../ignite/internal/GridKernalContextImpl.java | 10 +- .../apache/ignite/internal/GridLoggerProxy.java | 6 +- .../apache/ignite/internal/IgniteKernal.java| 17 +- .../internal/executor/GridExecutorService.java | 4 +- .../deployment/GridDeploymentStoreAdapter.java | 4 +- .../internal/portable/api/IgnitePortables.java | 2 +- .../processors/cache/CacheMetricsImpl.java | 2 +- .../cache/DynamicCacheDescriptor.java | 10 +- .../processors/cache/GridCacheAdapter.java | 33 +- .../cache/GridCacheClearAllRunnable.java| 4 +- .../processors/cache/GridCacheContext.java | 6 +- .../processors/cache/GridCacheEntryEx.java | 13 + .../cache/GridCacheEvictionManager.java | 24 +- .../cache/GridCacheEvictionResponse.java| 2 +- .../processors/cache/GridCacheIoManager.java| 47 +- .../processors/cache/GridCacheLogger.java | 4 +- .../processors/cache/GridCacheMapEntry.java | 103 +++- .../processors/cache/GridCacheMessage.java | 7 + .../processors/cache/GridCacheMvccManager.java | 34 +- .../GridCachePartitionExchangeManager.java | 47 +- .../processors/cache/GridCacheProcessor.java| 85 ++- .../cache/GridCacheSharedContext.java | 4 +- .../cache/GridCacheSwapEntryImpl.java | 55 +- .../processors/cache/GridCacheSwapManager.java | 272 +++-- .../processors/cache/GridCacheUtils.java| 21 +- .../processors/cache/IgniteCacheProxy.java | 4 +- .../GridDistributedLockResponse.java| 6 +- .../GridDistributedTxPrepareResponse.java | 6 +- .../GridDistributedTxRemoteAdapter.java | 8 +- .../dht/GridClientPartitionTopology.java| 104 ++-- .../distributed/dht/GridDhtLocalPartition.java | 32 +- .../dht/GridDhtPartitionTopology.java | 4 +- .../dht/GridDhtPartitionTopologyImpl.java | 16 +- .../distributed/dht/GridDhtTopologyFuture.java | 6 +- .../dht/GridDhtTransactionalCacheAdapter.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 7 +- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 12 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 16 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 2 + .../atomic/GridNearAtomicUpdateResponse.java| 11 +- .../colocated/GridDhtColocatedLockFuture.java | 44 +- .../dht/preloader/GridDhtForceKeysFuture.java | 2 +- .../dht/preloader/GridDhtForceKeysResponse.java | 6 +- .../GridDhtPartitionsExchangeFuture.java| 19 +- .../distributed/near/GridNearGetResponse.java | 6 +- .../distributed/near/GridNearLockFuture.java| 26 +- .../near/GridNearOptimisticTxPrepareFuture.java | 23 +- .../near/GridNearTxFinishFuture.java| 50 +- .../near/GridNearTxFinishResponse.java | 6 +- .../query/GridCacheDistributedQueryFuture.java | 27 +- .../cache/query/GridCacheLocalQueryFuture.java | 5 + .../cache/query/GridCacheQuery
[35/50] ignite git commit: Fixed test.
Fixed test. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/517d0f58 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/517d0f58 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/517d0f58 Branch: refs/heads/ignite-257 Commit: 517d0f584f67e9291b7f6f2efe3f42b7131f6a25 Parents: 04f4f54 Author: sboikov Authored: Wed Sep 23 15:43:13 2015 +0300 Committer: sboikov Committed: Wed Sep 23 15:43:13 2015 +0300 -- .../processors/cache/GridCacheAbstractRemoveFailureTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/517d0f58/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java index 647746e..a3d9948 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractRemoveFailureTest.java @@ -365,13 +365,13 @@ public abstract class GridCacheAbstractRemoveFailureTest extends GridCommonAbstr U.sleep(random(START_DELAY.get1(), START_DELAY.get2())); -if (stop.get()) -return; - log.info("Restarting node " + idx); startGrid(idx); +if (stop.get()) +return; + U.sleep(1000); }
[08/50] ignite git commit: Fixed yardstick config.
Fixed yardstick config. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4c101dc2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4c101dc2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4c101dc2 Branch: refs/heads/ignite-257 Commit: 4c101dc23be2365c6983381cac9dbe68873040d8 Parents: 3676cbe Author: sboikov Authored: Fri Sep 18 14:11:07 2015 +0300 Committer: sboikov Committed: Fri Sep 18 14:11:07 2015 +0300 -- modules/yardstick/config/ignite-base-config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/4c101dc2/modules/yardstick/config/ignite-base-config.xml -- diff --git a/modules/yardstick/config/ignite-base-config.xml b/modules/yardstick/config/ignite-base-config.xml index 6e94b3c..c77cc9a 100644 --- a/modules/yardstick/config/ignite-base-config.xml +++ b/modules/yardstick/config/ignite-base-config.xml @@ -25,7 +25,7 @@ xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd";> - +
[38/50] ignite git commit: IGNITE-1536 - Removed duplicated continuous query notifications in REPLICATED cache
IGNITE-1536 - Removed duplicated continuous query notifications in REPLICATED cache Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7db44f11 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7db44f11 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7db44f11 Branch: refs/heads/ignite-257 Commit: 7db44f11f7925b5a29a0a3e017baa93b52fb2982 Parents: 70a8a92 Author: Valentin Kulichenko Authored: Wed Sep 23 18:53:06 2015 -0700 Committer: Valentin Kulichenko Committed: Wed Sep 23 18:53:06 2015 -0700 -- .../processors/cache/IgniteCacheProxy.java | 4 +- .../continuous/CacheContinuousQueryManager.java | 58 +++-- .../continuous/GridContinuousProcessor.java | 3 +- ...ontinuousQueryReplicatedOneNodeSelfTest.java | 120 +++ .../IgniteCacheQuerySelfTestSuite.java | 4 +- 5 files changed, 144 insertions(+), 45 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/7db44f11/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 cc6c19a..ae96f23 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 @@ -556,7 +556,7 @@ public class IgniteCacheProxy extends AsyncSupportAdapter> cur = qry.getInitialQuery() != null ? query(qry.getInitialQuery()) : null; @@ -1896,4 +1896,4 @@ public class IgniteCacheProxy extends AsyncSupportAdapterhttp://git-wip-us.apache.org/repos/asf/ignite/blob/7db44f11/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java index c719f1e..6a151a5 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java @@ -43,10 +43,9 @@ import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.IgniteException; import org.apache.ignite.IgniteLogger; import org.apache.ignite.cache.CacheEntryEventSerializableFilter; +import org.apache.ignite.cache.CacheMode; import org.apache.ignite.cache.query.ContinuousQuery; -import org.apache.ignite.cluster.ClusterGroup; import org.apache.ignite.cluster.ClusterNode; -import org.apache.ignite.cluster.ClusterTopologyException; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.processors.cache.CacheObject; import org.apache.ignite.internal.processors.cache.GridCacheEntryEx; @@ -55,6 +54,7 @@ import org.apache.ignite.internal.processors.cache.KeyCacheObject; import org.apache.ignite.internal.processors.continuous.GridContinuousHandler; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.plugin.security.SecurityPermission; import org.apache.ignite.resources.LoggerResource; import org.jsr166.ConcurrentHashMap8; @@ -271,7 +271,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { * @param bufSize Buffer size. * @param timeInterval Time interval. * @param autoUnsubscribe Auto unsubscribe flag. - * @param grp Cluster group. + * @param loc Local flag. * @return Continuous routine ID. * @throws IgniteCheckedException In case of error. */ @@ -280,7 +280,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { int bufSize, long timeInterval, boolean autoUnsubscribe, -ClusterGroup grp) throws IgniteCheckedException +boolean loc) throws IgniteCheckedException { return executeQuery0( locLsnr, @@ -293,7 +293,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { true, false, true, -grp); +loc); } /** @@ -321,7 +321,7 @@ public class CacheContinuousQueryManager exten
[18/50] ignite git commit: IGNITE-1370 Refactor StreamTupleExtractor API for 0..1 and 0..n extraction.
IGNITE-1370 Refactor StreamTupleExtractor API for 0..1 and 0..n extraction. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/421a5234 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/421a5234 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/421a5234 Branch: refs/heads/ignite-257 Commit: 421a5234b5a7e56e36952a4c1976b3118310073e Parents: eae4df1 b80b171 Author: Raul Kripalani Authored: Mon Sep 21 16:28:12 2015 +0100 Committer: Raul Kripalani Committed: Mon Sep 21 16:28:12 2015 +0100 -- .../socket/WordsSocketStreamerServer.java | 5 +- .../org/apache/ignite/stream/StreamAdapter.java | 104 +++-- .../stream/StreamMultipleTupleExtractor.java| 38 +++ .../stream/StreamSingleTupleExtractor.java | 40 +++ .../ignite/stream/StreamTupleExtractor.java | 20 ++-- .../ignite/stream/socket/SocketStreamer.java| 3 +- .../stream/socket/SocketStreamerSelfTest.java | 112 ++- 7 files changed, 270 insertions(+), 52 deletions(-) --
[33/50] ignite git commit: ignite-1524 Fixed processing of ClientReconnectMessage
ignite-1524 Fixed processing of ClientReconnectMessage Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/04f4f54a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/04f4f54a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/04f4f54a Branch: refs/heads/ignite-257 Commit: 04f4f54a7ff1d43fa3baf4fa07865a8163796a82 Parents: 1942d75 Author: sboikov Authored: Wed Sep 23 09:31:59 2015 +0300 Committer: sboikov Committed: Wed Sep 23 09:31:59 2015 +0300 -- .../ignite/spi/discovery/tcp/ServerImpl.java| 97 +++- ...lientDiscoverySpiFailureTimeoutSelfTest.java | 33 +-- 2 files changed, 81 insertions(+), 49 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/04f4f54a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java index 4ce46e8..8a205d2 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java @@ -2958,70 +2958,81 @@ class ServerImpl extends TcpDiscoveryImpl { * @param msg Client reconnect message. */ private void processClientReconnectMessage(TcpDiscoveryClientReconnectMessage msg) { +UUID nodeId = msg.creatorNodeId(); + UUID locNodeId = getLocalNodeId(); boolean isLocNodeRouter = locNodeId.equals(msg.routerNodeId()); if (!msg.verified()) { -assert isLocNodeRouter; - -msg.verify(locNodeId); +TcpDiscoveryNode node = ring.node(nodeId); -if (ring.hasRemoteNodes()) { -sendMessageAcrossRing(msg); +assert node == null || node.isClient(); -return; +if (node != null) { +node.clientRouterNodeId(msg.routerNodeId()); +node.aliveCheck(spi.maxMissedClientHbs); } -} - -UUID nodeId = msg.creatorNodeId(); -TcpDiscoveryNode node = ring.node(nodeId); +if (isLocalNodeCoordinator()) { +msg.verify(locNodeId); -assert node == null || node.isClient(); +if (node != null) { +Collection pending = msgHist.messages(msg.lastMessageId(), node); -if (node != null) { -assert node.isClient(); +if (pending != null) { +msg.pendingMessages(pending); +msg.success(true); -node.clientRouterNodeId(msg.routerNodeId()); -node.aliveCheck(spi.maxMissedClientHbs); +if (log.isDebugEnabled()) +log.debug("Accept client reconnect, restored pending messages " + +"[locNodeId=" + locNodeId + ", clientNodeId=" + nodeId + ']'); +} +else { +if (log.isDebugEnabled()) +log.debug("Failing reconnecting client node because failed to restore pending " + +"messages [locNodeId=" + locNodeId + ", clientNodeId=" + nodeId + ']'); -if (isLocalNodeCoordinator()) { -Collection pending = msgHist.messages(msg.lastMessageId(), node); +processNodeFailedMessage(new TcpDiscoveryNodeFailedMessage(locNodeId, +node.id(), node.internalOrder())); +} +} +else if (log.isDebugEnabled()) +log.debug("Reconnecting client node is already failed [nodeId=" + nodeId + ']'); -if (pending != null) { -msg.pendingMessages(pending); -msg.success(true); +if (isLocNodeRouter) { +ClientMessageWorker wrk = clientMsgWorkers.get(nodeId); -if (log.isDebugEnabled()) -log.debug("Accept client reconnect, restored pending messages " + -"[locNodeId=" + locNodeId + ", clientNodeId=" + nodeId + ']'); +if (wrk != null) +wrk.addMessage(msg); +else if (log.isDebugEnabled()) +log.debug("Failed to reconn
[09/50] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4
Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d08ecf11 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d08ecf11 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d08ecf11 Branch: refs/heads/ignite-257 Commit: d08ecf11704b9b4b56ea81f9f03d10311ff9d27c Parents: 4c101dc d64fc9d Author: sboikov Authored: Fri Sep 18 14:11:41 2015 +0300 Committer: sboikov Committed: Fri Sep 18 14:11:41 2015 +0300 -- .../cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[48/50] ignite git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/31c44054 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/31c44054 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/31c44054 Branch: refs/heads/ignite-257 Commit: 31c44054c25e03e95fb4a3e237bfa6bf273c59dd Parents: 1056a31 3c5758b Author: sboikov Authored: Thu Sep 24 15:52:40 2015 +0300 Committer: sboikov Committed: Thu Sep 24 15:52:40 2015 +0300 -- examples/schema-import/pom.xml | 10 -- pom.xml| 1 + 2 files changed, 9 insertions(+), 2 deletions(-) --
[05/50] ignite git commit: Test for ignite-973.
Test for ignite-973. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3676cbe7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3676cbe7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3676cbe7 Branch: refs/heads/ignite-257 Commit: 3676cbe7f5f5f73199487318d6841e50a1f73496 Parents: 585761f Author: sboikov Authored: Thu Sep 17 17:52:24 2015 +0300 Committer: sboikov Committed: Thu Sep 17 17:52:24 2015 +0300 -- .../ignite/testframework/GridTestUtils.java | 14 +- .../cache/CacheIndexStreamerTest.java | 137 +++ 2 files changed, 150 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/3676cbe7/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java index edf7c52..be3f0e4 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java @@ -633,11 +633,23 @@ public final class GridTestUtils { */ @SuppressWarnings("ExternalizableWithoutPublicNoArgConstructor") public static IgniteInternalFuture runAsync(final Callable task) { +return runAsync(task, "async-runner"); +} + +/** + * Runs callable task asyncronously. + * + * @param task Callable. + * @param threadName Thread name. + * @return Future with task result. + */ +@SuppressWarnings("ExternalizableWithoutPublicNoArgConstructor") +public static IgniteInternalFuture runAsync(final Callable task, String threadName) { if (!busyLock.enterBusy()) throw new IllegalStateException("Failed to start new threads (test is being stopped)."); try { -final GridTestSafeThreadFactory thrFactory = new GridTestSafeThreadFactory("async-runner"); +final GridTestSafeThreadFactory thrFactory = new GridTestSafeThreadFactory(threadName); final GridFutureAdapter fut = new GridFutureAdapter() { @Override public boolean cancel() throws IgniteCheckedException { http://git-wip-us.apache.org/repos/asf/ignite/blob/3676cbe7/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexStreamerTest.java -- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexStreamerTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexStreamerTest.java new file mode 100644 index 000..25c3b81 --- /dev/null +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/CacheIndexStreamerTest.java @@ -0,0 +1,137 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.processors.cache; + +import java.util.concurrent.Callable; +import java.util.concurrent.ThreadLocalRandom; +import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.ignite.Ignite; +import org.apache.ignite.IgniteCache; +import org.apache.ignite.IgniteDataStreamer; +import org.apache.ignite.cache.CacheMemoryMode; +import org.apache.ignite.configuration.CacheConfiguration; +import org.apache.ignite.configuration.IgniteConfiguration; +import org.apache.ignite.internal.IgniteInternalFuture; +import org.apache.ignite.internal.util.typedef.internal.U; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; +import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; +import org.apache.ignite.spi.swapspace.file.FileSwapSpaceSpi; +import org.apache.ignite.testframework.GridTestUtils; +import org.apache.ignite.testframework.junits.common.GridC
[19/50] ignite git commit: Merge branch 'master' into feature/ignite-535-mqtt
Merge branch 'master' into feature/ignite-535-mqtt Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f03f3a3b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f03f3a3b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f03f3a3b Branch: refs/heads/ignite-257 Commit: f03f3a3b48fa105f318e9493440671188770f4ef Parents: 53683e2 421a523 Author: Raul Kripalani Authored: Mon Sep 21 16:36:53 2015 +0100 Committer: Raul Kripalani Committed: Mon Sep 21 16:36:53 2015 +0100 -- .../org/apache/ignite/IgniteAtomicLong.java | 15 +- .../apache/ignite/IgniteAtomicReference.java| 9 +- .../org/apache/ignite/IgniteAtomicSequence.java | 9 +- .../org/apache/ignite/IgniteAtomicStamped.java | 13 +- .../configuration/NearCacheConfiguration.java | 18 +- .../apache/ignite/internal/IgniteKernal.java| 7 - .../processors/cache/GridCacheContext.java | 6 +- .../cache/GridCacheEvictionManager.java | 6 +- .../cache/GridCacheEvictionResponse.java| 2 +- .../processors/cache/GridCacheIoManager.java| 47 ++-- .../processors/cache/GridCacheMessage.java | 7 + .../processors/cache/GridCacheMvccManager.java | 34 ++- .../GridCachePartitionExchangeManager.java | 41 +++- .../processors/cache/GridCacheProcessor.java| 28 ++- .../GridDistributedLockResponse.java| 6 +- .../GridDistributedTxPrepareResponse.java | 6 +- .../distributed/dht/GridDhtLocalPartition.java | 26 +- .../distributed/dht/GridDhtTopologyFuture.java | 6 +- .../dht/GridDhtTransactionalCacheAdapter.java | 2 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 2 +- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 12 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 16 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 2 + .../atomic/GridNearAtomicUpdateResponse.java| 11 +- .../colocated/GridDhtColocatedLockFuture.java | 44 +++- .../dht/preloader/GridDhtForceKeysFuture.java | 2 +- .../dht/preloader/GridDhtForceKeysResponse.java | 6 +- .../GridDhtPartitionsExchangeFuture.java| 19 +- .../distributed/near/GridNearGetResponse.java | 6 +- .../distributed/near/GridNearLockFuture.java| 26 +- .../near/GridNearOptimisticTxPrepareFuture.java | 20 +- .../near/GridNearTxFinishResponse.java | 6 +- .../query/GridCacheDistributedQueryFuture.java | 27 +- .../cache/query/GridCacheLocalQueryFuture.java | 5 + .../cache/query/GridCacheQueryAdapter.java | 170 - .../query/GridCacheQueryFutureAdapter.java | 11 +- .../cache/query/GridCacheQueryManager.java | 30 ++- .../cache/query/GridCacheQueryResponse.java | 6 +- .../continuous/CacheContinuousQueryHandler.java | 12 +- .../transactions/IgniteTxLocalAdapter.java | 4 +- .../ignite/internal/util/GridSpinBusyLock.java | 10 + .../ignite/spi/discovery/tcp/ServerImpl.java| 12 +- .../IgniteCacheEntryProcessorNodeJoinTest.java | 24 +- .../distributed/CacheAffEarlySelfTest.java | 245 +++ .../GridCacheSwapScanQueryAbstractSelfTest.java | 118 - .../processors/igfs/IgfsAbstractSelfTest.java | 5 +- .../loadtests/hashmap/GridCacheTestContext.java | 4 +- .../ignite/testframework/GridTestUtils.java | 14 +- .../cache/CacheIndexStreamerTest.java | 137 +++ ...CacheScanPartitionQueryFallbackSelfTest.java | 244 +- .../IgniteCacheQueryNodeRestartSelfTest2.java | 2 - .../Apache.Ignite.Core/Impl/IgniteManager.cs| 2 - .../ignite/visor/commands/VisorConsole.scala| 37 ++- .../config/benchmark-put-indexed-val.properties | 2 +- modules/yardstick/config/ignite-base-config.xml | 2 +- .../yardstick/IgniteBenchmarkArguments.java | 24 +- .../org/apache/ignite/yardstick/IgniteNode.java | 12 +- 57 files changed, 1084 insertions(+), 535 deletions(-) --
[03/50] ignite git commit: ignite-1.4 Fixed Visor cmd options.
ignite-1.4 Fixed Visor cmd options. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b8c0b308 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b8c0b308 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b8c0b308 Branch: refs/heads/ignite-257 Commit: b8c0b308a7f02f0495315e280936f6bacd170e44 Parents: 5cfb6e6 Author: Alexey Kuznetsov Authored: Thu Sep 17 17:17:05 2015 +0700 Committer: Alexey Kuznetsov Committed: Thu Sep 17 17:17:05 2015 +0700 -- .../scala/org/apache/ignite/visor/commands/VisorConsole.scala | 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/b8c0b308/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala -- diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala index 2abe8a7..6d91b05 100644 --- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala +++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/VisorConsole.scala @@ -105,6 +105,12 @@ class VisorConsole { val batchCommand = argValue("e", argLst) cfgFile.foreach(cfg => { +if (cfg.trim.isEmpty) { +visor.warn("Expected path to configuration after \"-cfg\" option.") + +visor.quit() +} + if (batchFile.isDefined || batchCommand.isDefined) { visor.warn("Options can't contains both -cfg and one of -b or -e options.")
[41/50] ignite git commit: Fixed test.
Fixed test. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f6ba3c3b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f6ba3c3b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f6ba3c3b Branch: refs/heads/ignite-257 Commit: f6ba3c3b4575c60f94ae4742b5d2d7bd2183f938 Parents: 4b0c029 Author: sboikov Authored: Thu Sep 24 12:56:19 2015 +0300 Committer: sboikov Committed: Thu Sep 24 12:56:19 2015 +0300 -- .../processors/cache/GridCacheVariableTopologySelfTest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/f6ba3c3b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java index 7078843..80103c3 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheVariableTopologySelfTest.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.processors.cache; import java.util.Random; import java.util.concurrent.atomic.AtomicBoolean; +import javax.cache.CacheException; import org.apache.ignite.IgniteCache; import org.apache.ignite.IgniteException; import org.apache.ignite.cache.CacheWriteSynchronizationMode; @@ -146,7 +147,7 @@ public class GridCacheVariableTopologySelfTest extends GridCommonAbstractTest { catch (TransactionRollbackException | ClusterTopologyException e) { info("Caught exception: " + e); } -catch (IgniteException e) { +catch (CacheException | IgniteException e) { if (X.hasCause(e, ClusterTopologyCheckedException.class)) info("Caught cache exception: " + e); else
[36/50] ignite git commit: Merging IGNITE-1171 - fixed problems with custom events in discovery
Merging IGNITE-1171 - fixed problems with custom events in discovery Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6f3ef6a8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6f3ef6a8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6f3ef6a8 Branch: refs/heads/ignite-257 Commit: 6f3ef6a84ee1c3e77d32ca9930835d1720918e20 Parents: 517d0f5 Author: Yakov Zhdanov Authored: Wed Sep 23 16:36:15 2015 +0300 Committer: Yakov Zhdanov Committed: Wed Sep 23 16:36:15 2015 +0300 -- .../org/apache/ignite/IgniteAtomicLong.java | 2 +- .../cache/DynamicCacheDescriptor.java | 10 +- .../GridCachePartitionExchangeManager.java | 6 + .../processors/cache/GridCacheProcessor.java| 18 +- .../continuous/CacheContinuousQueryManager.java | 10 +- .../communication/tcp/TcpCommunicationSpi.java | 7 +- .../discovery/DiscoverySpiCustomMessage.java| 12 +- .../ignite/spi/discovery/tcp/ServerImpl.java| 301 ++ .../spi/discovery/tcp/TcpDiscoveryImpl.java | 6 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../tcp/internal/TcpDiscoveryNodesRing.java | 94 ++ .../messages/TcpDiscoveryDiscardMessage.java| 15 +- .../TcpDiscoveryNodeAddFinishedMessage.java | 2 +- .../messages/TcpDiscoveryNodeAddedMessage.java | 19 +- .../distributed/CacheAffEarlySelfTest.java | 245 --- .../distributed/CacheAffinityEarlyTest.java | 168 ++ ...GridCacheValueConsistencyAtomicSelfTest.java | 2 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 53 ++-- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 315 ++- .../testsuites/IgniteCacheTestSuite4.java | 2 + 20 files changed, 864 insertions(+), 425 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/6f3ef6a8/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java b/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java index 83e2525..bac1a68 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java @@ -160,4 +160,4 @@ public interface IgniteAtomicLong extends Closeable { * @throws IgniteException If operation failed. */ @Override public void close(); -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/ignite/blob/6f3ef6a8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java index f3c3be9..3cfc34e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/DynamicCacheDescriptor.java @@ -39,9 +39,6 @@ public class DynamicCacheDescriptor { @GridToStringExclude private CacheConfiguration cacheCfg; -/** Cancelled flag. */ -private boolean cancelled; - /** Locally configured flag. */ private boolean locCfg; @@ -156,6 +153,13 @@ public class DynamicCacheDescriptor { } /** + * @return Started flag. + */ +public boolean started() { +return started; +} + +/** * @return Cache configuration. */ public CacheConfiguration cacheConfiguration() { http://git-wip-us.apache.org/repos/asf/ignite/blob/6f3ef6a8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java index 34c571c..eb76233 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java @@ -1435,6 +1435,7 @@ public class GridCachePartitionExchangeManager extends GridCacheSharedMana private static final long serialVersionUID = 0L; /** */ +@GridToStringInclude private AffinityTopologyVersion topVer; /** @@ -1455,5 +1456,10 @@ public class GridC
[26/50] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4
Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a1040872 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a1040872 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a1040872 Branch: refs/heads/ignite-257 Commit: a1040872f37cf4fd1dc20584c68307f420d0d3af Parents: 33fe30d 50f75bd Author: sboikov Authored: Tue Sep 22 12:59:14 2015 +0300 Committer: sboikov Committed: Tue Sep 22 12:59:14 2015 +0300 -- .../apache/ignite/cache/CacheAtomicityMode.java| 17 + .../processors/cache/GridCacheProcessor.java | 2 +- 2 files changed, 6 insertions(+), 13 deletions(-) --
[44/50] ignite git commit: schema-import examples fix (cherry picked from commit b054fdc)
schema-import examples fix (cherry picked from commit b054fdc) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/94f5248b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/94f5248b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/94f5248b Branch: refs/heads/ignite-257 Commit: 94f5248b0e03f04c53f0c264a880803e20de2d3a Parents: 30f5b9e Author: Anton Vinogradov Authored: Thu Sep 24 14:52:09 2015 +0300 Committer: Anton Vinogradov Committed: Thu Sep 24 15:16:20 2015 +0300 -- examples/schema-import/pom.xml | 2 +- pom.xml| 1 + 2 files changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/94f5248b/examples/schema-import/pom.xml -- diff --git a/examples/schema-import/pom.xml b/examples/schema-import/pom.xml index fdbd631..fce6f47 100644 --- a/examples/schema-import/pom.xml +++ b/examples/schema-import/pom.xml @@ -38,7 +38,7 @@ ignite-schema-import-demo -1.0.0-SNAPSHOT +1.3.3-p7-SNAPSHOT http://git-wip-us.apache.org/repos/asf/ignite/blob/94f5248b/pom.xml -- diff --git a/pom.xml b/pom.xml index b47958f..33689a4 100644 --- a/pom.xml +++ b/pom.xml @@ -466,6 +466,7 @@ examples examples +examples/schema-import
[06/50] ignite git commit: minor
minor Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d64fc9d1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d64fc9d1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d64fc9d1 Branch: refs/heads/ignite-257 Commit: d64fc9d105c66c08234d7bdf72046128456620a5 Parents: 3676cbe Author: Yakov Zhdanov Authored: Thu Sep 17 18:03:57 2015 +0300 Committer: Yakov Zhdanov Committed: Thu Sep 17 18:03:57 2015 +0300 -- .../cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/d64fc9d1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java index d9f6840..0cbad48 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java @@ -418,4 +418,4 @@ public class GridDhtAtomicUpdateFuture extends GridFutureAdapter @Override public String toString() { return S.toString(GridDhtAtomicUpdateFuture.class, this); } -} \ No newline at end of file +}
[25/50] ignite git commit: Added test.
Added test. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/33fe30da Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/33fe30da Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/33fe30da Branch: refs/heads/ignite-257 Commit: 33fe30da620e4f08cee959104805f3527b597700 Parents: e51fb42 Author: sboikov Authored: Tue Sep 22 12:55:18 2015 +0300 Committer: sboikov Committed: Tue Sep 22 12:55:18 2015 +0300 -- ...lientDiscoverySpiFailureTimeoutSelfTest.java | 118 ++- .../tcp/TcpClientDiscoverySpiSelfTest.java | 13 +- 2 files changed, 119 insertions(+), 12 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/33fe30da/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureTimeoutSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureTimeoutSelfTest.java b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureTimeoutSelfTest.java index 66275b3..14417c1 100644 --- a/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureTimeoutSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiFailureTimeoutSelfTest.java @@ -21,12 +21,25 @@ import java.io.IOException; import java.io.InputStream; import java.net.Socket; import java.net.SocketTimeoutException; +import java.util.Collections; +import java.util.UUID; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCheckedException; +import org.apache.ignite.events.DiscoveryEvent; +import org.apache.ignite.events.Event; import org.apache.ignite.internal.util.typedef.G; import org.apache.ignite.internal.util.typedef.X; +import org.apache.ignite.lang.IgnitePredicate; +import org.apache.ignite.spi.discovery.tcp.internal.TcpDiscoveryNode; +import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; import org.apache.ignite.spi.discovery.tcp.messages.TcpDiscoveryPingRequest; import org.jetbrains.annotations.Nullable; +import static org.apache.ignite.events.EventType.EVT_NODE_FAILED; + /** * Client-based discovery SPI test with failure detection timeout enabled. */ @@ -60,7 +73,7 @@ public class TcpClientDiscoverySpiFailureTimeoutSelfTest extends TcpClientDiscov /** {@inheritDoc} */ @Override protected TcpDiscoverySpi getDiscoverySpi() { -return useTestSpi ? new TestTcpDiscoverySpi() : super.getDiscoverySpi(); +return useTestSpi ? new TestTcpDiscoverySpi2() : super.getDiscoverySpi(); } /** @@ -117,16 +130,16 @@ public class TcpClientDiscoverySpiFailureTimeoutSelfTest extends TcpClientDiscov private void checkFailureThresholdWorkability() throws Exception { useTestSpi = true; -TestTcpDiscoverySpi firstSpi = null; -TestTcpDiscoverySpi secondSpi = null; +TestTcpDiscoverySpi2 firstSpi = null; +TestTcpDiscoverySpi2 secondSpi = null; try { startServerNodes(2); checkNodes(2, 0); -firstSpi = (TestTcpDiscoverySpi)(G.ignite("server-0").configuration().getDiscoverySpi()); -secondSpi = (TestTcpDiscoverySpi)(G.ignite("server-1").configuration().getDiscoverySpi()); +firstSpi = (TestTcpDiscoverySpi2)(G.ignite("server-0").configuration().getDiscoverySpi()); +secondSpi = (TestTcpDiscoverySpi2)(G.ignite("server-1").configuration().getDiscoverySpi()); assert firstSpi.err == null; @@ -157,9 +170,102 @@ public class TcpClientDiscoverySpiFailureTimeoutSelfTest extends TcpClientDiscov } /** + * Test tries to provoke scenario when client sends reconnect message before router failure detected. + * + * @throws Exception If failed. + */ +public void _testClientReconnectOnCoordinatorRouterFail() throws Exception { +startServerNodes(1); + +Ignite srv = G.ignite("server-0"); + +final TcpDiscoveryNode srvNode = (TcpDiscoveryNode)srv.cluster().localNode(); + +final UUID srvNodeId = srvNode.id(); + +clientIpFinder = new TcpDiscoveryVmIpFinder(); + +clientIpFinder.setAddresses( +Collections.singleton("localhost:" + srvNode.discoveryPort() + ".." + (srvNode.discoveryPort() + 1))); + +failureThreshold = 1000L; +netTimeout = 500L; + +startClientNodes(1); // Client should connect to coordinator. + +failureThreshold = 10_000L; +netTimeout = 5000L; + +for
[12/50] ignite git commit: Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4
Merge remote-tracking branch 'origin/ignite-1.4' into ignite-1.4 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7ccd0b31 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7ccd0b31 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7ccd0b31 Branch: refs/heads/ignite-257 Commit: 7ccd0b315192657f5fb2cde565ae4a12e4764b40 Parents: 909 d08ecf1 Author: vozerov-gridgain Authored: Fri Sep 18 16:56:38 2015 +0300 Committer: vozerov-gridgain Committed: Fri Sep 18 16:56:38 2015 +0300 -- modules/yardstick/config/ignite-base-config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[37/50] ignite git commit: Exposed IgniteKernal.dumpDebugInfo() to MX bean
Exposed IgniteKernal.dumpDebugInfo() to MX bean Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/70a8a92d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/70a8a92d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/70a8a92d Branch: refs/heads/ignite-257 Commit: 70a8a92da3cf39b0ed1cf18effd8fae1478cb2bd Parents: 6f3ef6a Author: Valentin Kulichenko Authored: Wed Sep 23 17:23:31 2015 -0700 Committer: Valentin Kulichenko Committed: Wed Sep 23 17:23:31 2015 -0700 -- .../main/java/org/apache/ignite/internal/IgniteKernal.java | 4 +--- .../src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java | 8 +++- 2 files changed, 8 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/70a8a92d/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index 82db059..60725e4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -3153,9 +3153,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { return ctx.isDaemon() && U.hasAnnotation(comp.getClass(), SkipDaemon.class); } -/** - * - */ +/** {@inheritDoc} */ public void dumpDebugInfo() { U.warn(log, "Dumping debug info for node [id=" + ctx.localNodeId() + ", name=" + ctx.gridName() + http://git-wip-us.apache.org/repos/asf/ignite/blob/70a8a92d/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java index 4755bf2..c30e0e5 100644 --- a/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java +++ b/modules/core/src/main/java/org/apache/ignite/mxbean/IgniteMXBean.java @@ -366,4 +366,10 @@ public interface IgniteMXBean { */ @MXBeanDescription("Prints last suppressed errors.") public void printLastErrors(); -} \ No newline at end of file + +/** + * Dumps debug information for the current node. + */ +@MXBeanDescription("Dumps debug information for the current node.") +public void dumpDebugInfo(); +}
[13/50] ignite git commit: minor (fixed warning messages)
minor (fixed warning messages) Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/84a23008 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/84a23008 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/84a23008 Branch: refs/heads/ignite-257 Commit: 84a230084e9488a4ddb9b52f86ecd6c623baf745 Parents: d64fc9d Author: Yakov Zhdanov Authored: Fri Sep 18 23:15:59 2015 +0300 Committer: Yakov Zhdanov Committed: Fri Sep 18 23:15:59 2015 +0300 -- .../org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/84a23008/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java index 3e50b94..4ce46e8 100644 --- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java @@ -4437,9 +4437,8 @@ class ServerImpl extends TcpDiscoveryImpl { LT.warn(log, null, "Unknown connection detected (is some other software connecting to " + "this Ignite port?" + -(!spi.isSslEnabled() ? " missed SSL configuration?" : "" ) + -") [rmtAddr=" + sock.getRemoteSocketAddress() + -", locAddr=" + sock.getLocalSocketAddress() + ']'); +(!spi.isSslEnabled() ? " missing SSL configuration on remote node?" : "" ) + +") [rmtAddr=" + sock.getInetAddress() + ']', true); return; } @@ -4555,8 +4554,9 @@ class ServerImpl extends TcpDiscoveryImpl { U.error(log, "Caught exception on handshake [err=" + e +", sock=" + sock + ']', e); if (X.hasCause(e, SSLException.class) && spi.isSslEnabled() && !spi.isNodeStopping0()) -LT.warn(log, null, "Failed to initialize connection. Not encrypted data received. " + -"Missed SSL configuration on node? [sock=" + sock + ']'); +LT.warn(log, null, "Failed to initialize connection " + +"(missing SSL configuration on remote node?) " + +"[rmtAddr=" + sock.getInetAddress() + ']', true); else if ((X.hasCause(e, ObjectStreamException.class) || !sock.isClosed()) && !spi.isNodeStopping0()) { if (U.isMacInvalidArgumentError(e)) @@ -5293,4 +5293,4 @@ class ServerImpl extends TcpDiscoveryImpl { this.sock = sock; } } -} \ No newline at end of file +}
[17/50] ignite git commit: IGNITE-535 (WIP) MQTT Streamer.
IGNITE-535 (WIP) MQTT Streamer. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/53683e20 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/53683e20 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/53683e20 Branch: refs/heads/ignite-257 Commit: 53683e20d304dfd96d544f286e8460d3829598d8 Parents: 6b53f1b Author: Raul Kripalani Authored: Mon Sep 21 16:23:28 2015 +0100 Committer: Raul Kripalani Committed: Mon Sep 21 16:23:28 2015 +0100 -- modules/mqtt/pom.xml| 39 +- .../apache/ignite/stream/mqtt/MqttStreamer.java | 336 +++--- .../stream/mqtt/IgniteMqttStreamerTest.java | 435 +++ .../ignite/stream/mqtt/TestTupleExtractors.java | 28 -- 4 files changed, 741 insertions(+), 97 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/53683e20/modules/mqtt/pom.xml -- diff --git a/modules/mqtt/pom.xml b/modules/mqtt/pom.xml index b108180..4b0b46c 100644 --- a/modules/mqtt/pom.xml +++ b/modules/mqtt/pom.xml @@ -37,7 +37,8 @@ 1.0.2 -0.7 +5.11.1 +2.0.0 @@ -54,9 +55,29 @@ -org.eclipse.moquette -moquette-broker -${mosquette.version} +com.github.rholder +guava-retrying +${guava-retryier.version} + + + +org.apache.activemq +activemq-broker +${activemq.version} +test + + + +org.apache.activemq +activemq-kahadb-store +${activemq.version} +test + + + +org.apache.activemq +activemq-mqtt +${activemq.version} test @@ -86,16 +107,6 @@ -bintray -http://dl.bintray.com/andsel/maven/ - -true - - -false - - - Eclipse Paho Repo https://repo.eclipse.org/content/repositories/paho-releases/ http://git-wip-us.apache.org/repos/asf/ignite/blob/53683e20/modules/mqtt/src/main/java/org/apache/ignite/stream/mqtt/MqttStreamer.java -- diff --git a/modules/mqtt/src/main/java/org/apache/ignite/stream/mqtt/MqttStreamer.java b/modules/mqtt/src/main/java/org/apache/ignite/stream/mqtt/MqttStreamer.java index 00a89ab..b86d385 100644 --- a/modules/mqtt/src/main/java/org/apache/ignite/stream/mqtt/MqttStreamer.java +++ b/modules/mqtt/src/main/java/org/apache/ignite/stream/mqtt/MqttStreamer.java @@ -20,6 +20,10 @@ package org.apache.ignite.stream.mqtt; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; import org.apache.ignite.IgniteDataStreamer; import org.apache.ignite.IgniteException; @@ -29,12 +33,19 @@ import org.apache.ignite.stream.StreamAdapter; import org.apache.ignite.stream.StreamMultipleTupleExtractor; import org.apache.ignite.stream.StreamSingleTupleExtractor; +import com.github.rholder.retry.Retryer; +import com.github.rholder.retry.RetryerBuilder; +import com.github.rholder.retry.StopStrategies; +import com.github.rholder.retry.StopStrategy; +import com.github.rholder.retry.WaitStrategies; +import com.github.rholder.retry.WaitStrategy; +import com.google.common.base.Joiner; +import com.google.common.base.Predicate; import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken; import org.eclipse.paho.client.mqttv3.MqttCallback; import org.eclipse.paho.client.mqttv3.MqttClient; import org.eclipse.paho.client.mqttv3.MqttClientPersistence; import org.eclipse.paho.client.mqttv3.MqttConnectOptions; -import org.eclipse.paho.client.mqttv3.MqttException; import org.eclipse.paho.client.mqttv3.MqttMessage; /** @@ -90,8 +101,20 @@ public class MqttStreamer extends StreamAdapter impleme private Integer disconnectForciblyTimeout; +private WaitStrategy retryWaitStrategy = WaitStrategies.fibonacciWait(); + +private StopStrategy retryStopStrategy = StopStrategies.neverStop(); + +private MqttConnectionRetrier connectionRetrier; + private volatile boolean stopped = true; +private volatile boolean connected; + +private String cachedLogPrefix; + +private boolean blockUntilConnected; + /** * Starts streamer. * @@ -109,18 +132,21 @@ public class MqttStreamer extends StreamAdapter impleme // parameter validations A.notNull(getStr
[30/50] ignite git commit: Check for WeakValue in GridH2AbstractKeyValueRow.onUnswap
Check for WeakValue in GridH2AbstractKeyValueRow.onUnswap Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ca2bce00 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ca2bce00 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ca2bce00 Branch: refs/heads/ignite-257 Commit: ca2bce00516142a1204fb9226c938174047e72d6 Parents: 72c3eef Author: sboikov Authored: Tue Sep 22 15:04:27 2015 +0300 Committer: sboikov Committed: Tue Sep 22 15:04:27 2015 +0300 -- .../processors/query/h2/opt/GridH2AbstractKeyValueRow.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/ca2bce00/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java -- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java index c11f541..ca5442a 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java @@ -119,7 +119,9 @@ public abstract class GridH2AbstractKeyValueRow extends GridH2Row { * @throws IgniteCheckedException If failed. */ public synchronized void onUnswap(Object val, boolean beforeRmv) throws IgniteCheckedException { -if (peekValue(VAL_COL) != null) +Value val0 = peekValue(VAL_COL); + +if (val0 != null && !(val0 instanceof WeakValue)) return; setValue(VAL_COL, desc.wrap(val, desc.valueType()));
[15/50] ignite git commit: ignite-1500 Invalid docs in distributed data structures classes
ignite-1500 Invalid docs in distributed data structures classes Signed-off-by: Anton Vinogradov Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1021d4ea Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1021d4ea Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1021d4ea Branch: refs/heads/ignite-257 Commit: 1021d4eaf4b8318786f3ea7e44e5acef2fbb9004 Parents: c28cec1 Author: agura Authored: Fri Sep 18 15:24:46 2015 +0300 Committer: Anton Vinogradov Committed: Mon Sep 21 10:34:35 2015 +0300 -- .../java/org/apache/ignite/IgniteAtomicLong.java | 15 ++- .../org/apache/ignite/IgniteAtomicReference.java | 9 +++-- .../java/org/apache/ignite/IgniteAtomicSequence.java | 9 +++-- .../java/org/apache/ignite/IgniteAtomicStamped.java | 13 + 4 files changed, 17 insertions(+), 29 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/1021d4ea/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java b/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java index 83e2525..77a5830 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteAtomicLong.java @@ -26,29 +26,26 @@ import java.io.Closeable; * Distributed atomic long includes the following main functionality: * * - * Method {@link #get()} synchronously gets current value of atomic long. + * Method {@link #get()} gets current value of atomic long. * * - * Various {@code get..(..)} methods synchronously get current value of atomic long + * Various {@code get..(..)} methods get current value of atomic long * and increase or decrease value of atomic long. * * - * Method {@link #addAndGet(long l)} synchronously sums {@code l} with current value of atomic long + * Method {@link #addAndGet(long l)} sums {@code l} with current value of atomic long * and returns result. * * - * Method {@link #incrementAndGet()} synchronously increases value of atomic long and returns result. + * Method {@link #incrementAndGet()} increases value of atomic long and returns result. * * - * Method {@link #decrementAndGet()} synchronously decreases value of atomic long and returns result. + * Method {@link #decrementAndGet()} decreases value of atomic long and returns result. * * - * Method {@link #getAndSet(long l)} synchronously gets current value of atomic long and sets {@code l} + * Method {@link #getAndSet(long l)} gets current value of atomic long and sets {@code l} * as value of atomic long. * - * - * All previously described methods have asynchronous analogs. - * * * Method {@link #name()} gets name of atomic long. * http://git-wip-us.apache.org/repos/asf/ignite/blob/1021d4ea/modules/core/src/main/java/org/apache/ignite/IgniteAtomicReference.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicReference.java b/modules/core/src/main/java/org/apache/ignite/IgniteAtomicReference.java index a33cf35..a1e6e8e 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicReference.java +++ b/modules/core/src/main/java/org/apache/ignite/IgniteAtomicReference.java @@ -26,17 +26,14 @@ import java.io.Closeable; * Distributed atomic reference includes the following main functionality: * * - * Method {@link #get()} synchronously gets current value of an atomic reference. + * Method {@link #get()} gets current value of an atomic reference. * * - * Method {@link #set(Object)} synchronously and unconditionally sets the value in the an atomic reference. + * Method {@link #set(Object)} unconditionally sets the value in the an atomic reference. * * - * Methods {@code compareAndSet(...)} synchronously and conditionally set the value in the an atomic reference. + * Methods {@code compareAndSet(...)} conditionally set the value in the an atomic reference. * - * - * All previously described methods have asynchronous analogs. - * * * Method {@link #name()} gets name of atomic reference. * http://git-wip-us.apache.org/repos/asf/ignite/blob/1021d4ea/modules/core/src/main/java/org/apache/ignite/IgniteAtomicSequence.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicSequence.java b/modules/core/src/main/java/org/apache/ignite/IgniteAtomicSequence.java index 313aba5..a1e1392 100644 --- a/modules/core/src/main/java/org/apache/ignite/IgniteAtomicSequence.java +++ b/modules/core/src/main/ja
[04/50] ignite git commit: ignite-1452 Cancel cache operations on node stop
ignite-1452 Cancel cache operations on node stop Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/585761f2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/585761f2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/585761f2 Branch: refs/heads/ignite-257 Commit: 585761f28e8b70487eaf2198d6ea39f7232b088d Parents: b8c0b30 Author: sboikov Authored: Thu Sep 17 16:26:02 2015 +0300 Committer: sboikov Committed: Thu Sep 17 16:26:02 2015 +0300 -- .../apache/ignite/internal/IgniteKernal.java| 7 --- .../processors/cache/GridCacheContext.java | 6 +-- .../cache/GridCacheEvictionManager.java | 6 +-- .../cache/GridCacheEvictionResponse.java| 2 +- .../processors/cache/GridCacheIoManager.java| 47 +--- .../processors/cache/GridCacheMessage.java | 7 +++ .../processors/cache/GridCacheMvccManager.java | 34 +++--- .../GridCachePartitionExchangeManager.java | 41 + .../processors/cache/GridCacheProcessor.java| 28 .../GridDistributedLockResponse.java| 6 +-- .../GridDistributedTxPrepareResponse.java | 6 +-- .../distributed/dht/GridDhtTopologyFuture.java | 6 ++- .../dht/GridDhtTransactionalCacheAdapter.java | 2 +- .../dht/atomic/GridDhtAtomicUpdateResponse.java | 12 +++-- .../dht/atomic/GridNearAtomicUpdateFuture.java | 16 --- .../dht/atomic/GridNearAtomicUpdateRequest.java | 2 + .../atomic/GridNearAtomicUpdateResponse.java| 11 ++--- .../colocated/GridDhtColocatedLockFuture.java | 44 ++ .../dht/preloader/GridDhtForceKeysFuture.java | 2 +- .../dht/preloader/GridDhtForceKeysResponse.java | 6 +-- .../GridDhtPartitionsExchangeFuture.java| 19 ++-- .../distributed/near/GridNearGetResponse.java | 6 +-- .../distributed/near/GridNearLockFuture.java| 26 --- .../near/GridNearOptimisticTxPrepareFuture.java | 20 +++-- .../near/GridNearTxFinishResponse.java | 6 +-- .../cache/query/GridCacheQueryResponse.java | 6 +-- .../continuous/CacheContinuousQueryHandler.java | 12 +++-- .../transactions/IgniteTxLocalAdapter.java | 4 +- .../ignite/internal/util/GridSpinBusyLock.java | 10 + .../IgniteCacheEntryProcessorNodeJoinTest.java | 24 +++--- .../loadtests/hashmap/GridCacheTestContext.java | 4 +- .../IgniteCacheQueryNodeRestartSelfTest2.java | 2 - 32 files changed, 292 insertions(+), 138 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/585761f2/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index daf7d23..82db059 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -1806,8 +1806,6 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { notifyLifecycleBeansEx(LifecycleEventType.BEFORE_NODE_STOP); } -GridCacheProcessor cacheProcessor = ctx.cache(); - List comps = ctx.components(); ctx.marshallerContext().onKernalStop(); @@ -1856,11 +1854,6 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { // Note that interrupted flag is cleared. interrupted = true; } -finally { -// Cleanup even on successful acquire. -if (cacheProcessor != null) -cacheProcessor.cancelUserOperations(); -} } if (interrupted) http://git-wip-us.apache.org/repos/asf/ignite/blob/585761f2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java index 86ba3e6..5385dec 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java @@ -283,12 +283,12 @@ public class GridCacheContext implements Externalizable { GridCacheEvictionManager evictMgr, GridCacheQueryManager qryMgr, CacheContinuousQueryManager contQryMgr, -GridCacheAffinityManager affMgr,
[29/50] ignite git commit: ignite-1516 Optimize GridH2AbstractKeyValueRow.getValue
ignite-1516 Optimize GridH2AbstractKeyValueRow.getValue Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/72c3eef2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/72c3eef2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/72c3eef2 Branch: refs/heads/ignite-257 Commit: 72c3eef2aa31df4a68b46a8877809cc0f49c1368 Parents: 39dace4 Author: sboikov Authored: Tue Sep 22 13:51:09 2015 +0300 Committer: sboikov Committed: Tue Sep 22 13:51:09 2015 +0300 -- .../processors/cache/GridCacheAdapter.java | 8 +-- .../processors/cache/GridCacheMapEntry.java | 14 ++--- .../processors/cache/GridCacheProcessor.java| 6 +-- .../cache/GridCacheSwapEntryImpl.java | 31 +-- .../processors/cache/GridCacheSwapManager.java | 56 +--- .../processors/query/h2/IgniteH2Indexing.java | 19 --- .../query/h2/opt/GridH2AbstractKeyValueRow.java | 49 ++--- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 11 +++- .../query/h2/opt/GridH2RowDescriptor.java | 5 ++ .../cache/CacheIndexStreamerTest.java | 33 +--- .../processors/cache/GridCacheSwapSelfTest.java | 4 +- .../IgniteCacheWithIndexingTestSuite.java | 2 + 12 files changed, 158 insertions(+), 80 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/72c3eef2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 1fc94ec..ae987b7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -805,9 +805,7 @@ public abstract class GridCacheAdapter implements IgniteInternalCache implements IgniteInternalCachehttp://git-wip-us.apache.org/repos/asf/ignite/blob/72c3eef2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index 961c792..4bf0aa1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -512,7 +512,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme } } else -e = detached() ? cctx.swap().read(this, true, true, true) : cctx.swap().readAndRemove(this); +e = detached() ? cctx.swap().read(this, true, true, true, false) : cctx.swap().readAndRemove(this); if (log.isDebugEnabled()) log.debug("Read swap entry [swapEntry=" + e + ", cacheEntry=" + this + ']'); @@ -2840,7 +2840,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme } if (offheap || swap) { -GridCacheSwapEntry e = cctx.swap().read(this, false, offheap, swap); +GridCacheSwapEntry e = cctx.swap().read(this, false, offheap, swap, true); return e != null ? e.value() : null; } @@ -3581,14 +3581,8 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme CacheObject val = rawGetOrUnmarshalUnlocked(false); -if (val == null) { -GridCacheSwapEntry swapEntry = cctx.swap().read(key, true, true); - -if (swapEntry == null) -return null; - -return swapEntry.value(); -} +if (val == null) +val = cctx.swap().readValue(key, true, true); return val; } http://git-wip-us.apache.org/repos/asf/ignite/blob/72c3eef2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 9c325aa..e92ea57 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/a
[11/50] ignite git commit: Removed "incubator" paths from IgniteManager.
Removed "incubator" paths from IgniteManager. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9092 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9092 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9092 Branch: refs/heads/ignite-257 Commit: 9092a078d035eeb5ada47be8287901eaff3d Parents: d64fc9d Author: vozerov-gridgain Authored: Fri Sep 18 16:56:18 2015 +0300 Committer: vozerov-gridgain Committed: Fri Sep 18 16:56:18 2015 +0300 -- .../src/main/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs | 2 -- 1 file changed, 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/9092/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs -- diff --git a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs index 0edaeab..8fd8825 100644 --- a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs +++ b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs @@ -351,8 +351,6 @@ namespace Apache.Ignite.Core.Impl { AppendTestClasses(ggHome + "\\examples", cpStr); AppendTestClasses(ggHome + "\\modules", cpStr); -AppendTestClasses(ggHome + "\\..\\incubator-ignite\\examples", cpStr); -AppendTestClasses(ggHome + "\\..\\incubator-ignite\\modules", cpStr); } string ggLibs = ggHome + "\\libs";
[46/50] ignite git commit: Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3c5758ba Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3c5758ba Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3c5758ba Branch: refs/heads/ignite-257 Commit: 3c5758bab14b30b1dad7eb39d1c388e5f6956e0f Parents: dd7d4fa ece3400 Author: Anton Vinogradov Authored: Thu Sep 24 15:17:46 2015 +0300 Committer: Anton Vinogradov Committed: Thu Sep 24 15:17:46 2015 +0300 -- .../socket/WordsSocketStreamerServer.java | 5 +- .../org/apache/ignite/IgniteAtomicLong.java | 2 +- .../org/apache/ignite/IgniteFileSystem.java | 2 +- .../apache/ignite/cache/CacheAtomicityMode.java | 17 +- .../configuration/CacheConfiguration.java | 17 +- .../apache/ignite/internal/IgniteKernal.java| 4 +- .../cache/DynamicCacheDescriptor.java | 10 +- .../processors/cache/GridCacheAdapter.java | 8 +- .../processors/cache/GridCacheMapEntry.java | 51 +- .../GridCachePartitionExchangeManager.java | 6 + .../processors/cache/GridCacheProcessor.java| 28 +- .../cache/GridCacheSwapEntryImpl.java | 31 +- .../processors/cache/GridCacheSwapManager.java | 80 ++- .../processors/cache/IgniteCacheProxy.java | 4 +- .../continuous/CacheContinuousQueryManager.java | 66 +- .../continuous/GridContinuousProcessor.java | 3 +- .../datastreamer/DataStreamerImpl.java | 2 - .../internal/processors/igfs/IgfsImpl.java | 87 +-- .../processors/igfs/IgfsMetaManager.java| 193 +- .../org/apache/ignite/mxbean/IgniteMXBean.java | 8 +- .../communication/tcp/TcpCommunicationSpi.java | 7 +- .../discovery/DiscoverySpiCustomMessage.java| 12 +- .../ignite/spi/discovery/tcp/ServerImpl.java| 410 + .../spi/discovery/tcp/TcpDiscoveryImpl.java | 6 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../tcp/internal/TcpDiscoveryNodesRing.java | 94 +-- .../messages/TcpDiscoveryDiscardMessage.java| 15 +- .../TcpDiscoveryNodeAddFinishedMessage.java | 2 +- .../messages/TcpDiscoveryNodeAddedMessage.java | 19 +- .../org/apache/ignite/stream/StreamAdapter.java | 104 +++- .../stream/StreamMultipleTupleExtractor.java| 38 ++ .../stream/StreamSingleTupleExtractor.java | 40 ++ .../ignite/stream/StreamTupleExtractor.java | 20 +- .../ignite/stream/socket/SocketStreamer.java| 3 +- .../GridCacheAbstractRemoveFailureTest.java | 6 +- .../GridCacheVariableTopologySelfTest.java | 3 +- .../IgniteCacheEntryListenerAbstractTest.java | 65 +- .../distributed/CacheAffEarlySelfTest.java | 245 .../distributed/CacheAffinityEarlyTest.java | 168 + .../IgniteCachePutRetryAbstractSelfTest.java| 33 + ...GridCacheValueConsistencyAtomicSelfTest.java | 2 +- .../near/NearCacheMultithreadedUpdateTest.java | 217 +++ ...ontinuousQueryReplicatedOneNodeSelfTest.java | 120 .../processors/igfs/IgfsAbstractSelfTest.java | 201 -- .../igfs/IgfsClientCacheSelfTest.java | 15 +- .../igfs/IgfsMetaManagerSelfTest.java | 106 ++-- ...lientDiscoverySpiFailureTimeoutSelfTest.java | 139 - .../tcp/TcpClientDiscoverySpiSelfTest.java | 13 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 53 +- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 315 +- .../stream/socket/SocketStreamerSelfTest.java | 112 +++- .../IgniteCacheFailoverTestSuite.java | 4 - .../IgniteCacheFailoverTestSuite3.java | 23 +- .../testsuites/IgniteCacheTestSuite4.java | 2 + .../testsuites/IgniteHadoopTestSuite.java | 19 +- .../processors/query/h2/IgniteH2Indexing.java | 19 +- .../query/h2/opt/GridH2AbstractKeyValueRow.java | 54 +- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 11 +- .../query/h2/opt/GridH2RowDescriptor.java | 5 + .../processors/query/h2/opt/GridH2Table.java| 10 +- .../cache/CacheIndexStreamerTest.java | 37 +- .../processors/cache/GridCacheSwapSelfTest.java | 4 +- .../IgniteCacheQuerySelfTestSuite.java | 4 +- .../IgniteCacheWithIndexingTestSuite.java | 2 + modules/mqtt/pom.xml| 114 .../apache/ignite/stream/mqtt/MqttStreamer.java | 611 +++ .../stream/mqtt/IgniteMqttStreamerTest.java | 553 + .../mqtt/IgniteMqttStreamerTestSuite.java | 34 ++ .../Apache.Ignite.Core/Impl/IgniteManager.cs| 2 - modules/yardstick/config/ignite-base-config.xml | 2 +- pom.xml | 1 + 71 files changed, 3762 insertions(+), 958 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/bl
[16/50] ignite git commit: Merge branch 'ignite-1.4'
Merge branch 'ignite-1.4' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/eae4df1e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/eae4df1e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/eae4df1e Branch: refs/heads/ignite-257 Commit: eae4df1e5207cfa124e25dff5079c1405ae01803 Parents: 1021d4e 8b94494 Author: vozerov-gridgain Authored: Mon Sep 21 17:15:38 2015 +0300 Committer: vozerov-gridgain Committed: Mon Sep 21 17:15:38 2015 +0300 -- .../org/apache/ignite/spi/discovery/tcp/ServerImpl.java | 12 ++-- .../dotnet/Apache.Ignite.Core/Impl/IgniteManager.cs | 2 -- modules/yardstick/config/ignite-base-config.xml | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) --