ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [43/50] [abbrv] incubator-ignite git commit: Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql
Date Wed, 04 Feb 2015 23:50:57 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/examples/config/example-cache.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/examples/config/filesystem/example-ignitefs.xml
----------------------------------------------------------------------
diff --cc examples/config/filesystem/example-ignitefs.xml
index 0000000,0cdb774..61bed2a
mode 000000,100644..100644
--- a/examples/config/filesystem/example-ignitefs.xml
+++ b/examples/config/filesystem/example-ignitefs.xml
@@@ -1,0 -1,165 +1,162 @@@
+ <?xml version="1.0" encoding="UTF-8"?>
+ 
+ <!--
+   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.
+   -->
+ 
+ <!--
+     Ignite Spring configuration file to startup ignite cache.
+ 
+     When starting a standalone node, you need to execute the following command:
+     {IGNITE_HOME}/bin/ignite.{bat|sh} examples/config/filesystem/example-ignitefs.xml
+ 
+     When starting Ignite from Java IDE, pass path to this file into Ignition:
+     Ignition.start("examples/config/filesystem/example-ignitefs.xml");
+ -->
+ <beans xmlns="http://www.springframework.org/schema/beans"
 -       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:util="http://www.springframework.org/schema/util"
 -       xsi:schemaLocation="
 -       http://www.springframework.org/schema/beans
 -       http://www.springframework.org/schema/beans/spring-beans.xsd
 -       http://www.springframework.org/schema/util
 -       http://www.springframework.org/schema/util/spring-util.xsd">
++       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
++       xsi:schemaLocation="http://www.springframework.org/schema/beans
++       http://www.springframework.org/schema/beans/spring-beans.xsd">
+ 
+     <!--
+         Optional description.
+     -->
+     <description>
+         Spring file for ignite configuration with client available endpoints.
+     </description>
+ 
+     <!--
+         Initialize property configurer so we can reference environment variables.
+     -->
+     <bean id="propertyConfigurer" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+         <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_FALLBACK"/>
+         <property name="searchSystemEnvironment" value="true"/>
+     </bean>
+ 
+     <!--
+         Configuration below demonstrates how to setup a IgniteFs node with file data.
+     -->
+     <bean id="ignite.cfg" class="org.apache.ignite.configuration.IgniteConfiguration">
+         <!-- Set to true to enable cluster-aware class loading for examples, default is false. -->
+         <property name="peerClassLoadingEnabled" value="true"/>
+ 
+         <property name="marshaller">
+             <bean class="org.apache.ignite.marshaller.optimized.IgniteOptimizedMarshaller">
+                 <!-- Set to false to allow non-serializable objects in examples, default is true. -->
+                 <property name="requireSerializable" value="false"/>
+             </bean>
+         </property>
+ 
+         <property name="ggfsConfiguration">
+             <list>
+                 <bean class="org.apache.ignite.fs.IgniteFsConfiguration">
+                     <property name="name" value="ignitefs"/>
+                     <property name="metaCacheName" value="ignitefs-meta"/>
+                     <property name="dataCacheName" value="ignitefs-data"/>
+ 
+                     <!-- Must correlate with cache affinity mapper. -->
+                     <property name="blockSize" value="#{128 * 1024}"/>
+                     <property name="perNodeBatchSize" value="512"/>
+                     <property name="perNodeParallelBatchCount" value="16"/>
+ 
+                     <!-- Set number of prefetch blocks. -->
+                     <property name="prefetchBlocks" value="32"/>
+ 
+                     <!--
+                         This will disable IPC endpoint binding thus preventing Hadoop clients from connecting to IgniteFs.
+                         With this option set to false the only possible way to interact with IgniteFs is through
+                         Ignite API.
+                     -->
+                     <property name="ipcEndpointEnabled" value="false"/>
+ 
+                     <!--
+                         Example of configured IPC loopback endpoint.
+                     -->
+                     <!--
+                     <property name="ipcEndpointConfiguration">
+                         <map>
+                             <entry key="type" value="tcp"/>
+                         </map>
+                     </property>
+                     -->
+ 
+                     <!--
+                         Example of configured shared memory endpoint.
+                     -->
+                     <!--
+                     <property name="ipcEndpointConfiguration">
+                         <map>
+                             <entry key="type" value="shmem"/>
+                             <entry key="port" value="10500"/>
+                         </map>
+                     </property>
+                     -->
+                 </bean>
+             </list>
+         </property>
+ 
+         <property name="cacheConfiguration">
+             <list>
+                 <bean class="org.apache.ignite.cache.CacheConfiguration">
+                     <property name="name" value="ignitefs-data"/>
+                     <property name="cacheMode" value="PARTITIONED"/>
+                     <property name="atomicityMode" value="TRANSACTIONAL"/>
+                     <property name="queryIndexEnabled" value="false"/>
+                     <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+                     <property name="distributionMode" value="PARTITIONED_ONLY"/>
+                     <property name="backups" value="0"/>
+                     <property name="affinityMapper">
+                         <bean class="org.apache.ignite.fs.IgniteFsGroupDataBlocksKeyMapper">
+                             <!-- Haw many blocks in row will be stored on the same node. -->
+                             <constructor-arg value="512"/>
+                         </bean>
+                     </property>
+                 </bean>
+ 
+                 <bean class="org.apache.ignite.cache.CacheConfiguration">
+                     <property name="name" value="ignitefs-meta"/>
+                     <property name="cacheMode" value="REPLICATED"/>
+                     <property name="atomicityMode" value="TRANSACTIONAL"/>
+                     <property name="queryIndexEnabled" value="false"/>
+                     <property name="writeSynchronizationMode" value="FULL_SYNC"/>
+                 </bean>
+             </list>
+         </property>
+ 
+         <!-- Explicitly configure TCP discovery SPI to provide list of initial nodes. -->
+         <property name="discoverySpi">
+             <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
+                 <property name="ipFinder">
+                     <!--
+                         Ignition provides several options for automatic discovery that can be used
+                         instead os static IP based discovery. For information on all options refer
+                         to our documentation: http://doc.gridgain.org/latest/Automatic+Node+Discovery
+                     -->
+                     <!-- Uncomment static IP finder to enable static-based discovery of initial nodes. -->
+                     <!--<bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder">-->
+                     <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.multicast.TcpDiscoveryMulticastIpFinder">
+                         <property name="addresses">
+                             <list>
+                                 <!-- In distributed environment, replace with actual host IP address. -->
+                                 <value>127.0.0.1:47500..47509</value>
+                             </list>
+                         </property>
+                     </bean>
+                 </property>
+             </bean>
+         </property>
+     </bean>
+ </beans>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/examples/src/main/java/org/apache/ignite/examples/compute/failover/ComputeFailoverExample.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimProduct.java
----------------------------------------------------------------------
diff --cc examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimProduct.java
index af1ba4c,aa59ae5..7cc7c72
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimProduct.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimProduct.java
@@@ -17,7 -17,8 +17,9 @@@
  
  package org.apache.ignite.examples.datagrid.starschema;
  
 +import org.apache.ignite.cache.query.annotations.*;
+ import org.apache.ignite.cache.query.*;
+ import org.apache.ignite.cache.*;
  
  /**
   * Represents a product available for purchase. In our {@code snowflake} schema a {@code product}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimStore.java
----------------------------------------------------------------------
diff --cc examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimStore.java
index 11fe365,a2494b5..9838b9c
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimStore.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/DimStore.java
@@@ -17,7 -17,8 +17,9 @@@
  
  package org.apache.ignite.examples.datagrid.starschema;
  
 +import org.apache.ignite.cache.query.annotations.*;
+ import org.apache.ignite.cache.query.*;
+ import org.apache.ignite.cache.*;
  
  /**
   * Represents a physical store location. In our {@code snowflake} schema a {@code store}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/FactPurchase.java
----------------------------------------------------------------------
diff --cc examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/FactPurchase.java
index fb097a2,61bbb6f..fd77cfb
--- a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/FactPurchase.java
+++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/FactPurchase.java
@@@ -17,7 -17,8 +17,9 @@@
  
  package org.apache.ignite.examples.datagrid.starschema;
  
 +import org.apache.ignite.cache.query.annotations.*;
+ import org.apache.ignite.cache.query.*;
+ import org.apache.ignite.cache.*;
  
  /**
   * Represents a purchase record. In our {@code snowflake} schema purchase

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/examples/src/main/java/org/apache/ignite/examples/datagrid/store/dummy/CacheDummyPersonStore.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/examples/src/main/java/org/apache/ignite/examples/misc/client/memcache/MemcacheRestExampleNodeStartup.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/examples/src/main/java8/org/apache/ignite/examples/ComputeExample.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/examples/src/main/java8/org/apache/ignite/examples/MessagingExample.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
----------------------------------------------------------------------
diff --cc modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
index b9ea56e,e01143e..83dc440
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java
@@@ -20,8 -20,8 +20,9 @@@ package org.apache.ignite.jdbc
  import org.apache.ignite.cache.*;
  import org.apache.ignite.cache.affinity.*;
  import org.apache.ignite.cache.query.*;
 +import org.apache.ignite.cache.query.annotations.*;
  import org.apache.ignite.configuration.*;
+ import org.apache.ignite.internal.util.typedef.*;
  import org.apache.ignite.spi.discovery.tcp.*;
  import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
  import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
----------------------------------------------------------------------
diff --cc modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
index 6d2a84d,82a5a54..7acc359
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcMetadataSelfTest.java
@@@ -20,8 -20,8 +20,9 @@@ package org.apache.ignite.jdbc
  import org.apache.ignite.cache.*;
  import org.apache.ignite.cache.affinity.*;
  import org.apache.ignite.cache.query.*;
 +import org.apache.ignite.cache.query.annotations.*;
  import org.apache.ignite.configuration.*;
+ import org.apache.ignite.internal.util.typedef.*;
  import org.apache.ignite.spi.discovery.tcp.*;
  import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
  import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java
----------------------------------------------------------------------
diff --cc modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java
index 910ff40,9155742..81a5f2f
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcResultSetSelfTest.java
@@@ -19,8 -19,8 +19,9 @@@ package org.apache.ignite.jdbc
  
  import org.apache.ignite.cache.*;
  import org.apache.ignite.cache.query.*;
 +import org.apache.ignite.cache.query.annotations.*;
  import org.apache.ignite.configuration.*;
+ import org.apache.ignite.internal.util.typedef.internal.*;
  import org.apache.ignite.spi.discovery.tcp.*;
  import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
  import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
----------------------------------------------------------------------
diff --cc modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
index 1d06ac8,082f980..e9f3c43
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcStatementSelfTest.java
@@@ -19,8 -19,8 +19,9 @@@ package org.apache.ignite.jdbc
  
  import org.apache.ignite.cache.*;
  import org.apache.ignite.cache.query.*;
 +import org.apache.ignite.cache.query.annotations.*;
  import org.apache.ignite.configuration.*;
+ import org.apache.ignite.internal.util.typedef.*;
  import org.apache.ignite.spi.discovery.tcp.*;
  import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
  import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
index 243b4a0,a194ba5..8009431
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheConfiguration.java
@@@ -22,11 -21,12 +21,11 @@@ import org.apache.ignite.*
  import org.apache.ignite.cache.affinity.*;
  import org.apache.ignite.cache.cloner.*;
  import org.apache.ignite.cache.eviction.*;
 -import org.apache.ignite.cache.query.*;
  import org.apache.ignite.cache.store.*;
  import org.apache.ignite.configuration.*;
- import org.apache.ignite.portables.PortableObject;
- import org.apache.ignite.spi.indexing.*;
  import org.apache.ignite.internal.util.typedef.internal.*;
+ import org.apache.ignite.portables.*;
+ import org.apache.ignite.spi.indexing.*;
  import org.jetbrains.annotations.*;
  
  import javax.cache.configuration.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
index 0595cd7,2cf10aa..46fddb2
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheProjection.java
@@@ -22,7 -23,7 +22,8 @@@ import org.apache.ignite.cache.store.*
  import org.apache.ignite.cluster.*;
  import org.apache.ignite.internal.*;
  import org.apache.ignite.internal.processors.cache.*;
 +import org.apache.ignite.internal.processors.cache.query.*;
+ import org.apache.ignite.internal.processors.cache.transactions.*;
  import org.apache.ignite.lang.*;
  import org.apache.ignite.transactions.*;
  import org.jetbrains.annotations.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/main/java/org/apache/ignite/cache/query/QueryPredicate.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/cache/query/QueryPredicate.java
index e2a8569,31cf987..3cb043c
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/QueryPredicate.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/QueryPredicate.java
@@@ -17,10 -17,10 +17,11 @@@
  
  package org.apache.ignite.cache.query;
  
 +import org.apache.ignite.configuration.*;
  import org.apache.ignite.internal.util.typedef.internal.*;
+ import org.apache.ignite.lang.*;
  
 -import javax.cache.*;
 +import java.io.*;
  
  /**
   * Query predicate to pass into any of {@code Cache.query(...)} methods.

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/main/java/org/apache/ignite/cache/query/QueryTypeMetadata.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/cache/query/QueryTypeMetadata.java
index 51c7736,0000000..f8dec3a
mode 100644,000000..100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/QueryTypeMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/QueryTypeMetadata.java
@@@ -1,196 -1,0 +1,196 @@@
 +/*
 + * 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.lang.*;
 +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 QueryTypeMetadata {
 +    /** Type name, e.g. class name. */
 +    @GridToStringInclude
 +    private String type;
 +
 +    /** Fields to be queried, in addition to indexed fields. */
 +    @GridToStringInclude
 +    private Map<String, Class<?>> qryFlds = new HashMap<>();
 +
 +    /** Fields to index in ascending order. */
 +    @GridToStringInclude
 +    private Map<String, Class<?>> ascFlds = new HashMap<>();
 +
 +    /** Fields to index in descending order. */
 +    @GridToStringInclude
 +    private Map<String, Class<?>> descFlds = new HashMap<>();
 +
 +    /** Fields to index as text. */
 +    @GridToStringInclude
 +    private Collection<String> txtFlds = new LinkedHashSet<>();
 +
 +    /** Fields to create group indexes for. */
 +    @GridToStringInclude
 +    private Map<String, LinkedHashMap<String, IgniteBiTuple<Class<?>, Boolean>>> grps;
 +
 +    /**
 +     * Default constructor.
 +     */
 +    public QueryTypeMetadata() {
 +        // No-op.
 +    }
 +
 +    /**
 +     *
 +     */
 +    public QueryTypeMetadata(QueryTypeMetadata src) {
 +        type = src.getType();
 +
 +        qryFlds = new HashMap<>(src.getQueryFields());
 +        ascFlds = new HashMap<>(src.getAscendingFields());
 +        descFlds = new HashMap<>(src.getDescendingFields());
 +        txtFlds = new HashSet<>(src.getTextFields());
 +
 +        grps = new HashMap<>(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<String, Class<?>> getQueryFields() {
 +        return qryFlds;
 +    }
 +
 +    /**
 +     * Sets query fields map.
 +     *
 +     * @param qryFlds Query fields.
 +     */
 +    public void setQueryFields(Map<String, Class<?>> qryFlds) {
 +        this.qryFlds = qryFlds;
 +    }
 +
 +    /**
 +     * Gets ascending-indexed fields.
 +     *
 +     * @return Map of ascending-indexed fields.
 +     */
 +    public Map<String, Class<?>> getAscendingFields() {
 +        return ascFlds;
 +    }
 +
 +    /**
 +     * Sets ascending-indexed fields.
 +     *
 +     * @param ascFlds Map of ascending-indexed fields.
 +     */
 +    public void setAscendingFields(Map<String, Class<?>> ascFlds) {
 +        this.ascFlds = ascFlds;
 +    }
 +
 +    /**
 +     * Gets descending-indexed fields.
 +     *
 +     * @return Map of descending-indexed fields.
 +     */
 +    public Map<String, Class<?>> getDescendingFields() {
 +        return descFlds;
 +    }
 +
 +    /**
 +     * Sets descending-indexed fields.
 +     *
 +     * @param descFlds Map of descending-indexed fields.
 +     */
 +    public void setDescendingFields(Map<String, Class<?>> descFlds) {
 +        this.descFlds = descFlds;
 +    }
 +
 +    /**
 +     * Gets text-indexed fields.
 +     *
 +     * @return Collection of text indexed fields.
 +     */
 +    public Collection<String> getTextFields() {
 +        return txtFlds;
 +    }
 +
 +    /**
 +     * Sets text-indexed fields.
 +     *
 +     * @param txtFlds Text-indexed fields.
 +     */
 +    public void setTextFields(Collection<String> txtFlds) {
 +        this.txtFlds = txtFlds;
 +    }
 +
 +    /**
 +     * Gets group-indexed fields.
 +     *
 +     * @return Map of group-indexed fields.
 +     */
 +    public Map<String, LinkedHashMap<String, IgniteBiTuple<Class<?>, 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<String, LinkedHashMap<String, IgniteBiTuple<Class<?>, Boolean>>> grps) {
 +        this.grps = grps;
 +    }
 +
 +    /** {@inheritDoc} */
 +    @Override public String toString() {
 +        return S.toString(QueryTypeMetadata.class, this);
 +    }
 +}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index c35377b,1db0e11..949d977
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@@ -26,15 -30,10 +30,17 @@@ import org.apache.ignite.lifecycle.*
  import org.apache.ignite.managed.*;
  import org.apache.ignite.marshaller.*;
  import org.apache.ignite.plugin.*;
 +import org.apache.ignite.portables.*;
 +import org.apache.ignite.spi.authentication.*;
 +import org.apache.ignite.spi.indexing.*;
 +import org.apache.ignite.streamer.*;
 +import org.apache.ignite.client.ssl.*;
 +import org.apache.ignite.hadoop.*;
 +import org.apache.ignite.internal.managers.eventstorage.*;
  import org.apache.ignite.plugin.security.*;
  import org.apache.ignite.plugin.segmentation.*;
+ import org.apache.ignite.portables.*;
+ import org.apache.ignite.spi.authentication.*;
  import org.apache.ignite.spi.checkpoint.*;
  import org.apache.ignite.spi.collision.*;
  import org.apache.ignite.spi.communication.*;
@@@ -45,7 -45,7 +52,8 @@@ import org.apache.ignite.spi.indexing.*
  import org.apache.ignite.spi.loadbalancing.*;
  import org.apache.ignite.spi.securesession.*;
  import org.apache.ignite.spi.swapspace.*;
 +import org.apache.ignite.internal.util.typedef.internal.*;
+ import org.apache.ignite.streamer.*;
  
  import javax.management.*;
  import java.lang.management.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/main/java/org/apache/ignite/events/IgniteCacheQueryExecutedEvent.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/events/IgniteCacheQueryExecutedEvent.java
index 476a5fc,18631d3..4baef54
--- a/modules/core/src/main/java/org/apache/ignite/events/IgniteCacheQueryExecutedEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/IgniteCacheQueryExecutedEvent.java
@@@ -19,10 -19,9 +19,11 @@@ package org.apache.ignite.events
  
  import org.apache.ignite.cache.query.*;
  import org.apache.ignite.cluster.*;
 +import org.apache.ignite.internal.processors.cache.query.*;
 +import org.apache.ignite.lang.*;
  import org.apache.ignite.internal.util.tostring.*;
  import org.apache.ignite.internal.util.typedef.internal.*;
+ import org.apache.ignite.lang.*;
  import org.jetbrains.annotations.*;
  
  import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/main/java/org/apache/ignite/events/IgniteCacheQueryReadEvent.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/events/IgniteCacheQueryReadEvent.java
index b872e85,9d0dcf6..89a2d17
--- a/modules/core/src/main/java/org/apache/ignite/events/IgniteCacheQueryReadEvent.java
+++ b/modules/core/src/main/java/org/apache/ignite/events/IgniteCacheQueryReadEvent.java
@@@ -19,10 -19,9 +19,11 @@@ package org.apache.ignite.events
  
  import org.apache.ignite.cache.query.*;
  import org.apache.ignite.cluster.*;
 +import org.apache.ignite.internal.processors.cache.query.*;
 +import org.apache.ignite.lang.*;
  import org.apache.ignite.internal.util.tostring.*;
  import org.apache.ignite.internal.util.typedef.internal.*;
+ import org.apache.ignite.lang.*;
  import org.jetbrains.annotations.*;
  
  import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/main/java/org/apache/ignite/internal/managers/indexing/GridIndexingManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
index be3b8d3,393a3fc..b4f8fc9
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java
@@@ -21,8 -21,8 +21,7 @@@ import org.apache.ignite.*
  import org.apache.ignite.cache.*;
  import org.apache.ignite.cache.affinity.*;
  import org.apache.ignite.cache.datastructures.*;
 -import org.apache.ignite.cache.query.*;
  import org.apache.ignite.cluster.*;
- import org.apache.ignite.compute.*;
  import org.apache.ignite.configuration.*;
  import org.apache.ignite.fs.*;
  import org.apache.ignite.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
index fcf71a0,905444b..e49e900
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionImpl.java
@@@ -19,15 -19,14 +19,13 @@@ package org.apache.ignite.internal.proc
  
  import org.apache.ignite.*;
  import org.apache.ignite.cache.*;
 -import org.apache.ignite.cache.query.*;
  import org.apache.ignite.cluster.*;
  import org.apache.ignite.internal.*;
- import org.apache.ignite.internal.processors.cache.version.*;
- import org.apache.ignite.internal.util.*;
- import org.apache.ignite.lang.*;
- import org.apache.ignite.portables.*;
- import org.apache.ignite.transactions.*;
  import org.apache.ignite.internal.processors.cache.dr.*;
  import org.apache.ignite.internal.processors.cache.query.*;
+ import org.apache.ignite.internal.processors.cache.transactions.*;
+ import org.apache.ignite.internal.processors.cache.version.*;
+ import org.apache.ignite.internal.util.*;
  import org.apache.ignite.internal.util.future.*;
  import org.apache.ignite.internal.util.tostring.*;
  import org.apache.ignite.internal.util.typedef.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
index 52c83ce,b20628e..9916564
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
@@@ -21,12 -21,9 +21,8 @@@ import org.apache.ignite.*
  import org.apache.ignite.cache.*;
  import org.apache.ignite.cache.affinity.*;
  import org.apache.ignite.cache.datastructures.*;
 -import org.apache.ignite.cache.query.*;
  import org.apache.ignite.cluster.*;
  import org.apache.ignite.internal.*;
- import org.apache.ignite.internal.processors.cache.version.*;
- import org.apache.ignite.lang.*;
- import org.apache.ignite.mxbean.*;
- import org.apache.ignite.transactions.*;
  import org.apache.ignite.internal.processors.cache.affinity.*;
  import org.apache.ignite.internal.processors.cache.datastructures.*;
  import org.apache.ignite.internal.processors.cache.dr.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
index 55140e3,43d231e..56dd6e1
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java
@@@ -21,10 -21,7 +21,11 @@@ import org.apache.ignite.*
  import org.apache.ignite.cache.*;
  import org.apache.ignite.cache.query.*;
  import org.apache.ignite.internal.*;
 +import org.apache.ignite.internal.processors.cache.query.*;
 +import org.apache.ignite.internal.util.*;
 +import org.apache.ignite.lang.*;
 +import org.apache.ignite.mxbean.*;
+ import org.apache.ignite.internal.util.future.*;
  import org.apache.ignite.internal.util.tostring.*;
  import org.apache.ignite.internal.util.typedef.*;
  import org.apache.ignite.internal.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetImpl.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetImpl.java
index 0b78b50,4feab81..47ad181
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetImpl.java
@@@ -21,11 -21,11 +21,10 @@@ import org.apache.ignite.*
  import org.apache.ignite.cache.*;
  import org.apache.ignite.cache.affinity.*;
  import org.apache.ignite.cache.datastructures.*;
 -import org.apache.ignite.cache.query.*;
  import org.apache.ignite.cluster.*;
  import org.apache.ignite.internal.processors.cache.*;
- import org.apache.ignite.internal.util.*;
- import org.apache.ignite.lang.*;
  import org.apache.ignite.internal.processors.cache.query.*;
+ import org.apache.ignite.internal.util.*;
  import org.apache.ignite.internal.util.lang.*;
  import org.apache.ignite.internal.util.typedef.*;
  import org.apache.ignite.internal.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueriesImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
index 09c3cf0,350b9b8..0d414e7
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryHandler.java
@@@ -23,10 -23,8 +23,11 @@@ import org.apache.ignite.cache.query.*
  import org.apache.ignite.cluster.*;
  import org.apache.ignite.events.*;
  import org.apache.ignite.internal.*;
 +import org.apache.ignite.internal.processors.cache.*;
 +import org.apache.ignite.internal.processors.cache.query.*;
 +import org.apache.ignite.lang.*;
  import org.apache.ignite.internal.managers.deployment.*;
+ import org.apache.ignite.internal.processors.cache.*;
  import org.apache.ignite.internal.processors.continuous.*;
  import org.apache.ignite.internal.util.typedef.*;
  import org.apache.ignite.internal.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/jdbc/GridCacheQueryJdbcTask.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheQueryCommandHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
index 492124f,b6b26e0..d610754
--- a/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/visor/query/VisorQueryTask.java
@@@ -19,9 -19,9 +19,8 @@@ package org.apache.ignite.internal.viso
  
  import org.apache.ignite.*;
  import org.apache.ignite.cache.*;
 -import org.apache.ignite.cache.query.*;
  import org.apache.ignite.cluster.*;
  import org.apache.ignite.internal.*;
- import org.apache.ignite.lang.*;
  import org.apache.ignite.internal.processors.cache.query.*;
  import org.apache.ignite.internal.processors.query.*;
  import org.apache.ignite.internal.processors.task.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
index ab0ac07,caa7875..ff9c600
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentTxMultiNodeTest.java
@@@ -27,13 -27,12 +27,13 @@@ import org.apache.ignite.cluster.*
  import org.apache.ignite.compute.*;
  import org.apache.ignite.configuration.*;
  import org.apache.ignite.internal.*;
 +import org.apache.ignite.internal.processors.cache.query.*;
+ import org.apache.ignite.internal.processors.cache.distributed.dht.*;
+ import org.apache.ignite.internal.processors.cache.distributed.near.*;
  import org.apache.ignite.internal.util.*;
+ import org.apache.ignite.internal.util.typedef.*;
  import org.apache.ignite.lang.*;
  import org.apache.ignite.resources.*;
- import org.apache.ignite.transactions.*;
- import org.apache.ignite.internal.processors.cache.distributed.dht.*;
- import org.apache.ignite.internal.processors.cache.distributed.near.*;
  import org.apache.ignite.spi.discovery.tcp.*;
  import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
  import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java
index ad3b544,63922a0..ac996b0
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLuceneQueryIndexTest.java
@@@ -19,9 -19,11 +19,11 @@@ package org.apache.ignite.internal.proc
  
  import org.apache.ignite.*;
  import org.apache.ignite.cache.*;
 -import org.apache.ignite.cache.query.*;
 +import org.apache.ignite.cache.query.annotations.*;
  import org.apache.ignite.configuration.*;
  import org.apache.ignite.internal.*;
+ import org.apache.ignite.internal.util.typedef.*;
+ import org.apache.ignite.internal.util.typedef.internal.*;
  import org.apache.ignite.spi.discovery.tcp.*;
  import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
  import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
index f36013e,bb8ae3c..cd51801
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java
@@@ -20,9 -20,10 +20,11 @@@ package org.apache.ignite.internal.proc
  import org.apache.ignite.*;
  import org.apache.ignite.cache.*;
  import org.apache.ignite.cache.query.*;
 +import org.apache.ignite.cache.query.annotations.*;
  import org.apache.ignite.configuration.*;
  import org.apache.ignite.events.*;
+ import org.apache.ignite.internal.util.typedef.*;
+ import org.apache.ignite.internal.util.typedef.internal.*;
  import org.apache.ignite.lang.*;
  import org.apache.ignite.marshaller.optimized.*;
  import org.apache.ignite.spi.discovery.tcp.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue.java
index 8be62e6,188370b..9ce96c9
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue.java
@@@ -18,8 -18,8 +18,9 @@@
  package org.apache.ignite.internal.processors.cache;
  
  import org.apache.ignite.cache.query.*;
 +import org.apache.ignite.cache.query.annotations.*;
  import org.apache.ignite.internal.util.typedef.internal.*;
+ 
  import java.io.*;
  
  /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue2.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue2.java
index e8ea547,8e1b5f3..5fb90a6
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue2.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestValue2.java
@@@ -18,8 -18,8 +18,9 @@@
  package org.apache.ignite.internal.processors.cache;
  
  import org.apache.ignite.cache.query.*;
 +import org.apache.ignite.cache.query.annotations.*;
  import org.apache.ignite.internal.util.typedef.internal.*;
+ 
  import java.io.*;
  
  /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxExceptionAbstractSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java
index bd02106,3f3277f..f9795b5
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteTxMultiNodeAbstractTest.java
@@@ -23,15 -23,9 +23,12 @@@ import org.apache.ignite.cache.affinity
  import org.apache.ignite.cluster.*;
  import org.apache.ignite.configuration.*;
  import org.apache.ignite.internal.*;
 +import org.apache.ignite.internal.processors.cache.query.*;
 +import org.apache.ignite.lang.*;
 +import org.apache.ignite.resources.*;
 +import org.apache.ignite.transactions.*;
  import org.apache.ignite.internal.processors.cache.distributed.dht.*;
  import org.apache.ignite.internal.processors.cache.distributed.near.*;
- import org.apache.ignite.spi.discovery.tcp.*;
- import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
- import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;
  import org.apache.ignite.internal.util.tostring.*;
  import org.apache.ignite.internal.util.typedef.*;
  import org.apache.ignite.internal.util.typedef.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java
index 164b394,1ea53b6..9e7b765
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedPreloadLifecycleSelfTest.java
@@@ -19,9 -19,10 +19,10 @@@ package org.apache.ignite.internal.proc
  
  import org.apache.ignite.*;
  import org.apache.ignite.cache.*;
 -import org.apache.ignite.cache.query.*;
  import org.apache.ignite.configuration.*;
  import org.apache.ignite.internal.processors.cache.distributed.*;
 +import org.apache.ignite.internal.processors.cache.query.*;
+ import org.apache.ignite.internal.util.typedef.*;
  import org.apache.ignite.lang.*;
  import org.apache.ignite.lifecycle.*;
  import org.apache.ignite.resources.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
index 8902218,6623569..d177e63
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadLifecycleSelfTest.java
@@@ -19,9 -19,10 +19,10 @@@ package org.apache.ignite.internal.proc
  
  import org.apache.ignite.*;
  import org.apache.ignite.cache.*;
 -import org.apache.ignite.cache.query.*;
  import org.apache.ignite.configuration.*;
  import org.apache.ignite.internal.processors.cache.distributed.*;
 +import org.apache.ignite.internal.processors.cache.query.*;
+ import org.apache.ignite.internal.util.typedef.*;
  import org.apache.ignite.lang.*;
  import org.apache.ignite.lifecycle.*;
  import org.apache.ignite.resources.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
index 8b72bd8,729db68..02e4f08
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
@@@ -19,9 -19,9 +19,10 @@@ package org.apache.ignite.internal.proc
  
  import org.apache.ignite.cache.*;
  import org.apache.ignite.cache.affinity.*;
 -import org.apache.ignite.cache.query.*;
 +import org.apache.ignite.cache.query.annotations.*;
  import org.apache.ignite.configuration.*;
 +import org.apache.ignite.internal.processors.cache.query.*;
+ import org.apache.ignite.internal.util.typedef.*;
  import org.apache.ignite.lang.*;
  import org.apache.ignite.marshaller.optimized.*;
  import org.apache.ignite.spi.discovery.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java
----------------------------------------------------------------------
diff --cc modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java
index 0000000,71705d9..878f9b2
mode 000000,100644..100644
--- a/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java
+++ b/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java
@@@ -1,0 -1,248 +1,249 @@@
+ /*
+  * 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.internal.processors.query.h2;
+ 
+ import com.vividsolutions.jts.geom.*;
+ import com.vividsolutions.jts.io.*;
+ import org.apache.ignite.cache.*;
 -import org.apache.ignite.cache.query.*;
++import org.apache.ignite.cache.query.annotations.*;
+ import org.apache.ignite.internal.*;
+ import org.apache.ignite.internal.processors.cache.*;
++import org.apache.ignite.internal.processors.cache.query.*;
+ import org.apache.ignite.internal.util.typedef.*;
+ import org.apache.ignite.internal.util.typedef.internal.*;
+ import org.apache.ignite.testframework.*;
+ 
+ import java.io.*;
+ import java.util.*;
+ import java.util.concurrent.*;
+ import java.util.concurrent.atomic.*;
+ 
+ /**
+  *
+  */
+ public class GridH2IndexingGeoSelfTest extends GridCacheAbstractSelfTest {
+     /** */
+     private static final int CNT = 100;
+ 
+     /** */
+     private static final long DUR = 60000L;
+ 
+     /** {@inheritDoc} */
+     @Override protected int gridCount() {
+         return 3;
+     }
+ 
+     /** {@inheritDoc} */
+     @Override protected long getTestTimeout() {
+         return DUR * 3;
+     }
+ 
+     /**
+      * @throws Exception If failed.
+      */
+     @SuppressWarnings("unchecked")
+     public void testGeo() throws Exception {
+         GridCache<Integer, EnemyCamp> cache = grid(0).cache(null);
+ 
+         WKTReader r = new WKTReader();
+ 
+         cache.put(0, new EnemyCamp(r.read("POINT(25 75)"), "A"));
+         cache.put(1, new EnemyCamp(r.read("POINT(70 70)"), "B"));
+         cache.put(2, new EnemyCamp(r.read("POINT(70 30)"), "C"));
+         cache.put(3, new EnemyCamp(r.read("POINT(75 25)"), "D"));
+ 
+         CacheQuery<Map.Entry<Integer, EnemyCamp>> qry = cache.queries().createSqlQuery(EnemyCamp.class,
+             "coords && ?");
+ 
+         Collection<Map.Entry<Integer, EnemyCamp>> res = qry.execute(r.read("POLYGON((5 70, 5 80, 30 80, 30 70, 5 70))"))
+             .get();
+ 
+         checkPoints(res, "A");
+ 
+         res = qry.execute(r.read("POLYGON((10 5, 10 35, 70 30, 75 25, 10 5))")).get();
+ 
+         checkPoints(res, "C", "D");
+ 
+         // Move B to the first polygon.
+         cache.put(1, new EnemyCamp(r.read("POINT(20 75)"), "B"));
+ 
+         res = qry.execute(r.read("POLYGON((5 70, 5 80, 30 80, 30 70, 5 70))")).get();
+ 
+         checkPoints(res, "A", "B");
+ 
+         // Move B to the second polygon.
+         cache.put(1, new EnemyCamp(r.read("POINT(30 30)"), "B"));
+ 
+         res = qry.execute(r.read("POLYGON((10 5, 10 35, 70 30, 75 25, 10 5))")).get();
+ 
+         checkPoints(res, "B", "C", "D");
+ 
+         // Remove B.
+         cache.remove(1);
+ 
+         res = qry.execute(r.read("POLYGON((5 70, 5 80, 30 80, 30 70, 5 70))")).get();
+ 
+         checkPoints(res, "A");
+ 
+         res = qry.execute(r.read("POLYGON((10 5, 10 35, 70 30, 75 25, 10 5))")).get();
+ 
+         checkPoints(res, "C", "D");
+ 
+         // Check explaint request.
+         assertTrue(F.first(cache.queries().createSqlFieldsQuery("explain select * from EnemyCamp " +
+             "where coords && 'POINT(25 75)'").execute().get()).get(0).toString().contains("coords_idx"));
+     }
+ 
+     /**
+      * @throws Exception If failed.
+      */
+     @SuppressWarnings("unchecked")
+     public void testGeoMultithreaded() throws Exception {
+         final GridCache<Integer, EnemyCamp> cache1 = grid(0).cache(null);
+         final GridCache<Integer, EnemyCamp> cache2 = grid(1).cache(null);
+         final GridCache<Integer, EnemyCamp> cache3 = grid(2).cache(null);
+ 
+         final String[] points = new String[CNT];
+ 
+         WKTReader r = new WKTReader();
+ 
+         ThreadLocalRandom rnd = ThreadLocalRandom.current();
+ 
+         for (int idx = 0; idx < CNT; idx++) {
+             int x = rnd.nextInt(1, 100);
+             int y = rnd.nextInt(1, 100);
+ 
+             cache1.put(idx, new EnemyCamp(r.read("POINT(" + x + " " + y + ")"), Integer.toString(idx)));
+ 
+             points[idx] = Integer.toString(idx);
+         }
+ 
+         Thread.sleep(200);
+ 
+         final AtomicBoolean stop = new AtomicBoolean();
+         final AtomicReference<Exception> err = new AtomicReference<>();
+ 
+         IgniteInternalFuture<?> putFut = GridTestUtils.runMultiThreadedAsync(new Callable<Void>() {
+             @Override public Void call() throws Exception {
+                 WKTReader r = new WKTReader();
+ 
+                 ThreadLocalRandom rnd = ThreadLocalRandom.current();
+ 
+                 while (!stop.get()) {
+                     int cacheIdx = rnd.nextInt(0, 3);
+ 
+                     GridCache<Integer, EnemyCamp> cache = cacheIdx == 0 ? cache1 : cacheIdx == 1 ? cache2 : cache3;
+ 
+                     int idx = rnd.nextInt(CNT);
+                     int x = rnd.nextInt(1, 100);
+                     int y = rnd.nextInt(1, 100);
+ 
+                     cache.put(idx, new EnemyCamp(r.read("POINT(" + x + " " + y + ")"), Integer.toString(idx)));
+ 
+                     U.sleep(50);
+                 }
+ 
+                 return null;
+             }
+         }, Runtime.getRuntime().availableProcessors(), "put-thread");
+ 
+         IgniteInternalFuture<?> qryFut = GridTestUtils.runMultiThreadedAsync(new Callable<Void>() {
+             @Override public Void call() throws Exception {
+                 WKTReader r = new WKTReader();
+ 
+                 ThreadLocalRandom rnd = ThreadLocalRandom.current();
+ 
+                 while (!stop.get()) {
+                     try {
+                         int cacheIdx = rnd.nextInt(0, 3);
+ 
+                         GridCache<Integer, EnemyCamp> cache = cacheIdx == 0 ? cache1 : cacheIdx == 1 ? cache2 : cache3;
+ 
+                         CacheQuery<Map.Entry<Integer, EnemyCamp>> qry = cache.queries().createSqlQuery(
+                             EnemyCamp.class, "coords && ?");
+ 
+                         Collection<Map.Entry<Integer, EnemyCamp>> res = qry.execute(
+                             r.read("POLYGON((0 0, 0 100, 100 100, 100 0, 0 0))")).get();
+ 
+                         checkPoints(res, points);
+ 
+                         U.sleep(5);
+                     }
+                     catch (Exception e) {
+                         err.set(e);
+ 
+                         stop.set(true);
+ 
+                         break;
+                     }
+                 }
+ 
+                 return null;
+             }
+         }, 4, "qry-thread");
+ 
+         U.sleep(60000L);
+ 
+         stop.set(true);
+ 
+         putFut.get();
+         qryFut.get();
+ 
+         Exception err0 = err.get();
+ 
+         if (err0 != null)
+             throw err0;
+     }
+ 
+     /**
+      * Check whether result contains all required points.
+      *
+      * @param res Result.
+      * @param points Expected points.
+      */
+     private void checkPoints( Collection<Map.Entry<Integer, EnemyCamp>> res, String... points) {
+         Set<String> set = new HashSet<>(Arrays.asList(points));
+ 
+         assertEquals(set.size(), res.size());
+ 
+         for (Map.Entry<Integer, EnemyCamp> e : res)
+             assertTrue(set.remove(e.getValue().name));
+     }
+ 
+     /**
+      *
+      */
+     private static class EnemyCamp implements Serializable {
+         /** */
 -        @CacheQuerySqlField(index = true)
++        @QuerySqlField(index = true)
+         private Geometry coords;
+ 
+         /** */
 -        @CacheQuerySqlField
++        @QuerySqlField
+         private String name;
+ 
+         /**
+          * @param coords Coordinates.
+          * @param name Name.
+          */
+         private EnemyCamp(Geometry coords, String name) {
+             this.coords = coords;
+             this.name = name;
+         }
+     }
+ }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
index f2190ab,cb774d0..be0d2d0
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java
@@@ -30,10 -29,11 +30,15 @@@ import org.apache.ignite.internal.proce
  import org.apache.ignite.internal.processors.query.h2.sql.*;
  import org.apache.ignite.internal.processors.query.h2.twostep.*;
  import org.apache.ignite.internal.util.*;
 +import org.apache.ignite.internal.util.lang.*;
 +import org.apache.ignite.internal.util.offheap.unsafe.*;
 +import org.apache.ignite.internal.util.typedef.*;
 +import org.apache.ignite.internal.util.typedef.internal.*;
+ import org.apache.ignite.internal.util.future.*;
+ import org.apache.ignite.internal.util.lang.*;
+ import org.apache.ignite.internal.util.offheap.unsafe.*;
+ import org.apache.ignite.internal.util.typedef.*;
+ import org.apache.ignite.internal.util.typedef.internal.*;
  import org.apache.ignite.lang.*;
  import org.apache.ignite.marshaller.*;
  import org.apache.ignite.marshaller.optimized.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
index afc526d,521cc93..7874915
--- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
+++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java
@@@ -17,6 -15,7 +17,8 @@@ import org.apache.ignite.internal.proce
  import org.apache.ignite.internal.processors.cache.query.*;
  import org.apache.ignite.internal.processors.query.h2.*;
  import org.apache.ignite.internal.processors.query.h2.twostep.messages.*;
++import org.apache.ignite.internal.processors.query.h2.twostep.messages.*;
+ import org.apache.ignite.internal.util.future.*;
  import org.apache.ignite.internal.util.typedef.*;
  import org.apache.ignite.internal.util.typedef.internal.*;
  import org.apache.ignite.lang.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
index 4c19444,a7b98d1..7f5d4e8
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractQuerySelfTest.java
@@@ -19,7 -19,7 +19,8 @@@ package org.apache.ignite.internal.proc
  
  import org.apache.ignite.*;
  import org.apache.ignite.cache.*;
 +import org.apache.ignite.cache.query.annotations.*;
+ import org.apache.ignite.cache.query.*;
  import org.apache.ignite.cache.store.*;
  import org.apache.ignite.configuration.*;
  import org.apache.ignite.events.*;
@@@ -51,8 -51,8 +52,10 @@@ import static org.apache.ignite.cache.C
  import static org.apache.ignite.cache.CacheMode.*;
  import static org.apache.ignite.cache.CachePreloadMode.*;
  import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*;
 +import static org.apache.ignite.internal.processors.cache.query.CacheQueryType.*;
 +import static org.apache.ignite.events.IgniteEventType.*;
+ import static org.apache.ignite.cache.query.CacheQueryType.*;
+ import static org.apache.ignite.events.IgniteEventType.*;
  import static org.junit.Assert.*;
  
  /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java
index cb7fbb5,6f94780..d8b5be0
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryLoadSelfTest.java
@@@ -19,7 -19,7 +19,8 @@@ package org.apache.ignite.internal.proc
  
  import org.apache.ignite.*;
  import org.apache.ignite.cache.*;
 +import org.apache.ignite.cache.query.annotations.*;
+ import org.apache.ignite.cache.query.*;
  import org.apache.ignite.cache.store.*;
  import org.apache.ignite.configuration.*;
  import org.apache.ignite.internal.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
index 45f5224,bfc0566..236de97
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridIndexingWithNoopSwapSelfTest.java
@@@ -20,9 -20,9 +20,10 @@@ package org.apache.ignite.internal.proc
  import org.apache.ignite.*;
  import org.apache.ignite.cache.*;
  import org.apache.ignite.cache.eviction.fifo.*;
 -import org.apache.ignite.cache.query.*;
  import org.apache.ignite.configuration.*;
  import org.apache.ignite.internal.processors.cache.GridCacheAbstractQuerySelfTest.*;
 +import org.apache.ignite.internal.processors.cache.query.*;
++import org.apache.ignite.internal.processors.cache.GridCacheAbstractQuerySelfTest.*;
  import org.apache.ignite.spi.discovery.tcp.*;
  import org.apache.ignite.spi.discovery.tcp.ipfinder.*;
  import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedHitsAndMissesSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java
index 6a99e4b,32924d8..a1f7292
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheQueryNodeRestartSelfTest.java
@@@ -23,9 -24,8 +23,11 @@@ import org.apache.ignite.configuration.
  import org.apache.ignite.events.*;
  import org.apache.ignite.internal.*;
  import org.apache.ignite.internal.processors.cache.*;
 +import org.apache.ignite.internal.processors.cache.query.*;
 +import org.apache.ignite.internal.util.typedef.*;
 +import org.apache.ignite.internal.util.typedef.internal.*;
+ import org.apache.ignite.internal.util.typedef.*;
+ import org.apache.ignite.internal.util.typedef.internal.*;
  import org.apache.ignite.lang.*;
  import org.apache.ignite.spi.discovery.tcp.*;
  import org.apache.ignite.spi.discovery.tcp.ipfinder.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java
index 7b68801,232ae2b..d75a258
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java
@@@ -17,9 -17,8 +17,8 @@@
  
  package org.apache.ignite.internal.processors.query.h2;
  
- import org.apache.ignite.*;
  import org.apache.ignite.cache.*;
 -import org.apache.ignite.cache.query.*;
 +import org.apache.ignite.cache.query.annotations.*;
  import org.apache.ignite.configuration.*;
  import org.apache.ignite.internal.*;
  import org.apache.ignite.internal.processors.cache.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/22ce9a79/modules/indexing/src/test/java/org/apache/ignite/spi/communication/tcp/GridOrderedMessageCancelSelfTest.java
----------------------------------------------------------------------


Mime
View raw message