Merge remote-tracking branch 'remotes/origin/ignite-sql-opt' into ignite-sql-opt-2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/eeb3ec47 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/eeb3ec47 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/eeb3ec47 Branch: refs/heads/ignite-sql-opt-2 Commit: eeb3ec47c9cadd0400b90a3d11265ef6ec87e75a Parents: fac3b8b 17c0b4f Author: sboikov <[email protected]> Authored: Wed Nov 25 08:51:20 2015 +0300 Committer: sboikov <[email protected]> Committed: Wed Nov 25 08:51:20 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 2 +- .../java/org/apache/ignite/IgniteBinary.java | 6 +- .../apache/ignite/binary/BinaryIdMapper.java | 2 +- .../apache/ignite/binary/BinarySerializer.java | 2 +- .../internal/portable/BinaryTypeImpl.java | 4 +- .../processors/cache/CacheObjectContext.java | 26 ++++- .../datastructures/GridCacheAtomicLongImpl.java | 6 +- .../portable/BinaryMarshallerSelfTest.java | 6 +- .../processors/query/h2/opt/GridH2Table.java | 10 +- .../query/h2/opt/GridH2TreeIndex.java | 104 ++++++++++--------- .../h2/GridIndexingSpiAbstractSelfTest.java | 17 ++- .../examples/project/vs/ignite-examples.vcxproj | 6 +- 12 files changed, 118 insertions(+), 73 deletions(-) ----------------------------------------------------------------------
