Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-qry
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/59204a51 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/59204a51 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/59204a51 Branch: refs/heads/master Commit: 59204a517bca1678ebfb06e1aa6267193f08e10b Parents: 922a2ba 06fbf57 Author: S.Vladykin <svlady...@gridgain.com> Authored: Tue Dec 9 19:32:26 2014 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Tue Dec 9 19:32:26 2014 +0300 ---------------------------------------------------------------------- .../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 +- .../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 +- .../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 +- .../spi/loadbalancing/LoadBalancingSpi.java | 6 +- .../adaptive/AdaptiveLoadBalancingSpi.java | 4 +- .../roundrobin/RoundRobinLoadBalancingSpi.java | 4 +- .../WeightedRandomLoadBalancingSpi.java | 4 +- .../deployment/GridDeploymentClassLoader.java | 4 +- .../processors/cache/GridCacheAdapter.java | 7 +- .../processors/cache/GridCacheMvccManager.java | 31 ++- .../processors/cache/GridCacheTxAdapter.java | 14 +- .../processors/cache/GridCacheTxHandler.java | 4 +- .../cache/GridCacheTxLocalAdapter.java | 5 +- .../processors/cache/GridCacheTxManager.java | 7 +- .../dht/GridDhtTransactionalCacheAdapter.java | 1 + .../cache/distributed/dht/GridDhtTxLocal.java | 2 + .../distributed/dht/GridDhtTxLocalAdapter.java | 5 +- .../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 | 51 +++- .../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 | 5 +- .../visor/node/VisorNodeDataCollectorTask.java | 4 +- .../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 +++++++++ .../GridCacheBasicStoreNoBatchAbstractTest.java | 251 ------------------- .../GridCacheNodeFailureAbstractTest.java | 10 +- ...ansformWriteThroughSingleUpdateSelfTest.java | 98 -------- ...chePartitionedBasicStoreNoBatchSelfTest.java | 25 -- ...acheReplicatedBasicStoreNoBatchSelfTest.java | 25 -- ...cheLocalAtomicBasicStoreNoBatchSelfTest.java | 24 -- ...GridCacheLocalBasicStoreNoBatchSelfTest.java | 25 -- .../bamboo/GridCacheFailoverTestSuite.java | 3 + .../bamboo/GridDataGridTestSuite.java | 29 +-- .../cache/jta/GridCacheJtaManager.java | 1 + .../org/gridgain/scalar/ScalarConversions.scala | 2 +- .../org/gridgain/scalar/lang/ScalarJob.scala | 2 +- .../visor/commands/gc/VisorGcCommand.scala | 4 +- .../main/scala/org/gridgain/visor/visor.scala | 10 +- 106 files changed, 561 insertions(+), 729 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/59204a51/modules/core/src/main/java/org/gridgain/grid/kernal/visor/query/VisorQueryTask.java ----------------------------------------------------------------------
