ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yzhda...@apache.org
Subject [18/43] incubator-ignite git commit: ignite-187 merging sprint to i-187
Date Thu, 05 Mar 2015 18:50:32 GMT
ignite-187 merging sprint to i-187


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

Branch: refs/heads/ignite-143
Commit: 4ba28629f5b682829761134f0897872a8ca414a8
Parents: 40fc67a 11efb91
Author: Yakov Zhdanov <yzhdanov@gridgain.com>
Authored: Mon Mar 2 17:02:25 2015 +0300
Committer: Yakov Zhdanov <yzhdanov@gridgain.com>
Committed: Mon Mar 2 17:02:25 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/GridKernalContext.java      |  10 +-
 .../ignite/internal/GridKernalContextImpl.java  |  14 +-
 .../apache/ignite/internal/IgniteKernal.java    |  25 +-
 .../processors/cache/GridCacheStoreManager.java |  12 +-
 .../GridDistributedCacheAdapter.java            |   2 +
 .../processors/cluster/ClusterProcessor.java    |  46 ++
 .../dataload/IgniteDataLoaderImpl.java          |  29 +-
 .../ignite/internal/visor/cache/VisorCache.java | 190 ++------
 .../cache/VisorCacheAffinityConfiguration.java  |  53 +-
 .../visor/cache/VisorCacheConfiguration.java    | 484 ++++---------------
 .../cache/VisorCacheDefaultConfiguration.java   |  27 +-
 .../cache/VisorCacheEvictionConfiguration.java  |  81 +---
 .../cache/VisorCacheNearConfiguration.java      |  42 +-
 .../cache/VisorCachePreloadConfiguration.java   |  54 +--
 .../cache/VisorCacheStoreConfiguration.java     | 148 +++++-
 .../VisorCacheWriteBehindConfiguration.java     | 137 ------
 .../visor/node/VisorAtomicConfiguration.java    |  27 +-
 .../visor/node/VisorBasicConfiguration.java     | 180 +------
 .../node/VisorCacheQueryConfiguration.java      |  45 +-
 .../node/VisorExecutorServiceConfiguration.java |  54 +--
 .../visor/node/VisorGridConfiguration.java      | 177 +------
 .../visor/node/VisorIgfsConfiguration.java      | 244 ++--------
 .../visor/node/VisorLifecycleConfiguration.java |   9 +-
 .../visor/node/VisorMetricsConfiguration.java   |  29 +-
 .../node/VisorPeerToPeerConfiguration.java      |  28 +-
 .../visor/node/VisorQueryConfiguration.java     |  65 +--
 .../visor/node/VisorRestConfiguration.java      |  80 +--
 .../node/VisorSegmentationConfiguration.java    |  45 +-
 .../visor/node/VisorSpisConfiguration.java      |  92 +---
 .../node/VisorTransactionConfiguration.java     |  62 +--
 .../internal/visor/util/VisorTaskUtils.java     |   4 +-
 .../core/src/test/config/store/jdbc/Ignite.xml  |  63 ++-
 .../IgniteCacheExpiryPolicyAbstractTest.java    |  38 +-
 .../ignite/schema/generator/XmlGenerator.java   |   8 +-
 .../apache/ignite/schema/model/PojoField.java   |  11 +-
 .../apache/ignite/schema/load/model/Ignite.xml  | 133 +++--
 .../commands/cache/VisorCacheCommand.scala      |  25 +-
 .../yardstick/config/ignite-store-config.xml    |  15 +-
 38 files changed, 715 insertions(+), 2073 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba28629/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
index 16e1189,cb9ffa1..322cf96
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
@@@ -510,32 -511,9 +511,39 @@@ public interface GridKernalContext exte
      public IgniteExceptionRegistry exceptionRegistry();
  
      /**
 +     * Get node attribute by name.
 +     *
 +     * @param key Attribute name.
 +     * @return Attribute value.
 +     */
 +    public Object nodeAttribute(String key);
 +
 +    /**
 +     * Check if node has specified attribute.
 +     *
 +     * @param key Attribute name.
 +     * @return {@code true} If node has attribute with specified name.
 +     */
 +    public boolean hasNodeAttribute(String key);
 +
 +    /**
 +     * Add attribute to node attributes.
 +     *
 +     * @param key Attribute name.
 +     * @param val Attribute value.
 +     * @return Previous attribute value associated with attribute name.
 +     */
 +    public Object addNodeAttribute(String key, Object val);
 +
 +    /**
 +     * @return Node attributes.
 +     */
 +    public Map<String, Object> nodeAttributes();
++
++    /**
+      * Gets Cluster processor.
+      *
+      * @return Cluster processor.
+      */
+     public ClusterProcessor cluster();
  }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba28629/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index da082b6,756c16a..64526e9
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
@@@ -857,26 -861,11 +864,31 @@@ public class GridKernalContextImpl impl
      }
  
      /** {@inheritDoc} */
 +    @Override public Object nodeAttribute(String key) {
 +        return attrs.get(key);
 +    }
 +
 +    /** {@inheritDoc} */
 +    @Override public boolean hasNodeAttribute(String key) {
 +        return attrs.containsKey(key);
 +    }
 +
 +    /** {@inheritDoc} */
 +    @Override public Object addNodeAttribute(String key, Object val) {
 +        return attrs.put(key, val);
 +    }
 +
 +    /** {@inheritDoc} */
 +    @Override public Map<String, Object> nodeAttributes() {
 +        return attrs;
 +    }
 +
 +    /** {@inheritDoc} */
+     @Override public ClusterProcessor cluster() {
+         return cluster;
+     }
+ 
+     /** {@inheritDoc} */
      @Override public String toString() {
          return S.toString(GridKernalContextImpl.class, this);
      }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4ba28629/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 92864d5,f46d071..72bfcbd
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@@ -674,9 -675,7 +671,9 @@@ public class IgniteKernal implements Ig
                  igfsExecSvc,
                  restExecSvc);
  
-             fillNodeAttributes();
 -            startProcessor(ctx, new ClusterProcessor(ctx), attrs);
++            startProcessor(new ClusterProcessor(ctx));
 +
-             cluster = new IgniteClusterImpl(ctx);
++            fillNodeAttributes();
  
              U.onGridStart();
  


Mime
View raw message