Merge remote-tracking branch 'origin/master' into ignite-9469
Conflicts:
modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.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/027ff7f5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/027ff7f5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/027ff7f5
Branch: refs/heads/master
Commit: 027ff7f570937aade9f9c6037705b622368c1cac
Parents: 641a748 7f6fdca
Author: Valentin Kulichenko <vkuliche...@gridgain.com>
Authored: Wed Dec 10 17:58:20 2014 +0300
Committer: Valentin Kulichenko <vkuliche...@gridgain.com>
Committed: Wed Dec 10 17:58:20 2014 +0300
----------------------------------------------------------------------
config/hadoop/default-config.xml | 6 +-
.../aop/aspectj/GridifyAspectJAspect.java | 2 +-
.../aspectj/GridifySetToSetAspectJAspect.java | 2 +-
.../aspectj/GridifySetToValueAspectJAspect.java | 2 +-
.../test/config/aop/aspectj/META-INF/aop.xml | 4 +-
.../grid/gridify/GridAbstractAopTest.java | 2 +-
.../grid/gridify/GridNonSpringAopSelfTest.java | 2 +-
.../src/main/java/org/apache/ignite/Ignite.java | 22 +-
.../java/org/apache/ignite/IgniteCache.java | 300 +++++++++++++++++++
.../apache/ignite/cache/CacheConfiguration.java | 23 ++
.../apache/ignite/cache/CacheEntryEvent.java | 36 +++
.../java/org/apache/ignite/cache/CacheFlag.java | 68 +++++
.../org/apache/ignite/cache/CachePeekMode.java | 72 +++++
.../ignite/cache/eviction/EvictableEntry.java | 39 +++
.../cache/query/QueryAffinityPredicate.java | 124 ++++++++
.../cache/query/QueryContinuousPredicate.java | 204 +++++++++++++
.../apache/ignite/cache/query/QueryCursor.java | 29 ++
.../ignite/cache/query/QueryPredicate.java | 68 +++++
.../apache/ignite/cache/query/QueryReducer.java | 22 ++
.../ignite/cache/query/QuerySqlPredicate.java | 107 +++++++
.../ignite/cache/query/QueryTextPredicate.java | 79 +++++
.../query/annotations/QueryGroupIndex.java | 50 ++++
.../cache/query/annotations/QuerySqlField.java | 125 ++++++++
.../query/annotations/QuerySqlFunction.java | 59 ++++
.../cache/query/annotations/QueryTextField.java | 25 ++
.../ignite/compute/ComputeJobAfterSend.java | 2 +-
.../compute/ComputeJobBeforeFailover.java | 2 +-
.../compute/ComputeJobContinuationAdapter.java | 2 +-
.../ignite/compute/ComputeLoadBalancer.java | 6 +-
.../org/apache/ignite/compute/ComputeTask.java | 4 +-
.../ignite/compute/ComputeTaskAdapter.java | 2 +-
.../ignite/compute/ComputeTaskSplitAdapter.java | 2 +-
.../fs/IgniteFsGroupDataBlocksKeyMapper.java | 2 +-
.../ignite/fs/mapreduce/IgniteFsTask.java | 2 +-
.../ignite/marshaller/IgniteMarshaller.java | 4 +-
.../marshaller/jdk/IgniteJdkMarshaller.java | 4 +-
.../optimized/IgniteOptimizedMarshaller.java | 4 +-
.../IgniteExecutorServiceResource.java | 4 +-
.../ignite/resources/IgniteHomeResource.java | 4 +-
.../resources/IgniteInstanceResource.java | 4 +-
.../resources/IgniteJobContextResource.java | 4 +-
.../resources/IgniteLocalHostResource.java | 4 +-
.../resources/IgniteLocalNodeIdResource.java | 4 +-
.../ignite/resources/IgniteLoggerResource.java | 4 +-
.../resources/IgniteMBeanServerResource.java | 4 +-
.../resources/IgniteMarshallerResource.java | 4 +-
.../ignite/resources/IgniteNameResource.java | 4 +-
.../ignite/resources/IgniteServiceResource.java | 4 +-
.../IgniteSpringApplicationContextResource.java | 4 +-
.../ignite/resources/IgniteSpringResource.java | 4 +-
.../IgniteTaskContinuousMapperResource.java | 4 +-
.../resources/IgniteTaskSessionResource.java | 4 +-
.../ignite/resources/IgniteUserResource.java | 4 +-
.../PriorityQueueCollisionSpi.java | 8 +-
.../ignite/spi/deployment/DeploymentSpi.java | 2 +-
.../spi/loadbalancing/LoadBalancingSpi.java | 6 +-
.../adaptive/AdaptiveLoadBalancingSpi.java | 4 +-
.../roundrobin/RoundRobinLoadBalancingSpi.java | 4 +-
.../WeightedRandomLoadBalancingSpi.java | 4 +-
.../org/gridgain/grid/kernal/GridKernal.java | 5 +
.../deployment/GridDeploymentClassLoader.java | 4 +-
.../processors/cache/GridCacheAdapter.java | 7 +
.../processors/cache/GridCacheMapEntry.java | 40 ++-
.../processors/cache/GridCacheMvccManager.java | 31 +-
.../processors/cache/GridCacheSwapManager.java | 14 +-
.../processors/cache/GridCacheTxAdapter.java | 14 +-
.../processors/cache/GridCacheTxHandler.java | 4 +-
.../cache/GridCacheTxLocalAdapter.java | 5 +-
.../processors/cache/GridCacheTxManager.java | 7 +-
.../distributed/dht/GridDhtLocalPartition.java | 32 ++
.../distributed/dht/GridDhtLockFuture.java | 3 +
.../distributed/dht/GridDhtLockResponse.java | 12 +
.../dht/GridDhtTransactionalCacheAdapter.java | 3 +
.../cache/distributed/dht/GridDhtTxLocal.java | 2 +
.../distributed/dht/GridDhtTxLocalAdapter.java | 5 +-
.../colocated/GridDhtDetachedCacheEntry.java | 5 +
.../dht/preloader/GridDhtPreloader.java | 10 +-
.../cache/distributed/near/GridNearTxLocal.java | 4 +-
.../processors/cache/local/GridLocalTx.java | 4 +-
.../transactions/IgniteTransactionsImpl.java | 8 +
.../gridgain/grid/kernal/visor/VisorJob.java | 27 +-
.../grid/kernal/visor/VisorMultiNodeTask.java | 72 ++++-
.../grid/kernal/visor/VisorOneNodeTask.java | 2 +-
.../grid/kernal/visor/VisorTaskArgument.java | 29 +-
.../kernal/visor/cache/VisorCacheClearTask.java | 7 +-
.../visor/cache/VisorCacheCompactTask.java | 13 +-
.../kernal/visor/cache/VisorCacheLoadTask.java | 7 +-
.../visor/cache/VisorCacheMetadataTask.java | 7 +-
.../cache/VisorCacheMetricsCollectorTask.java | 9 +-
.../visor/cache/VisorCachePreloadTask.java | 7 +-
.../visor/cache/VisorCacheResetMetricsTask.java | 7 +-
.../visor/cache/VisorCacheSwapBackupsTask.java | 7 +-
.../compute/VisorComputeCancelSessionsTask.java | 9 +-
.../compute/VisorComputeResetMetricsTask.java | 7 +-
.../VisorComputeToggleMonitoringTask.java | 17 +-
.../kernal/visor/debug/VisorThreadDumpTask.java | 7 +-
.../kernal/visor/file/VisorFileBlockTask.java | 7 +-
.../visor/file/VisorLatestTextFilesTask.java | 7 +-
.../kernal/visor/ggfs/VisorGgfsFormatTask.java | 7 +-
.../visor/ggfs/VisorGgfsProfilerClearTask.java | 7 +-
.../visor/ggfs/VisorGgfsProfilerTask.java | 13 +-
.../visor/ggfs/VisorGgfsResetMetricsTask.java | 7 +-
.../visor/ggfs/VisorGgfsSamplingStateTask.java | 7 +-
.../kernal/visor/log/VisorLogSearchTask.java | 12 +-
.../grid/kernal/visor/misc/VisorAckTask.java | 9 +-
.../visor/misc/VisorLatestVersionTask.java | 7 +-
.../visor/misc/VisorResolveHostNameTask.java | 7 +-
.../VisorNodeConfigurationCollectorJob.java | 5 +-
.../VisorNodeConfigurationCollectorTask.java | 2 +-
.../visor/node/VisorNodeDataCollectorJob.java | 69 ++++-
.../visor/node/VisorNodeDataCollectorTask.java | 28 +-
.../node/VisorNodeEventsCollectorTask.java | 9 +-
.../grid/kernal/visor/node/VisorNodeGcTask.java | 23 +-
.../kernal/visor/node/VisorNodePingTask.java | 16 +-
.../kernal/visor/node/VisorNodeRestartTask.java | 9 +-
.../kernal/visor/node/VisorNodeStopTask.java | 9 +-
.../VisorPortableMetadataCollectorTask.java | 13 +-
.../visor/query/VisorQueryNextPageTask.java | 7 +-
.../grid/kernal/visor/query/VisorQueryTask.java | 7 +-
.../streamer/VisorStreamerMetricsResetTask.java | 7 +-
.../visor/streamer/VisorStreamerResetTask.java | 7 +-
.../grid/kernal/visor/util/VisorTaskUtils.java | 123 ++++++++
modules/core/src/test/config/tests.properties | 2 +-
.../GridCacheBasicStoreNoBatchAbstractTest.java | 251 ----------------
.../cache/GridCacheOffheapUpdateSelfTest.java | 130 ++++++++
.../GridCacheNodeFailureAbstractTest.java | 10 +-
...ansformWriteThroughSingleUpdateSelfTest.java | 98 ------
...chePartitionedBasicStoreNoBatchSelfTest.java | 25 --
...acheReplicatedBasicStoreNoBatchSelfTest.java | 25 --
...cheLocalAtomicBasicStoreNoBatchSelfTest.java | 24 --
...GridCacheLocalBasicStoreNoBatchSelfTest.java | 25 --
...IpcEndpointRegistrationAbstractSelfTest.java | 4 +-
.../bamboo/GridCacheFailoverTestSuite.java | 3 +
.../bamboo/GridDataGridTestSuite.java | 30 +-
.../cache/jta/GridCacheJtaManager.java | 1 +
.../org/gridgain/scalar/ScalarConversions.scala | 2 +-
.../org/gridgain/scalar/lang/ScalarJob.scala | 2 +-
.../java/org/gridgain/grid/GridSpringBean.java | 5 +
...loymentClassLoaderMultiThreadedSelfTest.java | 4 +-
.../GridUriDeploymentFileProcessorSelfTest.java | 2 +-
.../GridUriDeploymentMultiScannersSelfTest.java | 2 +-
.../file/GridFileDeploymentSelfTest.java | 24 +-
.../GridFileDeploymentUndeploySelfTest.java | 4 +-
.../uri/scanners/ftp/GridFtpDeploymentTest.java | 2 +-
.../http/GridHttpDeploymentSelfTest.java | 2 +-
.../visor/commands/gc/VisorGcCommand.scala | 4 +-
.../main/scala/org/gridgain/visor/visor.scala | 10 +-
pom.xml | 34 ++-
148 files changed, 2377 insertions(+), 825 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/027ff7f5/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --cc
modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
index e4b86c2,f6207be..3790107
---
a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
+++
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
@@@ -52,6 -51,7 +52,8 @@@ import static org.gridgain.grid.cache.G
import static org.gridgain.grid.cache.GridCachePeekMode.*;
import static org.gridgain.grid.cache.GridCacheTxConcurrency.*;
import static org.gridgain.grid.cache.GridCacheTxIsolation.*;
++import static org.gridgain.grid.cache.GridCacheTxState.*;
+ import static org.apache.ignite.events.IgniteEventType.*;
import static org.gridgain.grid.kernal.GridClosureCallMode.*;
import static org.gridgain.grid.kernal.processors.dr.GridDrType.*;
import static
org.gridgain.grid.kernal.processors.task.GridTaskThreadContextKey.*;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/027ff7f5/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheTxLocalAdapter.java
----------------------------------------------------------------------
