ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [6/8] incubator-ignite git commit: # GG-10064: Fixed marshaller bug.
Date Thu, 09 Apr 2015 15:04:08 GMT
# GG-10064: Fixed marshaller bug.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0c1ad007
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0c1ad007
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0c1ad007

Branch: refs/heads/ignite-688
Commit: 0c1ad007f3c76a0e9e356619707aa07ab212ef87
Parents: fd9cdff
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Thu Apr 9 17:09:19 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Thu Apr 9 17:09:19 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/MarshallerContextImpl.java  |  3 +++
 .../continuous/CacheContinuousQueryManager.java | 28 --------------------
 2 files changed, 3 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c1ad007/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
index e6ef192..0952e86 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/MarshallerContextImpl.java
@@ -131,6 +131,9 @@ public class MarshallerContextImpl extends MarshallerContextAdapter {
                 throw new IgniteCheckedException("Failed to read class name from file [id="
+ id +
                     ", file=" + file.getAbsolutePath() + ']', e);
             }
+
+            // Must explicitly put entry to cache to invoke other continuous queries.
+            registerClassName(id, clsName);
         }
 
         return clsName;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0c1ad007/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 0d28120..13d29bf 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
@@ -274,34 +274,6 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter
{
      * @return Continuous routine ID.
      * @throws IgniteCheckedException In case of error.
      */
-    public UUID executeInternalQueryForNonInternalKeys(CacheEntryUpdatedListener<?, ?>
locLsnr,
-        CacheEntryEventSerializableFilter rmtFilter,
-        boolean loc,
-        boolean notifyExisting)
-        throws IgniteCheckedException
-    {
-        return executeQuery0(
-            locLsnr,
-            rmtFilter,
-            ContinuousQuery.DFLT_PAGE_SIZE,
-            ContinuousQuery.DFLT_TIME_INTERVAL,
-            ContinuousQuery.DFLT_AUTO_UNSUBSCRIBE,
-            false,
-            notifyExisting,
-            true,
-            false,
-            true,
-            loc ? cctx.grid().cluster().forLocal() : null);
-    }
-
-    /**
-     * @param locLsnr Local listener.
-     * @param rmtFilter Remote filter.
-     * @param loc Local flag.
-     * @param notifyExisting Notify existing flag.
-     * @return Continuous routine ID.
-     * @throws IgniteCheckedException In case of error.
-     */
     public UUID executeInternalQuery(CacheEntryUpdatedListener<?, ?> locLsnr,
         CacheEntryEventSerializableFilter rmtFilter,
         boolean loc,


Mime
View raw message