Merge remote-tracking branch 'origin/ignite-950' into ignite-950
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/038755ca Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/038755ca Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/038755ca Branch: refs/heads/ignite-950 Commit: 038755ca53ff156c17f8cff1744c00e56d79e668 Parents: 136453d cc19b08 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Tue Jun 30 23:42:07 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Tue Jun 30 23:42:07 2015 -0700 ---------------------------------------------------------------------- .../cache/CacheIndexedObjectImpl.java | 26 +- .../cacheobject/IgniteCacheObjectProcessor.java | 8 +- .../IgniteCacheObjectProcessorImpl.java | 27 +- .../processors/query/GridQueryProcessor.java | 105 ++--- .../ignite/jmh/CliendServerNodeBenchmark.java | 204 +++++++++ .../ignite/jmh/MarshallerContextJMHImpl.java | 57 +++ .../ignite/jmh/MarshallerMethodsBenchmark.java | 95 ++++ .../ignite/jmh/QueryMarshallerBenchmark.java | 412 ++++++++++++++++++ .../apache/ignite/jmh/ReadFieldBenchmark.java | 91 ++++ .../SeveralNodesQueryMarshallerBenchmark.java | 432 +++++++++++++++++++ .../ignite/jmh/SimpleMarshallerBenchmark.java | 208 +++++++++ .../java/org/apache/ignite/jmh/model/City.java | 72 ++++ .../org/apache/ignite/jmh/model/Department.java | 75 ++++ .../apache/ignite/jmh/model/Organization.java | 39 ++ .../org/apache/ignite/jmh/model/Person.java | 97 +++++ .../ignite/jmh/model/PersonExternalizable.java | 190 ++++++++ .../ignite/jmh/model/PersonMarshalAware.java | 199 +++++++++ .../apache/ignite/jmh/model/PersonSimple.java | 172 ++++++++ 18 files changed, 2386 insertions(+), 123 deletions(-) ----------------------------------------------------------------------
