[2/2] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/32b04d6e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/32b04d6e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/32b04d6e Branch: refs/heads/ignite-1537 Commit: 32b04d6e03e84a5f0424ecc321e074b32e7b2703 Parents: ad658eb f1f8cda Author: sboikovAuthored: Tue Dec 29 17:18:28 2015 +0300 Committer: sboikov Committed: Tue Dec 29 17:18:28 2015 +0300 -- assembly/release-fabric-base.xml | 1 + 1 file changed, 1 insertion(+) --
[3/3] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/94218a81 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/94218a81 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/94218a81 Branch: refs/heads/ignite-1537 Commit: 94218a8183c3c64fb763057d93870ba7da775c1d Parents: 5fa5f86 dd0a8d3 Author: sboikovAuthored: Mon Dec 28 12:56:58 2015 +0300 Committer: sboikov Committed: Mon Dec 28 12:56:58 2015 +0300 -- assembly/release-sources.xml| 79 modules/clients/pom.xml | 2 +- .../apache/ignite/internal/IgniteKernal.java| 7 +- .../ignite/internal/IgniteNodeAttributes.java | 3 + .../processors/rest/GridRestProcessor.java | 4 + .../rest/client/message/GridClientNodeBean.java | 4 +- .../plugin/security/AuthenticationContext.java | 33 ++-- pom.xml | 23 +++--- 8 files changed, 135 insertions(+), 20 deletions(-) --
[5/6] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/023ea3db Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/023ea3db Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/023ea3db Branch: refs/heads/ignite-1537 Commit: 023ea3dbd9958acdcc1b65d085f8ed3acf4e21f0 Parents: 2c46120 49c2988 Author: sboikovAuthored: Fri Dec 25 08:58:50 2015 +0300 Committer: sboikov Committed: Fri Dec 25 08:58:50 2015 +0300 -- README.txt | 4 +- .../JettyRestProcessorAbstractSelfTest.java | 25 +++- .../connection/GridClientNioTcpConnection.java | 17 +-- .../client/message/GridClientCacheBean.java | 139 +++ .../rest/client/message/GridClientNodeBean.java | 70 ++ .../top/GridTopologyCommandHandler.java | 38 +++-- ...yMetadataUpdateChangingTopologySelfTest.java | 1 - 7 files changed, 232 insertions(+), 62 deletions(-) --
[2/3] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/441a0399 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/441a0399 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/441a0399 Branch: refs/heads/ignite-1537 Commit: 441a039934c09b1345bcbbf6d5cf838702b8e7c5 Parents: bf101de 18c413c Author: sboikovAuthored: Fri Dec 25 10:03:25 2015 +0300 Committer: sboikov Committed: Fri Dec 25 10:03:25 2015 +0300 -- .../ignite/internal/binary/BinaryContext.java | 44 +-- .../internal/binary/BinaryEnumObjectImpl.java | 4 +- .../internal/binary/BinaryObjectImpl.java | 27 --- .../internal/binary/GridBinaryMarshaller.java | 82 +++- 4 files changed, 94 insertions(+), 63 deletions(-) --
[11/11] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Conflicts: modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFutureAdapter.java modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateChangingTopologySelfTest.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4b69eab2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4b69eab2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4b69eab2 Branch: refs/heads/ignite-1537 Commit: 4b69eab2dfa986fbc4f1b41906c9f5d348020654 Parents: 9f158b9 Author: sboikovAuthored: Thu Dec 24 09:09:23 2015 +0300 Committer: sboikov Committed: Thu Dec 24 09:09:23 2015 +0300 -- .../processors/cache/binary/CacheObjectBinaryProcessorImpl.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/4b69eab2/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java index 2209ec9..bcc2ab7 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java @@ -477,7 +477,7 @@ public class CacheObjectBinaryProcessorImpl extends IgniteCacheObjectProcessorIm } /** {@inheritDoc} */ -public void addMeta(final int typeId, final BinaryType newMeta) { +@Override public void addMeta(final int typeId, final BinaryType newMeta) throws BinaryObjectException { assert newMeta != null; assert newMeta instanceof BinaryTypeImpl;
[10/11] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Conflicts: modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFutureAdapter.java modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteBinaryMetadataUpdateChangingTopologySelfTest.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9f158b96 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9f158b96 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9f158b96 Branch: refs/heads/ignite-1537 Commit: 9f158b96d13e0dd2b916ea684c3c03f0cba66c7b Parents: 6d6be6b bd05fa9 Author: sboikovAuthored: Thu Dec 24 09:07:41 2015 +0300 Committer: sboikov Committed: Thu Dec 24 09:07:41 2015 +0300 -- .../ignite/internal/binary/BinaryContext.java | 2 +- .../internal/binary/BinaryObjectImpl.java | 2 +- .../query/GridCacheDistributedQueryManager.java | 6 +- .../processors/query/GridQueryProcessor.java| 5 + ...iteCacheScanPredicateDeploymentSelfTest.java | 114 + .../testsuites/IgniteCacheTestSuite3.java | 2 + .../p2p/CacheDeploymentAlwaysTruePredicate.java | 29 + .../ignite/tests/p2p/cache/PersonWrapper.java | 121 +++ .../processors/query/h2/IgniteH2Indexing.java | 2 +- .../IgniteBinaryObjectFieldsQuerySelfTest.java | 16 ++- ...eBinaryWrappedObjectFieldsQuerySelfTest.java | 28 + .../cache/IgniteCacheAbstractQuerySelfTest.java | 2 +- .../IgniteBinaryCacheQueryTestSuite.java| 4 + .../IgniteCacheQuerySelfTestSuite.java | 4 + 14 files changed, 326 insertions(+), 11 deletions(-) --
[13/14] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bad9e636 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bad9e636 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bad9e636 Branch: refs/heads/ignite-1537 Commit: bad9e6364916d1af791f72f73abdfa5fe4486416 Parents: 3938d29 b6dab09 Author: sboikovAuthored: Tue Dec 22 22:19:17 2015 +0300 Committer: sboikov Committed: Tue Dec 22 22:19:17 2015 +0300 -- assembly/dependencies-fabric-lgpl.xml | 7 +++ assembly/dependencies-fabric.xml| 7 +++ examples/pom.xml| 2 +- examples/schema-import/pom.xml | 2 +- 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 +- .../ignite/internal/IgniteVersionUtils.java | 5 +- .../internal/binary/GridBinaryMarshaller.java | 10 .../binary/CacheObjectBinaryProcessorImpl.java | 3 ++ .../ignite/lang/IgniteProductVersion.java | 2 +- .../core/src/main/resources/ignite.properties | 2 +- .../product/GridProductVersionSelfTest.java | 22 ++--- 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 +- 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 | 6 +-- .../Properties/AssemblyInfo.cs | 6 +-- .../Properties/AssemblyInfo.cs | 6 +-- .../Properties/AssemblyInfo.cs | 6 +-- .../Apache.Ignite/Properties/AssemblyInfo.cs| 6 +-- .../Properties/AssemblyInfo.cs | 6 +-- .../Properties/AssemblyInfo.cs | 6 +-- 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 +- 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 +- .../config/benchmark-multicast.properties | 6 +-- modules/yardstick/pom.xml | 2 +- .../cache/IgnitePutTxImplicitBenchmark.java | 52 .../cache/IgnitePutTxOffHeapBenchmark.java | 2 +- .../IgnitePutTxOffHeapValuesBenchmark.java | 2 +- modules/yarn/pom.xml| 2 +- modules/zookeeper/pom.xml | 2 +- pom.xml | 4 +- 75
[2/2] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/656b113e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/656b113e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/656b113e Branch: refs/heads/ignite-1537 Commit: 656b113ed9052c03b6b68096a69e08fe107d358c Parents: 70c182f fbb4982 Author: sboikovAuthored: Wed Dec 23 10:11:59 2015 +0300 Committer: sboikov Committed: Wed Dec 23 10:11:59 2015 +0300 -- .../binary/BinaryMarshallerSelfTest.java| 82 ++-- 1 file changed, 41 insertions(+), 41 deletions(-) --
[9/9] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0fd1e158 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0fd1e158 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0fd1e158 Branch: refs/heads/ignite-1537 Commit: 0fd1e158e68154adebadaa1e22707bad563290ef Parents: 3fed8be 3ee0966 Author: sboikovAuthored: Tue Dec 22 12:36:21 2015 +0300 Committer: sboikov Committed: Tue Dec 22 12:36:21 2015 +0300 -- .../internal/binary/BinaryClassDescriptor.java | 56 +-- .../ignite/internal/binary/BinaryUtils.java | 11 ++ .../processors/cache/IgniteCacheProxy.java | 3 +- .../cache/VisorCacheStoreConfiguration.java | 13 +- .../binary/BinaryMarshallerSelfTest.java| 110 ++ ...teCacheFullTextQueryNodeJoiningSelfTest.java | 145 +++ .../IgniteBinaryCacheQueryTestSuite.java| 3 +- .../commands/cache/VisorCacheCommand.scala | 1 + .../config/benchmark-multicast.properties | 2 +- 9 files changed, 329 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/0fd1e158/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java --
[10/10] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/95b51335 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/95b51335 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/95b51335 Branch: refs/heads/ignite-1537 Commit: 95b51335f197ffd14765da9f838189278b620c03 Parents: f2b1285 d8576b8 Author: sboikovAuthored: Tue Dec 22 09:28:19 2015 +0300 Committer: sboikov Committed: Tue Dec 22 09:28:19 2015 +0300 -- .../configuration/CacheConfiguration.java | 44 ++- .../internal/binary/BinaryObjectImpl.java | 20 +- .../processors/cache/IgniteCacheProxy.java | 5 +- .../cache/query/GridCacheQueryManager.java | 8 +- .../processors/query/GridQueryProcessor.java| 10 +- .../ignite/internal/util/IgniteUtils.java | 6 +- .../cache/VisorCacheQueryConfiguration.java | 11 + .../internal/visor/query/VisorQueryJob.java | 6 + .../IgniteCacheBinaryObjectsScanSelfTest.java | 137 + .../processors/query/h2/IgniteH2Indexing.java | 118 ++-- .../processors/query/h2/sql/GridSqlQuery.java | 3 + .../query/h2/sql/GridSqlQuerySplitter.java | 113 --- .../cache/IgniteCacheAbstractQuerySelfTest.java | 300 +-- .../IgniteCacheReplicatedQuerySelfTest.java | 10 +- .../local/IgniteCacheLocalQuerySelfTest.java| 2 +- .../query/IgniteSqlSchemaIndexingTest.java | 240 +++ .../query/IgniteSqlSplitterSelfTest.java| 52 .../query/h2/sql/GridQueryParsingTest.java | 9 +- .../IgniteBinaryCacheQueryTestSuite.java| 2 + .../IgniteCacheQuerySelfTestSuite.java | 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 | 5 +- .../Properties/AssemblyInfo.cs | 5 +- .../Properties/AssemblyInfo.cs | 5 +- .../Binary/IBinaryRawReader.cs | 4 +- .../Apache.Ignite.Core/Binary/IBinaryReader.cs | 25 +- .../Apache.Ignite.Core/Binary/Package-Info.cs | 2 +- .../Apache.Ignite.Core/Cache/Package-Info.cs| 2 +- .../Cache/Query/Continuous/Package-Info.cs | 2 +- .../Cache/Query/Package-Info.cs | 2 +- .../Cache/Store/Package-Info.cs | 2 +- .../Apache.Ignite.Core/Cluster/Package-Info.cs | 2 +- .../Apache.Ignite.Core/Compute/Package-Info.cs | 2 +- .../Datastream/Package-Info.cs | 2 +- .../Apache.Ignite.Core/Events/Package-Info.cs | 2 +- .../Impl/Binary/BinaryReader.cs | 13 +- .../Impl/Binary/BinaryUtils.cs | 4 +- .../Lifecycle/Package-Info.cs | 2 +- .../Messaging/Package-Info.cs | 2 +- .../dotnet/Apache.Ignite.Core/Package-Info.cs | 2 +- .../Properties/AssemblyInfo.cs | 5 +- .../Apache.Ignite.Core/Resource/Package-Info.cs | 2 +- .../Apache.Ignite.Core/Services/Package-Info.cs | 2 +- .../Transactions/Package-Info.cs| 2 +- .../Apache.Ignite/Properties/AssemblyInfo.cs| 5 +- .../Properties/AssemblyInfo.cs | 5 +- .../Properties/AssemblyInfo.cs | 5 +- .../commands/cache/VisorCacheCommand.scala | 13 +- pom.xml | 42 +-- 53 files changed, 978 insertions(+), 296 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/95b51335/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java --
[1/5] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Repository: ignite Updated Branches: refs/heads/ignite-1537 fe9e6f099 -> f2b1285fb Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a325e0e8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a325e0e8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a325e0e8 Branch: refs/heads/ignite-1537 Commit: a325e0e8c16aec028ac6ed824f436ada6fd55332 Parents: 184bc96 f5e9918 Author: sboikovAuthored: Mon Nov 30 23:54:37 2015 +0300 Committer: sboikov Committed: Mon Nov 30 23:54:37 2015 +0300 -- examples/pom.xml| 5 +- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/camel/pom.xml | 5 +- .../ignite/stream/camel/package-info.java | 21 .../ignite/stream/camel/package-info.java | 21 modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml| 2 +- .../GridDeploymentPerVersionStore.java | 12 +- .../distributed/dht/GridDhtLockFuture.java | 17 ++- .../communication/tcp/TcpCommunicationSpi.java | 12 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 - .../core/src/main/resources/ignite.properties | 2 +- ...cheAbstractFullApiMultithreadedSelfTest.java | 9 +- .../IgniteCacheStoreValueAbstractTest.java | 111 +++ .../cache/IgniteCacheTxPreloadNoWriteTest.java | 2 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 3 +- ...eRebalancingUnmarshallingFailedSelfTest.java | 13 ++- .../GridCacheLocalIsolatedNodesSelfTest.java| 6 +- .../cache/GridCacheCommandHandlerSelfTest.java | 7 +- .../tcp/IgniteCacheSslStartStopSelfTest.java| 2 +- modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 4 +- modules/flume/pom.xml | 5 +- .../ignite/stream/flume/package-info.java | 21 .../ignite/stream/flume/package-info.java | 21 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 +- modules/jcl/pom.xml | 2 +- modules/jms11/pom.xml | 2 +- .../ignite/stream/jms11/package-info.java | 21 .../ignite/stream/jms11/package-info.java | 21 modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- .../ignite/stream/kafka/package-info.java | 21 .../ignite/stream/kafka/package-info.java | 21 modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml| 5 +- .../apache/ignite/stream/mqtt/package-info.java | 21 .../apache/ignite/stream/mqtt/package-info.java | 21 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 | 12 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 6 +- .../Apache.Ignite/Properties/AssemblyInfo.cs| 4 +- .../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 +- .../ignite/cache/store/spring/package-info.java | 21
[11/11] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e97a96c7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e97a96c7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e97a96c7 Branch: refs/heads/ignite-1537 Commit: e97a96c7eadc2161b7b84d73098343f0c9f3bb78 Parents: 1a00ab5 d4687d9 Author: sboikovAuthored: Mon Dec 21 10:22:50 2015 +0300 Committer: sboikov Committed: Mon Dec 21 10:22:50 2015 +0300 -- RELEASE_NOTES.txt | 1 + ...ComputeClientBinaryTaskExecutionExample.java | 4 +- .../CacheClientBinaryPutGetExample.java | 6 +- .../datagrid/CacheClientBinaryQueryExample.java | 10 +- .../datagrid/CacheEntryProcessorExample.java| 157 ++ .../examples/datagrid/CacheQueryExample.java| 4 +- .../apache/ignite/examples/model/Address.java | 72 +++ .../apache/ignite/examples/model/Employee.java | 93 .../ignite/examples/model/EmployeeKey.java | 93 .../ignite/examples/model/Organization.java | 85 +++- .../ignite/examples/model/OrganizationType.java | 32 ++ .../apache/ignite/examples/model/Person.java| 2 +- .../ignite/examples/model/binary/Address.java | 72 --- .../ignite/examples/model/binary/Employee.java | 93 .../examples/model/binary/EmployeeKey.java | 93 .../examples/model/binary/Organization.java | 93 .../examples/model/binary/OrganizationType.java | 32 -- .../ignite/examples/model/package-info.java | 23 + .../datagrid/CacheEntryProcessorExample.java| 147 ++ .../ScalarCacheEntryProcessorExample.scala | 125 + .../ignite/examples/CacheExamplesSelfTest.java | 8 + .../java8/examples/CacheExamplesSelfTest.java | 8 + .../tests/examples/ScalarExamplesSelfTest.scala | 5 + .../ignite/internal/binary/BinaryContext.java | 16 +- .../processors/cache/CacheObjectAdapter.java| 3 + .../cache/BinarySerializationQuerySelfTest.java | 2 +- .../IgniteCacheAbstractFieldsQuerySelfTest.java | 68 ++- modules/platforms/cpp/core/impl/doxygen.h | 53 -- .../cpp/core/include/ignite/binary/binary.h | 5 + .../core/include/ignite/binary/binary_consts.h | 5 + .../include/ignite/binary/binary_containers.h | 5 + .../include/ignite/binary/binary_raw_reader.h | 5 + .../include/ignite/binary/binary_raw_writer.h | 5 + .../core/include/ignite/binary/binary_reader.h | 5 + .../core/include/ignite/binary/binary_type.h| 17 + .../core/include/ignite/binary/binary_writer.h | 5 + .../cpp/core/include/ignite/cache/cache.h | 5 + .../cpp/core/include/ignite/cache/cache_entry.h | 5 + .../core/include/ignite/cache/cache_peek_mode.h | 5 + .../cpp/core/include/ignite/cache/query/query.h | 5 + .../include/ignite/cache/query/query_argument.h | 6 + .../include/ignite/cache/query/query_cursor.h | 5 + .../ignite/cache/query/query_fields_cursor.h| 5 + .../ignite/cache/query/query_fields_row.h | 5 + .../include/ignite/cache/query/query_scan.h | 5 + .../core/include/ignite/cache/query/query_sql.h | 5 + .../ignite/cache/query/query_sql_fields.h | 5 + .../include/ignite/cache/query/query_text.h | 5 + .../platforms/cpp/core/include/ignite/guid.h| 5 + .../platforms/cpp/core/include/ignite/ignite.h | 5 + .../core/include/ignite/ignite_configuration.h | 5 + .../cpp/core/include/ignite/ignite_error.h | 5 + .../cpp/core/include/ignite/ignition.h | 5 + modules/platforms/cpp/core/namespaces.dox | 53 ++ .../ignite/schema/generator/CodeGenerator.java | 7 +- .../schema/test/AbstractSchemaImportTest.java | 18 + .../org/apache/ignite/schema/test/model/Tst.txt | 506 +++ .../apache/ignite/schema/test/model/TstKey.txt | 96 .../schema/test/model/ignite-type-metadata.xml | 180 +++ .../test/parser/DbMetadataParserTest.java | 17 +- 60 files changed, 1935 insertions(+), 480 deletions(-) --
[8/9] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Conflicts: modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/527aa2ad Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/527aa2ad Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/527aa2ad Branch: refs/heads/ignite-1537 Commit: 527aa2adf51b7d4aa60013e8ae6b2b48c550863b Parents: 9ed3909 24eccb8 Author: sboikovAuthored: Fri Dec 18 14:13:41 2015 +0300 Committer: sboikov Committed: Fri Dec 18 14:13:41 2015 +0300 -- .../apache/ignite/internal/binary/BinaryClassDescriptor.java | 5 - .../org/apache/ignite/internal/binary/BinaryWriteMode.java | 3 +++ .../apache/ignite/internal/IgniteClientReconnectCacheTest.java | 6 -- .../cache/IgniteCacheBinaryEntryProcessorSelfTest.java | 4 ++-- .../distributed/CacheGetInsideLockChangingTopologyTest.java| 2 ++ .../internal/processors/query/IgniteSqlSplitterSelfTest.java | 3 ++- 6 files changed, 17 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/527aa2ad/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java -- diff --cc modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java index ed38d2b,5234d6e..5456700 --- a/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java @@@ -73,7 -73,9 +73,10 @@@ import org.apache.ignite.transactions.T import org.apache.ignite.transactions.TransactionConcurrency; import static java.util.concurrent.TimeUnit.MILLISECONDS; + import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK; + import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.PRIMARY; + import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.values; +import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.*; import static org.apache.ignite.cache.CacheAtomicityMode.ATOMIC; import static org.apache.ignite.cache.CacheAtomicityMode.TRANSACTIONAL; import static org.apache.ignite.cache.CacheMode.PARTITIONED;
ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Repository: ignite Updated Branches: refs/heads/ignite-1537 098963bc0 -> d2c35503c Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Conflicts: modules/core/src/test/java/org/apache/ignite/internal/IgniteClientReconnectCacheTest.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d2c35503 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d2c35503 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d2c35503 Branch: refs/heads/ignite-1537 Commit: d2c35503c0d2ef44d1baea4e84706e3e79bbf1be Parents: 098963b Author: sboikovAuthored: Fri Dec 18 14:18:23 2015 +0300 Committer: sboikov Committed: Fri Dec 18 14:18:23 2015 +0300 -- .../internal/processors/cache/IgniteCachePutAllRestartTest.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/d2c35503/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java index 3e124f3..96a396c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCachePutAllRestartTest.java @@ -121,7 +121,7 @@ public class IgniteCachePutAllRestartTest extends GridCommonAbstractTest { iter++; -if (iter % 10 == 0) +if (iter % 1000 == 0) log.info("Iteration: " + iter); }
[18/18] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Conflicts: modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteStartCacheInTransactionSelfTest.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/19d92a09 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/19d92a09 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/19d92a09 Branch: refs/heads/ignite-1537 Commit: 19d92a09fff5d38e0ba84de736c23f604d961e9d Parents: cd02f2c 916f59a Author: sboikovAuthored: Thu Dec 17 12:15:33 2015 +0300 Committer: sboikov Committed: Thu Dec 17 12:15:33 2015 +0300 -- .../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 -- .../ignite/examples/CacheExamplesSelfTest.java | 10 +- modules/core/pom.xml| 5 + .../apache/ignite/internal/IgniteKernal.java| 38 ++-- .../processors/cache/GridCacheUtils.java| 18 +- .../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 | 1 + .../CacheSerializableTransactionsTest.java | 8 + .../IgniteStartCacheInTransactionSelfTest.java | 6 +- .../GridServiceProcessorProxySelfTest.java | 3 +- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 16 +- .../IgniteBinaryObjectFieldsQuerySelfTest.java | 53 - .../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 +- .../platforms/cpp/core-test/src/cache_test.cpp | 4 +- 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 +- .../Examples/ExamplesTest.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 .../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.Examples.csproj | 1 - .../Datagrid/CrossPlatformExample.cs| 205 --- parent/pom.xml | 1 + 63 files changed, 841 insertions(+), 974 deletions(-) --
[6/7] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4230ab0a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4230ab0a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4230ab0a Branch: refs/heads/ignite-1537 Commit: 4230ab0a5f98832c656f054ebb391cb4fb8313cc Parents: 730efda ab8ba97 Author: sboikovAuthored: Wed Dec 16 08:53:17 2015 +0300 Committer: sboikov Committed: Wed Dec 16 08:53:17 2015 +0300 -- .../store/auto/CacheBinaryAutoStoreExample.java | 9 +- .../examples/ScalarSnowflakeSchemaExample.scala | 31 ++- .../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 +- .../internal/binary/BinaryEnumObjectImpl.java | 7 + .../internal/binary/BinaryObjectExImpl.java | 7 + .../binary/BinaryObjectOffheapImpl.java | 7 + .../processors/cache/GridCacheProcessor.java| 4 +- .../cache/store/CacheOsStoreManager.java| 2 +- ...IgniteCacheBinaryEntryProcessorSelfTest.java | 255 +++ .../GridCacheBinaryStoreAbstractSelfTest.java | 2 +- .../BinaryTxCacheLocalEntriesSelfTest.java | 2 +- .../native-client-test-cache-parallel-store.xml | 2 +- .../Config/native-client-test-cache-store.xml | 6 +- .../scala/org/apache/ignite/scalar/scalar.scala | 11 +- 18 files changed, 370 insertions(+), 38 deletions(-) --
[23/23] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4dcff2a9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4dcff2a9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4dcff2a9 Branch: refs/heads/ignite-1537 Commit: 4dcff2a94827e39d99dca380f7acd3a6795413ac Parents: 2428871 301d522 Author: sboikovAuthored: Tue Dec 15 16:26:46 2015 +0300 Committer: sboikov Committed: Tue Dec 15 16:26:46 2015 +0300 -- bin/ignitevisorcmd.bat |1 + modules/clients/pom.xml |2 +- .../org/apache/ignite/cache/CacheManager.java |2 + .../cache/query/GridCacheQueryRequest.java | 12 +- ...ntNodeBinaryObjectMetadataMultinodeTest.java |8 +- .../GridCacheQueueApiSelfAbstractTest.java | 86 +- .../GridCacheRebalancingSyncSelfTest.java | 12 +- modules/platforms/cpp/cpp.dxg |2 +- modules/platforms/dotnet/Apache.Ignite.dxg |2 +- modules/platforms/dotnet/dotnet.dxg | 1795 -- .../Compute/ClosureExample.cs |2 +- .../Compute/TaskExample.cs |2 +- .../Datagrid/ContinuousQueryExample.cs |2 +- .../Datagrid/DataStreamerExample.cs |2 +- .../Datagrid/PutGetExample.cs |2 +- .../Datagrid/QueryExample.cs|2 +- .../Datagrid/StoreExample.cs|2 +- .../Datagrid/TransactionExample.cs |2 +- .../Events/EventsExample.cs |2 +- .../Services/ServicesExample.cs |2 +- .../cache/IgnitePutGetBatchBenchmark.java | 60 + .../cache/IgnitePutGetTxBatchBenchmark.java | 86 + 22 files changed, 222 insertions(+), 1866 deletions(-) --
[24/25] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Conflicts: modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6c5b8a15 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6c5b8a15 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6c5b8a15 Branch: refs/heads/ignite-1537 Commit: 6c5b8a151cda74cba9ad384800752700761e8091 Parents: 4225072 Author: sboikovAuthored: Mon Dec 14 14:13:42 2015 +0300 Committer: sboikov Committed: Mon Dec 14 14:13:42 2015 +0300 -- .../java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/6c5b8a15/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java -- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java index 5308092..594e3c2 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/util/nio/GridNioSelfTest.java @@ -80,7 +80,7 @@ public class GridNioSelfTest extends GridCommonAbstractTest { private static volatile Marshaller marsh; /** Test port. */ -private static int port = 55443; +private int port = 55443; /** {@inheritDoc} */ @Override protected void beforeTestsStarted() throws Exception {
[23/25] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Conflicts: modules/core/src/test/java/org/apache/ignite/spi/discovery/tcp/TcpClientDiscoverySpiMulticastTest.java Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/42250723 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/42250723 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/42250723 Branch: refs/heads/ignite-1537 Commit: 4225072339a031549673b71a43d9fb220c4849fc Parents: bafaaf5 3d9be34 Author: sboikovAuthored: Mon Dec 14 14:13:17 2015 +0300 Committer: sboikov Committed: Mon Dec 14 14:13:17 2015 +0300 -- .../apache/ignite/internal/IgniteKernal.java| 26 ++- .../ignite/internal/binary/BinaryUtils.java | 19 +- .../dht/GridPartitionedSingleGetFuture.java | 14 +- .../resources/META-INF/classnames.properties| 68 --- .../binary/BinaryMarshallerSelfTest.java| 42 - .../binary/BinaryObjectBuilderSelfTest.java | 10 +- .../binary/GridBinaryWildcardsSelfTest.java | 16 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 25 ++- .../GridCacheAbstractNodeRestartSelfTest.java | 25 ++- ...ContinuousQueryFailoverAbstractSelfTest.java | 186 ++- .../tcp/TcpClientDiscoverySpiMulticastTest.java | 10 +- .../query/IgniteSqlSplitterSelfTest.java| 4 +- .../cpp/core/include/ignite/ignition.h | 41 +--- .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs| 8 + .../ignite/internal/GridFactorySelfTest.java| 16 ++ 15 files changed, 265 insertions(+), 245 deletions(-) --
[3/3] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bedd357b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bedd357b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bedd357b Branch: refs/heads/ignite-1537 Commit: bedd357bc702db349e15d22c53f75ba9554bacef Parents: 30f3c34 b906ed3 Author: sboikovAuthored: Mon Dec 14 15:22:09 2015 +0300 Committer: sboikov Committed: Mon Dec 14 15:22:09 2015 +0300 -- .../cache/IgniteBinaryObjectFieldsQuerySelfTest.java | 2 +- modules/platforms/cpp/common/src/java.cpp| 8 2 files changed, 5 insertions(+), 5 deletions(-) --
[7/7] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dc7e33c8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dc7e33c8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dc7e33c8 Branch: refs/heads/ignite-1537 Commit: dc7e33c8b86ec4a5031cf6e2169806f88d2a3dec Parents: 96358d4 a3a8138 Author: sboikovAuthored: Tue Dec 15 09:12:24 2015 +0300 Committer: sboikov Committed: Tue Dec 15 09:12:24 2015 +0300 -- assembly/release-fabric-base.xml|4 +- .../CacheClientBinaryPutGetExample.java |6 +- .../datagrid/CacheClientBinaryQueryExample.java |7 +- .../starschema/CacheStarSchemaExample.java |9 +- modules/clients/pom.xml | 60 + .../processors/cache/GridCacheAdapter.java |9 +- .../IgniteTxExceptionAbstractSelfTest.java | 57 +- .../BinaryAtomicCacheLocalEntriesSelfTest.java | 30 + .../BinaryTxCacheLocalEntriesSelfTest.java | 84 + .../IgniteBinaryObjectsTestSuite.java | 23 +- modules/platforms/cpp/cpp.dxg |2 +- modules/platforms/dotnet/dotnet.dxg | 1795 ++ modules/platforms/dotnet/header.html| 27 + 13 files changed, 2074 insertions(+), 39 deletions(-) --
[5/5] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/29e8e8b9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/29e8e8b9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/29e8e8b9 Branch: refs/heads/ignite-1537 Commit: 29e8e8b99c75634189e101ebc18787edd46ebfe8 Parents: d45ec9a 0f98d51 Author: sboikovAuthored: Mon Dec 14 16:47:17 2015 +0300 Committer: sboikov Committed: Mon Dec 14 16:47:17 2015 +0300 -- .../apache/ignite/gridify/AbstractAopTest.java | 32 ++--- .../ignite/internal/binary/BinaryMetadata.java | 91 ++- .../ignite/internal/binary/BinarySchema.java| 28 + .../IgniteStartCacheInTransactionSelfTest.java | 8 ++ ...gniteTopologyValidatorAbstractCacheTest.java | 18 +-- ...iteTopologyValidatorAbstractTxCacheTest.java | 1 - .../IgniteTxExceptionAbstractSelfTest.java | 2 + .../CacheTryLockMultithreadedTest.java | 116 +++ .../near/GridCacheNearTxExceptionSelfTest.java | 20 .../GridSessionCheckpointAbstractSelfTest.java | 32 +++-- 10 files changed, 290 insertions(+), 58 deletions(-) --
[29/29] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bafaaf5b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bafaaf5b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bafaaf5b Branch: refs/heads/ignite-1537 Commit: bafaaf5b2d46b855c2ba95b52109df11277d759a Parents: e659a48 6c61598 Author: sboikovAuthored: Mon Dec 14 08:59:46 2015 +0300 Committer: sboikov Committed: Mon Dec 14 08:59:46 2015 +0300 -- .gitignore |1 + assembly/release-fabric-base.xml|6 + .../examples/CacheClientBinaryExampleTest.java | 46 + .../CacheClientPortableExampleTest.java | 46 - .../ComputeClientBinaryExampleTest.java | 37 + .../ComputeClientPortableExampleTest.java | 37 - .../testsuites/IgniteExamplesSelfTestSuite.java | 15 +- .../client/impl/ClientCacheFlagsCodecTest.java |8 +- .../src/test/resources/spring-server-node.xml |8 +- .../test/resources/spring-server-ssl-node.xml |8 +- modules/core/pom.xml|4 +- .../java/org/apache/ignite/IgniteBinary.java| 124 +- .../java/org/apache/ignite/IgniteCache.java |8 +- .../org/apache/ignite/binary/BinaryReader.java |4 +- .../affinity/AffinityNodeHashResolver.java |6 +- .../configuration/BinaryConfiguration.java |4 +- .../ignite/internal/IgniteNodeAttributes.java |4 +- .../binary/BinaryCachingMetadataHandler.java|2 +- .../internal/binary/BinaryClassDescriptor.java | 813 .../ignite/internal/binary/BinaryContext.java | 1102 ++ .../internal/binary/BinaryEnumObjectImpl.java | 12 +- .../internal/binary/BinaryFieldAccessor.java| 20 +- .../ignite/internal/binary/BinaryFieldImpl.java | 12 +- .../internal/binary/BinaryMarshaller.java | 12 +- .../ignite/internal/binary/BinaryMetadata.java | 16 +- .../binary/BinaryMetadataCollector.java |8 +- .../internal/binary/BinaryMetadataHandler.java |2 +- .../internal/binary/BinaryObjectExImpl.java |6 +- .../internal/binary/BinaryObjectImpl.java | 118 +- .../binary/BinaryObjectOffheapImpl.java | 125 +- .../internal/binary/BinaryPositionReadable.java | 47 + .../internal/binary/BinaryPrimitives.java | 382 .../internal/binary/BinaryRawWriterEx.java |4 +- .../internal/binary/BinaryReaderExImpl.java | 298 +-- .../ignite/internal/binary/BinarySchema.java| 466 + .../internal/binary/BinarySchemaRegistry.java | 172 ++ .../binary/BinaryThreadLocalContext.java|9 +- .../ignite/internal/binary/BinaryTypeImpl.java | 10 +- .../ignite/internal/binary/BinaryUtils.java | 1859 + .../ignite/internal/binary/BinaryWriteMode.java | 94 +- .../internal/binary/BinaryWriterExImpl.java | 278 ++- .../binary/BinaryWriterSchemaHolder.java| 19 +- .../internal/binary/GridBinaryMarshaller.java | 286 +++ .../internal/binary/GridPortableMarshaller.java | 289 --- .../binary/PortableClassDescriptor.java | 813 .../ignite/internal/binary/PortableContext.java | 1102 -- .../binary/PortablePositionReadable.java| 47 - .../internal/binary/PortablePrimitives.java | 382 .../ignite/internal/binary/PortableSchema.java | 466 - .../internal/binary/PortableSchemaRegistry.java | 172 -- .../ignite/internal/binary/PortableUtils.java | 1909 -- .../binary/builder/BinaryAbstractLazyValue.java | 57 + .../binary/builder/BinaryBuilderEnum.java | 115 ++ .../binary/builder/BinaryBuilderReader.java | 846 .../BinaryBuilderSerializationAware.java| 31 + .../binary/builder/BinaryBuilderSerializer.java | 217 ++ .../builder/BinaryEnumArrayLazyValue.java | 113 ++ .../binary/builder/BinaryLazyArrayList.java | 167 ++ .../binary/builder/BinaryLazyLinkedList.java| 218 ++ .../internal/binary/builder/BinaryLazyMap.java | 221 ++ .../internal/binary/builder/BinaryLazySet.java | 92 + .../binary/builder/BinaryLazyValue.java | 28 + .../builder/BinaryModifiableLazyValue.java | 52 + .../builder/BinaryObjectArrayLazyValue.java | 90 + .../binary/builder/BinaryObjectBuilderImpl.java | 134 +- .../binary/builder/BinaryPlainBinaryObject.java | 53 + .../binary/builder/BinaryPlainLazyValue.java| 49 + .../binary/builder/BinaryValueWithType.java | 76 + .../builder/PortableAbstractLazyValue.java | 57 - .../binary/builder/PortableBuilderEnum.java | 115 -- .../binary/builder/PortableBuilderReader.java | 857 .../PortableBuilderSerializationAware.java | 31 -
[42/42] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5a0c6dac Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5a0c6dac Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5a0c6dac Branch: refs/heads/ignite-1537 Commit: 5a0c6dacc91139b0fd0787c1c85404a1060e8691 Parents: 352f8bd 91760b9 Author: sboikovAuthored: Fri Dec 11 15:51:28 2015 +0300 Committer: sboikov Committed: Fri Dec 11 15:51:28 2015 +0300 -- examples/schema-import/README.txt |2 +- .../examples/datagrid/CacheQueryExample.java|6 + modules/core/pom.xml|4 +- .../java/org/apache/ignite/IgniteBinary.java|2 +- .../java/org/apache/ignite/IgniteCache.java |2 +- .../store/jdbc/CacheAbstractJdbcStore.java |2 +- .../cache/store/jdbc/CacheJdbcPojoStore.java|2 +- .../ignite/internal/GridKernalContextImpl.java |2 +- .../apache/ignite/internal/IgniteKernal.java|6 +- .../org/apache/ignite/internal/IgnitionEx.java |2 +- .../binary/BinaryCachingMetadataHandler.java| 70 + .../ignite/internal/binary/BinaryEnumCache.java | 69 + .../internal/binary/BinaryEnumObjectImpl.java | 311 ++ .../internal/binary/BinaryFieldAccessor.java| 856 .../ignite/internal/binary/BinaryFieldImpl.java | 116 + .../internal/binary/BinaryInternalIdMapper.java | 161 + .../internal/binary/BinaryMarshaller.java | 142 + .../ignite/internal/binary/BinaryMetadata.java | 180 + .../binary/BinaryMetadataCollector.java | 277 ++ .../internal/binary/BinaryMetadataHandler.java | 44 + .../binary/BinaryNoopMetadataHandler.java | 53 + .../ignite/internal/binary/BinaryObjectEx.java | 30 + .../internal/binary/BinaryObjectExImpl.java | 251 ++ .../internal/binary/BinaryObjectImpl.java | 569 +++ .../binary/BinaryObjectOffheapImpl.java | 432 ++ .../internal/binary/BinaryRawReaderEx.java | 33 + .../internal/binary/BinaryRawWriterEx.java | 60 + .../internal/binary/BinaryReaderExImpl.java | 2028 + .../internal/binary/BinaryReaderHandles.java| 108 + .../binary/BinaryReaderHandlesHolder.java | 46 + .../binary/BinaryReaderHandlesHolderImpl.java | 44 + .../binary/BinaryThreadLocalContext.java| 70 + .../ignite/internal/binary/BinaryTypeImpl.java | 93 + .../ignite/internal/binary/BinaryWriteMode.java | 178 + .../internal/binary/BinaryWriterExImpl.java | 1808 .../internal/binary/BinaryWriterHandles.java| 101 + .../binary/BinaryWriterSchemaHolder.java| 149 + .../internal/binary/GridPortableMarshaller.java | 289 ++ .../binary/PortableClassDescriptor.java | 813 .../ignite/internal/binary/PortableContext.java | 1102 + .../binary/PortablePositionReadable.java| 47 + .../internal/binary/PortablePrimitives.java | 382 ++ .../ignite/internal/binary/PortableSchema.java | 466 ++ .../internal/binary/PortableSchemaRegistry.java | 172 + .../ignite/internal/binary/PortableUtils.java | 1909 .../binary/builder/BinaryObjectBuilderImpl.java | 586 +++ .../builder/PortableAbstractLazyValue.java | 57 + .../binary/builder/PortableBuilderEnum.java | 115 + .../binary/builder/PortableBuilderReader.java | 857 .../PortableBuilderSerializationAware.java | 31 + .../builder/PortableBuilderSerializer.java | 217 + .../builder/PortableEnumArrayLazyValue.java | 115 + .../binary/builder/PortableLazyArrayList.java | 167 + .../binary/builder/PortableLazyLinkedList.java | 218 + .../binary/builder/PortableLazyMap.java | 221 + .../binary/builder/PortableLazySet.java | 94 + .../binary/builder/PortableLazyValue.java | 28 + .../builder/PortableModifiableLazyValue.java| 52 + .../builder/PortableObjectArrayLazyValue.java | 90 + .../binary/builder/PortablePlainLazyValue.java | 49 + .../builder/PortablePlainPortableObject.java| 56 + .../binary/builder/PortableValueWithType.java | 77 + .../internal/binary/builder/package-info.java | 22 + .../ignite/internal/binary/package-info.java| 22 + .../streams/PortableAbstractInputStream.java| 379 ++ .../streams/PortableAbstractOutputStream.java | 347 ++ .../binary/streams/PortableAbstractStream.java | 80 + .../binary/streams/PortableHeapInputStream.java | 166 + .../streams/PortableHeapOutputStream.java | 176 + .../binary/streams/PortableInputStream.java | 163 + .../binary/streams/PortableMemoryAllocator.java | 57 + .../streams/PortableMemoryAllocatorChunk.java | 117 + .../streams/PortableOffheapInputStream.java | 144 +
[3/3] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e659a48e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e659a48e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e659a48e Branch: refs/heads/ignite-1537 Commit: e659a48e9909341c3edc46dd5fc7e564fef70e96 Parents: de0ea39 ec1ffe1 Author: sboikovAuthored: Fri Dec 11 17:13:21 2015 +0300 Committer: sboikov Committed: Fri Dec 11 17:13:21 2015 +0300 -- .../org/apache/ignite/cache/QueryEntity.java| 3 +- .../CacheDataStructuresManager.java | 5 + .../processors/query/GridQueryProcessor.java| 21 +- modules/docker/1.0.0/Dockerfile | 40 +++ modules/docker/1.0.0/run.sh | 50 modules/docker/1.1.0/Dockerfile | 40 +++ modules/docker/1.1.0/run.sh | 50 modules/docker/1.2.0/Dockerfile | 40 +++ modules/docker/1.2.0/run.sh | 50 modules/docker/1.3.0/Dockerfile | 40 +++ modules/docker/1.3.0/run.sh | 50 modules/docker/1.4.0/Dockerfile | 40 +++ modules/docker/1.4.0/run.sh | 50 modules/docker/Dockerfile | 41 +--- modules/docker/build_users_libs.sh | 39 --- modules/docker/download_ignite.sh | 49 modules/docker/execute.sh | 62 - modules/docker/run.sh | 36 ++- .../apache/ignite/tests/p2p/cache/Person.java | 77 ++ .../ignite/tests/p2p/cache/PersonKey.java | 74 ++ .../IgniteBinaryObjectFieldsQuerySelfTest.java | 246 +++ .../IgnitePortableCacheQueryTestSuite.java | 2 + 22 files changed, 915 insertions(+), 190 deletions(-) --
[14/16] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a88d81a7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a88d81a7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a88d81a7 Branch: refs/heads/ignite-1537 Commit: a88d81a71107ac5e641173292c64c36d7b252592 Parents: 7d8cade e1554df Author: sboikovAuthored: Fri Dec 11 10:29:56 2015 +0300 Committer: sboikov Committed: Fri Dec 11 10:29:56 2015 +0300 -- bin/ignite.bat | 4 +- bin/include/parseargs.bat | 4 +- ...ComputeClientBinaryTaskExecutionExample.java | 4 +- .../CacheClientBinaryPutGetExample.java | 2 +- .../datagrid/CacheClientBinaryQueryExample.java | 8 ++-- .../store/auto/CacheBinaryAutoStoreExample.java | 38 --- .../store/auto/CacheAutoStoreExample.java | 32 ++-- .../ignite/examples/model/Organization.java | 16 ++-- .../apache/ignite/examples/model/Person.java| 40 ++-- .../ignite/examples/util/DbH2ServerStartup.java | 31 --- .../preloader/GridDhtPartitionsFullMessage.java | 8 +++- .../marshaller/optimized/package-info.java | 2 +- .../GridEventStorageCheckAllEventsSelfTest.java | 6 ++- .../ignite/osgi/classloaders/package-info.java | 21 ++ .../org/apache/ignite/osgi/package-info.java| 21 ++ .../IgniteKarafFeaturesInstallationTest.java| 2 +- 16 files changed, 169 insertions(+), 70 deletions(-) --
[26/26] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5da19c7f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5da19c7f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5da19c7f Branch: refs/heads/ignite-1537 Commit: 5da19c7fc0c6725afbe872f70a6dd503a4766d07 Parents: f6d4836 c12d17e Author: sboikovAuthored: Thu Dec 10 12:49:45 2015 +0300 Committer: sboikov Committed: Thu Dec 10 12:49:45 2015 +0300 -- assembly/docfiles/ignite_logo.png | Bin 0 -> 24315 bytes assembly/release-fabric-base.xml| 25 +- .../ignite/binary/BinaryCollectionFactory.java | 33 + .../apache/ignite/binary/BinaryMapFactory.java | 33 + .../apache/ignite/binary/BinaryRawReader.java |8 +- .../org/apache/ignite/binary/BinaryReader.java |9 +- .../configuration/IgniteConfiguration.java |2 +- .../internal/portable/BinaryFieldAccessor.java | 19 +- .../internal/portable/BinaryObjectImpl.java | 28 +- .../internal/portable/BinaryReaderExImpl.java | 107 +- .../internal/portable/BinaryWriteMode.java |3 - .../internal/portable/BinaryWriterExImpl.java | 45 +- .../portable/GridPortableMarshaller.java| 21 - .../portable/PortableClassDescriptor.java |9 +- .../internal/portable/PortableContext.java | 78 +- .../ignite/internal/portable/PortableUtils.java | 144 +- .../portable/builder/PortableBuilderReader.java | 12 - .../builder/PortableBuilderSerializer.java | 17 +- .../portable/builder/PortableLazyMapEntry.java | 68 - .../processors/cache/CacheLazyEntry.java| 12 +- .../distributed/dht/GridDhtTxPrepareFuture.java |2 +- .../ignite/internal/visor/cache/VisorCache.java | 13 + .../internal/visor/query/VisorQueryJob.java | 76 +- .../internal/visor/query/VisorQueryUtils.java |5 +- .../org/apache/ignite/thread/IgniteThread.java |6 +- .../GridEventStorageCheckAllEventsSelfTest.java | 16 +- .../IgniteClientReconnectAbstractTest.java |1 + .../IgniteClientReconnectCacheTest.java | 10 +- .../portable/BinaryMarshallerSelfTest.java | 127 +- .../BinaryObjectBuilderAdditionalSelfTest.java | 101 +- .../GridPortableAffinityKeySelfTest.java|2 +- .../mutabletest/GridPortableTestClasses.java| 77 +- ...eAtomicEntryProcessorDeploymentSelfTest.java | 69 +- ...niteCacheClientNodeChangingTopologyTest.java | 125 +- ...idCacheReplicatedUnswapAdvancedSelfTest.java | 42 +- .../GridCacheReplicatedPreloadSelfTest.java | 44 +- ...yAtomicEntryProcessorDeploymentSelfTest.java | 129 + ...ctionalEntryProcessorDeploymentSelfTest.java | 31 + ...CacheClientNodeBinaryObjectMetadataTest.java |2 +- ...ridCacheAffinityRoutingPortableSelfTest.java |2 +- .../IgniteBinaryObjectsCacheTestSuite3.java |9 +- ...cheDeploymentBinaryObjectEntryProcessor.java | 36 + .../tests/p2p/CacheDeploymentTestValue3.java| 41 + .../src/binary_reader_writer_raw_test.cpp | 10 +- .../core-test/src/binary_reader_writer_test.cpp | 10 +- .../core/include/ignite/binary/binary_consts.h | 29 +- .../Apache.Ignite.Core.csproj |4 + .../Cache/Query/IQueryCursor.cs |2 +- .../Apache.Ignite.Core/Cache/Query/QueryBase.cs |2 +- .../Store/CacheParallelLoadStoreAdapter.cs |4 +- .../Cache/Store/CacheStoreAdapter.cs| 12 +- .../Cache/Store/ICacheStore.cs | 36 +- .../Apache.Ignite.Core/Cluster/ICluster.cs |2 +- .../Cluster/IClusterMetrics.cs |6 +- .../Apache.Ignite.Core/Cluster/IClusterNode.cs |6 +- .../Apache.Ignite.Core/Compute/IComputeTask.cs |2 +- .../Datastream/IDataStreamer.cs | 12 +- .../Apache.Ignite.Core/Events/CacheEvent.cs |4 +- .../Apache.Ignite.Core/Events/TaskEvent.cs |2 +- .../dotnet/Apache.Ignite.Core/IIgnite.cs|6 +- .../dotnet/Apache.Ignite.Core/Ignition.cs | 24 +- .../Impl/Binary/BinaryObjectBuilder.cs |8 +- .../Impl/Binary/BinaryObjectHeader.cs | 10 +- .../Impl/Binary/BinarySystemHandlers.cs | 34 +- .../Impl/Binary/BinaryUtils.cs | 94 +- .../Impl/Binary/Metadata/BinaryTypeHolder.cs|1 + .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs |2 - .../Transactions/ITransaction.cs|2 +- modules/platforms/dotnet/Apache.Ignite.dxg | 2387 ++ modules/platforms/dotnet/Apache.Ignite.sln |1 + modules/platforms/dotnet/Apache.Ignite.slnrel | 43 - .../platforms/dotnet/Apache.Ignite_x86.slnrel | 43 - modules/platforms/dotnet/README.txt | 36 +-
[4/4] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dc85fe3b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dc85fe3b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dc85fe3b Branch: refs/heads/ignite-1537 Commit: dc85fe3b636a7011a6c4438ed571a3a9a665f9e2 Parents: 5da19c7 18fef56 Author: sboikovAuthored: Thu Dec 10 13:26:49 2015 +0300 Committer: sboikov Committed: Thu Dec 10 13:26:49 2015 +0300 -- .../portable/PortableClassDescriptor.java | 14 +- .../processors/cache/GridCacheIoManager.java| 5 +- .../processors/cache/GridCacheProcessor.java| 17 ++ .../portable/BinaryMarshallerSelfTest.java | 198 +++ 4 files changed, 228 insertions(+), 6 deletions(-) --
[5/5] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7d8cadec Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7d8cadec Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7d8cadec Branch: refs/heads/ignite-1537 Commit: 7d8cadecd13537763d4477343588550220d43d57 Parents: 445e2e6 2e68a87 Author: sboikovAuthored: Thu Dec 10 16:15:03 2015 +0300 Committer: sboikov Committed: Thu Dec 10 16:15:03 2015 +0300 -- .../examples/datagrid/CacheTransactionExample.java | 4 ++-- .../apache/ignite/internal/util/nio/GridNioServer.java | 11 +-- modules/osgi-karaf/src/main/resources/features.xml | 11 +++ 3 files changed, 14 insertions(+), 12 deletions(-) --
[14/14] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/63f00fb4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/63f00fb4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/63f00fb4 Branch: refs/heads/ignite-1537 Commit: 63f00fb483412232c6758c4ef6f09edbd5a3148c Parents: 6f38064 67ebd02 Author: sboikovAuthored: Tue Dec 8 15:28:02 2015 +0300 Committer: sboikov Committed: Tue Dec 8 15:28:02 2015 +0300 -- examples/pom.xml| 2 +- examples/schema-import/pom.xml | 2 +- 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 +- .../ignite/codegen/MessageCodeGenerator.java| 6 +- modules/core/pom.xml| 2 +- .../configuration/CacheConfiguration.java | 34 +++- .../communication/GridIoMessageFactory.java | 8 +- .../internal/util/GridMessageCollection.java| 160 +++ .../internal/util/UUIDCollectionMessage.java| 42 - .../optimized/OptimizedMarshallerUtils.java | 16 +- .../core/src/main/resources/ignite.properties | 2 +- ...eAtomicEntryProcessorDeploymentSelfTest.java | 6 +- .../DataStreamProcessorSelfTest.java| 25 +-- .../config/GridTestProperties.java | 3 + .../IgniteBinaryObjectsCacheTestSuite3.java | 2 + .../testsuites/IgniteUtilSelfTestSuite.java | 2 + .../ignite/util/GridMessageCollectionTest.java | 105 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 +- ...cheDuplicateEntityConfigurationSelfTest.java | 126 +++ .../IgniteCacheQuerySelfTestSuite.java | 4 + 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 | 5 +- modules/osgi-paxlogging/pom.xml | 6 +- modules/osgi/pom.xml| 5 +- 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 +- .../Apache.Ignite.Core.Tests/EventsTest.cs | 3 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Apache.Ignite/Properties/AssemblyInfo.cs| 4 +- .../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 +- 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
[12/12] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/345ee82e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/345ee82e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/345ee82e Branch: refs/heads/ignite-1537 Commit: 345ee82ed5af7304bafd4657c519d0b030b4abbf Parents: 172a90f baab3d2 Author: sboikovAuthored: Fri Dec 4 09:51:57 2015 +0300 Committer: sboikov Committed: Fri Dec 4 09:51:57 2015 +0300 -- examples/pom.xml| 2 +- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml | 12 +- modules/aws/pom.xml | 18 +- modules/camel/pom.xml | 11 +- modules/core/pom.xml| 28 +- .../processors/cache/GridCacheIoManager.java| 2 +- .../GridDhtPartitionsExchangeFuture.java| 9 +- .../dht/GridCacheTxNodeFailureSelfTest.java | 2 + .../dht/GridNearCacheTxNodeFailureSelfTest.java | 4 - .../testsuites/IgniteCacheTestSuite2.java | 2 + modules/flume/pom.xml | 16 +- modules/geospatial/pom.xml | 20 ++ modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 10 +- modules/indexing/pom.xml| 22 +- modules/jcl/pom.xml | 11 + modules/jms11/pom.xml | 20 +- modules/jta/pom.xml | 17 + modules/kafka/pom.xml | 16 +- modules/log4j/pom.xml | 10 + modules/log4j2/pom.xml | 11 + modules/mqtt/pom.xml| 24 +- modules/osgi-karaf/README.txt | 18 + modules/osgi-karaf/licenses/apache-2.0.txt | 202 modules/osgi-karaf/pom.xml | 84 + .../osgi-karaf/src/main/resources/features.xml | 327 +++ modules/osgi-paxlogging/README.txt | 12 + modules/osgi-paxlogging/licenses/apache-2.0.txt | 202 modules/osgi-paxlogging/pom.xml | 69 modules/osgi/README.txt | 65 modules/osgi/licenses/apache-2.0.txt| 202 modules/osgi/pom.xml| 171 ++ .../IgniteAbstractOsgiContextActivator.java | 238 ++ .../org/apache/ignite/osgi/IgniteOsgiUtils.java | 69 .../BundleDelegatingClassLoader.java| 147 + .../classloaders/ContainerSweepClassLoader.java | 134 .../OsgiClassLoadingStrategyType.java | 29 ++ .../ignite/osgi/AbstractIgniteKarafTest.java| 109 +++ .../IgniteKarafFeaturesInstallationTest.java| 100 ++ .../ignite/osgi/IgniteOsgiServiceTest.java | 131 .../apache/ignite/osgi/IgniteOsgiTestSuite.java | 32 ++ .../activators/BasicIgniteTestActivator.java| 76 + .../ignite/osgi/activators/TestOsgiFlags.java | 53 +++ .../osgi/activators/TestOsgiFlagsImpl.java | 83 + modules/rest-http/pom.xml | 34 +- modules/scalar-2.10/pom.xml | 9 +- modules/scalar/pom.xml | 9 +- modules/schedule/pom.xml| 25 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 12 +- modules/spark-2.10/pom.xml | 2 +- modules/spring/pom.xml | 30 +- modules/ssh/pom.xml | 19 +- modules/twitter/pom.xml | 12 +- modules/urideploy/pom.xml | 17 +- modules/visor-console-2.10/pom.xml | 4 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 4 +- modules/web/pom.xml | 13 +- ...IgniteTransactionalInvokeRetryBenchmark.java | 4 +- ...IgniteTransactionalWriteInvokeBenchmark.java | 6 +- modules/zookeeper/pom.xml | 14 +- parent/pom.xml | 136 +++- pom.xml | 44 ++- 65 files changed, 3120 insertions(+), 102 deletions(-) --
[7/8] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a811536c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a811536c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a811536c Branch: refs/heads/ignite-1537 Commit: a811536c87515d5f8b9e0bd20689e6778cabe659 Parents: 37303d2 3ac1504 Author: sboikovAuthored: Wed Dec 2 08:54:50 2015 +0300 Committer: sboikov Committed: Wed Dec 2 08:54:50 2015 +0300 -- examples/pom.xml| 2 +- examples/schema-import/pom.xml | 2 +- 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 +- .../internal/portable/BinaryFieldAccessor.java | 83 +++-- .../internal/portable/BinaryReaderExImpl.java | 11 ++ .../distributed/near/GridNearGetFuture.java | 12 +- .../handlers/query/QueryCommandHandler.java | 2 +- .../ignite/internal/util/IgniteUtils.java | 8 + .../core/src/main/resources/ignite.properties | 2 +- .../portable/BinaryMarshallerSelfTest.java | 186 --- .../cache/GridCacheAbstractFullApiSelfTest.java | 2 - .../internal/util/nio/GridNioSelfTest.java | 69 +++ 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 +- 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/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 +- 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 +- 57 files changed, 344 insertions(+), 127 deletions(-) --
[4/4] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e59b0f6d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e59b0f6d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e59b0f6d Branch: refs/heads/ignite-1537 Commit: e59b0f6d62bb836a80a96a6d31a3e812dbd10613 Parents: e8bc4c9 b64100a Author: sboikovAuthored: Tue Dec 1 12:21:29 2015 +0300 Committer: sboikov Committed: Tue Dec 1 12:21:29 2015 +0300 -- RELEASE_NOTES.txt | 2 ++ 1 file changed, 2 insertions(+) --
[4/4] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9b3cc956 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9b3cc956 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9b3cc956 Branch: refs/heads/ignite-1537 Commit: 9b3cc956501256bbb7716e9717a280b150c1f92b Parents: e59b0f6 c850ae4 Author: sboikovAuthored: Tue Dec 1 14:23:57 2015 +0300 Committer: sboikov Committed: Tue Dec 1 14:23:57 2015 +0300 -- .../apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java | 4 ++-- .../internal/processors/cache/IgniteCacheAbstractTest.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) --
[4/4] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/37303d28 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/37303d28 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/37303d28 Branch: refs/heads/ignite-1537 Commit: 37303d28733fb8e4c0b8bbda197291296925aef6 Parents: 9b3cc95 74f93b6 Author: sboikovAuthored: Tue Dec 1 16:19:16 2015 +0300 Committer: sboikov Committed: Tue Dec 1 16:19:16 2015 +0300 -- examples/pom.xml | 2 +- examples/schema-import/pom.xml | 2 +- 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 +- .../dht/preloader/GridDhtPartitionDemander.java | 19 +++ .../core/src/main/resources/ignite.properties| 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 +- 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/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 +- 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 +- 50 files changed, 60 insertions(+), 57 deletions(-) --
[16/16] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9dce7388 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9dce7388 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9dce7388 Branch: refs/heads/ignite-1537 Commit: 9dce73888aebcac7e4b108dcbc8b81dff33b8925 Parents: 184bc96 f5e9918 Author: sboikovAuthored: Tue Dec 1 09:02:42 2015 +0300 Committer: sboikov Committed: Tue Dec 1 09:02:42 2015 +0300 -- examples/pom.xml| 5 +- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/camel/pom.xml | 5 +- .../ignite/stream/camel/package-info.java | 21 .../ignite/stream/camel/package-info.java | 21 modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml| 2 +- .../GridDeploymentPerVersionStore.java | 12 +- .../distributed/dht/GridDhtLockFuture.java | 17 ++- .../communication/tcp/TcpCommunicationSpi.java | 12 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 - .../core/src/main/resources/ignite.properties | 2 +- ...cheAbstractFullApiMultithreadedSelfTest.java | 9 +- .../IgniteCacheStoreValueAbstractTest.java | 111 +++ .../cache/IgniteCacheTxPreloadNoWriteTest.java | 2 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 3 +- ...eRebalancingUnmarshallingFailedSelfTest.java | 13 ++- .../GridCacheLocalIsolatedNodesSelfTest.java| 6 +- .../cache/GridCacheCommandHandlerSelfTest.java | 7 +- .../tcp/IgniteCacheSslStartStopSelfTest.java| 2 +- modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 4 +- modules/flume/pom.xml | 5 +- .../ignite/stream/flume/package-info.java | 21 .../ignite/stream/flume/package-info.java | 21 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 +- modules/jcl/pom.xml | 2 +- modules/jms11/pom.xml | 2 +- .../ignite/stream/jms11/package-info.java | 21 .../ignite/stream/jms11/package-info.java | 21 modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- .../ignite/stream/kafka/package-info.java | 21 .../ignite/stream/kafka/package-info.java | 21 modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml| 5 +- .../apache/ignite/stream/mqtt/package-info.java | 21 .../apache/ignite/stream/mqtt/package-info.java | 21 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 | 12 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 6 +- .../Apache.Ignite/Properties/AssemblyInfo.cs| 4 +- .../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 +- .../ignite/cache/store/spring/package-info.java | 21 modules/ssh/pom.xml | 2 +- modules/tools/pom.xml
[49/49] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0d2cb908 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0d2cb908 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0d2cb908 Branch: refs/heads/ignite-1537 Commit: 0d2cb9089bc92a8ad426ce13f9f189bd13f4377e Parents: 2e988f4 0b61333 Author: sboikovAuthored: Mon Nov 30 12:25:28 2015 +0300 Committer: sboikov Committed: Mon Nov 30 12:25:28 2015 +0300 -- RELEASE_NOTES.txt | 2 +- assembly/release-fabric-base.xml| 9 + .../hibernate/CacheHibernatePersonStore.java| 4 +- .../hibernate/CacheHibernateStoreExample.java | 2 +- .../datagrid/store/hibernate/Person.hbm.xml | 2 +- .../apache/ignite/examples/binary/Address.java | 72 --- .../apache/ignite/examples/binary/Employee.java | 93 .../ignite/examples/binary/EmployeeKey.java | 93 .../ignite/examples/binary/Organization.java| 93 .../examples/binary/OrganizationType.java | 32 -- ...ComputeClientBinaryTaskExecutionExample.java | 4 +- .../CacheClientBinaryPutGetExample.java | 6 +- .../datagrid/CacheClientBinaryQueryExample.java | 22 +- .../examples/datagrid/CacheQueryExample.java| 161 ++- .../ignite/examples/datagrid/store/Person.java | 154 --- .../store/auto/CacheAutoStoreExample.java | 4 +- .../auto/CacheAutoStoreLoadDataExample.java | 4 +- .../datagrid/store/auto/CacheConfig.java| 6 +- .../store/dummy/CacheDummyPersonStore.java | 12 +- .../store/dummy/CacheDummyStoreExample.java | 4 +- .../store/jdbc/CacheJdbcPersonStore.java| 18 +- .../store/jdbc/CacheJdbcStoreExample.java | 4 +- .../store/spring/CacheSpringPersonStore.java| 10 +- .../store/spring/CacheSpringStoreExample.java | 4 +- .../ignite/examples/model/Organization.java | 62 +++ .../apache/ignite/examples/model/Person.java| 127 ++ .../ignite/examples/model/binary/Address.java | 72 +++ .../ignite/examples/model/binary/Employee.java | 93 .../examples/model/binary/EmployeeKey.java | 93 .../examples/model/binary/Organization.java | 93 .../examples/model/binary/OrganizationType.java | 32 ++ .../examples/ScalarCacheQueryExample.scala | 66 +-- .../java/org/apache/ignite/IgniteBinary.java| 9 + .../org/apache/ignite/binary/BinaryObject.java | 8 + .../org/apache/ignite/binary/BinaryType.java| 7 + .../ignite/binary/BinaryTypeConfiguration.java | 21 + .../ignite/cache/CacheKeyConfiguration.java | 19 + .../cache/store/jdbc/CacheJdbcPojoStore.java| 188 +--- .../apache/ignite/internal/IgniteKernal.java| 13 +- .../managers/communication/GridIoManager.java | 88 +--- .../communication/GridIoMessageFactory.java | 8 +- .../internal/portable/BinaryEnumObjectImpl.java | 311 + .../internal/portable/BinaryMarshaller.java | 2 - .../internal/portable/BinaryMetadata.java | 16 +- .../internal/portable/BinaryObjectExImpl.java | 10 +- .../internal/portable/BinaryObjectImpl.java | 13 +- .../internal/portable/BinaryReaderExImpl.java | 8 +- .../internal/portable/BinaryTypeImpl.java | 7 +- .../internal/portable/BinaryWriteMode.java | 3 + .../internal/portable/BinaryWriterExImpl.java | 29 +- .../portable/PortableClassDescriptor.java | 26 +- .../internal/portable/PortableContext.java | 66 ++- .../ignite/internal/portable/PortableUtils.java | 157 ++- .../builder/BinaryObjectBuilderImpl.java| 16 +- .../portable/builder/PortableBuilderEnum.java | 2 +- .../builder/PortableBuilderSerializer.java | 10 +- .../builder/PortableEnumArrayLazyValue.java | 2 +- .../builder/PortableObjectArrayLazyValue.java | 2 +- .../CacheDefaultBinaryAffinityKeyMapper.java| 51 +++ .../processors/cache/CacheInvokeResult.java | 14 + .../processors/cache/CacheLazyEntry.java| 2 +- .../internal/processors/cache/CacheObject.java | 3 + .../processors/cache/CacheObjectContext.java| 21 + .../processors/cache/GridCacheAdapter.java | 69 +-- .../cache/GridCacheConcurrentMap.java | 52 +-- .../processors/cache/GridCacheContext.java | 12 +- .../CacheDataStructuresManager.java | 45 +- .../distributed/dht/GridDhtTxFinishFuture.java | 12 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 41 +- .../cache/distributed/dht/GridDhtTxRemote.java | 15 +- .../distributed/dht/GridNoStorageCacheMap.java | 4 +- .../dht/atomic/GridDhtAtomicCache.java | 55 ++-
[4/4] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f90b3589 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f90b3589 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f90b3589 Branch: refs/heads/ignite-1537 Commit: f90b35890b91fc51cf782257208b8a388e06226c Parents: cadbddd d99fc8d Author: sboikovAuthored: Thu Nov 26 11:41:30 2015 +0300 Committer: sboikov Committed: Thu Nov 26 11:41:30 2015 +0300 -- .../ignite/internal/IgniteClientReconnectCacheTest.java | 7 +++ .../GridCacheAbstractDataStructuresFailoverSelfTest.java | 3 +++ .../cache/datastructures/IgniteCollectionAbstractTest.java| 3 +++ .../distributed/dht/IgniteCachePutRetryAbstractSelfTest.java | 2 ++ 4 files changed, 15 insertions(+) --
[14/15] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a293f9be Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a293f9be Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a293f9be Branch: refs/heads/ignite-1537 Commit: a293f9bef7c99034840edbd87cfad7877829fda1 Parents: bfe74ed 895760e Author: sboikovAuthored: Thu Nov 26 21:34:33 2015 +0300 Committer: sboikov Committed: Thu Nov 26 21:34:33 2015 +0300 -- RELEASE_NOTES.txt | 17 +++ .../ComputeFibonacciContinuationExample.java| 15 ++- .../computegrid/ComputeTaskMapExample.java | 6 +- .../computegrid/ComputeTaskSplitExample.java| 4 +- .../examples/messaging/MessagingExample.java| 18 +-- .../examples/misc/springbean/spring-bean.xml| 7 -- .../testsuites/IgniteExamplesSelfTestSuite.java | 4 +- .../apache/ignite/cache/CacheInterceptor.java | 2 +- .../rendezvous/RendezvousAffinityFunction.java | 2 +- .../portable/GridPortableMarshaller.java| 3 + .../internal/portable/PortableContext.java | 10 +- .../ignite/internal/portable/PortableUtils.java | 7 ++ .../processors/cache/GridCacheAdapter.java | 65 +++--- .../cache/GridCacheConcurrentMap.java | 16 +-- .../processors/cache/GridCacheEventManager.java | 4 +- .../processors/cache/GridCacheIoManager.java| 4 +- .../processors/cache/GridCacheMapEntry.java | 4 +- .../distributed/dht/GridDhtCacheAdapter.java| 15 ++- .../cache/distributed/dht/GridDhtGetFuture.java | 28 +++-- .../dht/GridPartitionedSingleGetFuture.java | 16 +-- .../distributed/near/GridNearGetRequest.java| 3 +- .../near/GridNearSingleGetRequest.java | 12 +- .../near/GridNearSingleGetResponse.java | 13 +- .../processors/query/GridQueryProcessor.java| 8 ++ .../util/future/GridCompoundFuture.java | 7 +- .../internal/util/future/GridFutureAdapter.java | 2 +- .../sharedfs/SharedFsCheckpointSpi.java | 14 ++- .../session/GridSessionCheckpointSelfTest.java | 16 +++ .../tcp/IgniteCacheSslStartStopSelfTest.java| 1 + ...ObjectsCacheDataStructuresSelfTestSuite.java | 33 + ...BinaryObjectsCacheExpiryPolicyTestSuite.java | 34 ++ ...gniteBinaryObjectsCacheRestartTestSuite.java | 33 + .../IgniteBinaryObjectsCacheTestSuite3.java | 33 + .../IgniteBinaryObjectsCacheTestSuite4.java | 33 + ...IgniteBinaryObjectsComputeGridTestSuite.java | 33 + .../IgniteCacheFailoverTestSuite3.java | 6 - .../IgniteCacheFailoverTestSuiteSsl.java| 41 +++ .../cache/IgniteCacheNoClassQuerySelfTest.java | 122 +++ .../IgniteCacheQuerySelfTestSuite.java | 2 + 39 files changed, 572 insertions(+), 121 deletions(-) --
[49/49] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2bd58780 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2bd58780 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2bd58780 Branch: refs/heads/ignite-1537 Commit: 2bd587805dbaa5f8484d215856af33a44a50552c Parents: d215017 a4848a7 Author: sboikovAuthored: Mon Nov 9 12:48:10 2015 +0300 Committer: sboikov Committed: Mon Nov 9 12:48:10 2015 +0300 -- .../java8/messaging/MessagingExample.java |7 +- .../rest/AbstractRestProcessorSelfTest.java |5 +- .../JettyRestProcessorAbstractSelfTest.java | 142 +- .../src/main/java/org/apache/ignite/Ignite.java | 12 +- .../apache/ignite/IgniteSystemProperties.java |3 + .../configuration/CacheConfiguration.java | 54 +- .../configuration/ConnectorConfiguration.java | 61 +- .../configuration/IgniteConfiguration.java | 32 +- .../apache/ignite/internal/IgniteKernal.java| 68 +- .../org/apache/ignite/internal/IgnitionEx.java |3 + .../managers/communication/GridIoMessage.java |4 +- .../communication/GridIoMessageFactory.java | 10 +- .../discovery/GridDiscoveryManager.java |5 +- .../affinity/GridAffinityAssignmentCache.java | 13 + .../cache/GridCacheAffinityManager.java | 28 +- .../processors/cache/GridCacheContext.java | 29 +- .../processors/cache/GridCacheEntryEx.java |4 +- .../processors/cache/GridCacheIoManager.java| 19 +- .../processors/cache/GridCacheMapEntry.java | 91 +- .../processors/cache/GridCacheMvccManager.java | 145 +- .../GridCachePartitionExchangeManager.java | 188 ++- .../processors/cache/GridCachePreloader.java| 60 +- .../cache/GridCachePreloaderAdapter.java| 45 +- .../processors/cache/GridCacheProcessor.java| 151 +- .../distributed/GridCacheTxRecoveryFuture.java | 13 +- .../distributed/GridDistributedCacheEntry.java |2 +- .../distributed/GridDistributedTxMapping.java |8 +- .../GridDistributedTxRemoteAdapter.java |5 +- .../distributed/dht/GridDhtCacheEntry.java | 11 +- .../distributed/dht/GridDhtLocalPartition.java | 71 +- .../distributed/dht/GridDhtLockFuture.java |7 +- .../dht/GridDhtPartitionsReservation.java |2 +- .../dht/GridDhtTransactionalCacheAdapter.java | 13 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 43 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 122 +- .../cache/distributed/dht/GridDhtTxRemote.java | 45 +- .../dht/atomic/GridDhtAtomicCache.java |1 - .../dht/colocated/GridDhtColocatedCache.java|7 +- .../dht/preloader/GridDhtForceKeysFuture.java | 14 + .../GridDhtPartitionDemandMessage.java | 14 +- .../preloader/GridDhtPartitionDemandPool.java | 1192 --- .../dht/preloader/GridDhtPartitionDemander.java | 1389 ++ .../dht/preloader/GridDhtPartitionSupplier.java | 1034 + .../GridDhtPartitionSupplyMessageV2.java| 380 + .../preloader/GridDhtPartitionSupplyPool.java | 555 --- .../GridDhtPartitionsExchangeFuture.java|8 + .../dht/preloader/GridDhtPreloader.java | 303 +++- ...arOptimisticSerializableTxPrepareFuture.java | 12 +- .../near/GridNearOptimisticTxPrepareFuture.java | 11 +- .../near/GridNearTransactionalCache.java|7 +- .../near/GridNearTxFinishFuture.java| 157 +- .../cache/distributed/near/GridNearTxLocal.java | 21 +- .../CacheObjectPortableProcessorImpl.java |9 + .../cache/transactions/IgniteInternalTx.java|3 +- .../cache/transactions/IgniteTxAdapter.java | 251 ++-- .../cache/transactions/IgniteTxHandler.java | 37 +- .../transactions/IgniteTxLocalAdapter.java | 26 +- .../cache/transactions/IgniteTxManager.java | 175 ++- .../datastructures/DataStructuresProcessor.java |3 + .../processors/job/GridJobProcessor.java| 96 +- .../handlers/cache/GridCacheCommandHandler.java | 128 +- .../handlers/query/QueryCommandHandler.java | 258 +++- .../top/GridTopologyCommandHandler.java |4 - .../service/GridServiceProcessor.java | 31 +- .../processors/task/GridTaskWorker.java |4 +- .../GridBoundedConcurrentLinkedHashMap.java |7 +- .../GridBoundedConcurrentLinkedHashSet.java |7 +- .../util/GridBoundedConcurrentOrderedMap.java | 39 +- .../internal/util/GridConcurrentFactory.java| 11 +- .../util/GridConcurrentLinkedHashSet.java |9 +- .../ignite/internal/util/IgniteUuidCache.java |6 +- .../util/future/GridCompoundFuture.java | 155 +-