Merge branches 'ignite-843' and 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-843
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/24af0422
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/24af0422
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/24af0422
Branch: refs/heads/ignite-843
Commit: 24af0422a9c02abbb35dbae409a4fccbea2d268b
Parents: 627dd46 09da9c2
Author: AKuznetsov <akuznet...@gridgain.com>
Authored: Tue Aug 18 23:10:25 2015 +0700
Committer: AKuznetsov <akuznet...@gridgain.com>
Committed: Tue Aug 18 23:10:25 2015 +0700
----------------------------------------------------------------------
.../org/apache/ignite/cache/CacheEntry.java | 94 ++++
.../store/jdbc/CacheJdbcPojoStoreFactory.java | 2 +-
.../configuration/IgniteConfiguration.java | 5 +-
.../processors/cache/CacheEntryImpl.java | 20 +
.../processors/cache/CacheEntryImpl0.java | 5 +
.../processors/cache/CacheEntryImplEx.java | 83 +++
.../processors/cache/CacheInvokeEntry.java | 27 +-
.../CachePartialUpdateCheckedException.java | 29 +-
.../cache/CacheVersionedEntryImpl.java | 80 ---
.../processors/cache/GridCacheAdapter.java | 174 +++++-
.../processors/cache/GridCacheEntryEx.java | 2 +-
.../processors/cache/GridCacheMapEntry.java | 32 +-
.../processors/cache/GridCacheSwapManager.java | 82 ++-
.../distributed/dht/GridDhtTxPrepareFuture.java | 2 +-
.../GridDhtUnreservedPartitionException.java | 66 +++
.../dht/atomic/GridDhtAtomicCache.java | 3 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 63 ++-
.../near/GridNearOptimisticTxPrepareFuture.java | 2 +-
.../local/atomic/GridLocalAtomicCache.java | 3 +-
.../cache/query/GridCacheQueryAdapter.java | 56 +-
.../cache/query/GridCacheQueryManager.java | 71 ++-
.../cache/transactions/IgniteTxAdapter.java | 16 +-
.../cache/transactions/IgniteTxEntry.java | 16 +-
.../transactions/IgniteTxLocalAdapter.java | 83 ++-
.../cache/version/GridCacheVersion.java | 2 +-
.../cache/version/GridCacheVersionAware.java | 30 +
.../cache/version/GridCacheVersionManager.java | 5 +-
.../clock/GridClockSyncProcessor.java | 2 +-
.../ignite/internal/util/GridArgumentCheck.java | 17 +
.../ignite/spi/discovery/tcp/ServerImpl.java | 83 ++-
.../spi/discovery/tcp/TcpDiscoveryImpl.java | 4 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 49 +-
.../tcp/internal/TcpDiscoveryNode.java | 18 +-
.../tcp/internal/TcpDiscoveryNodesRing.java | 23 +
.../resources/META-INF/classnames.properties | 3 +-
...cheDhtLocalPartitionAfterRemoveSelfTest.java | 33 +-
.../cache/GridCacheAbstractFullApiSelfTest.java | 1 -
.../processors/cache/GridCacheTestEntryEx.java | 2 +-
.../IgniteCacheSizeFailoverTest.java | 115 ++++
.../IgniteCachePutRetryAbstractSelfTest.java | 120 +++-
...PutRetryAtomicPrimaryWriteOrderSelfTest.java | 32 ++
.../CacheVersionedEntryAbstractTest.java | 170 ++++++
...nedEntryLocalAtomicSwapDisabledSelfTest.java | 45 ++
...ersionedEntryLocalTransactionalSelfTest.java | 40 ++
...edEntryPartitionedAtomicOffHeapSelfTest.java | 35 ++
...VersionedEntryPartitionedAtomicSelfTest.java | 35 ++
...PartitionedTransactionalOffHeapSelfTest.java | 36 ++
...edEntryPartitionedTransactionalSelfTest.java | 35 ++
...nedEntryReplicatedAtomicOffHeapSelfTest.java | 35 ++
...eVersionedEntryReplicatedAtomicSelfTest.java | 35 ++
...yReplicatedTransactionalOffHeapSelfTest.java | 36 ++
...nedEntryReplicatedTransactionalSelfTest.java | 35 ++
.../tcp/IgniteCacheSslStartStopSelfTest.java | 1 +
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 152 ++++-
.../TcpDiscoverySpiFailureTimeoutSelfTest.java | 8 +-
.../IgniteCacheFailoverTestSuite.java | 3 +
.../testsuites/IgniteCacheTestSuite2.java | 1 +
.../testsuites/IgniteCacheTestSuite4.java | 13 +
.../query/h2/sql/GridSqlQuerySplitter.java | 3 +
.../query/h2/twostep/GridMergeTable.java | 7 +-
.../query/h2/twostep/GridThreadLocalTable.java | 22 +-
...CacheScanPartitionQueryFallbackSelfTest.java | 96 ++++
.../query/IgniteSqlSplitterSelfTest.java | 152 +++++
.../IgniteCacheQuerySelfTestSuite.java | 2 +
modules/jms11/pom.xml | 98 ++++
.../apache/ignite/stream/jms11/JmsStreamer.java | 524 ++++++++++++++++++
.../ignite/stream/jms11/MessageTransformer.java | 43 ++
.../stream/jms11/IgniteJmsStreamerTest.java | 551 +++++++++++++++++++
.../jms11/IgniteJmsStreamerTestSuite.java | 34 ++
.../ignite/stream/jms11/TestTransformers.java | 123 +++++
.../apache/ignite/logger/log4j/Log4JLogger.java | 4 +
.../util/spring/IgniteSpringHelperImpl.java | 4 +-
pom.xml | 1 +
73 files changed, 3634 insertions(+), 300 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24af0422/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/24af0422/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 50c7c35,f3a5d65..0098fe9
--- a/pom.xml
+++ b/pom.xml
@@@ -72,10 -72,9 +72,11 @@@
<module>modules/gce</module>
<module>modules/cloud</module>
<module>modules/mesos</module>
+ <module>modules/nodejs</module>
<module>modules/kafka</module>
<module>modules/yarn</module>
+ <module>modules/jms11</module>
+ <module>modules/json</module>
</modules>
<profiles>
