# Merge sprint-2 into ignite-339
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/555e3f94 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/555e3f94 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/555e3f94 Branch: refs/heads/ignite-141 Commit: 555e3f9455dc82a011943a561c0aa6405cca82bc Parents: 53141e5 4e7463d Author: anovikov <anovi...@gridgain.com> Authored: Fri Feb 27 17:21:33 2015 +0700 Committer: anovikov <anovi...@gridgain.com> Committed: Fri Feb 27 17:21:33 2015 +0700 ---------------------------------------------------------------------- .../visor/node/VisorBasicConfiguration.java | 17 --- .../commands/alert/VisorAlertCommand.scala | 8 +- .../commands/cache/VisorCacheCommand.scala | 95 +++++++------ .../config/VisorConfigurationCommand.scala | 140 ++++++++++--------- .../commands/disco/VisorDiscoveryCommand.scala | 2 +- .../scala/org/apache/ignite/visor/visor.scala | 64 ++++++--- .../commands/tasks/VisorTasksCommandSpec.scala | 2 +- 7 files changed, 178 insertions(+), 150 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/555e3f94/modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala ---------------------------------------------------------------------- diff --cc modules/visor-console/src/main/scala/org/apache/ignite/visor/commands/cache/VisorCacheCommand.scala index 97adeac,5dd19b1..577067a --- 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 @@@ -776,6 -775,8 +775,7 @@@ object VisorCacheCommand val evictCfg = cfg.evictConfiguration() val defaultCfg = cfg.defaultConfiguration() val storeCfg = cfg.storeConfiguration() - val writeBehind = cfg.writeBehind() + val queryCfg = cfg.queryConfiguration() val cacheT = VisorTextTable() @@@ -789,19 -792,21 +791,19 @@@ cacheT += ("Time To Live", defaultCfg.timeToLive()) cacheT += ("Time To Live Eager Flag", cfg.eagerTtl) - cacheT += ("Write Synchronization Mode", cfg.writeSynchronizationMode) - cacheT += ("Swap Enabled", cfg.swapEnabled()) - cacheT += ("Invalidate", cfg.invalidate()) + cacheT += ("Write Synchronization Mode", safe(cfg.writeSynchronizationMode)) + cacheT += ("Swap Enabled", bool2Str(cfg.swapEnabled())) + cacheT += ("Invalidate", bool2Str(cfg.invalidate())) - cacheT += ("Read Through", bool2Str(cfg.readThrough())) - cacheT += ("Write Through", bool2Str(cfg.writeThrough())) cacheT += ("Start Size", cfg.startSize()) - cacheT += ("Transaction Manager Lookup", cfg.transactionManagerLookupClassName()) + cacheT += ("Transaction Manager Lookup", safe(cfg.transactionManagerLookupClassName())) - cacheT += ("Affinity Function", affinityCfg.function()) + cacheT += ("Affinity Function", safe(affinityCfg.function())) cacheT += ("Affinity Backups", affinityCfg.partitionedBackups()) - cacheT += ("Affinity Partitions", affinityCfg.partitions()) - cacheT += ("Affinity Default Replicas", affinityCfg.defaultReplicas()) - cacheT += ("Affinity Exclude Neighbors", affinityCfg.excludeNeighbors()) - cacheT += ("Affinity Mapper", affinityCfg.mapper()) + cacheT += ("Affinity Partitions", safe(affinityCfg.partitions())) + cacheT += ("Affinity Default Replicas", safe(affinityCfg.defaultReplicas())) + cacheT += ("Affinity Exclude Neighbors", safe(affinityCfg.excludeNeighbors())) + cacheT += ("Affinity Mapper", safe(affinityCfg.mapper())) cacheT += ("Preload Mode", preloadCfg.mode()) cacheT += ("Preload Batch Size", preloadCfg.batchSize()) @@@ -830,30 -835,41 +832,45 @@@ cacheT += ("Default Lock Timeout", defaultCfg.txLockTimeout()) cacheT += ("Default Query Timeout", defaultCfg.queryTimeout()) - cacheT += ("Query Indexing Enabled", cfg.queryIndexEnabled()) + cacheT += ("Query Indexing Enabled", bool2Str(cfg.queryIndexEnabled())) cacheT += ("Query Iterators Number", cfg.maxQueryIteratorCount()) - cacheT += ("Indexing SPI Name", cfg.indexingSpiName()) - cacheT += ("Cache Interceptor", cfg.interceptor()) + cacheT += ("Metadata type count", cfg.typeMeta().size()) + cacheT += ("Indexing SPI Name", safe(cfg.indexingSpiName())) + cacheT += ("Cache Interceptor", safe(cfg.interceptor())) + + cacheT += ("Store Enabled", bool2Str(storeCfg.enabled())) + cacheT += ("Store", safe(storeCfg.store())) - cacheT += ("Store Values In Bytes", storeCfg.valueBytes()) - cacheT += ("Configured JDBC Store", bool2Str(cfg.jdbcStore())) ++ cacheT += ("Configured JDBC Store", bool2Str(storeCfg.jdbcStore())) + - cacheT += ("Off-Heap Size", cfg.offsetHeapMaxMemory()) ++ cacheT += ("Read Through", bool2Str(storeCfg.readThrough())) ++ cacheT += ("Write Through", bool2Str(storeCfg.writeThrough())) + - cacheT += ("Write-Behind Enabled", bool2Str(writeBehind.enabled())) - cacheT += ("Write-Behind Flush Size", writeBehind.flushSize()) - cacheT += ("Write-Behind Frequency", writeBehind.flushFrequency()) - cacheT += ("Write-Behind Flush Threads Count", writeBehind.flushThreadCount()) - cacheT += ("Write-Behind Batch Size", writeBehind.batchSize()) ++ cacheT += ("Write-Behind Enabled", bool2Str(storeCfg.enabled())) ++ cacheT += ("Write-Behind Flush Size", storeCfg.flushSize()) ++ cacheT += ("Write-Behind Frequency", storeCfg.flushFrequency()) ++ cacheT += ("Write-Behind Flush Threads Count", storeCfg.flushThreadCount()) ++ cacheT += ("Write-Behind Batch Size", storeCfg.batchSize()) cacheT += ("Concurrent Asynchronous Operations Number", cfg.maxConcurrentAsyncOperations()) cacheT += ("Memory Mode", cfg.memoryMode()) + cacheT += ("Store Values In Bytes", cfg.valueBytes()) + + cacheT += ("Off-Heap Size", cfg.offsetHeapMaxMemory()) + - cacheT += ("Store Enabled", storeCfg.enabled()) - cacheT += ("Store", storeCfg.store()) - cacheT += ("Store Factory", storeCfg.storeFactory()) - - cacheT += ("Store Read-Through", storeCfg.readThrough()) - cacheT += ("Store Write-Through", storeCfg.writeThrough()) + cacheT += ("Loader Factory Class Name", safe(cfg.loaderFactory())) + cacheT += ("Writer Factory Class Name", safe(cfg.writerFactory())) + cacheT += ("Expiry Policy Factory Class Name", safe(cfg.expiryPolicyFactory())) - cacheT += ("Write-Behind Enabled", storeCfg.writeBehindEnabled()) - cacheT += ("Write-Behind Flush Size", storeCfg.flushSize()) - cacheT += ("Write-Behind Frequency", storeCfg.flushFrequency()) - cacheT += ("Write-Behind Flush Threads Count", storeCfg.flushThreadCount()) - cacheT += ("Write-Behind Batch Size", storeCfg.batchSize()) + if (queryCfg != null) { + cacheT +=("Query Type Resolver", safe(queryCfg.typeResolver())) + cacheT +=("Query Indexing Primitive Key", bool2Str(queryCfg.indexPrimitiveKey())) + cacheT +=("Query Indexing Primitive Value", bool2Str(queryCfg.indexPrimitiveValue())) + cacheT +=("Query Fixed Typing", bool2Str(queryCfg.indexFixedTyping())) + cacheT +=("Query Escaped Names", bool2Str(queryCfg.escapeAll())) + } + else + cacheT += ("Query Configuration", NA) println(title)
