Merge branches 'ignite-1.5' and 'ignite-843-rc2' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843-rc2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f888e54f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f888e54f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f888e54f Branch: refs/heads/ignite-843-rc2 Commit: f888e54fcbb30088f1256da81bd0a19e4a0d78ef Parents: 23c3e54 a4b547b Author: Alexey Kuznetsov <[email protected]> Authored: Fri Dec 18 10:14:11 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Fri Dec 18 10:14:11 2015 +0700 ---------------------------------------------------------------------- .../hibernate/CacheHibernateStoreExample.java | 8 + .../datagrid/store/hibernate/Person.hbm.xml | 6 +- .../datagrid/store/hibernate/hibernate.cfg.xml | 7 +- .../store/spring/CacheSpringPersonStore.java | 118 ++++++ .../store/spring/CacheSpringStoreExample.java | 155 +++++++ .../datagrid/store/spring/package-info.java | 22 + .../binary/BinaryReflectiveSerializer.java | 33 ++ .../ignite/binary/BinaryTypeConfiguration.java | 20 +- .../ignite/cache/affinity/AffinityKey.java | 2 +- .../internal/binary/BinaryClassDescriptor.java | 124 ++---- .../ignite/internal/binary/BinaryContext.java | 109 ++++- .../internal/binary/BinaryFieldAccessor.java | 3 - .../ignite/internal/binary/BinaryUtils.java | 49 ++- .../ignite/internal/binary/BinaryWriteMode.java | 3 - .../processors/cache/CacheEntryImpl.java | 6 +- .../processors/cache/CacheEntryImplEx.java | 17 +- .../cache/binary/BinaryMetadataKey.java | 2 +- .../binary/CacheObjectBinaryProcessorImpl.java | 2 +- .../PlatformDotNetConfigurationClosure.java | 4 +- .../processors/query/GridQueryProcessor.java | 204 ++++++--- .../binary/BinaryFieldsAbstractSelfTest.java | 4 +- .../BinaryFooterOffsetsAbstractSelfTest.java | 3 +- .../binary/BinaryMarshallerSelfTest.java | 34 +- ...GridBinaryMarshallerCtxDisabledSelfTest.java | 3 +- .../binary/GridBinaryWildcardsSelfTest.java | 3 +- .../GridCacheOnCopyFlagAbstractSelfTest.java | 33 +- .../GridBinaryCacheEntryMemorySizeSelfTest.java | 3 +- .../session/GridSessionCheckpointSelfTest.java | 3 +- .../ignite/testframework/junits/IgniteMock.java | 3 +- .../junits/IgniteTestResources.java | 4 +- .../cache/BinarySerializationQuerySelfTest.java | 416 +++++++++++++++++++ ...onQueryWithReflectiveSerializerSelfTest.java | 28 ++ ...niteCacheP2pUnmarshallingQueryErrorTest.java | 4 +- .../IgniteBinaryCacheQueryTestSuite.java | 119 +++++- .../Services/ServicesTest.cs | 23 +- 35 files changed, 1340 insertions(+), 237 deletions(-) ----------------------------------------------------------------------
