You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/12/17 10:42:13 UTC
[23/24] ignite git commit: Merge
Merge
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3163f085
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3163f085
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3163f085
Branch: refs/heads/ignite-1.5.1
Commit: 3163f085e0e2ee27e6d5fc25e5deb058d285f5cf
Parents: ad638e7 9087f01
Author: Anton Vinogradov <av...@gridgain.com>
Authored: Thu Dec 17 12:39:34 2015 +0300
Committer: Anton Vinogradov <av...@gridgain.com>
Committed: Thu Dec 17 12:39:34 2015 +0300
----------------------------------------------------------------------
examples/pom.xml | 2 +-
examples/schema-import/pom.xml | 2 +-
.../store/auto/CacheBinaryAutoStoreExample.java | 2 +-
.../store/dummy/CacheDummyPersonStore.java | 113 -----
.../store/dummy/CacheDummyStoreExample.java | 133 ------
.../datagrid/store/dummy/package-info.java | 22 -
.../store/jdbc/CacheJdbcPersonStore.java | 43 +-
.../store/jdbc/CacheJdbcStoreExample.java | 24 +-
.../store/spring/CacheSpringPersonStore.java | 131 -----
.../store/spring/CacheSpringStoreExample.java | 147 ------
.../datagrid/store/spring/package-info.java | 22 -
.../examples/ScalarSnowflakeSchemaExample.scala | 31 +-
.../ignite/examples/CacheExamplesSelfTest.java | 10 +-
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 | 7 +-
.../src/main/java/org/apache/ignite/Ignite.java | 19 +
.../java/org/apache/ignite/IgniteCache.java | 8 +-
.../org/apache/ignite/binary/BinaryObject.java | 15 +
.../store/jdbc/CacheAbstractJdbcStore.java | 2 +-
.../configuration/CacheConfiguration.java | 19 +-
.../apache/ignite/internal/IgniteKernal.java | 38 +-
.../internal/binary/BinaryEnumObjectImpl.java | 7 +
.../internal/binary/BinaryObjectExImpl.java | 7 +
.../binary/BinaryObjectOffheapImpl.java | 7 +
.../processors/cache/GridCacheProcessor.java | 12 +-
.../cache/GridCacheSharedContext.java | 20 +
.../processors/cache/GridCacheUtils.java | 18 +-
.../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/store/CacheOsStoreManager.java | 2 +-
.../transactions/IgniteTxLocalAdapter.java | 23 +-
.../cache/transactions/IgniteTxManager.java | 6 +-
.../service/GridServiceProcessor.java | 30 +-
.../internal/visor/query/VisorQueryJob.java | 4 +-
.../ignite/spi/discovery/tcp/ClientImpl.java | 2 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 4 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 42 +-
.../core/src/main/resources/ignite.properties | 3 +-
.../CacheSerializableTransactionsTest.java | 8 +
...IgniteCacheBinaryEntryProcessorSelfTest.java | 255 ++++++++++
.../cache/IgniteCacheNearLockValueSelfTest.java | 11 +-
.../IgniteCacheStoreValueAbstractTest.java | 2 +-
.../IgniteStartCacheInTransactionSelfTest.java | 39 +-
.../GridCacheBinaryStoreAbstractSelfTest.java | 2 +-
.../CacheGetInsideLockChangingTopologyTest.java | 475 +++++++++++++++++++
.../BinaryTxCacheLocalEntriesSelfTest.java | 2 +-
.../GridServiceProcessorProxySelfTest.java | 3 +-
.../ServicePredicateAccessCacheTest.java | 155 ++++++
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 16 +-
.../IgniteCacheFailoverTestSuite3.java | 2 +
.../testsuites/IgniteKernalSelfTestSuite.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 +-
.../IgniteBinaryObjectFieldsQuerySelfTest.java | 53 ++-
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 +-
.../common/include/ignite/common/concurrent.h | 2 +-
.../cpp/common/include/ignite/common/utils.h | 1 -
.../cpp/common/os/win/src/concurrent_os.cpp | 26 +-
modules/platforms/cpp/common/src/java.cpp | 20 +-
modules/platforms/cpp/core-test/configure.ac | 2 +-
.../platforms/cpp/core-test/src/cache_test.cpp | 4 +-
modules/platforms/cpp/core/configure.ac | 2 +-
modules/platforms/cpp/core/impl/doxygen.h | 53 +++
.../core/include/ignite/binary/binary_type.h | 4 +-
.../cpp/core/include/ignite/cache/cache.h | 12 +-
.../include/ignite/cache/query/query_scan.h | 28 +-
.../include/ignite/cache/query/query_text.h | 38 +-
.../cpp/core/include/ignite/ignition.h | 10 +-
.../core/include/ignite/impl/cache/cache_impl.h | 6 +-
.../cpp/core/include/ignite/impl/operations.h | 8 +-
modules/platforms/cpp/cpp.dxg | 4 +-
modules/platforms/cpp/examples/configure.ac | 2 +-
modules/platforms/cpp/ignite/configure.ac | 2 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../native-client-test-cache-parallel-store.xml | 2 +-
.../Config/native-client-test-cache-store.xml | 6 +-
.../Examples/ExamplesTest.cs | 4 +-
.../Properties/AssemblyInfo.cs | 4 +-
.../Apache.Ignite.Core.csproj | 19 +
.../Apache.Ignite.Core/Binary/Package-Info.cs | 26 +
.../Cache/Event/Package-Info.cs | 26 +
.../Cache/Expiry/Package-Info.cs | 26 +
.../Apache.Ignite.Core/Cache/Package-Info.cs | 26 +
.../Cache/Query/Continuous/Package-Info.cs | 26 +
.../Cache/Query/Package-Info.cs | 26 +
.../Cache/Store/Package-Info.cs | 26 +
.../Apache.Ignite.Core/Cluster/Package-Info.cs | 26 +
.../Apache.Ignite.Core/Common/Package-Info.cs | 26 +
.../Apache.Ignite.Core/Compute/IComputeTask.cs | 11 +-
.../Apache.Ignite.Core/Compute/Package-Info.cs | 26 +
.../DataStructures/Package-Info.cs | 26 +
.../Datastream/Package-Info.cs | 26 +
.../Apache.Ignite.Core/Events/Package-Info.cs | 26 +
.../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 8 -
.../Lifecycle/Package-Info.cs | 26 +
.../Messaging/Package-Info.cs | 26 +
.../dotnet/Apache.Ignite.Core/Package-Info.cs | 36 ++
.../Properties/AssemblyInfo.cs | 4 +-
.../Apache.Ignite.Core/Resource/Package-Info.cs | 26 +
.../Apache.Ignite.Core/Services/Package-Info.cs | 26 +
.../Transactions/Package-Info.cs | 26 +
modules/platforms/dotnet/Apache.Ignite.sln | 1 +
.../Apache.Ignite/Properties/AssemblyInfo.cs | 4 +-
.../Apache.Ignite.Examples.csproj | 1 -
.../Datagrid/CrossPlatformExample.cs | 205 --------
.../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 +-
.../scala/org/apache/ignite/scalar/scalar.scala | 11 +-
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 +-
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 +-
parent/pom.xml | 1 +
pom.xml | 2 +-
161 files changed, 2071 insertions(+), 1144 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3163f085/modules/platforms/dotnet/Apache.Ignite.Benchmarks/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3163f085/modules/platforms/dotnet/Apache.Ignite.Core.Tests.TestDll/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3163f085/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3163f085/modules/platforms/dotnet/Apache.Ignite.Core/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3163f085/modules/platforms/dotnet/Apache.Ignite/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3163f085/modules/platforms/dotnet/examples/Apache.Ignite.Examples/Properties/AssemblyInfo.cs
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3163f085/modules/platforms/dotnet/examples/Apache.Ignite.ExamplesDll/Properties/AssemblyInfo.cs
----------------------------------------------------------------------