ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [69/92] [abbrv] incubator-ignite git commit: IGNITE-51 Removed StoreValueBytes flag.
Date Fri, 06 Mar 2015 10:14:45 GMT
IGNITE-51 Removed StoreValueBytes flag.


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

Branch: refs/heads/ignite-user-req
Commit: ad82e1eae763d21ce7b722499caeb5e119d0564c
Parents: 0219f3e
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Thu Mar 5 10:12:16 2015 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Thu Mar 5 17:49:53 2015 +0300

----------------------------------------------------------------------
 .../org/apache/ignite/cache/CacheManager.java   |  1 -
 .../configuration/CacheConfiguration.java       | 28 --------------------
 .../processors/cache/GridCacheAttributes.java   | 13 ---------
 .../processors/cache/GridCacheMapEntry.java     |  7 -----
 .../processors/cache/GridCacheProcessor.java    |  3 ---
 .../visor/cache/VisorCacheConfiguration.java    | 11 --------
 .../cache/GridCacheDeploymentSelfTest.java      |  1 -
 .../cache/GridCachePutAllFailoverSelfTest.java  |  1 -
 .../cache/GridCacheStoreValueBytesSelfTest.java |  1 -
 .../GridCacheValueBytesPreloadingSelfTest.java  |  1 -
 ...eAtomicInvalidPartitionHandlingSelfTest.java |  1 -
 .../dataload/GridDataLoaderPerformanceTest.java |  2 --
 .../GridCacheStoreValueBytesNode.java           |  2 --
 .../commands/cache/VisorCacheCommand.scala      |  1 -
 14 files changed, 73 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad82e1ea/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
index 3316ff5..7acafdf 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
@@ -112,7 +112,6 @@ public class CacheManager implements javax.cache.CacheManager {
             igniteCacheCfg = new CacheConfiguration();
 
             igniteCacheCfg.setTypes(cacheCfg.getKeyType(), cacheCfg.getValueType());
-            igniteCacheCfg.setStoreValueBytes(cacheCfg.isStoreByValue());
         }
 
         igniteCacheCfg.setName(cacheName);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad82e1ea/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
index 93d831f..f3058cb 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java
@@ -88,9 +88,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K,
V> {
     /** Default value for 'invalidate' flag that indicates if this is invalidation-based
cache. */
     public static final boolean DFLT_INVALIDATE = false;
 
-    /** Default value for 'storeValueBytes' flag indicating if value bytes should be stored.
*/
-    public static final boolean DFLT_STORE_VALUE_BYTES = true;
-
     /** Default preload mode for distributed cache. */
     public static final CachePreloadMode DFLT_PRELOAD_MODE = CachePreloadMode.ASYNC;
 
@@ -247,9 +244,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K,
V> {
     /** Flag indicating whether this is invalidation-based cache. */
     private boolean invalidate = DFLT_INVALIDATE;
 
-    /** Flag indicating if cached values should be additionally stored in serialized form.
*/
-    private boolean storeValBytes = DFLT_STORE_VALUE_BYTES;
-
     /** Name of class implementing GridCacheTmLookup. */
     private String tmLookupClsName;
 
@@ -395,7 +389,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K,
V> {
         readFromBackup = cc.isReadFromBackup();
         startSize = cc.getStartSize();
         storeFactory = cc.getCacheStoreFactory();
-        storeValBytes = cc.isStoreValueBytes();
         swapEnabled = cc.isSwapEnabled();
         tmLookupClsName = cc.getTransactionManagerLookupClassName();
         ttl = cc.getDefaultTimeToLive();
@@ -1000,27 +993,6 @@ public class CacheConfiguration<K, V> extends MutableConfiguration<K,
V> {
     }
 
     /**
-     * Flag indicating if cached values should be additionally stored in serialized form.
It's set to true by default.
-     *
-     * @param storeValBytes {@code true} if cached values should be additionally stored in
serialized form, {@code
-     * false} otherwise.
-     */
-    public void setStoreValueBytes(boolean storeValBytes) {
-        this.storeValBytes = storeValBytes;
-    }
-
-    /**
-     * Flag indicating if cached values should be additionally stored in serialized form.
-     * It's set to {@code true} by default.
-     *
-     * @return {@code true} if cached values should be additionally stored in
-     *      serialized form, {@code false} otherwise.
-     */
-    public boolean isStoreValueBytes() {
-        return storeValBytes;
-    }
-
-    /**
      * Gets class name of transaction manager finder for integration for JEE app servers.
      *
      * @return Transaction manager finder.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad82e1ea/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
index 94ae1fa..f701a75 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAttributes.java
@@ -67,9 +67,6 @@ public class GridCacheAttributes implements Externalizable {
     /** Default lock timeout. */
     private long dfltLockTimeout;
 
-    /** Flag indicating if cached values should be additionally stored in serialized form.
*/
-    private boolean storeValBytes;
-
     /** Cache preload mode. */
     private CachePreloadMode preloadMode;
 
@@ -168,7 +165,6 @@ public class GridCacheAttributes implements Externalizable {
         preloadMode = cfg.getPreloadMode();
         qryIdxEnabled = cfg.isQueryIndexEnabled();
         readThrough = cfg.isReadThrough();
-        storeValBytes = cfg.isStoreValueBytes();
         swapEnabled = cfg.isSwapEnabled();
         ttl = cfg.getDefaultTimeToLive();
         writeBehindBatchSize = cfg.getWriteBehindBatchSize();
@@ -394,13 +390,6 @@ public class GridCacheAttributes implements Externalizable {
     }
 
     /**
-     * @return Flag indicating if cached values should be additionally stored in serialized
form.
-     */
-    public boolean storeValueBytes() {
-        return storeValBytes;
-    }
-
-    /**
      * @return Preload batch size.
      */
     public int preloadBatchSize() {
@@ -501,7 +490,6 @@ public class GridCacheAttributes implements Externalizable {
         U.writeEnum(out, preloadMode);
         out.writeBoolean(qryIdxEnabled);
         out.writeBoolean(readThrough);
-        out.writeBoolean(storeValBytes);
         out.writeBoolean(swapEnabled);
         out.writeLong(ttl);
         out.writeInt(writeBehindBatchSize);
@@ -543,7 +531,6 @@ public class GridCacheAttributes implements Externalizable {
         preloadMode = CachePreloadMode.fromOrdinal(in.readByte());
         qryIdxEnabled = in.readBoolean();
         readThrough = in.readBoolean();
-        storeValBytes = in.readBoolean();
         swapEnabled = in.readBoolean();
         ttl = in.readLong();
         writeBehindBatchSize = in.readInt();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad82e1ea/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
index 48462f0..641068c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -2692,13 +2692,6 @@ public abstract class GridCacheMapEntry implements GridCacheEntryEx
{
     }
 
     /**
-     * @return {@code true} If value bytes should be stored.
-     */
-    protected boolean isStoreValueBytes() {
-        return cctx.config().isStoreValueBytes();
-    }
-
-    /**
      * @return {@code True} if values should be stored off-heap.
      */
     protected boolean isOffHeapValuesOnly() {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad82e1ea/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 122281c..0d148a6 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
@@ -1169,9 +1169,6 @@ public class GridCacheProcessor extends GridProcessorAdapter {
                         CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "queryIndexEnabled",
                             "Query index enabled", locAttr.queryIndexEnabled(), rmtAttr.queryIndexEnabled(),
true);
 
-                        CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "storeValueBytes",
-                            "Store value bytes", locAttr.storeValueBytes(), rmtAttr.storeValueBytes(),
true);
-
                         CU.checkAttributeMismatch(log, rmtAttr.cacheName(), rmt, "queryIndexEnabled",
                             "Query index enabled", locAttr.queryIndexEnabled(), rmtAttr.queryIndexEnabled(),
true);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad82e1ea/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
index a6ec05c..07f23ef 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/cache/VisorCacheConfiguration.java
@@ -90,9 +90,6 @@ public class VisorCacheConfiguration implements Serializable {
     /** Cache interceptor. */
     private String interceptor;
 
-    /** Flag indicating if cached values should be additionally stored in serialized form.
*/
-    private boolean valBytes;
-
     /** Cache affinityCfg config. */
     private VisorCacheAffinityConfiguration affinityCfg;
 
@@ -158,7 +155,6 @@ public class VisorCacheConfiguration implements Serializable {
         cfg.memoryMode = ccfg.getMemoryMode();
         cfg.indexingSpiName = ccfg.getIndexingSpiName();
         cfg.interceptor = compactClass(ccfg.getInterceptor());
-        cfg.valBytes = ccfg.isStoreValueBytes();
         cfg.typeMeta = VisorCacheTypeMetadata.list(ccfg.getTypeMetadata());
         cfg.statisticsEnabled = ccfg.isStatisticsEnabled();
         cfg.mgmtEnabled = ccfg.isManagementEnabled();
@@ -321,13 +317,6 @@ public class VisorCacheConfiguration implements Serializable {
     }
 
     /**
-     * @return {@code true} if cached values should be additionally stored in serialized
form.
-     */
-    public boolean valueBytes() {
-        return valBytes;
-    }
-
-    /**
      * @return Collection of type metadata.
      */
     public Collection<VisorCacheTypeMetadata> typeMeta() {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad82e1ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
index 2f1e9b0..12a30fb 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentSelfTest.java
@@ -102,7 +102,6 @@ public class GridCacheDeploymentSelfTest extends GridCommonAbstractTest
{
         cfg.setCacheMode(PARTITIONED);
         cfg.setWriteSynchronizationMode(FULL_SYNC);
         cfg.setPreloadMode(SYNC);
-        cfg.setStoreValueBytes(true);
         cfg.setAtomicityMode(TRANSACTIONAL);
         cfg.setDistributionMode(NEAR_PARTITIONED);
         cfg.setBackups(1);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad82e1ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
index 9d2fe99..fca3965 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCachePutAllFailoverSelfTest.java
@@ -620,7 +620,6 @@ public class GridCachePutAllFailoverSelfTest extends GridCommonAbstractTest
{
 
             cacheCfg.setBackups(backups);
 
-            cacheCfg.setStoreValueBytes(true);
             cacheCfg.setDistributionMode(nearEnabled ? NEAR_PARTITIONED : PARTITIONED_ONLY);
             cacheCfg.setQueryIndexEnabled(false);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad82e1ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java
index 3871257..ef0169d 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheStoreValueBytesSelfTest.java
@@ -53,7 +53,6 @@ public class GridCacheStoreValueBytesSelfTest extends GridCommonAbstractTest
{
 
         ccfg.setCacheMode(REPLICATED);
         ccfg.setWriteSynchronizationMode(FULL_SYNC);
-        ccfg.setStoreValueBytes(storeValBytes);
 
         cfg.setCacheConfiguration(ccfg);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad82e1ea/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java
index 85bceb4..8f71235 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheValueBytesPreloadingSelfTest.java
@@ -57,7 +57,6 @@ public class GridCacheValueBytesPreloadingSelfTest extends GridCommonAbstractTes
         ccfg.setBackups(1);
         ccfg.setAtomicityMode(ATOMIC);
         ccfg.setDistributionMode(PARTITIONED_ONLY);
-        ccfg.setStoreValueBytes(true);
         ccfg.setWriteSynchronizationMode(FULL_SYNC);
         ccfg.setMemoryMode(memMode);
         ccfg.setOffHeapMaxMemory(1024 * 1024 * 1024);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad82e1ea/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 651ba8f..ebdae89 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
@@ -85,7 +85,6 @@ public class GridCacheAtomicInvalidPartitionHandlingSelfTest extends GridCommonA
         ccfg.setCacheMode(PARTITIONED);
 
         ccfg.setBackups(1);
-        ccfg.setStoreValueBytes(false);
         ccfg.setAtomicWriteOrderMode(writeOrder);
         ccfg.setWriteSynchronizationMode(writeSync);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad82e1ea/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java
index 1945912..740c5c1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/dataload/GridDataLoaderPerformanceTest.java
@@ -84,8 +84,6 @@ public class GridDataLoaderPerformanceTest extends GridCommonAbstractTest
{
 
             cc.setBackups(1);
 
-            cc.setStoreValueBytes(true);
-
             cfg.setCacheSanityCheckEnabled(false);
             cfg.setCacheConfiguration(cc);
         }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad82e1ea/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesNode.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesNode.java
b/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesNode.java
index 06a91cb..d813698 100644
--- a/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesNode.java
+++ b/modules/core/src/test/java/org/apache/ignite/storevalbytes/GridCacheStoreValueBytesNode.java
@@ -114,8 +114,6 @@ public class GridCacheStoreValueBytesNode {
 
         cacheCfg.setCacheMode(PARTITIONED);
 
-        cacheCfg.setStoreValueBytes(storeValBytes);
-
         cacheCfg.setBackups(1);
 
         if (nearOnly) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad82e1ea/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 8a2f6e0..2096743 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
@@ -855,7 +855,6 @@ object VisorCacheCommand {
 
         cacheT += ("Concurrent Asynchronous Operations Number", cfg.maxConcurrentAsyncOperations())
         cacheT += ("Memory Mode", cfg.memoryMode())
-        cacheT += ("Keep Values Bytes", cfg.valueBytes())
         cacheT += ("Off-Heap Size", cfg.offsetHeapMaxMemory() match {
             case 0 => "UNLIMITED"
             case size if size < 0 => NA


Mime
View raw message