ignite-sql-tests - load schema on start

apache · Feb 13, 2015 · a21f3ba · a21f3ba
1 parent 124856a
commit a21f3ba
Show file tree

Hide file tree

Showing 3 changed files with 153 additions and 249 deletions.
diff --git a/...rc/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java b/...rc/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
@@ -1918,18 +1918,15 @@ private static class MetadataJob implements IgniteCallable<Collection<CacheSqlMe
                         keyClasses.put(type.name(), type.keyClass().getName());
                         valClasses.put(type.name(), type.valueClass().getName());
 
-                        int size = 2 + type.keyFields().size() + type.valueFields().size();
+                        int size = 2 + type.fields().size();
 
                         Map<String, String> fieldsMap = U.newLinkedHashMap(size);
 
                         // _KEY and _VAL are not included in GridIndexingTypeDescriptor.valueFields
                         fieldsMap.put("_KEY", type.keyClass().getName());
                         fieldsMap.put("_VAL", type.valueClass().getName());
 
-                        for (Map.Entry<String, Class<?>> e : type.keyFields().entrySet())
+                        for (Map.Entry<String, Class<?>> e : type.fields().entrySet())
-                            fieldsMap.put(e.getKey().toUpperCase(), e.getValue().getName());
-
-                        for (Map.Entry<String, Class<?>> e : type.valueFields().entrySet())
                             fieldsMap.put(e.getKey().toUpperCase(), e.getValue().getName());
 
                         fields.put(type.name(), fieldsMap);