ignite-sql-tests - fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0e10a463 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0e10a463 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0e10a463 Branch: refs/heads/ignite-sql-tests Commit: 0e10a4639cd62cb070a71c6e906fde907947e9db Parents: 2279f4b Author: S.Vladykin <svlady...@gridgain.com> Authored: Thu Feb 5 16:37:07 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Thu Feb 5 16:37:07 2015 +0300 ---------------------------------------------------------------------- .../configuration/CacheQueryConfiguration.java | 21 ------------ .../processors/query/GridQueryProcessor.java | 36 ++++++++++---------- 2 files changed, 18 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0e10a463/modules/core/src/main/java/org/apache/ignite/configuration/CacheQueryConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheQueryConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheQueryConfiguration.java index 1822856..99683e6 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheQueryConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheQueryConfiguration.java @@ -28,9 +28,6 @@ public class CacheQueryConfiguration implements Serializable { /** */ private static final long serialVersionUID = 0L; - /** Collection of query type metadata. */ - private Collection<QueryTypeMetadata> typeMeta; - /** Query type resolver. */ private QueryTypeResolver typeRslvr; @@ -68,24 +65,6 @@ public class CacheQueryConfiguration implements Serializable { } /** - * Gets collection of query type metadata objects. - * - * @return Collection of query type metadata. - */ - public Collection<QueryTypeMetadata> getTypeMetadata() { - return typeMeta; - } - - /** - * Sets collection of query type metadata objects. - * - * @param typeMeta Collection of query type metadata. - */ - public void setTypeMetadata(Collection<QueryTypeMetadata> typeMeta) { - this.typeMeta = typeMeta; - } - - /** * Gets query type resolver. * * @return Query type resolver. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0e10a463/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 3a21586..a92abef 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 @@ -70,10 +70,10 @@ public class GridQueryProcessor extends GridProcessorAdapter { private final GridQueryIndexing idx; /** Configuration-declared types. */ - private final Map<TypeName,QueryTypeMetadata> declaredTypesByName = new HashMap<>(); + private final Map<TypeName,CacheTypeMetadata> declaredTypesByName = new HashMap<>(); /** Configuration-declared types. */ - private Map<TypeId,QueryTypeMetadata> declaredTypesById; + private Map<TypeId,CacheTypeMetadata> declaredTypesById; /** Portable IDs. */ private Map<Integer, String> portableIds; @@ -109,9 +109,9 @@ public class GridQueryProcessor extends GridProcessorAdapter { CacheQueryConfiguration qryCfg = ccfg.getQueryConfiguration(); if (qryCfg != null) { - if (!F.isEmpty(qryCfg.getTypeMetadata())) { - for (QueryTypeMetadata meta : qryCfg.getTypeMetadata()) - declaredTypesByName.put(new TypeName(ccfg.getName(), meta.getType()), meta); + if (!F.isEmpty(ccfg.getTypeMetadata())) { + for (CacheTypeMetadata meta : ccfg.getTypeMetadata()) + declaredTypesByName.put(new TypeName(ccfg.getName(), meta.getValueType()), meta); } if (qryCfg.getTypeResolver() != null) @@ -334,14 +334,14 @@ public class GridQueryProcessor extends GridProcessorAdapter { String typeName = portableName(portableKey.typeId()); if (typeName != null) { - QueryTypeMetadata keyMeta = declaredType(space, portableKey.typeId()); + CacheTypeMetadata keyMeta = declaredType(space, portableKey.typeId()); if (keyMeta != null) processPortableMeta(true, keyMeta, d); } } else { - QueryTypeMetadata keyMeta = declaredType(space, keyCls.getName()); + CacheTypeMetadata keyMeta = declaredType(space, keyCls.getName()); if (keyMeta == null) processAnnotationsInClass(true, d.keyCls, d, null); @@ -355,7 +355,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { String typeName = portableName(portableVal.typeId()); if (typeName != null) { - QueryTypeMetadata valMeta = declaredType(space, portableVal.typeId()); + CacheTypeMetadata valMeta = declaredType(space, portableVal.typeId()); d.name(typeName); @@ -368,7 +368,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { d.name(valTypeName); - QueryTypeMetadata typeMeta = declaredType(space, valCls.getName()); + CacheTypeMetadata typeMeta = declaredType(space, valCls.getName()); if (typeMeta == null) processAnnotationsInClass(false, d.valCls, d, null); @@ -635,8 +635,8 @@ public class GridQueryProcessor extends GridProcessorAdapter { CacheQueryConfiguration qryCfg = ccfg.getQueryConfiguration(); if (qryCfg != null) { - for (QueryTypeMetadata meta : qryCfg.getTypeMetadata()) - portableIds.put(ctx.portable().typeId(meta.getType()), meta.getType()); + for (CacheTypeMetadata meta : ccfg.getTypeMetadata()) + portableIds.put(ctx.portable().typeId(meta.getValueType()), meta.getValueType()); } } @@ -651,8 +651,8 @@ public class GridQueryProcessor extends GridProcessorAdapter { * @param typeId Type ID. * @return Type meta data if it was declared in configuration. */ - @Nullable private QueryTypeMetadata declaredType(String space, int typeId) { - Map<TypeId,QueryTypeMetadata> declaredTypesById = this.declaredTypesById; + @Nullable private CacheTypeMetadata declaredType(String space, int typeId) { + Map<TypeId,CacheTypeMetadata> declaredTypesById = this.declaredTypesById; if (declaredTypesById == null) { declaredTypesById = new HashMap<>(); @@ -661,8 +661,8 @@ public class GridQueryProcessor extends GridProcessorAdapter { CacheQueryConfiguration qryCfg = ccfg.getQueryConfiguration(); if (qryCfg != null) { - for (QueryTypeMetadata meta : qryCfg.getTypeMetadata()) - declaredTypesById.put(new TypeId(ccfg.getName(), ctx.portable().typeId(meta.getType())), meta); + for (CacheTypeMetadata meta : ccfg.getTypeMetadata()) + declaredTypesById.put(new TypeId(ccfg.getName(), ctx.portable().typeId(meta.getValueType())), meta); } } @@ -677,7 +677,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { * @param typeName Type name. * @return Type meta data if it was declared in configuration. */ - @Nullable private QueryTypeMetadata declaredType(String space, String typeName) { + @Nullable private CacheTypeMetadata declaredType(String space, String typeName) { return declaredTypesByName.get(new TypeName(space, typeName)); } @@ -947,7 +947,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { * @param d Type descriptor. * @throws IgniteCheckedException If failed. */ - static void processClassMeta(boolean key, Class<?> cls, QueryTypeMetadata meta, TypeDescriptor d) + static void processClassMeta(boolean key, Class<?> cls, CacheTypeMetadata meta, TypeDescriptor d) throws IgniteCheckedException { for (Map.Entry<String, Class<?>> entry : meta.getAscendingFields().entrySet()) { ClassProperty prop = buildClassProperty(cls, entry.getKey(), entry.getValue()); @@ -1020,7 +1020,7 @@ public class GridQueryProcessor extends GridProcessorAdapter { * @param d Type descriptor. * @throws IgniteCheckedException If failed. */ - static void processPortableMeta(boolean key, QueryTypeMetadata meta, TypeDescriptor d) + static void processPortableMeta(boolean key, CacheTypeMetadata meta, TypeDescriptor d) throws IgniteCheckedException { for (Map.Entry<String, Class<?>> entry : meta.getAscendingFields().entrySet()) { PortableProperty prop = buildPortableProperty(entry.getKey(), entry.getValue());
