You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2018/08/14 12:02:13 UTC
[05/10] ignite git commit: Merge remote-tracking branch
'apache-ignite/master' into IGNITE-5960
Merge remote-tracking branch 'apache-ignite/master' into IGNITE-5960
Conflicts:
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/454c32fa
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/454c32fa
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/454c32fa
Branch: refs/heads/ignite-5960
Commit: 454c32fa973781ea099b94a87610cc02cceb6f16
Parents: 7dfd51a dc87cda
Author: Sunny Chan <su...@clsa.com>
Authored: Mon Jun 11 11:59:46 2018 +0800
Committer: Sunny Chan <su...@clsa.com>
Committed: Mon Jun 11 11:59:46 2018 +0800
----------------------------------------------------------------------
.../apache/ignite/IgniteSystemProperties.java | 6 +
.../dht/atomic/GridDhtAtomicCache.java | 6 +-
.../persistence/pagemem/PageMemoryImpl.java | 3 +-
.../continuous/CacheContinuousQueryManager.java | 25 +++-
.../odbc/odbc/OdbcRequestHandler.java | 14 +-
.../util/nio/GridNioRecoveryDescriptor.java | 52 ++++++-
.../internal/util/nio/GridNioSessionImpl.java | 5 +
.../util/nio/GridSelectorNioSessionImpl.java | 23 +++
.../communication/tcp/TcpCommunicationSpi.java | 20 ++-
...onnectionConcurrentReserveAndRemoveTest.java | 146 +++++++++++++++++++
.../atomic/IgniteCacheAtomicProtocolTest.java | 4 +
...gniteAbstractStandByClientReconnectTest.java | 28 ++--
...eStandByClientReconnectToNewClusterTest.java | 117 +++++++--------
...ridCacheContinuousQueryAbstractSelfTest.java | 24 +++
.../testsuites/IgniteKernalSelfTestSuite.java | 2 +
modules/platforms/cpp/odbc/src/connection.cpp | 26 +++-
.../list-of-registered-users/column-defs.js | 2 +-
.../list-of-registered-users/style.scss | 11 ++
.../components/web-console-header/style.scss | 13 +-
.../frontend/views/includes/header-right.pug | 6 +-
.../zk/internal/ZookeeperDiscoverySpiTest.java | 8 +-
parent/pom.xml | 4 +-
22 files changed, 448 insertions(+), 97 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/454c32fa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java
index e3c6d3b,5e6af2f..932cfde
--- 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
@@@ -73,7 -62,7 +73,8 @@@ import org.apache.ignite.internal.proce
import org.apache.ignite.internal.processors.cache.distributed.dht.atomic.GridDhtAtomicAbstractUpdateFuture;
import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow;
import org.apache.ignite.internal.processors.continuous.GridContinuousHandler;
+import org.apache.ignite.internal.util.StripedCompositeReadWriteLock;
+ import org.apache.ignite.internal.processors.timeout.GridTimeoutProcessor;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
import org.apache.ignite.internal.util.typedef.CI2;
import org.apache.ignite.internal.util.typedef.F;
@@@ -127,10 -124,29 +128,32 @@@ public class CacheContinuousQueryManage
/** Ordered topic prefix. */
private String topicPrefix;
+
+ /** ReadWriteLock to control setup of listener */
+ private final StripedCompositeReadWriteLock listenerLock = new StripedCompositeReadWriteLock(Runtime.getRuntime().availableProcessors()) ;
+ /** Cancelable future task for backup cleaner */
+ private GridTimeoutProcessor.CancelableTask cancelableTask;
+
+ /** {@inheritDoc} */
+ @Override protected void stop0(boolean cancel, boolean destroy) {
+ if (cancelableTask != null) {
+ cancelableTask.close();
+
+ cancelableTask = null;
+ }
+ }
+
+ /**
+ * USED ONLY FOR TESTING.
+ *
+ * @return Internal cancelable future task for backup cleaner.
+ */
+ /*@java.test.only*/
+ protected GridTimeoutProcessor.CancelableTask getCancelableTask() {
+ return cancelableTask;
+ }
+
/** {@inheritDoc} */
@Override protected void start0() throws IgniteCheckedException {
// Append cache name to the topic.