Improving platform interfaces.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9a557588 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9a557588 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9a557588 Branch: refs/heads/ignite-1093-2 Commit: 9a5575886d667eae74871262976fd7356b0d355d Parents: 32579d4 Author: vozerov-gridgain <[email protected]> Authored: Tue Sep 1 12:55:49 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Tue Sep 1 12:55:49 2015 +0300 ---------------------------------------------------------------------- .../CacheContinuousQueryFilterEx.java | 31 -------------------- .../continuous/CacheContinuousQueryHandler.java | 5 ++-- .../processors/platform/PlatformContext.java | 4 +-- .../cache/query/PlatformContinuousQuery.java | 6 ++-- .../query/PlatformContinuousQueryFilter.java | 30 +++++++++++++++++++ .../PlatformContinuousQueryRemoteFilter.java | 20 ++++++------- 6 files changed, 48 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/9a557588/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFilterEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFilterEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFilterEx.java deleted file mode 100644 index c17433c..0000000 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFilterEx.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.internal.processors.cache.query.continuous; - - -import org.apache.ignite.cache.CacheEntryEventSerializableFilter; - -/** - * Extended continuous query filter. - */ -public interface CacheContinuousQueryFilterEx<K, V> extends CacheEntryEventSerializableFilter<K, V> { - /** - * Callback for query unregister event. - */ - public void onQueryUnregister(); -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/9a557588/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java index be3cdbd..df6b4b7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java @@ -44,6 +44,7 @@ import org.apache.ignite.internal.processors.cache.GridCacheContext; import org.apache.ignite.internal.processors.cache.GridCacheDeploymentManager; import org.apache.ignite.internal.processors.cache.query.CacheQueryType; import org.apache.ignite.internal.processors.continuous.GridContinuousHandler; +import org.apache.ignite.internal.processors.platform.cache.query.PlatformContinuousQueryFilter; import org.apache.ignite.internal.util.typedef.C1; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.internal.S; @@ -278,8 +279,8 @@ class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler { } @Override public void onUnregister() { - if (rmtFilter instanceof CacheContinuousQueryFilterEx) - ((CacheContinuousQueryFilterEx)rmtFilter).onQueryUnregister(); + if (rmtFilter instanceof PlatformContinuousQueryFilter) + ((PlatformContinuousQueryFilter)rmtFilter).onQueryUnregister(); } @Override public boolean oldValueRequired() { http://git-wip-us.apache.org/repos/asf/ignite/blob/9a557588/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java index 1febf07..218ae6b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/PlatformContext.java @@ -24,10 +24,10 @@ import org.apache.ignite.events.Event; import org.apache.ignite.internal.GridKernalContext; import org.apache.ignite.internal.portable.PortableRawReaderEx; import org.apache.ignite.internal.portable.PortableRawWriterEx; -import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFilterEx; import org.apache.ignite.internal.processors.platform.cache.PlatformCacheEntryFilter; import org.apache.ignite.internal.processors.platform.cache.PlatformCacheEntryProcessor; import org.apache.ignite.internal.processors.platform.cache.query.PlatformContinuousQuery; +import org.apache.ignite.internal.processors.platform.cache.query.PlatformContinuousQueryFilter; import org.apache.ignite.internal.processors.platform.callback.PlatformCallbackGateway; import org.apache.ignite.internal.processors.platform.cluster.PlatformClusterNodeFilter; import org.apache.ignite.internal.processors.platform.compute.PlatformJob; @@ -166,7 +166,7 @@ public interface PlatformContext { * @param filter Native filter. * @return Filter. */ - public CacheContinuousQueryFilterEx createContinuousQueryFilter(Object filter); + public PlatformContinuousQueryFilter createContinuousQueryFilter(Object filter); /** * Create remote message filter. http://git-wip-us.apache.org/repos/asf/ignite/blob/9a557588/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQuery.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQuery.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQuery.java index b7cd3c2..227af89 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQuery.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQuery.java @@ -17,17 +17,17 @@ package org.apache.ignite.internal.processors.platform.cache.query; -import javax.cache.event.CacheEntryUpdatedListener; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.cache.query.Query; import org.apache.ignite.internal.processors.cache.IgniteCacheProxy; -import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFilterEx; import org.apache.ignite.internal.processors.platform.PlatformTarget; +import javax.cache.event.CacheEntryUpdatedListener; + /** * Platform continuous query. */ -public interface PlatformContinuousQuery extends CacheEntryUpdatedListener, CacheContinuousQueryFilterEx { +public interface PlatformContinuousQuery extends CacheEntryUpdatedListener, PlatformContinuousQueryFilter { /** * Start continuous query execution. * http://git-wip-us.apache.org/repos/asf/ignite/blob/9a557588/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryFilter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryFilter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryFilter.java new file mode 100644 index 0000000..61fa137 --- /dev/null +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryFilter.java @@ -0,0 +1,30 @@ +/* + * 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.platform.cache.query; + +import org.apache.ignite.cache.CacheEntryEventSerializableFilter; + +/** + * Platform continuous query filter. + */ +public interface PlatformContinuousQueryFilter extends CacheEntryEventSerializableFilter { + /** + * Callback for query unregister event. + */ + public void onQueryUnregister(); +} http://git-wip-us.apache.org/repos/asf/ignite/blob/9a557588/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryRemoteFilter.java ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryRemoteFilter.java b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryRemoteFilter.java index e89cae9..71aa38c 100644 --- a/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryRemoteFilter.java +++ b/modules/platform/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryRemoteFilter.java @@ -17,17 +17,8 @@ package org.apache.ignite.internal.processors.platform.cache.query; -import java.io.Externalizable; -import java.io.IOException; -import java.io.ObjectInput; -import java.io.ObjectOutput; -import java.util.concurrent.locks.ReadWriteLock; -import java.util.concurrent.locks.ReentrantReadWriteLock; -import javax.cache.event.CacheEntryEvent; -import javax.cache.event.CacheEntryListenerException; import org.apache.ignite.Ignite; import org.apache.ignite.internal.portable.PortableRawWriterEx; -import org.apache.ignite.internal.processors.cache.query.continuous.CacheContinuousQueryFilterEx; import org.apache.ignite.internal.processors.platform.PlatformContext; import org.apache.ignite.internal.processors.platform.memory.PlatformMemory; import org.apache.ignite.internal.processors.platform.memory.PlatformOutputStream; @@ -35,10 +26,19 @@ import org.apache.ignite.internal.processors.platform.utils.PlatformUtils; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.resources.IgniteInstanceResource; +import javax.cache.event.CacheEntryEvent; +import javax.cache.event.CacheEntryListenerException; +import java.io.Externalizable; +import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; +import java.util.concurrent.locks.ReadWriteLock; +import java.util.concurrent.locks.ReentrantReadWriteLock; + /** * Continuous query filter deployed on remote nodes. */ -public class PlatformContinuousQueryRemoteFilter implements CacheContinuousQueryFilterEx, Externalizable { +public class PlatformContinuousQueryRemoteFilter implements PlatformContinuousQueryFilter, Externalizable { /** */ private static final long serialVersionUID = 0L;
