* ... @@ -264,7 +264,7 @@ * <bean class="CacheQueryConfiguration"> * <property name="typeMetadata"> * <list> - * <bean class="CacheQueryTypeMetadata"> + * <bean class="CacheTypeMetadata"> * <property name="type" value="Employee"/> * * <!-- Fields to index in ascending order. --> diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueryConfiguration.java b/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueryConfiguration.java index 9f1cb915c99b6..e96e22244bf5d 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueryConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueryConfiguration.java @@ -18,7 +18,6 @@ package org.apache.ignite.cache.query; import java.io.*; -import java.util.*; /** * Query configuration object. @@ -27,9 +26,6 @@ public class CacheQueryConfiguration implements Serializable { /** */ private static final long serialVersionUID = 0L; - /** Collection of query type metadata. */ - private Collection typeMeta; - /** Query type resolver. */ private CacheQueryTypeResolver typeRslvr; @@ -56,7 +52,6 @@ public CacheQueryConfiguration() { * @param cfg Configuration to copy. */ public CacheQueryConfiguration(CacheQueryConfiguration cfg) { - typeMeta = cfg.getTypeMetadata(); typeRslvr = cfg.getTypeResolver(); idxPrimitiveKey = cfg.isIndexPrimitiveKey(); idxPrimitiveVal = cfg.isIndexPrimitiveValue(); @@ -64,24 +59,6 @@ public CacheQueryConfiguration(CacheQueryConfiguration cfg) { escapeAll = cfg.isEscapeAll(); } - /** - * Gets collection of query type metadata objects. - * - * @return Collection of query type metadata. - */ - public Collection getTypeMetadata() { - return typeMeta; - } - - /** - * Sets collection of query type metadata objects. - * - * @param typeMeta Collection of query type metadata. - */ - public void setTypeMetadata(Collection typeMeta) { - this.typeMeta = typeMeta; - } - /** * Gets query type resolver. * diff --git a/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueryTypeMetadata.java b/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueryTypeMetadata.java deleted file mode 100644 index 55dc10203a753..0000000000000 --- a/modules/core/src/main/java/org/apache/ignite/cache/query/CacheQueryTypeMetadata.java +++ /dev/null @@ -1,206 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.ignite.cache.query; - -import org.apache.ignite.internal.util.tostring.*; -import org.apache.ignite.internal.util.typedef.internal.*; -import org.apache.ignite.lang.*; - -import java.util.*; - -/** - * Cache query type metadata. - */ -public class CacheQueryTypeMetadata { - /** Type name, e.g. class name. */ - private String type; - - /** Fields to be queried, in addition to indexed fields. */ - @GridToStringInclude - private Map> qryFlds; - - /** Fields to index in ascending order. */ - @GridToStringInclude - private Map> ascFlds; - - /** Fields to index in descending order. */ - @GridToStringInclude - private Map> descFlds; - - /** Fields to index as text. */ - @GridToStringInclude - private Collection txtFlds; - - /** Fields to create group indexes for. */ - @GridToStringInclude - private Map, Boolean>>> grps; - - /** - * Default constructor. - */ - public CacheQueryTypeMetadata() { - qryFlds = new LinkedHashMap<>(); - - ascFlds = new LinkedHashMap<>(); - - descFlds = new LinkedHashMap<>(); - - txtFlds = new LinkedHashSet<>(); - - grps = new LinkedHashMap<>(); - } - - /** - * Copy constructor. - */ - public CacheQueryTypeMetadata(CacheQueryTypeMetadata src) { - type = src.getType(); - - qryFlds = new LinkedHashMap<>(src.getQueryFields()); - - ascFlds = new LinkedHashMap<>(src.getAscendingFields()); - - descFlds = new LinkedHashMap<>(src.getDescendingFields()); - - txtFlds = new LinkedHashSet<>(src.getTextFields()); - - grps = new LinkedHashMap<>(src.getGroups()); - } - - /** - * Gets type (e.g. class name). - * - * @return Type name. - */ - public String getType() { - return type; - } - - /** - * Sets type. - * - * @param cls Type class. - */ - public void setType(Class cls) { - setType(cls.getName()); - } - - /** - * Sets type. - * - * @param type Type name. - */ - public void setType(String type) { - this.type = type; - } - - /** - * Gets query-enabled fields. - * - * @return Collection of fields available for query. - */ - public Map> getQueryFields() { - return qryFlds; - } - - /** - * Sets query fields map. - * - * @param qryFlds Query fields. - */ - public void setQueryFields(Map> qryFlds) { - this.qryFlds = qryFlds; - } - - /** - * Gets ascending-indexed fields. - * - * @return Map of ascending-indexed fields. - */ - public Map> getAscendingFields() { - return ascFlds; - } - - /** - * Sets ascending-indexed fields. - * - * @param ascFlds Map of ascending-indexed fields. - */ - public void setAscendingFields(Map> ascFlds) { - this.ascFlds = ascFlds; - } - - /** - * Gets descending-indexed fields. - * - * @return Map of descending-indexed fields. - */ - public Map> getDescendingFields() { - return descFlds; - } - - /** - * Sets descending-indexed fields. - * - * @param descFlds Map of descending-indexed fields. - */ - public void setDescendingFields(Map> descFlds) { - this.descFlds = descFlds; - } - - /** - * Gets text-indexed fields. - * - * @return Collection of text indexed fields. - */ - public Collection getTextFields() { - return txtFlds; - } - - /** - * Sets text-indexed fields. - * - * @param txtFlds Text-indexed fields. - */ - public void setTextFields(Collection txtFlds) { - this.txtFlds = txtFlds; - } - - /** - * Gets group-indexed fields. - * - * @return Map of group-indexed fields. - */ - public Map, Boolean>>> getGroups() { - return grps; - } - - /** - * Sets group-indexed fields. - * - * @param grps Map of group-indexed fields from index name to index fields. - */ - public void setGroups(Map, Boolean>>> grps) { - this.grps = grps; - } - - /** {@inheritDoc} */ - @Override public String toString() { - return S.toString(CacheQueryTypeMetadata.class, this); - } -} diff --git a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcCacheStore.java b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcCacheStore.java index 52a7bfc610237..47cc2128a5b30 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcCacheStore.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/store/jdbc/JdbcCacheStore.java @@ -437,8 +437,8 @@ private EntryMapping entryMapping(Object keyTypeId, Object key) throws CacheExce EntryMapping em = cacheMappings(cacheName).get(keyTypeId); if (em == null) - throw new CacheException("Failed to find mapping description [table = " + em.fullTableName() + - ", key=" + key + ", cache=" + (cacheName != null ? cacheName : "") + "]"); + throw new CacheException("Failed to find mapping description [key=" + key + + ", cache=" + (cacheName != null ? cacheName : "") + "]"); return em; } 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 da89e49344037..eff84a847aff7 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 @@ -66,10 +66,10 @@ public class GridQueryProcessor extends GridProcessorAdapter { private final GridQueryIndexing idx; /** Configuration-declared types. */ - private final Map declaredTypesByName = new HashMap<>(); + private final Map declaredTypesByName = new HashMap<>(); /** Configuration-declared types. */ - private Map declaredTypesById; + private Map declaredTypesById; /** Portable IDs. */ private Map portableIds; @@ -105,9 +105,9 @@ public GridQueryProcessor(GridKernalContext ctx) throws IgniteCheckedException { CacheQueryConfiguration qryCfg = ccfg.getQueryConfiguration(); if (qryCfg != null) { - if (!F.isEmpty(qryCfg.getTypeMetadata())) { - for (CacheQueryTypeMetadata 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) @@ -330,14 +330,14 @@ public void store(final String space, final K key, @Nullable byte[] keyBy String typeName = portableName(portableKey.typeId()); if (typeName != null) { - CacheQueryTypeMetadata keyMeta = declaredType(space, portableKey.typeId()); + CacheTypeMetadata keyMeta = declaredType(space, portableKey.typeId()); if (keyMeta != null) processPortableMeta(true, keyMeta, d); } } else { - CacheQueryTypeMetadata keyMeta = declaredType(space, keyCls.getName()); + CacheTypeMetadata keyMeta = declaredType(space, keyCls.getName()); if (keyMeta == null) processAnnotationsInClass(true, d.keyCls, d, null); @@ -351,7 +351,7 @@ public void store(final String space, final K key, @Nullable byte[] keyBy String typeName = portableName(portableVal.typeId()); if (typeName != null) { - CacheQueryTypeMetadata valMeta = declaredType(space, portableVal.typeId()); + CacheTypeMetadata valMeta = declaredType(space, portableVal.typeId()); d.name(typeName); @@ -364,7 +364,7 @@ public void store(final String space, final K key, @Nullable byte[] keyBy d.name(valTypeName); - CacheQueryTypeMetadata typeMeta = declaredType(space, valCls.getName()); + CacheTypeMetadata typeMeta = declaredType(space, valCls.getName()); if (typeMeta == null) processAnnotationsInClass(false, d.valCls, d, null); @@ -536,8 +536,8 @@ private String portableName(int typeId) { CacheQueryConfiguration qryCfg = ccfg.getQueryConfiguration(); if (qryCfg != null) { - for (CacheQueryTypeMetadata 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()); } } @@ -552,8 +552,8 @@ private String portableName(int typeId) { * @param typeId Type ID. * @return Type meta data if it was declared in configuration. */ - @Nullable private CacheQueryTypeMetadata declaredType(String space, int typeId) { - Map declaredTypesById = this.declaredTypesById; + @Nullable private CacheTypeMetadata declaredType(String space, int typeId) { + Map declaredTypesById = this.declaredTypesById; if (declaredTypesById == null) { declaredTypesById = new HashMap<>(); @@ -562,8 +562,8 @@ private String portableName(int typeId) { CacheQueryConfiguration qryCfg = ccfg.getQueryConfiguration(); if (qryCfg != null) { - for (CacheQueryTypeMetadata 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); } } @@ -578,7 +578,7 @@ private String portableName(int typeId) { * @param typeName Type name. * @return Type meta data if it was declared in configuration. */ - @Nullable private CacheQueryTypeMetadata declaredType(String space, String typeName) { + @Nullable private CacheTypeMetadata declaredType(String space, String typeName) { return declaredTypesByName.get(new TypeName(space, typeName)); } @@ -848,7 +848,7 @@ static void processAnnotation(boolean key, CacheQuerySqlField sqlAnn, CacheQuery * @param d Type descriptor. * @throws IgniteCheckedException If failed. */ - static void processClassMeta(boolean key, Class cls, CacheQueryTypeMetadata meta, TypeDescriptor d) + static void processClassMeta(boolean key, Class cls, CacheTypeMetadata meta, TypeDescriptor d) throws IgniteCheckedException { for (Map.Entry> entry : meta.getAscendingFields().entrySet()) { ClassProperty prop = buildClassProperty(cls, entry.getKey(), entry.getValue()); @@ -921,7 +921,7 @@ static void processClassMeta(boolean key, Class cls, CacheQueryTypeMetadata m * @param d Type descriptor. * @throws IgniteCheckedException If failed. */ - static void processPortableMeta(boolean key, CacheQueryTypeMetadata meta, TypeDescriptor d) + static void processPortableMeta(boolean key, CacheTypeMetadata meta, TypeDescriptor d) throws IgniteCheckedException { for (Map.Entry> entry : meta.getAscendingFields().entrySet()) { PortableProperty prop = buildPortableProperty(entry.getKey(), entry.getValue());