# ignite-63
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cc294245 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cc294245 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cc294245 Branch: refs/heads/ignite-63 Commit: cc2942450b805b98f1c850afc143d8d7f1014be4 Parents: bda1cbf Author: sboikov <sboi...@gridgain.com> Authored: Fri Jan 23 10:03:54 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Fri Jan 23 10:03:54 2015 +0300 ---------------------------------------------------------------------- .../compute/ComputeBroadcastExample.java | 1 - .../compute/ComputeCallableExample.java | 1 - .../examples/compute/ComputeClosureExample.java | 1 - .../compute/ComputeContinuousMapperExample.java | 1 - .../compute/ComputeExecutorServiceExample.java | 1 - .../ComputeFibonacciContinuationExample.java | 1 - .../compute/ComputeProjectionExample.java | 1 - .../examples/compute/ComputeReducerExample.java | 1 - .../compute/ComputeRunnableExample.java | 1 - .../compute/ComputeScheduleExample.java | 1 - .../examples/compute/ComputeTaskMapExample.java | 1 - .../compute/ComputeTaskSplitExample.java | 1 - .../failover/ComputeFailoverExample.java | 1 - .../compute/montecarlo/CreditRiskExample.java | 1 - .../datagrid/CacheDataLoaderExample.java | 1 - .../hibernate/HibernateL2CacheExample.java | 1 - .../store/CacheStoreLoadDataExample.java | 1 - .../ignite/examples/events/EventsExample.java | 1 - .../examples/messaging/MessagingExample.java | 1 - .../messaging/MessagingPingPongExample.java | 1 - .../MessagingPingPongListenActorExample.java | 1 - .../misc/deployment/DeploymentExample.java | 1 - .../misc/springbean/SpringBeanExample.java | 1 - .../examples/services/ServicesExample.java | 1 - .../streaming/StreamingCheckInExample.java | 1 - .../StreamingPopularNumbersExample.java | 1 - .../streaming/StreamingPriceBarsExample.java | 1 - .../testsuites/GridExamplesSelfTestSuite.java | 3 +- .../aop/spring/GridifySpringEnhancer.java | 6 +- .../GridClientAbstractMultiNodeSelfTest.java | 1 + .../transactions/IgniteTxLocalAdapter.java | 2 +- ...pcEndpointRegistrationOnWindowsSelfTest.java | 3 +- .../GridCacheMetricsSelfTestSuite.java | 1 + .../testsuites/GridStreamerSelfTestSuite.java | 1 + .../grid/ggfs/GridGgfsFragmentizerSelfTest.java | 1 + .../cache/GridCacheP2PUndeploySelfTest.java | 1 + .../GridHadoopDefaultMapReducePlanner.java | 3 +- .../hadoop/v1/GridGgfsHadoopFileSystem.java | 1 + .../hadoop/v2/GridGgfsHadoopFileSystem.java | 1 + .../grid/kernal/ggfs/hadoop/GridGgfsHadoop.java | 1 + .../hadoop/GridGgfsHadoopFileSystemWrapper.java | 1 + .../ggfs/hadoop/GridGgfsHadoopInProc.java | 1 + .../ggfs/hadoop/GridGgfsHadoopOutProc.java | 1 + .../kernal/ggfs/hadoop/GridGgfsHadoopUtils.java | 1 + .../ggfs/hadoop/GridGgfsHadoopWrapper.java | 1 + .../hadoop/GridHadoopAbstractWordCountTest.java | 1 + .../hadoop/GridHadoopCommandLineTest.java | 1 + ...idHadoopDefaultMapReducePlannerSelfTest.java | 1 + .../bamboo/GridGgfsLinuxAndMacOSTestSuite.java | 5 +- ...dGgfsHadoop20FileSystemAbstractSelfTest.java | 1 + .../GridGgfsHadoopDualAbstractSelfTest.java | 2 + ...ridGgfsHadoopFileSystemAbstractSelfTest.java | 1 + .../GridGgfsHadoopFileSystemClientSelfTest.java | 1 + ...idGgfsHadoopFileSystemHandshakeSelfTest.java | 1 + ...ridGgfsHadoopFileSystemIpcCacheSelfTest.java | 1 + .../GridGgfsHadoopFileSystemLoggerSelfTest.java | 1 + ...GgfsHadoopFileSystemLoggerStateSelfTest.java | 1 + ...fsHadoopFileSystemSecondaryModeSelfTest.java | 1 + .../cache/GridCacheOffHeapAndSwapSelfTest.java | 572 +++++++++++++++++++ .../testsuites/GridCacheQuerySelfTestSuite.java | 1 + .../bamboo/GridH2IndexingSpiTestSuite.java | 1 + .../cache/GridCacheOffHeapAndSwapSelfTest.java | 572 ------------------- .../ignite/scalar/lang/ScalarAbsClosureX.scala | 1 - .../scalar/lang/ScalarAbsPredicateX.scala | 1 - .../ignite/scalar/lang/ScalarClosure2X.scala | 1 - .../ignite/scalar/lang/ScalarClosure3X.scala | 1 - .../ignite/scalar/lang/ScalarClosureX.scala | 1 - .../ignite/scalar/lang/ScalarInClosure2X.scala | 1 - .../ignite/scalar/lang/ScalarInClosure3X.scala | 1 - .../ignite/scalar/lang/ScalarInClosureX.scala | 1 - .../ignite/scalar/lang/ScalarOutClosureX.scala | 1 - .../ignite/scalar/lang/ScalarPredicate2X.scala | 1 - .../ignite/scalar/lang/ScalarPredicate3X.scala | 1 - .../ignite/scalar/lang/ScalarPredicateX.scala | 1 - .../pimps/ScalarCacheProjectionPimp.scala | 1 - .../ignite/scalar/pimps/ScalarGridPimp.scala | 1 - .../scalar/pimps/ScalarProjectionPimp.scala | 1 - .../scalar/pimps/ScalarTaskThreadContext.scala | 1 - .../resource/GridLoggerInjectionSelfTest.java | 1 + .../testsuites/bamboo/GridSpringTestSuite.java | 1 - .../bamboo/GridUriDeploymentTestSuite.java | 1 - .../visor/commands/VisorTextTable.scala | 1 + 82 files changed, 615 insertions(+), 626 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/examples/src/main/java/org/apache/ignite/examples/compute/ComputeBroadcastExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeBroadcastExample.java b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeBroadcastExample.java index ef31fb0..cf8e487 100644 --- a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeBroadcastExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeBroadcastExample.java @@ -21,7 +21,6 @@ import org.apache.ignite.*; import org.apache.ignite.examples.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; -import org.gridgain.examples.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/examples/src/main/java/org/apache/ignite/examples/compute/ComputeCallableExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeCallableExample.java b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeCallableExample.java index 9b3269c..6c70c70 100644 --- a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeCallableExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeCallableExample.java @@ -20,7 +20,6 @@ package org.apache.ignite.examples.compute; import org.apache.ignite.*; import org.apache.ignite.examples.*; import org.apache.ignite.lang.*; -import org.gridgain.examples.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/examples/src/main/java/org/apache/ignite/examples/compute/ComputeClosureExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeClosureExample.java b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeClosureExample.java index 3746d13..0365fb5 100644 --- a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeClosureExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeClosureExample.java @@ -20,7 +20,6 @@ package org.apache.ignite.examples.compute; import org.apache.ignite.*; import org.apache.ignite.examples.*; import org.apache.ignite.lang.*; -import org.gridgain.examples.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/examples/src/main/java/org/apache/ignite/examples/compute/ComputeContinuousMapperExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeContinuousMapperExample.java b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeContinuousMapperExample.java index 987dccb..cea5ee0 100644 --- a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeContinuousMapperExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeContinuousMapperExample.java @@ -22,7 +22,6 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.examples.*; import org.apache.ignite.resources.*; -import org.gridgain.examples.*; import java.util.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/examples/src/main/java/org/apache/ignite/examples/compute/ComputeExecutorServiceExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeExecutorServiceExample.java b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeExecutorServiceExample.java index 0aa66d2..46f6bfa 100644 --- a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeExecutorServiceExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeExecutorServiceExample.java @@ -20,7 +20,6 @@ package org.apache.ignite.examples.compute; import org.apache.ignite.*; import org.apache.ignite.examples.*; import org.apache.ignite.lang.*; -import org.gridgain.examples.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/examples/src/main/java/org/apache/ignite/examples/compute/ComputeFibonacciContinuationExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeFibonacciContinuationExample.java b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeFibonacciContinuationExample.java index 49cc169..9d8bbca 100644 --- a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeFibonacciContinuationExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeFibonacciContinuationExample.java @@ -23,7 +23,6 @@ import org.apache.ignite.compute.*; import org.apache.ignite.examples.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; -import org.gridgain.examples.*; import org.jetbrains.annotations.*; import java.math.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/examples/src/main/java/org/apache/ignite/examples/compute/ComputeProjectionExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeProjectionExample.java b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeProjectionExample.java index 83f9855..258b5cd 100644 --- a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeProjectionExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeProjectionExample.java @@ -21,7 +21,6 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.examples.*; import org.apache.ignite.lang.*; -import org.gridgain.examples.*; /** * Demonstrates new functional APIs. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/examples/src/main/java/org/apache/ignite/examples/compute/ComputeReducerExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeReducerExample.java b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeReducerExample.java index 90b167d..779add0 100644 --- a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeReducerExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeReducerExample.java @@ -20,7 +20,6 @@ package org.apache.ignite.examples.compute; import org.apache.ignite.*; import org.apache.ignite.examples.*; import org.apache.ignite.lang.*; -import org.gridgain.examples.*; import java.util.*; import java.util.concurrent.atomic.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/examples/src/main/java/org/apache/ignite/examples/compute/ComputeRunnableExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeRunnableExample.java b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeRunnableExample.java index 364ee6c..147e98a 100644 --- a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeRunnableExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeRunnableExample.java @@ -20,7 +20,6 @@ package org.apache.ignite.examples.compute; import org.apache.ignite.*; import org.apache.ignite.examples.*; import org.apache.ignite.lang.*; -import org.gridgain.examples.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/examples/src/main/java/org/apache/ignite/examples/compute/ComputeScheduleExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeScheduleExample.java b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeScheduleExample.java index aac73f1..07f2fa6 100644 --- a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeScheduleExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeScheduleExample.java @@ -21,7 +21,6 @@ import org.apache.ignite.*; import org.apache.ignite.examples.*; import org.apache.ignite.lang.*; import org.apache.ignite.scheduler.*; -import org.gridgain.examples.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/examples/src/main/java/org/apache/ignite/examples/compute/ComputeTaskMapExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeTaskMapExample.java b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeTaskMapExample.java index c9320fc..eece6f2 100644 --- a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeTaskMapExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeTaskMapExample.java @@ -21,7 +21,6 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.compute.*; import org.apache.ignite.examples.*; -import org.gridgain.examples.*; import org.jetbrains.annotations.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/examples/src/main/java/org/apache/ignite/examples/compute/ComputeTaskSplitExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeTaskSplitExample.java b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeTaskSplitExample.java index 14b7089..8bb9191 100644 --- a/examples/src/main/java/org/apache/ignite/examples/compute/ComputeTaskSplitExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/compute/ComputeTaskSplitExample.java @@ -20,7 +20,6 @@ package org.apache.ignite.examples.compute; import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.examples.*; -import org.gridgain.examples.*; import org.jetbrains.annotations.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/examples/src/main/java/org/apache/ignite/examples/compute/failover/ComputeFailoverExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/failover/ComputeFailoverExample.java b/examples/src/main/java/org/apache/ignite/examples/compute/failover/ComputeFailoverExample.java index a12861f..fa065aa 100644 --- a/examples/src/main/java/org/apache/ignite/examples/compute/failover/ComputeFailoverExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/compute/failover/ComputeFailoverExample.java @@ -22,7 +22,6 @@ import org.apache.ignite.compute.*; import org.apache.ignite.examples.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; -import org.gridgain.examples.*; import org.apache.ignite.internal.util.lang.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/examples/src/main/java/org/apache/ignite/examples/compute/montecarlo/CreditRiskExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/compute/montecarlo/CreditRiskExample.java b/examples/src/main/java/org/apache/ignite/examples/compute/montecarlo/CreditRiskExample.java index 70fc1db..ce36999 100644 --- a/examples/src/main/java/org/apache/ignite/examples/compute/montecarlo/CreditRiskExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/compute/montecarlo/CreditRiskExample.java @@ -20,7 +20,6 @@ package org.apache.ignite.examples.compute.montecarlo; import org.apache.ignite.*; import org.apache.ignite.examples.*; import org.apache.ignite.lang.*; -import org.gridgain.examples.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java index b4c6255..4ea15b8 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataLoaderExample.java @@ -19,7 +19,6 @@ package org.apache.ignite.examples.datagrid; import org.apache.ignite.*; import org.apache.ignite.examples.*; -import org.gridgain.examples.*; /** * Demonstrates how cache can be populated with data utilizing {@link org.apache.ignite.IgniteDataLoader} API. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java index 8f7f17b..7773980 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/hibernate/HibernateL2CacheExample.java @@ -19,7 +19,6 @@ package org.apache.ignite.examples.datagrid.hibernate; import org.apache.ignite.*; import org.apache.ignite.examples.*; -import org.gridgain.examples.*; import org.hibernate.*; import org.hibernate.cache.spi.access.AccessType; import org.hibernate.cfg.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java index d7cd4fe..7fded3c 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheStoreLoadDataExample.java @@ -21,7 +21,6 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.examples.*; import org.apache.ignite.lang.*; -import org.gridgain.examples.*; /** * Loads data from persistent store at cache startup by calling http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/examples/src/main/java/org/apache/ignite/examples/events/EventsExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/events/EventsExample.java b/examples/src/main/java/org/apache/ignite/examples/events/EventsExample.java index 3cd0678..6877935 100644 --- a/examples/src/main/java/org/apache/ignite/examples/events/EventsExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/events/EventsExample.java @@ -23,7 +23,6 @@ import org.apache.ignite.events.*; import org.apache.ignite.examples.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; -import org.gridgain.examples.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingExample.java b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingExample.java index ee00902..8aabf4e 100644 --- a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingExample.java @@ -22,7 +22,6 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.examples.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; -import org.gridgain.examples.*; import java.util.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java index 1095322..11edc44 100644 --- a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongExample.java @@ -22,7 +22,6 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.examples.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; -import org.gridgain.examples.*; import org.apache.ignite.internal.util.lang.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongListenActorExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongListenActorExample.java b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongListenActorExample.java index 95d4e37..65fa6ae 100644 --- a/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongListenActorExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/messaging/MessagingPingPongListenActorExample.java @@ -21,7 +21,6 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.examples.*; import org.apache.ignite.messaging.*; -import org.gridgain.examples.*; import java.util.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/examples/src/main/java/org/apache/ignite/examples/misc/deployment/DeploymentExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/deployment/DeploymentExample.java b/examples/src/main/java/org/apache/ignite/examples/misc/deployment/DeploymentExample.java index be93ded..873a63f 100644 --- a/examples/src/main/java/org/apache/ignite/examples/misc/deployment/DeploymentExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/misc/deployment/DeploymentExample.java @@ -20,7 +20,6 @@ package org.apache.ignite.examples.misc.deployment; import org.apache.ignite.*; import org.apache.ignite.compute.*; import org.apache.ignite.examples.*; -import org.gridgain.examples.*; import org.jetbrains.annotations.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java b/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java index 1b6d2eb..83a3e17 100644 --- a/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/misc/springbean/SpringBeanExample.java @@ -19,7 +19,6 @@ package org.apache.ignite.examples.misc.springbean; import org.apache.ignite.*; import org.apache.ignite.examples.*; -import org.gridgain.examples.*; import org.springframework.context.support.*; import java.util.concurrent.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/examples/src/main/java/org/apache/ignite/examples/services/ServicesExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/services/ServicesExample.java b/examples/src/main/java/org/apache/ignite/examples/services/ServicesExample.java index 84769b9..c5d0c51 100644 --- a/examples/src/main/java/org/apache/ignite/examples/services/ServicesExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/services/ServicesExample.java @@ -22,7 +22,6 @@ import org.apache.ignite.cluster.*; import org.apache.ignite.examples.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; -import org.gridgain.examples.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingCheckInExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingCheckInExample.java b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingCheckInExample.java index 21df363..758ec3b 100644 --- a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingCheckInExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingCheckInExample.java @@ -22,7 +22,6 @@ import org.apache.ignite.examples.*; import org.apache.ignite.lang.*; import org.apache.ignite.streamer.*; import org.apache.ignite.streamer.index.*; -import org.gridgain.examples.*; import org.jetbrains.annotations.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java index 5461a51..53ef58a 100644 --- a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPopularNumbersExample.java @@ -22,7 +22,6 @@ import org.apache.ignite.examples.*; import org.apache.ignite.lang.*; import org.apache.ignite.streamer.*; import org.apache.ignite.streamer.index.*; -import org.gridgain.examples.*; import org.jetbrains.annotations.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPriceBarsExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPriceBarsExample.java b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPriceBarsExample.java index e1d29aa..c351bbe 100644 --- a/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPriceBarsExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/streaming/StreamingPriceBarsExample.java @@ -22,7 +22,6 @@ import org.apache.ignite.examples.*; import org.apache.ignite.lang.*; import org.apache.ignite.streamer.*; import org.apache.ignite.streamer.router.*; -import org.gridgain.examples.*; import org.jetbrains.annotations.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/examples/src/test/java/org/apache/ignite/testsuites/GridExamplesSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/examples/src/test/java/org/apache/ignite/testsuites/GridExamplesSelfTestSuite.java b/examples/src/test/java/org/apache/ignite/testsuites/GridExamplesSelfTestSuite.java index 9f1aca4..41be0d9 100644 --- a/examples/src/test/java/org/apache/ignite/testsuites/GridExamplesSelfTestSuite.java +++ b/examples/src/test/java/org/apache/ignite/testsuites/GridExamplesSelfTestSuite.java @@ -19,7 +19,6 @@ package org.apache.ignite.testsuites; import junit.framework.*; import org.apache.ignite.examples.*; -import org.gridgain.examples.*; import org.apache.ignite.testframework.*; import static org.apache.ignite.IgniteSystemProperties.*; @@ -38,7 +37,7 @@ public class GridExamplesSelfTestSuite extends TestSuite { System.setProperty(GG_OVERRIDE_MCAST_GRP, GridTestUtils.getNextMulticastGroup(GridExamplesSelfTestSuite.class)); - TestSuite suite = new TestSuite("GridGain Examples Test Suite"); + TestSuite suite = new TestSuite("Ignite Examples Test Suite"); suite.addTest(new TestSuite(GridCacheExamplesSelfTest.class)); suite.addTest(new TestSuite(GridBasicExamplesSelfTest.class)); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySpringEnhancer.java ---------------------------------------------------------------------- diff --git a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySpringEnhancer.java b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySpringEnhancer.java index d80b24e..bade583 100644 --- a/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySpringEnhancer.java +++ b/modules/aop/src/main/java/org/apache/ignite/compute/gridify/aop/spring/GridifySpringEnhancer.java @@ -70,11 +70,11 @@ public final class GridifySpringEnhancer { proxyFac.removeAdvisor(0); proxyFac.addAdvisor(new DefaultPointcutAdvisor( - new GridifySpringPointcut(GridifySpringPointcutType.DFLT), dfltAsp)); + new GridifySpringPointcut(GridifySpringPointcut.GridifySpringPointcutType.DFLT), dfltAsp)); proxyFac.addAdvisor(new DefaultPointcutAdvisor( - new GridifySpringPointcut(GridifySpringPointcutType.SET_TO_VALUE), setToValAsp)); + new GridifySpringPointcut(GridifySpringPointcut.GridifySpringPointcutType.SET_TO_VALUE), setToValAsp)); proxyFac.addAdvisor(new DefaultPointcutAdvisor( - new GridifySpringPointcut(GridifySpringPointcutType.SET_TO_SET), setToSetAsp)); + new GridifySpringPointcut(GridifySpringPointcut.GridifySpringPointcutType.SET_TO_SET), setToSetAsp)); return (T)proxyFac.getProxy(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/modules/clients/src/test/java/org/apache/ignite/client/integration/GridClientAbstractMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/client/integration/GridClientAbstractMultiNodeSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/client/integration/GridClientAbstractMultiNodeSelfTest.java index 878510d..fa5ef0f 100644 --- a/modules/clients/src/test/java/org/apache/ignite/client/integration/GridClientAbstractMultiNodeSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/client/integration/GridClientAbstractMultiNodeSelfTest.java @@ -24,6 +24,7 @@ import org.apache.ignite.compute.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; +import org.apache.ignite.internal.processors.cache.distributed.*; import org.apache.ignite.lang.*; import org.apache.ignite.resources.*; import org.apache.ignite.spi.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java index f554147..f0dc22f 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java @@ -1965,7 +1965,7 @@ public abstract class IgniteTxLocalAdapter<K, V> extends IgniteTxAdapter<K, V> // Should read through if filter is specified. old = entry.innerGet(this, /*swap*/false, - /*read-through*/cacheCtx.loadPreviousValue(), + /*read-through*/readThrough && cacheCtx.loadPreviousValue(), /*fail-fast*/false, /*unmarshal*/retval, /*metrics*/retval, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsServerManagerIpcEndpointRegistrationOnWindowsSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsServerManagerIpcEndpointRegistrationOnWindowsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsServerManagerIpcEndpointRegistrationOnWindowsSelfTest.java index 20cfe3c..a759266 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsServerManagerIpcEndpointRegistrationOnWindowsSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/fs/GridGgfsServerManagerIpcEndpointRegistrationOnWindowsSelfTest.java @@ -22,6 +22,7 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.internal.util.ipc.loopback.*; import org.apache.ignite.internal.util.ipc.shmem.*; import org.apache.ignite.internal.util.typedef.*; +import org.apache.ignite.testframework.*; import java.util.concurrent.*; @@ -35,7 +36,7 @@ public class GridGgfsServerManagerIpcEndpointRegistrationOnWindowsSelfTest * @throws Exception If failed. */ public void testShmemEndpointsRegistration() throws Exception { - Throwable e = assertThrows(log, new Callable<Object>() { + Throwable e = GridTestUtils.assertThrows(log, new Callable<Object>() { @Override public Object call() throws Exception { IgniteConfiguration cfg = gridConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/modules/core/src/test/java/org/apache/ignite/testsuites/GridCacheMetricsSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/GridCacheMetricsSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/GridCacheMetricsSelfTestSuite.java index a861011..4b9799e 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/GridCacheMetricsSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/GridCacheMetricsSelfTestSuite.java @@ -19,6 +19,7 @@ package org.apache.ignite.testsuites; import junit.framework.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; +import org.apache.ignite.internal.processors.cache.distributed.replicated.*; import org.apache.ignite.internal.processors.cache.local.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/modules/core/src/test/java/org/apache/ignite/testsuites/GridStreamerSelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/GridStreamerSelfTestSuite.java b/modules/core/src/test/java/org/apache/ignite/testsuites/GridStreamerSelfTestSuite.java index e69b673..7db7cda 100644 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/GridStreamerSelfTestSuite.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/GridStreamerSelfTestSuite.java @@ -18,6 +18,7 @@ package org.apache.ignite.testsuites; import junit.framework.*; +import org.apache.ignite.internal.processors.streamer.*; import org.apache.ignite.streamer.index.*; import org.apache.ignite.streamer.window.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerSelfTest.java b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerSelfTest.java index ec44bff..550383e 100644 --- a/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerSelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/ggfs/GridGgfsFragmentizerSelfTest.java @@ -21,6 +21,7 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.fs.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.processors.fs.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.testframework.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheP2PUndeploySelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheP2PUndeploySelfTest.java b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheP2PUndeploySelfTest.java index 4f433eb..17cf318 100644 --- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheP2PUndeploySelfTest.java +++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/cache/GridCacheP2PUndeploySelfTest.java @@ -22,6 +22,7 @@ import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; +import org.apache.ignite.internal.processors.cache.distributed.*; import org.apache.ignite.marshaller.jdk.*; 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/cc294245/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java index 755f5d4..eef6c14 100644 --- a/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java +++ b/modules/hadoop/src/main/java/org/apache/ignite/internal/processors/hadoop/planner/GridHadoopDefaultMapReducePlanner.java @@ -21,6 +21,7 @@ import org.apache.ignite.*; import org.apache.ignite.cluster.*; import org.apache.ignite.fs.*; import org.apache.ignite.internal.*; +import org.apache.ignite.internal.processors.fs.*; import org.apache.ignite.resources.*; import org.apache.ignite.hadoop.*; import org.gridgain.grid.kernal.ggfs.hadoop.*; @@ -157,7 +158,7 @@ public class GridHadoopDefaultMapReducePlanner implements GridHadoopMapReducePla GridGgfsEx ggfs = null; if (F.eq(ignite.name(), endpoint.grid())) - ggfs = (GridGgfsEx) ((GridEx) ignite).ggfsx(endpoint.ggfs()); + ggfs = (GridGgfsEx)((GridEx)ignite).ggfsx(endpoint.ggfs()); if (ggfs != null && !ggfs.isProxy(split0.file())) { Collection<IgniteFsBlockLocation> blocks = ggfs.affinity(new IgniteFsPath(split0.file()), http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java index c6ca571..f9131e4 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v1/GridGgfsHadoopFileSystem.java @@ -27,6 +27,7 @@ import org.apache.hadoop.util.*; import org.apache.ignite.*; import org.apache.ignite.fs.*; import org.apache.ignite.internal.fs.common.*; +import org.apache.ignite.internal.processors.fs.*; import org.gridgain.grid.kernal.ggfs.hadoop.*; 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/cc294245/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java b/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java index 6001fc0..f71ded0 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/ggfs/hadoop/v2/GridGgfsHadoopFileSystem.java @@ -27,6 +27,7 @@ import org.apache.hadoop.util.*; import org.apache.ignite.*; import org.apache.ignite.fs.*; import org.apache.ignite.internal.fs.common.*; +import org.apache.ignite.internal.processors.fs.*; import org.gridgain.grid.kernal.ggfs.hadoop.*; 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/cc294245/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoop.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoop.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoop.java index c82ec51..75cb829 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoop.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoop.java @@ -19,6 +19,7 @@ package org.gridgain.grid.kernal.ggfs.hadoop; import org.apache.ignite.*; import org.apache.ignite.fs.*; +import org.apache.ignite.internal.processors.fs.*; import org.jetbrains.annotations.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java index 3ea08e1..77ca6b1 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java @@ -28,6 +28,7 @@ import java.io.*; import java.net.*; import java.util.*; +import org.apache.ignite.internal.processors.fs.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopInProc.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopInProc.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopInProc.java index 54c2c3f..37c7d70 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopInProc.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopInProc.java @@ -20,6 +20,7 @@ package org.gridgain.grid.kernal.ggfs.hadoop; import org.apache.commons.logging.*; import org.apache.ignite.*; import org.apache.ignite.fs.*; +import org.apache.ignite.internal.processors.fs.*; import org.apache.ignite.internal.util.lang.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopOutProc.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopOutProc.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopOutProc.java index eee11c9..78e00dc 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopOutProc.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopOutProc.java @@ -21,6 +21,7 @@ import org.apache.commons.logging.*; import org.apache.ignite.*; import org.apache.ignite.fs.*; import org.apache.ignite.internal.fs.common.*; +import org.apache.ignite.internal.processors.fs.*; import org.apache.ignite.internal.util.lang.*; import org.jdk8.backport.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopUtils.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopUtils.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopUtils.java index 9638071..7c8f2f2 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopUtils.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopUtils.java @@ -21,6 +21,7 @@ import org.apache.hadoop.conf.*; import org.apache.hadoop.fs.*; import org.apache.ignite.*; import org.apache.ignite.fs.*; +import org.apache.ignite.internal.processors.fs.*; import org.jetbrains.annotations.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopWrapper.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopWrapper.java b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopWrapper.java index 7ae5aee..a6e05c2 100644 --- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopWrapper.java +++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopWrapper.java @@ -21,6 +21,7 @@ import org.apache.commons.logging.*; import org.apache.hadoop.conf.*; import org.apache.ignite.*; import org.apache.ignite.fs.*; +import org.apache.ignite.internal.processors.fs.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.jetbrains.annotations.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractWordCountTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractWordCountTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractWordCountTest.java index 53a3523..24f5be2 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractWordCountTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopAbstractWordCountTest.java @@ -21,6 +21,7 @@ import com.google.common.base.*; import org.apache.hadoop.conf.*; import org.apache.hadoop.fs.*; import org.apache.ignite.fs.*; +import org.apache.ignite.internal.processors.fs.*; import java.io.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopCommandLineTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopCommandLineTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopCommandLineTest.java index 50824ec..c243c30 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopCommandLineTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopCommandLineTest.java @@ -21,6 +21,7 @@ import com.google.common.base.Joiner; import org.apache.ignite.*; import org.apache.ignite.fs.*; import org.apache.ignite.hadoop.*; +import org.apache.ignite.internal.processors.fs.*; import org.apache.ignite.internal.processors.hadoop.counter.*; import org.apache.ignite.internal.processors.hadoop.jobtracker.*; import org.apache.ignite.internal.util.typedef.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java index 88a3fd3..5c48b5a 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/internal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java @@ -24,6 +24,7 @@ import org.apache.ignite.fs.*; import org.apache.ignite.fs.mapreduce.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; +import org.apache.ignite.internal.processors.fs.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; import org.apache.ignite.hadoop.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/modules/hadoop/src/test/java/org/apache/ignite/testsuites/bamboo/GridGgfsLinuxAndMacOSTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/bamboo/GridGgfsLinuxAndMacOSTestSuite.java b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/bamboo/GridGgfsLinuxAndMacOSTestSuite.java index c5e829f..50d783b 100644 --- a/modules/hadoop/src/test/java/org/apache/ignite/testsuites/bamboo/GridGgfsLinuxAndMacOSTestSuite.java +++ b/modules/hadoop/src/test/java/org/apache/ignite/testsuites/bamboo/GridGgfsLinuxAndMacOSTestSuite.java @@ -18,9 +18,12 @@ package org.apache.ignite.testsuites.bamboo; import junit.framework.*; +import org.apache.ignite.internal.processors.fs.*; import org.gridgain.grid.ggfs.*; import org.apache.ignite.internal.processors.hadoop.*; +import static org.apache.ignite.testsuites.bamboo.GridHadoopTestSuite.*; + /** * Test suite for Hadoop file system over GridGain cache. * Contains tests which works on Linux and Mac OS platform only. @@ -34,7 +37,7 @@ public class GridGgfsLinuxAndMacOSTestSuite extends TestSuite { downloadHadoop(); GridHadoopClassLoader ldr = new GridHadoopClassLoader(null); - + TestSuite suite = new TestSuite("Gridgain GGFS Test Suite For Linux And Mac OS"); suite.addTest(new TestSuite(ldr.loadClass(GridGgfsServerManagerIpcEndpointRegistrationOnLinuxAndMacSelfTest.class.getName()))); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java index f355fa3..d972b59 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java @@ -25,6 +25,7 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; +import org.apache.ignite.internal.processors.fs.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.lang.*; import org.gridgain.grid.kernal.ggfs.hadoop.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java index f594b9c..4e4acf6 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java @@ -23,6 +23,7 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; +import org.apache.ignite.internal.processors.fs.*; import org.gridgain.grid.kernal.ggfs.hadoop.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; @@ -39,6 +40,7 @@ import java.util.concurrent.*; import static org.apache.ignite.cache.GridCacheAtomicityMode.*; import static org.apache.ignite.cache.GridCacheMode.*; import static org.apache.ignite.fs.IgniteFsMode.*; +import static org.apache.ignite.internal.processors.fs.GridGgfsAbstractSelfTest.*; import static org.gridgain.grid.ggfs.hadoop.GridGgfsHadoopParameters.*; /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java index 937de0c..e6240cf 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemAbstractSelfTest.java @@ -25,6 +25,7 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; +import org.apache.ignite.internal.processors.fs.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.lang.*; import org.gridgain.grid.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java index d93f122..385e83f 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemClientSelfTest.java @@ -23,6 +23,7 @@ import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; import org.apache.ignite.internal.*; import org.apache.ignite.internal.fs.common.*; +import org.apache.ignite.internal.processors.fs.*; import org.gridgain.grid.kernal.ggfs.hadoop.*; import org.apache.ignite.spi.discovery.tcp.*; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java index 6f36bd2..bb7b273 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemHandshakeSelfTest.java @@ -24,6 +24,7 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; +import org.apache.ignite.internal.processors.fs.*; import org.apache.ignite.spi.communication.tcp.*; 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/cc294245/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java index e08daaf..c9a4480 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemIpcCacheSelfTest.java @@ -22,6 +22,7 @@ import org.apache.hadoop.fs.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; +import org.apache.ignite.internal.processors.fs.*; import org.gridgain.grid.kernal.ggfs.hadoop.*; import org.apache.ignite.spi.communication.tcp.*; import org.apache.ignite.spi.discovery.tcp.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerSelfTest.java index cd30a9f..3acaa36 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerSelfTest.java @@ -19,6 +19,7 @@ package org.gridgain.grid.ggfs; import org.apache.ignite.fs.*; import org.apache.ignite.internal.fs.common.*; +import org.apache.ignite.internal.processors.fs.*; import org.apache.ignite.internal.util.typedef.internal.*; import java.io.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java index dfbede4..24fb434 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemLoggerStateSelfTest.java @@ -23,6 +23,7 @@ import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; +import org.apache.ignite.internal.processors.fs.*; import org.gridgain.grid.ggfs.hadoop.v1.*; import org.apache.ignite.internal.fs.common.*; import org.apache.ignite.spi.discovery.tcp.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java index a54d035..7c10448 100644 --- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java +++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopFileSystemSecondaryModeSelfTest.java @@ -22,6 +22,7 @@ import org.apache.hadoop.fs.*; import org.apache.ignite.cache.*; import org.apache.ignite.configuration.*; import org.apache.ignite.fs.*; +import org.apache.ignite.internal.processors.fs.*; import org.apache.ignite.lang.*; import org.gridgain.grid.ggfs.hadoop.v1.*; import org.gridgain.grid.kernal.ggfs.hadoop.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java new file mode 100644 index 0000000..34c245a --- /dev/null +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java @@ -0,0 +1,572 @@ +/* + * 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.cache; + +import org.apache.ignite.*; +import org.apache.ignite.cache.*; +import org.apache.ignite.cache.query.*; +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.lang.*; +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.spi.swapspace.file.*; +import org.apache.ignite.internal.processors.cache.distributed.near.*; +import org.apache.ignite.internal.util.lang.*; +import org.apache.ignite.internal.util.typedef.*; +import org.apache.ignite.testframework.junits.common.*; + +import java.util.*; +import java.util.concurrent.atomic.*; + +import static org.apache.ignite.configuration.IgniteDeploymentMode.*; +import static org.apache.ignite.events.IgniteEventType.*; +import static org.apache.ignite.cache.GridCacheAtomicityMode.*; +import static org.apache.ignite.cache.GridCacheDistributionMode.*; +import static org.apache.ignite.cache.GridCacheMode.*; +import static org.apache.ignite.cache.GridCachePeekMode.*; + +/** + * Tests off heap storage when both offheaped and swapped entries exists. + */ +public class GridCacheOffHeapAndSwapSelfTest extends GridCommonAbstractTest { + /** Entry count. This count should result in 20KB memory. */ + private static final int ENTRY_CNT = 1000; + + /** This amount of memory gives 256 stored entries on 32 JVM. */ + private static final long OFFHEAP_MEM = 10L * 1024L; + + /** Offheap store count. */ + private final AtomicInteger offheapedCnt = new AtomicInteger(); + + /** Offheap load count. */ + private final AtomicInteger onheapedCnt = new AtomicInteger(); + + /** Swap count. */ + private final AtomicInteger swappedCnt = new AtomicInteger(); + + /** Unswap count. */ + private final AtomicInteger unswapedCnt = new AtomicInteger(); + + /** Lower bound for tested key range. */ + private long from; + + /** Upper bound for tested key range. */ + private long to; + + /** Saved versions. */ + private final Map<Long, Object> versions = new HashMap<>(); + + /** Listener on swap events. Updates counters. */ + private final IgnitePredicate<IgniteEvent> swapLsnr = new IgnitePredicate<IgniteEvent>() { + @Override public boolean apply(IgniteEvent evt) { + assert evt != null; + + switch (evt.type()) { + case EVT_CACHE_OBJECT_TO_OFFHEAP: + offheapedCnt.incrementAndGet(); + + break; + case EVT_CACHE_OBJECT_FROM_OFFHEAP: + onheapedCnt.incrementAndGet(); + + break; + + case EVT_CACHE_OBJECT_SWAPPED: + swappedCnt.incrementAndGet(); + + break; + + case EVT_CACHE_OBJECT_UNSWAPPED: + unswapedCnt.incrementAndGet(); + + break; + } + + return true; + } + }; + + /** */ + private final TcpDiscoveryIpFinder ipFinder = new TcpDiscoveryVmIpFinder(true); + + /** {@inheritDoc} */ + @Override protected IgniteConfiguration getConfiguration(String gridName) throws Exception { + IgniteConfiguration cfg = super.getConfiguration(gridName); + + TcpDiscoverySpi disco = new TcpDiscoverySpi(); + + disco.setIpFinder(ipFinder); + + cfg.setDiscoverySpi(disco); + + cfg.setNetworkTimeout(2000); + + cfg.setSwapSpaceSpi(new FileSwapSpaceSpi()); + + CacheConfiguration cacheCfg = defaultCacheConfiguration(); + + cacheCfg.setWriteSynchronizationMode(GridCacheWriteSynchronizationMode.FULL_SYNC); + cacheCfg.setSwapEnabled(true); + cacheCfg.setCacheMode(PARTITIONED); + cacheCfg.setBackups(1); + cacheCfg.setOffHeapMaxMemory(OFFHEAP_MEM); + cacheCfg.setEvictSynchronized(true); + cacheCfg.setEvictNearSynchronized(true); + cacheCfg.setEvictSynchronizedKeyBufferSize(1); + cacheCfg.setAtomicityMode(TRANSACTIONAL); + cacheCfg.setDistributionMode(NEAR_PARTITIONED); + + cacheCfg.setEvictionPolicy(null); + + GridCacheQueryConfiguration qcfg = new GridCacheQueryConfiguration(); + + qcfg.setIndexPrimitiveKey(true); + qcfg.setIndexPrimitiveValue(true); + + cacheCfg.setQueryConfiguration(qcfg); + + cfg.setCacheConfiguration(cacheCfg); + + cfg.setDeploymentMode(SHARED); + + return cfg; + } + + /** {@inheritDoc} */ + @Override protected void beforeTestsStarted() throws Exception { + startGrids(1); + + grid(0).events().localListen(swapLsnr, + EVT_CACHE_OBJECT_TO_OFFHEAP, EVT_CACHE_OBJECT_FROM_OFFHEAP, + EVT_CACHE_OBJECT_SWAPPED, EVT_CACHE_OBJECT_UNSWAPPED); + } + + /** {@inheritDoc} */ + @Override protected void afterTestsStopped() throws Exception { + stopAllGrids(); + + versions.clear(); + } + + /** {@inheritDoc} */ + @Override protected void beforeTest() throws Exception { + grid(0).events().localListen(swapLsnr, + EVT_CACHE_OBJECT_TO_OFFHEAP, EVT_CACHE_OBJECT_FROM_OFFHEAP, + EVT_CACHE_OBJECT_SWAPPED, EVT_CACHE_OBJECT_UNSWAPPED); + } + + /** {@inheritDoc} */ + @Override protected void afterTest() throws Exception { + grid(0).cache(null).clearAll(); + } + + /** Resets event counters. */ + private void resetCounters() { + offheapedCnt.set(0); + onheapedCnt.set(0); + swappedCnt.set(0); + unswapedCnt.set(0); + } + + /** + * Populates cache with entries and evicts them partially to offheap partially to swap. + * + * @return Cache to use in tests. + * @throws Exception If failed. + */ + private GridCache<Long, Long> populate() throws Exception { + GridCache<Long, Long> cache = grid(0).cache(null); + + assertEquals(0, cache.size()); + assertEquals(0, cache.offHeapEntriesCount()); + + assert offheapedCnt.get() == 0; + assert onheapedCnt.get() == 0; + assert swappedCnt.get() == 0; + assert unswapedCnt.get() == 0; + + for (long i = 0; i < ENTRY_CNT; i++) { + info("putting: " + i); + + cache.put(i, i); + + Long val = cache.peek(i); + + assert val != null; + assert val == i; + + GridCacheEntry<Long, Long> entry = cache.entry(i); + + assert entry != null; + + versions.put(i, entry.version()); + } + + assertEquals(0, offheapedCnt.get()); + assertEquals(0, onheapedCnt.get()); + assertEquals(0, swappedCnt.get()); + assertEquals(0, unswapedCnt.get()); + + assertEquals(ENTRY_CNT, cache.size()); + assertEquals(0, cache.offHeapEntriesCount()); + + for (long i = 0; i < ENTRY_CNT; i++) { + cache.evict(i); + + assertEquals(ENTRY_CNT - i - 1, cache.size()); + } + + // Ensure that part of entries located in off-heap memory and part is swapped. + assertEquals(0, cache.size()); + assertTrue(cache.offHeapEntriesCount() > 0); + assertTrue(cache.offHeapEntriesCount() < ENTRY_CNT); + + // Setting test window to catch near half of both offheaped and swapped entries. + from = cache.offHeapEntriesCount() / 2; + to = (ENTRY_CNT + cache.offHeapEntriesCount()) / 2; + + for (long i = 0; i < ENTRY_CNT; i++) + assertNull(cache.peek(i)); + + assertEquals(ENTRY_CNT, offheapedCnt.get()); + assertEquals(0, onheapedCnt.get()); + assertTrue(swappedCnt.get() > 0); + assertEquals(0, unswapedCnt.get()); + + resetCounters(); + + return cache; + } + + /** + * Checks that entries in cache are correct after being unswapped. If entry is still swapped, it will be unswapped + * in this method. + * + * @param cache Cache. + * @throws Exception In case of error. + */ + private void checkEntries(GridCacheProjection<Long, Long> cache) throws Exception { + for (long i = from; i < to; i++) { + GridCacheEntry<Long, Long> entry = cache.entry(i); + + assert entry != null; + assert entry.getKey() != null; + + Long val = entry.getValue(); + + assertNotNull("Value null for key: " + i, val); + assertEquals(entry.getKey(), val); + assertEquals(entry.version(), versions.get(i)); + } + + assertEquals(0, swappedCnt.get()); + assertEquals(0, offheapedCnt.get()); + } + + /** @throws Exception If failed. */ + public void testPartitionIterators() throws Exception { + populate(); + + GridCacheAdapter<Long, Object> cacheAdapter = ((GridKernal)grid(0)).internalCache(); + GridNearCacheAdapter<Long, Object> cache = (GridNearCacheAdapter<Long, Object>)cacheAdapter; + + Map<Integer, Collection<Long>> grouped = new HashMap<>(); + + for (long i = 0; i < ENTRY_CNT; i++) { + // Avoid entry creation. + int part = cache.affinity().partition(i); + + Collection<Long> list = grouped.get(part); + + if (list == null) { + list = new LinkedList<>(); + + grouped.put(part, list); + } + + list.add(i); + } + + // Now check that partition iterators contain all values. + for (Map.Entry<Integer, Collection<Long>> entry : grouped.entrySet()) { + int part = entry.getKey(); + Collection<Long> vals = entry.getValue(); + + GridCacheContext<Long, Object> ctx = cache.dht().context(); + + GridCloseableIterator<Map.Entry<byte[], GridCacheSwapEntry<Object>>> it = ctx.swap().iterator(part, true); + + assert it != null || vals.isEmpty(); + + if (it != null) { + while (it.hasNext()) { + Map.Entry<byte[], GridCacheSwapEntry<Object>> swapEntry = it.next(); + + Long key = ctx.marshaller().unmarshal(swapEntry.getKey(), ctx.deploy().globalLoader()); + + assertTrue(vals.contains(key)); + + vals.remove(key); + } + } + } + + info(String.valueOf(grouped)); + + for (Map.Entry<Integer, Collection<Long>> entry : grouped.entrySet()) { + assertTrue("Got skipped keys in partition iterator [partId=" + entry.getKey() + + ", keys=" + entry.getValue(), F.isEmpty(entry.getValue())); + } + } + + /** + * Tests offheap and swap iterators. + * + * @throws Exception If failed. + */ + public void testIterators() throws Exception { + GridCache<Long, Long> cache = populate(); + + int cnt = 0; + + Iterator<Map.Entry<Long, Long>> ohIt = cache.offHeapIterator(); + + while (ohIt.hasNext()) { + Map.Entry<Long, Long> e = ohIt.next(); + + assertEquals(e.getKey(), e.getValue()); + + cnt++; + } + + int cnt0 = cnt; + + assertTrue(cnt > 0); + + Iterator<Map.Entry<Long, Long>> sIt = cache.swapIterator(); + + while (sIt.hasNext()) { + Map.Entry<Long, Long> e = sIt.next(); + + assertEquals(e.getKey(), e.getValue()); + + cnt++; + } + + assertTrue(cnt > cnt0); + assertEquals(ENTRY_CNT, cnt); + } + + /** + * Tests SQL queries over evicted entries. + * + * @throws Exception If failed. + */ + public void testSql() throws Exception { + GridCache<Long, Long> cache = populate(); + + Collection<Map.Entry<Long, Long>> res = cache.queries(). + createSqlQuery(Long.class, "_val >= ? and _val < ?"). + execute(from, to). + get(); + + assertEquals(to - from, res.size()); + + for (Map.Entry<Long, Long> entry : res) { + assertNotNull(entry); + assertNotNull(entry.getKey()); + assertNotNull(entry.getValue()); + assert entry.getKey().equals(entry.getValue()); + } + + assertEquals(0, offheapedCnt.get()); + assertEquals(0, onheapedCnt.get()); + + checkEntries(cache); + + assertEquals(0, offheapedCnt.get()); + assertEquals(to - from, onheapedCnt.get() + unswapedCnt.get()); + } + + /** + * Tests {@link GridCacheProjection#promote(Object)} behavior on offheaped entries. + * + * @throws Exception If failed. + */ + public void testUnswap() throws Exception { + GridCache<Long, Long> cache = populate(); + + for (long i = from; i < to; i++) { + Long val = cache.promote(i); + + assertNotNull(val); + assertEquals(i, val.longValue()); + + assertEquals(i - from + 1, unswapedCnt.get() + onheapedCnt.get()); + } + + assertEquals(0, swappedCnt.get()); + + checkEntries(cache); + + assertEquals(0, swappedCnt.get()); + assertEquals(0, offheapedCnt.get()); + assertEquals(to - from, unswapedCnt.get() + onheapedCnt.get()); + } + + /** + * Tests. + * + * @throws Exception If failed. + */ + public void testUnswapAll() throws Exception { + GridCache<Long, Long> cache = populate(); + + Collection<Long> keys = new HashSet<>(); + + for (long i = from; i < to; i++) + keys.add(i); + + cache.promoteAll(keys); + + assertEquals(0, swappedCnt.get()); + assertEquals(to - from, unswapedCnt.get() + onheapedCnt.get()); + + checkEntries(cache); + + assertEquals(to - from, unswapedCnt.get() + onheapedCnt.get()); + } + + /** + * Tests behavior on offheaped entries. + * + * @throws Exception If failed. + */ + public void testGet() throws Exception { + GridCache<Long, Long> cache = populate(); + + for (long i = from; i < to; i++) { + Long val = cache.get(i); + + assertNotNull(val); + assertEquals(i, val.longValue()); + } + + assertEquals(0, swappedCnt.get()); + assertEquals(0, offheapedCnt.get()); + assertEquals(to - from, unswapedCnt.get() + onheapedCnt.get()); + + checkEntries(cache); + + assertEquals(to - from, unswapedCnt.get() + onheapedCnt.get()); + } + + /** + * Tests {@link GridCacheProjection#peek(Object)} behavior on offheaped entries. + * + * @throws Exception If failed. + */ + public void testPeek() throws Exception { + GridCache<Long, Long> cache = populate(); + + for (long i = from; i < to; i++) { + assertNull(cache.peek(i)); + + Long val = cache.peek(i, F.asList(SWAP)); + + assertNotNull(val); + assertEquals(i, val.longValue()); + } + + assert swappedCnt.get() == 0; + assert unswapedCnt.get() == 0; + assert offheapedCnt.get() == 0; + assert onheapedCnt.get() == 0; + + checkEntries(cache); + } + + /** + * Tests weak iterators cleanup after garbage collections. + * + * @throws Exception If failed. + */ + public void testIteratorsCleanup() throws Exception { + final GridCache<Long, Long> cache = populate(); + + IgniteFuture<?> offHeapFut = multithreadedAsync(new Runnable() { + @Override public void run() { + try { + Iterator<Map.Entry<Long, Long>> ohIt = cache.offHeapIterator(); + + int cnt = 0; + + while (ohIt.hasNext()) { + Map.Entry<Long, Long> e = ohIt.next(); + + assertEquals(e.getKey(), e.getValue()); + + cnt++; + } + + assertEquals(cache.offHeapEntriesCount(), cnt); + } + catch (IgniteCheckedException ignored) { + fail(); + } + } + }, 20); + + IgniteFuture<?> swapFut = multithreadedAsync(new Runnable() { + @Override public void run() { + try { + Iterator<Map.Entry<Long, Long>> ohIt = cache.swapIterator(); + + int cnt = 0; + + while (ohIt.hasNext()) { + Map.Entry<Long, Long> e = ohIt.next(); + + assertEquals(e.getKey(), e.getValue()); + + cnt++; + } + + assertEquals(ENTRY_CNT - cache.offHeapEntriesCount(), cnt); + } + catch (IgniteCheckedException ignored) { + fail(); + } + } + }, 20); + + offHeapFut.get(); + swapFut.get(); + + System.gc(); + + // Runs iterator queue cleanup in GridCacheSwapManager.read method. + cache.get(1L + ENTRY_CNT); + + assertEquals(0, ((GridKernal)grid(0)).internalCache().context().swap().iteratorSetSize()); + } +} http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/modules/indexing/src/test/java/org/apache/ignite/testsuites/GridCacheQuerySelfTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/GridCacheQuerySelfTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/GridCacheQuerySelfTestSuite.java index b315d11..1f72a9f 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/GridCacheQuerySelfTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/GridCacheQuerySelfTestSuite.java @@ -18,6 +18,7 @@ package org.apache.ignite.testsuites; import junit.framework.*; +import org.apache.ignite.internal.processors.cache.distributed.replicated.*; import org.apache.ignite.spi.communication.tcp.*; import org.gridgain.grid.kernal.processors.cache.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cc294245/modules/indexing/src/test/java/org/apache/ignite/testsuites/bamboo/GridH2IndexingSpiTestSuite.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/testsuites/bamboo/GridH2IndexingSpiTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/testsuites/bamboo/GridH2IndexingSpiTestSuite.java index 2137f35..400aba5 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/testsuites/bamboo/GridH2IndexingSpiTestSuite.java +++ b/modules/indexing/src/test/java/org/apache/ignite/testsuites/bamboo/GridH2IndexingSpiTestSuite.java @@ -18,6 +18,7 @@ package org.apache.ignite.testsuites.bamboo; import junit.framework.*; +import org.apache.ignite.internal.processors.cache.*; import org.gridgain.grid.kernal.processors.cache.*; import org.apache.ignite.internal.processors.cache.distributed.near.*; import org.apache.ignite.internal.processors.query.h2.*;
