You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2016/01/21 10:39:57 UTC
[1/3] ignite git commit: Added initialization of 'storeKeepBinary'
flag for cache configurations received on discovery. (cherry picked from
commit d2f84d1)
Repository: ignite
Updated Branches:
refs/heads/ignite-1.5.4 d5a5f6aa8 -> dc261786d
Added initialization of 'storeKeepBinary' flag for cache configurations received on discovery.
(cherry picked from commit d2f84d1)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0222978a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0222978a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0222978a
Branch: refs/heads/ignite-1.5.4
Commit: 0222978a64e00b015a3e0f737ba9a96c72d5f0fe
Parents: d5a5f6a
Author: sboikov <sb...@gridgain.com>
Authored: Thu Jan 21 11:45:27 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Jan 21 12:29:56 2016 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheProcessor.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0222978a/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 bf77ccf..5dabbef 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
@@ -1899,6 +1899,13 @@ public class GridCacheProcessor extends GridProcessorAdapter {
}
else {
for (DynamicCacheChangeRequest req : batch.requests()) {
+ if (req.startCacheConfiguration() != null) {
+ CacheConfiguration ccfg = req.startCacheConfiguration();
+
+ if (ccfg.isStoreKeepBinary() == null)
+ ccfg.setStoreKeepBinary(CacheConfiguration.DFLT_STORE_KEEP_BINARY);
+ }
+
if (req.template()) {
CacheConfiguration ccfg = req.startCacheConfiguration();
[2/3] ignite git commit: Init simple value type if it was not set for
a cache configuration received on discovery. (cherry picked from commit
fb0173f)
Posted by sb...@apache.org.
Init simple value type if it was not set for a cache configuration received on discovery.
(cherry picked from commit fb0173f)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/782e7438
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/782e7438
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/782e7438
Branch: refs/heads/ignite-1.5.4
Commit: 782e7438f7e46a87382da5ca07c1e2bb69a14d79
Parents: 0222978
Author: Alexey Goncharuk <al...@gmail.com>
Authored: Thu Jan 21 12:17:43 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Jan 21 12:30:05 2016 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/query/GridQueryProcessor.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/782e7438/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index 4808e96..64bbc8f 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -318,7 +318,12 @@ public class GridQueryProcessor extends GridProcessorAdapter {
if (keyCls == null)
keyCls = Object.class;
- desc.name(meta.getSimpleValueType());
+ String simpleValType = meta.getSimpleValueType();
+
+ if (simpleValType == null)
+ simpleValType = typeName(meta.getValueType());
+
+ desc.name(simpleValType);
if (binaryEnabled && !keyOrValMustDeserialize) {
// Safe to check null.
[3/3] ignite git commit: Added initialization of 'storeKeepBinary'
flag for cache configurations received on discovery. (cherry picked from
commit abe44f9)
Posted by sb...@apache.org.
Added initialization of 'storeKeepBinary' flag for cache configurations received on discovery.
(cherry picked from commit abe44f9)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dc261786
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dc261786
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dc261786
Branch: refs/heads/ignite-1.5.4
Commit: dc261786dea5f9af75cf8f81775c18eff8a89543
Parents: 782e743
Author: sboikov <sb...@gridgain.com>
Authored: Thu Jan 21 12:20:04 2016 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Jan 21 12:30:15 2016 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheProcessor.java | 23 +++++++++++++++-----
1 file changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/dc261786/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 5dabbef..6b734b5 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
@@ -1899,12 +1899,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
}
else {
for (DynamicCacheChangeRequest req : batch.requests()) {
- if (req.startCacheConfiguration() != null) {
- CacheConfiguration ccfg = req.startCacheConfiguration();
-
- if (ccfg.isStoreKeepBinary() == null)
- ccfg.setStoreKeepBinary(CacheConfiguration.DFLT_STORE_KEEP_BINARY);
- }
+ initReceivedCacheConfiguration(req);
if (req.template()) {
CacheConfiguration ccfg = req.startCacheConfiguration();
@@ -1997,6 +1992,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
for (DynamicCacheChangeRequest req : batch.requests()) {
assert !req.template() : req;
+ initReceivedCacheConfiguration(req);
+
String name = req.cacheName();
boolean sysCache = CU.isMarshallerCache(name) || CU.isUtilityCache(name) || CU.isAtomicsCache(name);
@@ -2427,6 +2424,8 @@ public class GridCacheProcessor extends GridProcessorAdapter {
boolean incMinorTopVer = false;
for (DynamicCacheChangeRequest req : batch.requests()) {
+ initReceivedCacheConfiguration(req);
+
if (req.template()) {
CacheConfiguration ccfg = req.startCacheConfiguration();
@@ -2571,6 +2570,18 @@ public class GridCacheProcessor extends GridProcessorAdapter {
}
/**
+ * @param req Cache change request.
+ */
+ private void initReceivedCacheConfiguration(DynamicCacheChangeRequest req) {
+ if (req.startCacheConfiguration() != null) {
+ CacheConfiguration ccfg = req.startCacheConfiguration();
+
+ if (ccfg.isStoreKeepBinary() == null)
+ ccfg.setStoreKeepBinary(CacheConfiguration.DFLT_STORE_KEEP_BINARY);
+ }
+ }
+
+ /**
* Checks that preload-order-dependant caches has SYNC or ASYNC preloading mode.
*
* @param cfgs Caches.