ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [50/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-2.0' into ignite-3477-merge2.0
Date Wed, 15 Feb 2017 10:45:15 GMT
Merge remote-tracking branch 'remotes/origin/ignite-2.0' into ignite-3477-merge2.0


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

Branch: refs/heads/ignite-3477-merge2.0
Commit: faf07d8b7320bcb868eb3b02466d2bb18867cf0d
Parents: 1748e22
Author: sboikov <sboikov@gridgain.com>
Authored: Wed Feb 15 13:42:18 2017 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Wed Feb 15 13:42:18 2017 +0300

----------------------------------------------------------------------
 .../apache/ignite/internal/GridCachePluginContext.java | 13 ++++++++++++-
 .../internal/processors/cache/GridCacheProcessor.java  | 12 +++++++-----
 .../cache/IgniteCacheOffheapManagerImpl.java           |  4 ++--
 .../distributed/dht/GridClientPartitionTopology.java   |  1 +
 .../internal/processors/cluster/ClusterProcessor.java  |  1 -
 .../apache/ignite/plugin/CachePluginConfiguration.java |  7 +++++++
 .../org/apache/ignite/plugin/CachePluginProvider.java  |  3 ++-
 ...ridCacheAtomicInvalidPartitionHandlingSelfTest.java |  9 ++++-----
 modules/web-console/web-agent/bin/ignite-web-agent.bat |  4 +++-
 modules/web-console/web-agent/bin/ignite-web-agent.sh  |  2 ++
 10 files changed, 40 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/faf07d8b/modules/core/src/main/java/org/apache/ignite/internal/GridCachePluginContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridCachePluginContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridCachePluginContext.java
index 8579ba7..552dffa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridCachePluginContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridCachePluginContext.java
@@ -35,12 +35,18 @@ public class GridCachePluginContext<C extends CachePluginConfiguration>
implemen
     /** */
     private final CacheConfiguration igniteCacheCfg;
 
+    /** */
+    private final CachePluginConfiguration cachePluginCfg;
+
     /**
      * @param ctx Kernal context.
+     * @param cachePluginCfg Cache plugin config.
      * @param igniteCacheCfg Ignite config.
      */
-    public GridCachePluginContext(GridKernalContext ctx, CacheConfiguration igniteCacheCfg)
{
+    public GridCachePluginContext(GridKernalContext ctx, CacheConfiguration igniteCacheCfg,
+        CachePluginConfiguration cachePluginCfg) {
         this.ctx = ctx;
+        this.cachePluginCfg = cachePluginCfg;
         this.igniteCacheCfg = igniteCacheCfg;
     }
 
@@ -49,6 +55,11 @@ public class GridCachePluginContext<C extends CachePluginConfiguration>
implemen
     }
 
     /** {@inheritDoc} */
+    @Override public C cacheConfiguration() {
+        return (C)cachePluginCfg;
+    }
+
+    /** {@inheritDoc} */
     @Override public CacheConfiguration igniteCacheConfiguration() {
         return igniteCacheCfg;
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/faf07d8b/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 0456539..d5a7bf6 100644
--- 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
@@ -2085,7 +2085,9 @@ public class GridCacheProcessor extends GridProcessorAdapter {
      */
     private void collectDataOnGridNode(Collection<DynamicCacheChangeRequest> reqs)
{
         for (DynamicCacheDescriptor desc : registeredCaches.values()) {
-            DynamicCacheChangeRequest req = new DynamicCacheChangeRequest(desc.cacheConfiguration().getName(),
null);
+            DynamicCacheChangeRequest req = new DynamicCacheChangeRequest(null,
+                desc.cacheConfiguration().getName(),
+                null);
 
             req.startCacheConfiguration(desc.cacheConfiguration());
 
@@ -2099,7 +2101,9 @@ public class GridCacheProcessor extends GridProcessorAdapter {
         }
 
         for (DynamicCacheDescriptor desc : registeredTemplates.values()) {
-            DynamicCacheChangeRequest req = new DynamicCacheChangeRequest(desc.cacheConfiguration().getName(),
null);
+            DynamicCacheChangeRequest req = new DynamicCacheChangeRequest(null,
+                desc.cacheConfiguration().getName(),
+                null);
 
             req.startCacheConfiguration(desc.cacheConfiguration());
 
@@ -2125,7 +2129,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
             if (desc == null)
                 continue;
 
-            DynamicCacheChangeRequest req = new DynamicCacheChangeRequest(cache.name(), null);
+            DynamicCacheChangeRequest req = new DynamicCacheChangeRequest(null, cache.name(),
null);
 
             req.startCacheConfiguration(desc.cacheConfiguration());
 
@@ -2757,8 +2761,6 @@ public class GridCacheProcessor extends GridProcessorAdapter {
 
         if (CU.isUtilityCache(cacheName))
             req.cacheType(CacheType.UTILITY);
-        else if (CU.isMarshallerCache(cacheName))
-            req.cacheType(CacheType.MARSHALLER);
         else if (internalCaches.contains(cacheName))
             req.cacheType(CacheType.INTERNAL);
         else

http://git-wip-us.apache.org/repos/asf/ignite/blob/faf07d8b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
index 5df99b6..1240264 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
@@ -259,7 +259,7 @@ public class IgniteCacheOffheapManagerImpl extends GridCacheManagerAdapter
imple
 
             for (GridDhtLocalPartition locPart : cctx.topology().currentLocalPartitions())
{
                 if (primary) {
-                    if (cctx.affinity().primary(locNode, locPart.id(), topVer)) {
+                    if (cctx.affinity().primaryByPartition(locNode, locPart.id(), topVer))
{
                         cnt += locPart.size();
 
                         continue;
@@ -267,7 +267,7 @@ public class IgniteCacheOffheapManagerImpl extends GridCacheManagerAdapter
imple
                 }
 
                 if (backup) {
-                    if (cctx.affinity().backup(locNode, locPart.id(), topVer))
+                    if (cctx.affinity().primaryByPartition(locNode, locPart.id(), topVer))
                         cnt += locPart.size();
                 }
             }

http://git-wip-us.apache.org/repos/asf/ignite/blob/faf07d8b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
index 0076b36..ca71f51 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridClientPartitionTopology.java
@@ -38,6 +38,7 @@ import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.Gri
 import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionFullMap;
 import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionMap2;
 import org.apache.ignite.internal.processors.cache.distributed.dht.preloader.GridDhtPartitionsExchangeFuture;
+import org.apache.ignite.internal.util.F0;
 import org.apache.ignite.internal.util.GridAtomicLong;
 import org.apache.ignite.internal.util.tostring.GridToStringExclude;
 import org.apache.ignite.internal.util.typedef.F;

http://git-wip-us.apache.org/repos/asf/ignite/blob/faf07d8b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java
index a32b9d8..fa5c982 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cluster/ClusterProcessor.java
@@ -115,7 +115,6 @@ public class ClusterProcessor extends GridProcessorAdapter {
         dataBag.addNodeSpecificData(CLUSTER_PROC.ordinal(), getDiscoveryData());
     }
 
-
     /**
      * @return Discovery data.
      */

http://git-wip-us.apache.org/repos/asf/ignite/blob/faf07d8b/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginConfiguration.java
index 0c94348..d4331b5 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginConfiguration.java
@@ -25,4 +25,11 @@ import org.apache.ignite.configuration.CacheConfiguration;
  * and extend existing functionality of cache.
  */
 public interface CachePluginConfiguration<K, V> extends Serializable {
+    /**
+     * Creates cache plugin provider.
+     *
+     * @return Cache plugin provider class.
+     * @param ctx Plugin context.
+     */
+    public CachePluginProvider createProvider(CachePluginContext ctx);
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/faf07d8b/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginProvider.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginProvider.java
b/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginProvider.java
index b56e546..86afc1b 100644
--- a/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginProvider.java
+++ b/modules/core/src/main/java/org/apache/ignite/plugin/CachePluginProvider.java
@@ -85,9 +85,10 @@ public interface CachePluginProvider<C extends CachePluginConfiguration>
{
      * Checks that remote caches has configuration compatible with the local.
      *
      * @param locCfg Local configuration.
+     * @param locPluginCcfg Local plugin configuration.
      * @param rmtCfg Remote configuration.
      * @param rmtNode Remote node.
      */
-    public void validateRemote(CacheConfiguration locCfg, CacheConfiguration rmtCfg, ClusterNode
rmtNode)
+    public void validateRemote(CacheConfiguration locCfg, C locPluginCcfg, CacheConfiguration
rmtCfg, ClusterNode rmtNode)
         throws IgniteCheckedException;
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ignite/blob/faf07d8b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
index 04f00c2..fd310c4 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheAtomicInvalidPartitionHandlingSelfTest.java
@@ -387,11 +387,10 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends
GridCommonA
                     try {
                         entry = c.entryEx(k);
 
-                            entry.unswap();
-                        }
-                        catch (GridDhtInvalidPartitionException ignored) {
-                            // Skip key.
-                        }
+                        entry.unswap();
+                    }
+                    catch (GridDhtInvalidPartitionException ignored) {
+                        // Skip key.
                     }
 
                     for (int r = 0; r < 10; r++) {

http://git-wip-us.apache.org/repos/asf/ignite/blob/faf07d8b/modules/web-console/web-agent/bin/ignite-web-agent.bat
----------------------------------------------------------------------
diff --git a/modules/web-console/web-agent/bin/ignite-web-agent.bat b/modules/web-console/web-agent/bin/ignite-web-agent.bat
index 8291b55..1f1b52d 100644
--- a/modules/web-console/web-agent/bin/ignite-web-agent.bat
+++ b/modules/web-console/web-agent/bin/ignite-web-agent.bat
@@ -60,7 +60,9 @@ if %ERRORLEVEL% equ 0 (
     if "%JVM_OPTS%" == "" set JVM_OPTS=-Xms1g -Xmx1g -server -XX:+AggressiveOpts -XX:MaxMetaspaceSize=256m
 )
 
-"%JAVA_HOME%\bin\java.exe" %JVM_OPTS% -cp "*" org.apache.ignite.console.agent.AgentLauncher
 %*
+set JVM_OPTS=%JVM_OPTS% -Djava.net.useSystemProxies=true
+
+"%JAVA_HOME%\bin\java.exe" %JVM_OPTS% -cp "*" org.apache.ignite.console.agent.AgentLauncher
%*
 
 set JAVA_ERRORLEVEL=%ERRORLEVEL%
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/faf07d8b/modules/web-console/web-agent/bin/ignite-web-agent.sh
----------------------------------------------------------------------
diff --git a/modules/web-console/web-agent/bin/ignite-web-agent.sh b/modules/web-console/web-agent/bin/ignite-web-agent.sh
index 2e9f041..c2958fc 100644
--- a/modules/web-console/web-agent/bin/ignite-web-agent.sh
+++ b/modules/web-console/web-agent/bin/ignite-web-agent.sh
@@ -88,4 +88,6 @@ if [ -z "$JVM_OPTS" ] ; then
     fi
 fi
 
+JVM_OPTS="${JVM_OPTS} -Djava.net.useSystemProxies=true"
+
 "$JAVA" ${JVM_OPTS} -cp "*" org.apache.ignite.console.agent.AgentLauncher "$@"


Mime
View raw message