Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8832E18590 for ; Wed, 18 Nov 2015 08:08:13 +0000 (UTC) Received: (qmail 2376 invoked by uid 500); 18 Nov 2015 08:08:13 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 569 invoked by uid 500); 18 Nov 2015 08:08:12 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 99406 invoked by uid 99); 18 Nov 2015 08:08:11 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Nov 2015 08:08:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 502C7E0AB2; Wed, 18 Nov 2015 08:08:11 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Wed, 18 Nov 2015 08:08:41 -0000 Message-Id: <28aa2a41567b4a91b2f74a62ebfb3e8d@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [32/50] [abbrv] ignite git commit: Renaming. Renaming. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6fa22e2e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6fa22e2e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6fa22e2e Branch: refs/heads/ignite-1816 Commit: 6fa22e2e2e00dbb665b3eba24121b756716297d7 Parents: b278fe3 Author: Alexey Goncharuk Authored: Tue Nov 17 13:42:40 2015 +0300 Committer: Alexey Goncharuk Committed: Tue Nov 17 13:42:40 2015 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 28 ++++++++++---------- .../processors/cache/GridCacheProcessor.java | 4 +-- .../cache/store/CacheOsStoreManager.java | 2 +- .../GridCachePortableStoreAbstractSelfTest.java | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6fa22e2e/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 9cde3a2..5b246b3 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 @@ -206,9 +206,9 @@ public class CacheConfiguration extends MutableConfiguration { /** Default size for onheap SQL row cache size. */ public static final int DFLT_SQL_ONHEAP_ROW_CACHE_SIZE = 10 * 1024; - /** Default value for keep portable in store behavior .*/ + /** Default value for keep binary in store behavior .*/ @SuppressWarnings({"UnnecessaryBoxing", "BooleanConstructorCall"}) - public static final Boolean DFLT_KEEP_PORTABLE_IN_STORE = new Boolean(true); + public static final Boolean DFLT_KEEP_BINARY_IN_STORE = new Boolean(true); /** Default threshold for concurrent loading of keys from {@link CacheStore}. */ public static final int DFLT_CONCURRENT_LOAD_ALL_THRESHOLD = 5; @@ -269,7 +269,7 @@ public class CacheConfiguration extends MutableConfiguration { private Factory storeFactory; /** */ - private Boolean keepPortableInStore = DFLT_KEEP_PORTABLE_IN_STORE; + private Boolean keepBinaryInStore = DFLT_KEEP_BINARY_IN_STORE; /** */ private boolean loadPrevVal = DFLT_LOAD_PREV_VAL; @@ -441,8 +441,8 @@ public class CacheConfiguration extends MutableConfiguration { invalidate = cc.isInvalidate(); isReadThrough = cc.isReadThrough(); isWriteThrough = cc.isWriteThrough(); - keepPortableInStore = cc.isKeepPortableInStore() != null ? cc.isKeepPortableInStore() : - DFLT_KEEP_PORTABLE_IN_STORE; + keepBinaryInStore = cc.isKeepBinaryInStore() != null ? cc.isKeepBinaryInStore() : + DFLT_KEEP_BINARY_IN_STORE; listenerConfigurations = cc.listenerConfigurations; loadPrevVal = cc.isLoadPreviousValue(); longQryWarnTimeout = cc.getLongQueryWarningTimeout(); @@ -886,34 +886,34 @@ public class CacheConfiguration extends MutableConfiguration { /** * Flag indicating that {@link CacheStore} implementation - * is working with portable objects instead of Java objects. - * Default value of this flag is {@link #DFLT_KEEP_PORTABLE_IN_STORE}, + * is working with binary objects instead of Java objects. + * Default value of this flag is {@link #DFLT_KEEP_BINARY_IN_STORE}, * because this is recommended behavior from performance standpoint. *

* If set to {@code false}, Ignite will deserialize keys and - * values stored in portable format before they are passed + * values stored in binary format before they are passed * to cache store. *

* Note that setting this flag to {@code false} can simplify * store implementation in some cases, but it can cause performance * degradation due to additional serializations and deserializations - * of portable objects. You will also need to have key and value + * of binary objects. You will also need to have key and value * classes on all nodes since binary will be deserialized when * store is called. * * @return Keep binary in store flag. */ - public Boolean isKeepPortableInStore() { - return keepPortableInStore; + public Boolean isKeepBinaryInStore() { + return keepBinaryInStore; } /** * Sets keep binary in store flag. * - * @param keepPortableInStore Keep binary in store flag. + * @param keepBinaryInStore Keep binary in store flag. */ - public void setKeepPortableInStore(boolean keepPortableInStore) { - this.keepPortableInStore = keepPortableInStore; + public void setKeepBinaryInStore(boolean keepBinaryInStore) { + this.keepBinaryInStore = keepBinaryInStore; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/6fa22e2e/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 395e827..4fe8d84 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 @@ -1018,9 +1018,9 @@ public class GridCacheProcessor extends GridProcessorAdapter { CacheConfiguration cfg = cacheCtx.config(); // Intentionally compare Boolean references using '!=' below to check if the flag has been explicitly set. - if (cfg.isKeepPortableInStore() && cfg.isKeepPortableInStore() != CacheConfiguration.DFLT_KEEP_PORTABLE_IN_STORE + if (cfg.isKeepBinaryInStore() && cfg.isKeepBinaryInStore() != CacheConfiguration.DFLT_KEEP_BINARY_IN_STORE && !(ctx.config().getMarshaller() instanceof PortableMarshaller)) - U.warn(log, "CacheConfiguration.isKeepPortableInStore() configuration property will be ignored because " + + U.warn(log, "CacheConfiguration.isKeepBinaryInStore() configuration property will be ignored because " + "PortableMarshaller is not used"); // Start managers. http://git-wip-us.apache.org/repos/asf/ignite/blob/6fa22e2e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java index f7f5f4e..b84908d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/store/CacheOsStoreManager.java @@ -82,6 +82,6 @@ public class CacheOsStoreManager extends GridCacheStoreManagerAdapter { /** {@inheritDoc} */ @Override public boolean configuredConvertPortable() { - return !(ctx.config().getMarshaller() instanceof PortableMarshaller && cfg.isKeepPortableInStore()); + return !(ctx.config().getMarshaller() instanceof PortableMarshaller && cfg.isKeepBinaryInStore()); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ignite/blob/6fa22e2e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableStoreAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableStoreAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableStoreAbstractSelfTest.java index 1c842e1..13a4c12 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableStoreAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/portable/GridCachePortableStoreAbstractSelfTest.java @@ -59,7 +59,7 @@ public abstract class GridCachePortableStoreAbstractSelfTest extends GridCommonA CacheConfiguration cacheCfg = new CacheConfiguration(); cacheCfg.setCacheStoreFactory(singletonFactory(STORE)); - cacheCfg.setKeepPortableInStore(keepPortableInStore()); + cacheCfg.setKeepBinaryInStore(keepPortableInStore()); cacheCfg.setReadThrough(true); cacheCfg.setWriteThrough(true); cacheCfg.setLoadPreviousValue(true);