IGNITE-2979: .NET: Implemented ability to use Java filter in .NET-based continuous queries.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e050ac0e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e050ac0e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e050ac0e Branch: refs/heads/ignite-testing-discovery Commit: e050ac0e8ce421e8039a22d4848c3165e7a62842 Parents: 4e34f58 Author: vozerov-gridgain <[email protected]> Authored: Wed Apr 13 18:11:00 2016 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Wed Apr 13 18:11:00 2016 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/internal/binary/BinaryContext.java | 1 + .../platform/cache/query/PlatformContinuousQueryImpl.java | 3 +-- .../ignite/internal/processors/platform/utils/PlatformUtils.java | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e050ac0e/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java index 54cb971..0a1ed11 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java @@ -273,6 +273,7 @@ public class BinaryContext { registerPredefinedType(GridMapEntry.class, 60); registerPredefinedType(IgniteBiTuple.class, 61); registerPredefinedType(T2.class, 62); + registerPredefinedType(PlatformJavaObjectFactoryProxy.class, GridBinaryMarshaller.PLATFORM_JAVA_OBJECT_FACTORY_PROXY); http://git-wip-us.apache.org/repos/asf/ignite/blob/e050ac0e/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryImpl.java index f8244a9..e864029 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/cache/query/PlatformContinuousQueryImpl.java @@ -125,7 +125,6 @@ public class PlatformContinuousQueryImpl implements PlatformContinuousQuery { @SuppressWarnings("unchecked") @Override public void start(IgniteCacheProxy cache, boolean loc, int bufSize, long timeInterval, boolean autoUnsubscribe, Query initialQry) throws IgniteCheckedException { - lock.writeLock().lock(); try { @@ -263,7 +262,7 @@ public class PlatformContinuousQueryImpl implements PlatformContinuousQuery { * @return Filter to be deployed on remote node. * @throws ObjectStreamException If failed. */ - protected Object writeReplace() throws ObjectStreamException { + Object writeReplace() throws ObjectStreamException { if (javaFilter != null) return javaFilter; http://git-wip-us.apache.org/repos/asf/ignite/blob/e050ac0e/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java index 5f43753..37f31ae 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/utils/PlatformUtils.java @@ -47,8 +47,6 @@ import javax.cache.CacheException; import javax.cache.event.CacheEntryEvent; import javax.cache.event.CacheEntryListenerException; import java.lang.reflect.Field; -import java.math.BigDecimal; -import java.security.Timestamp; import java.util.ArrayList; import java.util.Collection; import java.util.List;
