ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From agoncha...@apache.org
Subject [4/7] ignite git commit: Init simple value type if it was not set for a cache configuration received on discovery.
Date Thu, 21 Jan 2016 09:31:03 GMT
Init simple value type if it was not set for a cache configuration received on discovery.


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

Branch: refs/heads/sql-store
Commit: fb0173f3c7577cf36a60be3ab7e814cc301adb49
Parents: d2f84d1
Author: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Authored: Thu Jan 21 12:17:43 2016 +0300
Committer: Alexey Goncharuk <alexey.goncharuk@gmail.com>
Committed: Thu Jan 21 12:17:43 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/fb0173f3/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.


Mime
View raw message