Merge branch 'sprint-1' into ignite-35
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/04361abb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/04361abb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/04361abb Branch: refs/heads/ignite-32 Commit: 04361abb4c5296f0c7fcf39fc94c172961db0a2d Parents: 6d5ed0e 4174b33 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Thu Jan 22 20:31:58 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Thu Jan 22 20:31:58 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/cache/store/CacheStore.java | 5 +- .../org/apache/ignite/cluster/ClusterNode.java | 39 +++- .../ignite/cluster/ClusterNodeLocalMap.java | 3 +- .../ignite/compute/ComputeJobSibling.java | 3 +- .../ignite/compute/ComputeLoadBalancer.java | 3 +- .../ignite/logger/java/IgniteJavaLogger.java | 4 +- .../apache/ignite/transactions/IgniteTx.java | 31 +++ .../org/gridgain/grid/GridMetadataAware.java | 187 ------------------- .../org/gridgain/grid/cache/GridCacheEntry.java | 77 +++++++- .../grid/kernal/ClusterNodeLocalMapImpl.java | 80 -------- .../grid/kernal/GridJobContextImpl.java | 4 +- .../grid/kernal/GridJobSiblingImpl.java | 3 +- .../gridgain/grid/kernal/GridKernalContext.java | 3 +- .../grid/kernal/GridKernalContextImpl.java | 4 +- .../gridgain/grid/kernal/GridLoggerProxy.java | 5 +- .../kernal/executor/GridExecutorService.java | 4 +- .../loadbalancer/GridLoadBalancerAdapter.java | 4 +- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/GridCacheEntryEx.java | 85 ++++++++- .../processors/cache/GridCacheEntryImpl.java | 54 +----- .../cache/GridCacheEvictionEntry.java | 36 ---- .../cache/GridCacheFilterEvaluationEntry.java | 36 ---- .../processors/cache/GridCacheLogger.java | 3 +- .../processors/cache/GridCacheMapEntry.java | 88 +-------- .../processors/cache/GridCacheStoreManager.java | 7 +- .../GridPartitionedCacheEntryImpl.java | 147 --------------- .../cache/query/GridCacheQueryManager.java | 37 ---- .../GridCacheContinuousQueryEntry.java | 50 ----- .../cache/transactions/IgniteTxEx.java | 3 +- .../cache/transactions/IgniteTxProxyImpl.java | 19 +- .../java/org/gridgain/grid/util/GridUtils.java | 19 -- .../grid/util/lang/GridComputeJobWrapper.java | 14 +- .../org/gridgain/grid/util/lang/GridFunc.java | 146 --------------- .../util/lang/GridMetadataAwareAdapter.java | 159 ++++++++++++---- .../org/gridgain/grid/GridTestJobContext.java | 3 +- .../gridgain/grid/lang/GridTupleSelfTest.java | 85 --------- .../junits/logger/GridTestLog4jLogger.java | 4 +- .../gridgain/grid/logger/jcl/GridJclLogger.java | 3 +- .../ignite/logger/log4j/IgniteLog4jLogger.java | 4 +- .../processors/schedule/ScheduleFutureImpl.java | 6 +- .../grid/logger/slf4j/GridSlf4jLogger.java | 3 +- .../java/org/gridgain/grid/GridSpringBean.java | 3 +- 42 files changed, 401 insertions(+), 1074 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/04361abb/modules/core/src/main/java/org/apache/ignite/compute/ComputeLoadBalancer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/04361abb/modules/core/src/main/java/org/gridgain/grid/kernal/GridKernalContextImpl.java ----------------------------------------------------------------------
