You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/12/18 04:42:23 UTC
[20/22] ignite git commit: Merge branches 'ignite-1.5' and
'ignite-gg-10889' of https://git-wip-us.apache.org/repos/asf/ignite into
ignite-gg-10889
Merge branches 'ignite-1.5' and 'ignite-gg-10889' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-gg-10889
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/562c70a3
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/562c70a3
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/562c70a3
Branch: refs/heads/ignite-gg-10889
Commit: 562c70a39ede2f2f41af841b1d9e0df40af70fda
Parents: 3b23b71 a4b547b
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Dec 18 10:16:30 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Dec 18 10:16:30 2015 +0700
----------------------------------------------------------------------
examples/pom.xml | 2 +-
examples/schema-import/pom.xml | 2 +-
.../hibernate/CacheHibernateStoreExample.java | 8 +
.../datagrid/store/hibernate/Person.hbm.xml | 6 +-
.../datagrid/store/hibernate/hibernate.cfg.xml | 7 +-
.../examples/datagrid/CacheQueryExample.java | 11 +-
.../store/jdbc/CacheJdbcStoreExample.java | 1 -
.../store/spring/CacheSpringPersonStore.java | 118 +++++
.../store/spring/CacheSpringStoreExample.java | 155 ++++++
.../datagrid/store/spring/package-info.java | 22 +
.../streaming/StreamVisitorExample.java | 40 +-
modules/aop/pom.xml | 2 +-
modules/apache-license-gen/pom.xml | 2 +-
modules/aws/pom.xml | 2 +-
modules/camel/pom.xml | 2 +-
modules/clients/pom.xml | 2 +-
modules/cloud/pom.xml | 2 +-
modules/codegen/pom.xml | 2 +-
modules/core/pom.xml | 2 +-
.../binary/BinaryReflectiveSerializer.java | 33 ++
.../ignite/binary/BinaryTypeConfiguration.java | 20 +-
.../org/apache/ignite/cache/CacheManager.java | 2 +-
.../ignite/cache/affinity/AffinityKey.java | 2 +-
.../apache/ignite/internal/IgniteKernal.java | 35 +-
.../org/apache/ignite/internal/IgnitionEx.java | 51 +-
.../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 +-
.../processors/cache/GridCacheProcessor.java | 8 +-
.../cache/GridCacheSharedContext.java | 20 +
.../processors/cache/GridCacheUtils.java | 18 +-
.../cache/binary/BinaryMetadataKey.java | 2 +-
.../binary/CacheObjectBinaryProcessorImpl.java | 2 +-
.../dht/CacheDistributedGetFutureAdapter.java | 2 +-
.../dht/GridPartitionedGetFuture.java | 15 +-
.../dht/GridPartitionedSingleGetFuture.java | 8 +
.../dht/atomic/GridNearAtomicUpdateFuture.java | 10 +-
.../colocated/GridDhtColocatedLockFuture.java | 2 +-
.../distributed/near/GridNearGetFuture.java | 17 +-
.../distributed/near/GridNearLockFuture.java | 30 +-
...ridNearOptimisticTxPrepareFutureAdapter.java | 6 +-
.../cache/transactions/IgniteTxManager.java | 6 +-
.../datastreamer/DataStreamerUpdateJob.java | 2 +-
.../PlatformDotNetConfigurationClosure.java | 4 +-
.../processors/query/GridQueryProcessor.java | 204 ++++++--
.../core/src/main/resources/ignite.properties | 2 +-
.../binary/BinaryFieldsAbstractSelfTest.java | 4 +-
.../BinaryFooterOffsetsAbstractSelfTest.java | 3 +-
.../binary/BinaryMarshallerSelfTest.java | 34 +-
...GridBinaryMarshallerCtxDisabledSelfTest.java | 3 +-
.../binary/GridBinaryWildcardsSelfTest.java | 3 +-
.../cache/CacheStopAndDestroySelfTest.java | 2 +
.../GridCacheOnCopyFlagAbstractSelfTest.java | 33 +-
.../cache/IgniteCacheNearLockValueSelfTest.java | 11 +-
.../cache/IgniteCacheSerializationSelfTest.java | 112 +++++
.../IgniteCacheStoreValueAbstractTest.java | 2 +-
.../IgniteStartCacheInTransactionSelfTest.java | 39 +-
.../GridBinaryCacheEntryMemorySizeSelfTest.java | 3 +-
.../CacheGetInsideLockChangingTopologyTest.java | 475 +++++++++++++++++++
.../session/GridSessionCheckpointSelfTest.java | 3 +-
.../ignite/testframework/junits/IgniteMock.java | 3 +-
.../junits/IgniteTestResources.java | 4 +-
.../IgniteCacheFailoverTestSuite3.java | 2 +
modules/extdata/p2p/pom.xml | 2 +-
.../extdata/uri/modules/uri-dependency/pom.xml | 2 +-
modules/extdata/uri/pom.xml | 2 +-
modules/flume/pom.xml | 2 +-
modules/gce/pom.xml | 2 +-
modules/geospatial/pom.xml | 2 +-
modules/hadoop/pom.xml | 2 +-
modules/hibernate/pom.xml | 2 +-
modules/indexing/pom.xml | 2 +-
.../cache/BinarySerializationQuerySelfTest.java | 416 ++++++++++++++++
...onQueryWithReflectiveSerializerSelfTest.java | 28 ++
.../IgniteBinaryObjectFieldsQuerySelfTest.java | 53 ++-
...niteCacheP2pUnmarshallingQueryErrorTest.java | 4 +-
.../IgniteBinaryCacheQueryTestSuite.java | 119 ++++-
modules/jcl/pom.xml | 2 +-
modules/jms11/pom.xml | 2 +-
modules/jta/pom.xml | 2 +-
modules/kafka/pom.xml | 2 +-
modules/log4j/pom.xml | 2 +-
modules/log4j2/pom.xml | 2 +-
modules/mesos/pom.xml | 2 +-
modules/mqtt/pom.xml | 2 +-
modules/osgi-karaf/pom.xml | 2 +-
modules/osgi-paxlogging/pom.xml | 2 +-
modules/osgi/pom.xml | 2 +-
modules/platforms/cpp/common/configure.ac | 2 +-
modules/platforms/cpp/core-test/configure.ac | 2 +-
modules/platforms/cpp/core/configure.ac | 2 +-
modules/platforms/cpp/examples/configure.ac | 2 +-
modules/platforms/cpp/ignite/configure.ac | 2 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../Services/ServicesTest.cs | 23 +-
.../Properties/AssemblyInfo.cs | 4 +-
modules/platforms/dotnet/Apache.Ignite.dxg | 2 +-
.../Apache.Ignite/Properties/AssemblyInfo.cs | 4 +-
.../Messaging/MessagingExample.cs | 6 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../Properties/AssemblyInfo.cs | 4 +-
modules/rest-http/pom.xml | 2 +-
modules/scalar-2.10/pom.xml | 2 +-
modules/scalar/pom.xml | 2 +-
modules/schedule/pom.xml | 2 +-
modules/schema-import/pom.xml | 2 +-
modules/slf4j/pom.xml | 2 +-
modules/spark-2.10/pom.xml | 2 +-
modules/spark/pom.xml | 2 +-
modules/spring/pom.xml | 2 +-
.../java/org/apache/ignite/IgniteSpring.java | 4 +-
modules/ssh/pom.xml | 2 +-
modules/tools/pom.xml | 2 +-
modules/twitter/pom.xml | 2 +-
modules/urideploy/pom.xml | 2 +-
modules/visor-console-2.10/pom.xml | 2 +-
modules/visor-console/pom.xml | 2 +-
modules/visor-plugins/pom.xml | 2 +-
modules/web/pom.xml | 2 +-
modules/yardstick/pom.xml | 2 +-
modules/yarn/pom.xml | 2 +-
modules/zookeeper/pom.xml | 2 +-
pom.xml | 2 +-
129 files changed, 2273 insertions(+), 438 deletions(-)
----------------------------------------------------------------------