Merge branch 'master' into ignite-2004
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/93770272 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/93770272 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/93770272 Branch: refs/heads/ignite-2004 Commit: 937702729bc598efc8232404f835a8e1a49a7737 Parents: 1825305 21bd626 Author: nikolay_tikhonov <[email protected]> Authored: Fri Apr 15 18:00:19 2016 +0300 Committer: nikolay_tikhonov <[email protected]> Committed: Fri Apr 15 18:00:19 2016 +0300 ---------------------------------------------------------------------- .../dht/atomic/GridDhtAtomicCache.java | 2 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 1235 +++++++++--------- .../closure/GridClosureProcessor.java | 6 + .../ignite/schema/generator/GeneratorUtils.java | 17 + .../IgniteCacheRandomOperationBenchmark.java | 122 +- .../yardstick/cache/load/model/ModelUtil.java | 39 +- .../cache/load/model/key/Identifier.java | 21 +- .../yardstick/cache/load/model/key/Mark.java | 14 +- .../yardstick/cache/load/model/value/Car.java | 1 - .../yardstick/cache/load/model/value/Color.java | 14 +- .../yardstick/cache/load/model/value/Truck.java | 17 +- 11 files changed, 742 insertions(+), 746 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/93770272/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ----------------------------------------------------------------------
