ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From se...@apache.org
Subject [44/45] incubator-ignite git commit: Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-old
Date Sun, 15 Feb 2015 03:12:35 GMT
Merge branch 'sprint-1' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sql-old

Conflicts:
	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexSelfTest.java
	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryAbstractSelfTest.java
	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/GridCacheContinuousQueryReplicatedSelfTest.java
	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheAbstractReduceFieldsQuerySelfTest.java
	modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java
	modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java
	modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java
	modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java
	modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedQuerySelfTest.java
	modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalQuerySelfTest.java


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ddbfb711
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ddbfb711
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ddbfb711

Branch: refs/heads/ignite-sql-old
Commit: ddbfb711000b4402a4755d865da4bf6d0de43e84
Parents: 4873f04 f846f8a
Author: S.Vladykin <svladykin@gridgain.com>
Authored: Sun Feb 15 06:01:30 2015 +0300
Committer: S.Vladykin <svladykin@gridgain.com>
Committed: Sun Feb 15 06:01:30 2015 +0300

----------------------------------------------------------------------
 assembly/core-jar.xml                           |   49 -
 assembly/dependencies-fabric.xml                |   53 +-
 assembly/dependencies-hadoop.xml                |   42 +-
 assembly/dependencies-optional-fabric.xml       |    1 -
 assembly/dependencies-optional-hadoop.xml       |    1 -
 .../client/memcache/MemcacheRestExample.java    |    3 +-
 modules/core/licenses/sun-bcl-license.txt       |   50 +
 modules/core/pom.xml                            |   16 -
 .../ignite/internal/GridKernalGateway.java      |    7 +
 .../ignite/internal/GridKernalGatewayImpl.java  |   16 +
 .../apache/ignite/internal/IgniteKernal.java    |   23 +-
 .../deployment/GridDeploymentManager.java       |    2 +-
 .../processors/cache/GridCacheMvccManager.java  |   15 +
 .../processors/cache/GridCacheProcessor.java    |    8 +
 .../optimized/optimized-classnames.properties   |  254 +-
 .../fifoqueue/FifoQueueCollisionSpi.java        |    6 +-
 .../PriorityQueueCollisionSpi.java              |    6 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |   70 +-
 .../org/jdk8/backport/ConcurrentHashMap8.java   | 3825 ++++++++++++++++++
 .../jdk8/backport/ConcurrentLinkedDeque8.java   | 1983 +++++++++
 .../jdk8/backport/ConcurrentLinkedHashMap.java  | 2170 ++++++++++
 .../main/java/org/jdk8/backport/LongAdder.java  |  235 ++
 .../main/java/org/jdk8/backport/Striped64.java  |  370 ++
 .../org/jdk8/backport/ThreadLocalRandom8.java   |  231 ++
 .../META-INF/licenses/gnu-gplv2ce-license.txt   |  349 ++
 .../internal/GridReleaseTypeSelfTest.java       |   35 +-
 .../GridTopologyBuildVersionSelfTest.java       |  101 -
 .../internal/GridUpdateNotifierSelfTest.java    |    4 +
 .../GridCacheConcurrentTxMultiNodeTest.java     |    4 +-
 ...CacheFullTextQueryMultithreadedSelfTest.java |    2 +-
 .../cache/GridCacheLuceneQueryIndexTest.java    |   16 +-
 .../cache/GridCacheOffHeapSelfTest.java         |    2 +-
 .../cache/GridCacheP2PUndeploySelfTest.java     |    2 +-
 .../cache/GridCacheQueryIndexSelfTest.java      |    5 +-
 .../GridCacheQueryInternalKeysSelfTest.java     |    2 +-
 .../cache/GridCacheSwapPreloadSelfTest.java     |    2 +-
 .../GridCacheVariableTopologySelfTest.java      |    2 +-
 .../IgniteCacheAbstractStopBusySelfTest.java    |  381 ++
 .../IgniteCacheAtomicStopBusySelfTest.java      |   59 +
 ...gniteCacheTransactionalStopBusySelfTest.java |   53 +
 .../cache/IgniteTxMultiNodeAbstractTest.java    |    6 +-
 ...niteCacheContinuousExecutionContextTest.java |   34 +
 ...IgniteCacheIsolatedExecutionContextTest.java |   34 +
 ...niteCacheP2PDisableExecutionContextTest.java |   34 +
 .../IgniteCachePrivateExecutionContextTest.java |   34 +
 .../IgniteCacheSharedExecutionContextTest.java  |   34 +
 .../GridCacheQueueCleanupSelfTest.java          |    8 +-
 .../GridCacheAbstractJobExecutionTest.java      |    7 +-
 .../GridCacheClientModesAbstractSelfTest.java   |    9 +-
 ...ePartitionedNearDisabledMetricsSelfTest.java |    2 +-
 ...achePartitionedPreloadLifecycleSelfTest.java |    8 +-
 ...hePartitionedQueryMultiThreadedSelfTest.java |    2 +-
 ...CacheReplicatedPreloadLifecycleSelfTest.java |    7 +-
 .../GridCacheSwapScanQueryAbstractSelfTest.java |   13 +-
 ...ridCacheContinuousQueryAbstractSelfTest.java |    4 +-
 ...dCacheAbstractReduceFieldsQuerySelfTest.java |   11 +-
 ...cheReduceFieldsQueryPartitionedSelfTest.java |    3 +-
 .../GridContinuousOperationsLoadTest.java       |    1 +
 .../ignite/testsuites/IgniteBasicTestSuite.java |    1 -
 .../ignite/testsuites/IgniteCacheTestSuite.java |    7 +
 .../query/h2/GridH2IndexingGeoSelfTest.java     |    8 +-
 modules/hadoop/pom.xml                          |    6 -
 .../GridHibernateAccessStrategyAdapter.java     |    3 +-
 .../hibernate/GridHibernateRegionFactory.java   |    7 +-
 modules/indexing/pom.xml                        |    6 -
 .../GridCacheAbstractFieldsQuerySelfTest.java   |   47 +-
 .../cache/GridCacheAbstractQuerySelfTest.java   |   82 +-
 .../cache/GridCacheCrossCacheQuerySelfTest.java |    5 +-
 .../cache/GridCacheOffHeapAndSwapSelfTest.java  |    4 +-
 .../GridCacheQueryMultiThreadedSelfTest.java    |   30 +-
 .../GridCacheSqlQueryMultiThreadedSelfTest.java |    3 +-
 .../processors/cache/GridCacheSwapSelfTest.java |    7 +-
 .../cache/GridIndexingWithNoopSwapSelfTest.java |    3 +-
 .../GridCacheAtomicFieldsQuerySelfTest.java     |    3 +-
 ...GridCachePartitionedFieldsQuerySelfTest.java |    3 +-
 ...idCachePartitionedHitsAndMissesSelfTest.java |    2 +-
 .../near/GridCachePartitionedQuerySelfTest.java |   22 +-
 .../near/GridCacheQueryNodeRestartSelfTest.java |    2 +-
 .../GridCacheReplicatedFieldsQuerySelfTest.java |    4 +-
 .../GridCacheReplicatedQuerySelfTest.java       |    6 +-
 .../local/GridCacheLocalQuerySelfTest.java      |    5 +-
 .../query/h2/GridH2IndexRebuildTest.java        |   16 +-
 .../query/h2/sql/GridQueryParsingTest.java      |    2 +-
 .../tcp/GridOrderedMessageCancelSelfTest.java   |    2 +-
 .../jdk8-backport/licenses/sun-bcl-license.txt  |   50 -
 modules/jdk8-backport/pom.xml                   |   36 -
 .../org/jdk8/backport/ConcurrentHashMap8.java   | 3825 ------------------
 .../jdk8/backport/ConcurrentLinkedDeque8.java   | 1983 ---------
 .../jdk8/backport/ConcurrentLinkedHashMap.java  | 2170 ----------
 .../main/java/org/jdk8/backport/LongAdder.java  |  235 --
 .../main/java/org/jdk8/backport/Striped64.java  |  370 --
 .../org/jdk8/backport/ThreadLocalRandom8.java   |  231 --
 .../META-INF/licenses/gnu-gplv2ce-license.txt   |  349 --
 modules/spring/pom.xml                          |   12 +-
 .../org/apache/ignite/IgniteSpringBean.java     |    3 +-
 .../ignite/cache/spring/SpringCacheManager.java |    3 +-
 .../cache/spring/SpringDynamicCacheManager.java |    2 +-
 modules/visor-console/pom.xml                   |    6 +
 modules/web/pom.xml                             |    6 +
 pom.xml                                         |  153 +-
 100 files changed, 10472 insertions(+), 9954 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ddbfb711/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ddbfb711/modules/core/src/main/java/org/apache/ignite/marshaller/optimized/optimized-classnames.properties
----------------------------------------------------------------------

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

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

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

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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ddbfb711/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexSelfTest.java
index 2b66871,0ead33c..db38ec3
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryIndexSelfTest.java
@@@ -18,8 -18,8 +18,9 @@@
  package org.apache.ignite.internal.processors.cache;
  
  import org.apache.ignite.cache.*;
 -import org.apache.ignite.cache.query.*;
 +import org.apache.ignite.cache.query.annotations.*;
 +import org.apache.ignite.internal.processors.cache.query.*;
+ import org.apache.ignite.internal.*;
  import org.apache.ignite.internal.util.typedef.internal.*;
  
  import java.util.*;

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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ddbfb711/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 d6dce11,606f36e..52300a4
--- 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.*;
  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.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ddbfb711/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/ddbfb711/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 977e414,f15f35e..8c5f4e3
--- 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.*;
  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.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ddbfb711/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
index c6bc91c,a08db4d..ddf8376
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java
@@@ -18,7 -18,9 +18,8 @@@
  package org.apache.ignite.internal.processors.cache.query;
  
  import org.apache.ignite.cache.*;
 -import org.apache.ignite.cache.query.*;
  import org.apache.ignite.configuration.*;
+ import org.apache.ignite.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/ddbfb711/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/ddbfb711/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 1da1957,75a7129..0119b4f
--- 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.*;
  import org.apache.ignite.internal.util.typedef.*;
  import org.apache.ignite.lang.*;
  import org.apache.ignite.marshaller.optimized.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ddbfb711/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java
index ae1adde,14b7149..b7bc84e
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/reducefields/GridCacheReduceFieldsQueryPartitionedSelfTest.java
@@@ -18,7 -18,8 +18,8 @@@
  package org.apache.ignite.internal.processors.cache.query.reducefields;
  
  import org.apache.ignite.cache.*;
 -import org.apache.ignite.cache.query.*;
 +import org.apache.ignite.internal.processors.cache.query.*;
+ import org.apache.ignite.internal.*;
  import org.apache.ignite.lang.*;
  
  import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ddbfb711/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java
----------------------------------------------------------------------
diff --cc modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java
index 6fe1cc5,7ae8c12..ad49cae
--- a/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/loadtests/continuous/GridContinuousOperationsLoadTest.java
@@@ -79,7 -79,7 +79,8 @@@ public class GridContinuousOperationsLo
          dumpProperties(System.out);
  
          try (Ignite ignite = Ignition.start(cfgPath)) {
 +            final IgniteCache<Object, Object> cache = ignite.jcache(cacheName);
+             final GridCache<Object, Object> cache = ((IgniteKernal)ignite).cache(cacheName);
  
              if (cache == null)
                  throw new IgniteCheckedException("Cache is not configured: " + cacheName);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ddbfb711/modules/geospatial/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexingGeoSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ddbfb711/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
index 585ed35,551fbf1..7020487
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFieldsQuerySelfTest.java
@@@ -20,8 -20,9 +20,9 @@@ package org.apache.ignite.internal.proc
  import org.apache.ignite.*;
  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.*;
  import org.apache.ignite.internal.processors.cache.query.*;
  import org.apache.ignite.internal.processors.datastructures.*;
  import org.apache.ignite.internal.processors.query.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ddbfb711/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 2922599,bba57ed..957102d
--- 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
@@@ -1148,10 -1148,10 +1148,10 @@@ public abstract class GridCacheAbstract
       * @throws Exception If failed.
       */
      public void testAnonymousClasses() throws Exception {
-         GridCache<Integer, Object> cache = ignite.cache(null);
+         GridCache<Integer, Object> cache = ((IgniteKernal)ignite).cache(null);
  
          Object val = new Object() {
 -            @CacheQuerySqlField
 +            @QuerySqlField
              private int field1 = 10;
  
              @Override public String toString() {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ddbfb711/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
index 3e2ea10,ce885fb..7c7e680
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java
@@@ -19,8 -19,9 +19,9 @@@ 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.processors.cache.query.*;
  import org.apache.ignite.internal.util.typedef.*;
  import org.apache.ignite.lang.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ddbfb711/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ddbfb711/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java
index 01d9d8a,3199088..40aacae
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSqlQueryMultiThreadedSelfTest.java
@@@ -18,9 -18,9 +18,10 @@@
  package org.apache.ignite.internal.processors.cache;
  
  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.processors.cache.query.*;
+ import org.apache.ignite.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/ddbfb711/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java
index 9b8ce8e,5539d9e..fbcc7f9
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheSwapSelfTest.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.cache.query.annotations.*;
  import org.apache.ignite.configuration.*;
  import org.apache.ignite.events.*;
+ import org.apache.ignite.internal.*;
  import org.apache.ignite.internal.util.typedef.*;
  import org.apache.ignite.lang.*;
  import org.apache.ignite.marshaller.optimized.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ddbfb711/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,ee914dd..0b775e9
--- 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,10 +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.*;
  import org.apache.ignite.internal.processors.cache.GridCacheAbstractQuerySelfTest.*;
 +import org.apache.ignite.internal.processors.cache.query.*;
  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/ddbfb711/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java
index 47abfde,0f67a21..d1ba4a2
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheAtomicFieldsQuerySelfTest.java
@@@ -19,7 -19,8 +19,8 @@@ 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.internal.processors.cache.query.*;
+ import org.apache.ignite.internal.*;
  import org.apache.ignite.internal.util.typedef.*;
  
  import java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ddbfb711/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java
index c61a1b1,24658ab..d2952a9
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedFieldsQuerySelfTest.java
@@@ -19,9 -19,10 +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.configuration.*;
+ import org.apache.ignite.internal.*;
  import org.apache.ignite.internal.processors.cache.*;
 +import org.apache.ignite.internal.processors.cache.query.*;
  import org.jetbrains.annotations.*;
  
  import java.util.*;

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

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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ddbfb711/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedFieldsQuerySelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ddbfb711/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/GridCacheReplicatedQuerySelfTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ddbfb711/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalQuerySelfTest.java
----------------------------------------------------------------------
diff --cc modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalQuerySelfTest.java
index 9cd000b,065f9c3..b7e50ce
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/local/GridCacheLocalQuerySelfTest.java
@@@ -18,8 -18,9 +18,9 @@@
  package org.apache.ignite.internal.processors.cache.local;
  
  import org.apache.ignite.cache.*;
 -import org.apache.ignite.cache.query.*;
+ 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 java.util.*;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ddbfb711/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridH2IndexRebuildTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ddbfb711/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/sql/GridQueryParsingTest.java
----------------------------------------------------------------------

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

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ddbfb711/pom.xml
----------------------------------------------------------------------


Mime
View raw message