Repository: ignite Updated Branches: refs/heads/ignite-950-new 4b6d1e6f5 -> 0062bcb54
Ignite-950 - Fixed compilation after merge. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0062bcb5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0062bcb5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0062bcb5 Branch: refs/heads/ignite-950-new Commit: 0062bcb54551c3014d0c3bd69e6088ff1ea19976 Parents: 4b6d1e6 Author: Alexey Goncharuk <[email protected]> Authored: Fri Oct 23 14:09:54 2015 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Fri Oct 23 14:09:54 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/cache/CacheTypeMetadata.java | 6 +++--- .../ignite/configuration/CacheConfiguration.java | 10 +++++++--- .../processors/query/GridQueryProcessor.java | 18 ++++++++---------- .../cache/GridCacheAbstractSelfTest.java | 1 + 4 files changed, 19 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0062bcb5/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java index cddb313..2b7205b 100644 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java @@ -23,14 +23,14 @@ import java.util.Collection; import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.Map; +import javax.cache.CacheException; import org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStore; +import org.apache.ignite.internal.processors.query.GridQueryProcessor; import org.apache.ignite.internal.util.tostring.GridToStringInclude; import org.apache.ignite.internal.util.typedef.internal.S; +import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiTuple; -import java.io.*; -import java.util.*; - /** * Cache type metadata need for configuration of indexes or automatic persistence. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/0062bcb5/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java index 8c699e1..f214928 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java @@ -27,6 +27,7 @@ import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedHashMap; import java.util.Map; import java.util.TreeSet; @@ -71,10 +72,13 @@ import org.apache.ignite.lang.IgniteBiTuple; import org.apache.ignite.lang.IgnitePredicate; import org.apache.ignite.plugin.CachePluginConfiguration; import org.jetbrains.annotations.Nullable; -import java.util.HashSet; -import static org.apache.ignite.internal.processors.query.GridQueryIndexType.*; -import static org.apache.ignite.internal.processors.query.GridQueryProcessor.*; +import static org.apache.ignite.internal.processors.query.GridQueryIndexType.FULLTEXT; +import static org.apache.ignite.internal.processors.query.GridQueryIndexType.GEO_SPATIAL; +import static org.apache.ignite.internal.processors.query.GridQueryIndexType.SORTED; +import static org.apache.ignite.internal.processors.query.GridQueryProcessor._VAL; +import static org.apache.ignite.internal.processors.query.GridQueryProcessor.isGeometryClass; +import static org.apache.ignite.internal.processors.query.GridQueryProcessor.isSqlType; /** * This class defines grid cache configuration. This configuration is passed to http://git-wip-us.apache.org/repos/asf/ignite/blob/0062bcb5/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 b80dfae..5ea2aa7 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 @@ -34,7 +34,9 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.TreeSet; +import java.util.UUID; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ExecutorService; import javax.cache.Cache; @@ -46,9 +48,6 @@ import org.apache.ignite.cache.CacheTypeMetadata; import org.apache.ignite.cache.query.QueryCursor; import org.apache.ignite.cache.query.SqlFieldsQuery; import org.apache.ignite.cache.query.SqlQuery; -import org.apache.ignite.cache.query.annotations.QueryGroupIndex; -import org.apache.ignite.cache.query.annotations.QuerySqlField; -import org.apache.ignite.cache.query.annotations.QueryTextField; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.events.CacheQueryExecutedEvent; import org.apache.ignite.internal.GridKernalContext; @@ -82,10 +81,11 @@ import org.apache.ignite.spi.indexing.IndexingQueryFilter; import org.jetbrains.annotations.Nullable; import org.jsr166.ConcurrentHashMap8; -import javax.cache.*; -import java.lang.reflect.*; -import java.util.*; -import java.util.concurrent.*; +import static org.apache.ignite.events.EventType.EVT_CACHE_QUERY_EXECUTED; +import static org.apache.ignite.internal.IgniteComponentType.INDEXING; +import static org.apache.ignite.internal.processors.query.GridQueryIndexType.FULLTEXT; +import static org.apache.ignite.internal.processors.query.GridQueryIndexType.GEO_SPATIAL; +import static org.apache.ignite.internal.processors.query.GridQueryIndexType.SORTED; /** * Indexing processor. @@ -1326,11 +1326,9 @@ public class GridQueryProcessor extends GridProcessorAdapter { * @param resType Expected result type. * @param aliases Aliases. * @return Property instance corresponding to the given path. - * @throws IgniteCheckedException If property cannot be created. */ static ClassProperty buildClassProperty(boolean key, Class<?> cls, String pathStr, Class<?> resType, - Map<String,String> aliases) - throws IgniteCheckedException { + Map<String,String> aliases) { String[] path = pathStr.split("\\."); ClassProperty res = null; http://git-wip-us.apache.org/repos/asf/ignite/blob/0062bcb5/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java index a6a9c82..52fbf4c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java @@ -38,6 +38,7 @@ import org.apache.ignite.internal.IgniteKernal; import org.apache.ignite.internal.cluster.ClusterTopologyCheckedException; import org.apache.ignite.internal.util.lang.GridAbsPredicateX; import org.apache.ignite.internal.util.typedef.CI1; +import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.P1; import org.apache.ignite.internal.util.typedef.R1; import org.apache.ignite.internal.util.typedef.X;
