Repository: ignite Updated Branches: refs/heads/ignite-4565-ddl 7541f5680 -> 2b7c1a2c9
Minors. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2b7c1a2c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2b7c1a2c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2b7c1a2c Branch: refs/heads/ignite-4565-ddl Commit: 2b7c1a2c907390ee53ee288045b0b70b3a2ab590 Parents: 7541f56 Author: devozerov <[email protected]> Authored: Mon Mar 20 14:29:01 2017 +0300 Committer: devozerov <[email protected]> Committed: Mon Mar 20 14:29:01 2017 +0300 ---------------------------------------------------------------------- .../processors/query/GridQueryProcessor.java | 38 ++++---------------- 1 file changed, 7 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2b7c1a2c/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 f92108e..1bb3c1c 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 @@ -799,9 +799,9 @@ public class GridQueryProcessor extends GridProcessorAdapter { @Override public QueryCursor<Cache.Entry<K, V>> applyx() throws IgniteCheckedException { String type = qry.getType(); - QueryTypeDescriptorImpl typeDesc = type(cctx.name(), type); + String typeName = type(cctx.name(), type); - qry.setType(typeDesc.name()); + qry.setType(typeName); sendQueryExecutedEvent( qry.getSql(), @@ -1054,9 +1054,9 @@ public class GridQueryProcessor extends GridProcessorAdapter { return executeQuery(GridCacheQueryType.TEXT, clause, cctx, new IgniteOutClosureX<GridCloseableIterator<IgniteBiTuple<K, V>>>() { @Override public GridCloseableIterator<IgniteBiTuple<K, V>> applyx() throws IgniteCheckedException { - QueryTypeDescriptorImpl type = type(space, resType); + String typeName = type(space, resType); - return idx.queryLocalText(space, clause, type.name(), filters); + return idx.queryLocalText(space, clause, typeName, filters); } }, true); } @@ -1139,20 +1139,20 @@ public class GridQueryProcessor extends GridProcessorAdapter { } /** - * Gets type descriptor for space and type name. + * Gets type name for provided space and type name if type is still valid. * * @param space Space name. * @param typeName Type name. * @return Type descriptor. * @throws IgniteCheckedException If failed. */ - private QueryTypeDescriptorImpl type(@Nullable String space, String typeName) throws IgniteCheckedException { + private String type(@Nullable String space, String typeName) throws IgniteCheckedException { QueryTypeDescriptorImpl type = typesByName.get(new QueryTypeNameKey(space, typeName)); if (type == null || !type.registered()) throw new IgniteCheckedException("Failed to find SQL table for type: " + typeName); - return type; + return type.name(); } /** @@ -1442,30 +1442,6 @@ public class GridQueryProcessor extends GridProcessorAdapter { } /** - * Type removal task (either due to cache stop or due to type undeploy). - */ - private static class TypeRemoveTask implements IndexingTask { - /** Type descriptor. */ - private final QueryTypeDescriptorImpl typeDesc; - - /** - * Constructor. - * - * @param typeDesc Type descriptor. - */ - public TypeRemoveTask(QueryTypeDescriptorImpl typeDesc) { - this.typeDesc = typeDesc; - } - - /** - * @return Type descriptor. - */ - public QueryTypeDescriptorImpl typeDescriptor() { - return typeDesc; - } - } - - /** * Operation status message received. */ private static class OperationStatusTask implements IndexingTask {
