ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [1/3] incubator-ignite git commit: # IGNITE-274 Cleanup of removed functionality.
Date Wed, 18 Feb 2015 07:22:54 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/sprint-2 f13970678 -> dd6c24f4e


# IGNITE-274 Cleanup of removed functionality.


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

Branch: refs/heads/sprint-2
Commit: ce9fd4e32b64448762f9980a53c77aa02626ea61
Parents: 659b432
Author: AKuznetsov <akuznetsov@gridgain.com>
Authored: Tue Feb 17 10:22:19 2015 +0700
Committer: AKuznetsov <akuznetsov@gridgain.com>
Committed: Tue Feb 17 10:22:19 2015 +0700

----------------------------------------------------------------------
 .../cache/VisorCacheDefaultConfiguration.java   | 57 --------------------
 .../commands/cache/VisorCacheCommand.scala      |  3 --
 2 files changed, 60 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce9fd4e3/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
index ae8aa11..97f8f30 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheDefaultConfiguration.java
@@ -19,7 +19,6 @@ package org.apache.ignite.internal.visor.cache;
 
 import org.apache.ignite.configuration.*;
 import org.apache.ignite.internal.util.typedef.internal.*;
-import org.apache.ignite.transactions.*;
 
 import java.io.*;
 
@@ -30,18 +29,9 @@ public class VisorCacheDefaultConfiguration implements Serializable {
     /** */
     private static final long serialVersionUID = 0L;
 
-    /** Default transaction isolation. */
-    private TransactionIsolation txIsolation;
-
-    /** Default transaction concurrency. */
-    private TransactionConcurrency txConcurrency;
-
     /** TTL value. */
     private long ttl;
 
-    /** Default transaction concurrency. */
-    private long txTimeout;
-
     /** Default transaction timeout. */
     private long txLockTimeout;
 
@@ -53,14 +43,9 @@ public class VisorCacheDefaultConfiguration implements Serializable {
      * @return Data transfer object for default cache configuration properties.
      */
     public static VisorCacheDefaultConfiguration from(CacheConfiguration ccfg) {
-        // TODO GG-9141 Update Visor.
-
         VisorCacheDefaultConfiguration cfg = new VisorCacheDefaultConfiguration();
 
-//        cfg.txIsolation(ccfg.getDefaultTxIsolation());
-//        cfg.txConcurrency(ccfg.getDefaultTxConcurrency());
         cfg.timeToLive(ccfg.getDefaultTimeToLive());
-//        cfg.txTimeout(ccfg.getDefaultTxTimeout());
         cfg.txLockTimeout(ccfg.getDefaultLockTimeout());
         cfg.queryTimeout(ccfg.getDefaultQueryTimeout());
 
@@ -68,34 +53,6 @@ public class VisorCacheDefaultConfiguration implements Serializable {
     }
 
     /**
-     * @return Default transaction isolation.
-     */
-    public TransactionIsolation txIsolation() {
-        return txIsolation;
-    }
-
-    /**
-     * @param txIsolation New default transaction isolation.
-     */
-    public void txIsolation(TransactionIsolation txIsolation) {
-        this.txIsolation = txIsolation;
-    }
-
-    /**
-     * @return Default transaction concurrency.
-     */
-    public TransactionConcurrency txConcurrency() {
-        return txConcurrency;
-    }
-
-    /**
-     * @param txConcurrency New default transaction concurrency.
-     */
-    public void txConcurrency(TransactionConcurrency txConcurrency) {
-        this.txConcurrency = txConcurrency;
-    }
-
-    /**
      * @return TTL value.
      */
     public long timeToLive() {
@@ -110,20 +67,6 @@ public class VisorCacheDefaultConfiguration implements Serializable {
     }
 
     /**
-     * @return Default transaction concurrency.
-     */
-    public long txTimeout() {
-        return txTimeout;
-    }
-
-    /**
-     * @param txTimeout New default transaction concurrency.
-     */
-    public void txTimeout(long txTimeout) {
-        this.txTimeout = txTimeout;
-    }
-
-    /**
      * @return Default transaction timeout.
      */
     public long txLockTimeout() {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce9fd4e3/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 21aae23..42b4d2e 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
@@ -829,9 +829,6 @@ object VisorCacheCommand {
         cacheT += ("Near Eviction Synchronized", evictCfg.nearSynchronized())
         cacheT += ("Near Eviction Policy Max Size", nearCfg.nearEvictMaxSize())
 
-        cacheT += ("Default Isolation", defaultCfg.txIsolation())
-        cacheT += ("Default Concurrency", defaultCfg.txConcurrency())
-        cacheT += ("Default Transaction Timeout", defaultCfg.txTimeout())
         cacheT += ("Default Lock Timeout", defaultCfg.txLockTimeout())
         cacheT += ("Default Query Timeout", defaultCfg.queryTimeout())
         cacheT += ("Query Indexing Enabled", cfg.queryIndexEnabled())


Mime
View raw message