ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject [1/8] incubator-ignite git commit: IGNITE-298 Review.
Date Fri, 27 Feb 2015 11:24:48 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-339 53141e550 -> 57bdd8a54


 IGNITE-298 Review.


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

Branch: refs/heads/ignite-339
Commit: ea57e07481e3755fe5e0ecc0d33502dd2648e531
Parents: 36e9236
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Fri Feb 20 21:58:06 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Fri Feb 20 21:58:06 2015 +0700

----------------------------------------------------------------------
 .../visor/node/VisorBasicConfiguration.java     | 17 -----------------
 .../commands/cache/VisorCacheCommand.scala      | 20 ++++++++++++++++++++
 .../config/VisorConfigurationCommand.scala      |  2 +-
 3 files changed, 21 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea57e074/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
index 6b9df54..8a79299 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/node/VisorBasicConfiguration.java
@@ -96,9 +96,6 @@ public class VisorBasicConfiguration implements Serializable {
     /** Whether update checker is enabled. */
     private boolean updateNtf;
 
-    /** Security credentials. */
-    private String securityCred;
-
     /**
      * @param ignite Grid.
      * @param c Grid configuration.
@@ -411,20 +408,6 @@ public class VisorBasicConfiguration implements Serializable {
         this.updateNtf = updateNtf;
     }
 
-    /**
-     * @return Security credentials.
-     */
-    @Nullable public String securityCredentialsProvider() {
-        return securityCred;
-    }
-
-    /**
-     * @param securityCred New security credentials.
-     */
-    public void securityCredentialsProvider(@Nullable String securityCred) {
-        this.securityCred = securityCred;
-    }
-
     /** {@inheritDoc} */
     @Override public String toString() {
         return S.toString(VisorBasicConfiguration.class, this);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea57e074/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
index 3c1aa01..fb9cf47 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala
@@ -777,6 +777,7 @@ object VisorCacheCommand {
         val defaultCfg = cfg.defaultConfiguration()
         val storeCfg = cfg.storeConfiguration()
         val writeBehind = cfg.writeBehind()
+        val queryCfg = cfg.queryConfiguration()
 
         val cacheT = VisorTextTable()
 
@@ -786,6 +787,8 @@ object VisorCacheCommand {
         cacheT += ("Atomicity Mode", cfg.atomicityMode)
         cacheT += ("Atomic Sequence Reserve Size", cfg.atomicSequenceReserveSize)
         cacheT += ("Atomic Write Ordering Mode", cfg.atomicWriteOrderMode)
+        cacheT += ("Statistic Enabled", cfg.statisticsEnabled())
+        cacheT += ("Management Enabled", cfg.managementEnabled())
 
         cacheT += ("Time To Live", defaultCfg.timeToLive())
         cacheT += ("Time To Live Eager Flag", cfg.eagerTtl)
@@ -793,6 +796,7 @@ object VisorCacheCommand {
         cacheT += ("Write Synchronization Mode", cfg.writeSynchronizationMode)
         cacheT += ("Swap Enabled", cfg.swapEnabled())
         cacheT += ("Invalidate", cfg.invalidate())
+        cacheT += ("Read Through", cfg.readThrough())
         cacheT += ("Start Size", cfg.startSize())
 
         cacheT += ("Transaction Manager Lookup", cfg.transactionManagerLookupClassName())
@@ -833,12 +837,14 @@ object VisorCacheCommand {
         cacheT += ("Default Query Timeout", defaultCfg.queryTimeout())
         cacheT += ("Query Indexing Enabled", cfg.queryIndexEnabled())
         cacheT += ("Query Iterators Number", cfg.maxQueryIteratorCount())
+        cacheT += ("Metadata type count", cfg.typeMeta().size())
         cacheT += ("Indexing SPI Name", cfg.indexingSpiName())
         cacheT += ("Cache Interceptor", cfg.interceptor())
 
         cacheT += ("Store Enabled", storeCfg.enabled())
         cacheT += ("Store", storeCfg.store())
         cacheT += ("Store Values In Bytes", storeCfg.valueBytes())
+        cacheT += ("Configured JDBC Store", cfg.jdbcStore())
 
         cacheT += ("Off-Heap Size", cfg.offsetHeapMaxMemory())
 
@@ -851,6 +857,20 @@ object VisorCacheCommand {
         cacheT += ("Concurrent Asynchronous Operations Number", cfg.maxConcurrentAsyncOperations())
         cacheT += ("Memory Mode", cfg.memoryMode())
 
+        cacheT += ("Loader Factory Class Name", cfg.loaderFactory())
+        cacheT += ("Writer Factory Class Name", cfg.writerFactory())
+        cacheT += ("Expiry Policy Factory Class Name", cfg.expiryPolicyFactory())
+
+        if (queryCfg != null) {
+            cacheT +=("Query Type Resolver Class Name", queryCfg.typeResolver())
+            cacheT +=("Indexing Primitive Key", queryCfg.indexPrimitiveKey())
+            cacheT +=("Indexing Primitive Value", queryCfg.indexPrimitiveValue())
+            cacheT +=("Fixed Typing", queryCfg.indexFixedTyping())
+            cacheT +=("Escaped Names", queryCfg.escapeAll())
+        }
+        else
+            cacheT += ("Query configuration", queryCfg)
+
         println(title)
 
         cacheT.render()

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ea57e074/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
----------------------------------------------------------------------
diff --git a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
index a27064d..4ebfc8b 100644
--- a/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
+++ b/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/config/VisorConfigurationCommand.scala
@@ -241,7 +241,6 @@ class VisorConfigurationCommand {
             cmnT += ("Quiet mode", bool2Str(cfg.basic().quiet()))
             cmnT += ("Success filename", safe(cfg.basic().successFile(), DFLT))
             cmnT += ("Update notification", bool2Str(cfg.basic().updateNotifier()))
-            cmnT += ("Security credentials", safe(cfg.basic().securityCredentialsProvider(),
DFLT))
             cmnT += ("Include properties", safe(cfg.includeProperties(), DFLT))
 
             cmnT.render()
@@ -279,6 +278,7 @@ class VisorConfigurationCommand {
             spisT += ("Failovers", spisClass(cfg.spis().failoverSpis()))
             spisT += ("Load balancings", spisClass(cfg.spis().loadBalancingSpis()))
             spisT += ("Swap spaces", spiClass(cfg.spis().swapSpaceSpi()))
+            spisT += ("Indexing", spisClass(cfg.spis().indexingSpis()))
 
             spisT.render()
 


Mime
View raw message