Merge remote-tracking branch 'remotes/community/ignite-1.7.6' into ignite-1.8.3
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/09ed1284 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/09ed1284 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/09ed1284 Branch: refs/heads/ignite-1.9 Commit: 09ed12847422b265a60d7217530b98728363688b Parents: 065fe45 f350578 Author: sboikov <[email protected]> Authored: Mon Jan 23 11:20:57 2017 +0300 Committer: sboikov <[email protected]> Committed: Mon Jan 23 11:20:57 2017 +0300 ---------------------------------------------------------------------- .../apache/ignite/IgniteSystemProperties.java | 3 + .../org/apache/ignite/cache/QueryEntity.java | 21 + .../org/apache/ignite/cache/query/SqlQuery.java | 25 + .../store/jdbc/dialect/BasicJdbcDialect.java | 31 +- .../GridClientConnectionManagerAdapter.java | 7 +- .../impl/connection/GridClientTopology.java | 53 ++- .../processors/cache/EntryGetResult.java | 65 +++ .../processors/cache/GridCacheAdapter.java | 123 +++-- .../cache/GridCacheClearAllRunnable.java | 58 +-- .../processors/cache/GridCacheContext.java | 4 +- .../processors/cache/GridCacheEntryEx.java | 42 +- .../processors/cache/GridCacheMapEntry.java | 144 +++++- .../processors/cache/GridCacheSwapManager.java | 8 - .../processors/cache/GridCacheUtils.java | 3 + .../processors/cache/IgniteCacheProxy.java | 3 + .../processors/cache/ReaderArguments.java | 74 +++ .../distributed/dht/GridDhtCacheAdapter.java | 9 +- .../cache/distributed/dht/GridDhtGetFuture.java | 83 ++-- .../distributed/dht/GridDhtGetSingleFuture.java | 75 ++- .../dht/GridPartitionedGetFuture.java | 10 +- .../dht/GridPartitionedSingleGetFuture.java | 10 +- .../dht/atomic/GridDhtAtomicCache.java | 12 +- .../GridNearAtomicAbstractUpdateFuture.java | 34 +- .../GridNearAtomicSingleUpdateFuture.java | 44 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 57 +-- .../dht/colocated/GridDhtColocatedCache.java | 10 +- .../distributed/near/GridNearGetFuture.java | 19 +- .../local/atomic/GridLocalAtomicCache.java | 11 +- .../cache/query/GridCacheQueryManager.java | 83 +++- .../continuous/CacheContinuousQueryHandler.java | 81 +++- .../cache/transactions/IgniteTxHandler.java | 4 +- .../transactions/IgniteTxLocalAdapter.java | 64 +-- .../IgniteCacheObjectProcessorImpl.java | 5 +- .../processors/query/GridQueryIndexing.java | 4 +- .../processors/query/GridQueryProcessor.java | 79 ++-- .../query/GridQueryTypeDescriptor.java | 7 + .../communication/tcp/TcpCommunicationSpi.java | 16 + .../ignite/spi/discovery/tcp/ClientImpl.java | 90 +++- .../ignite/spi/discovery/tcp/ServerImpl.java | 63 ++- .../messages/TcpDiscoveryAbstractMessage.java | 21 + modules/core/src/test/config/log4j-test.xml | 6 + .../store/jdbc/CacheJdbcPojoStoreTest.java | 48 +- .../ignite/cache/store/jdbc/model/Person.java | 2 +- .../cache/CacheConcurrentReadThroughTest.java | 184 ++++++++ .../cache/CacheEntryProcessorCopySelfTest.java | 6 +- .../cache/GridCacheBasicStoreAbstractTest.java | 2 +- .../processors/cache/GridCacheTestEntryEx.java | 30 +- .../GridCacheDhtEvictionsDisabledSelfTest.java | 5 +- .../AtomicPutAllChangingTopologyTest.java | 212 +++++++++ .../near/GridNearCacheStoreUpdateTest.java | 466 +++++++++++++++++++ .../GridNearOffheapCacheStoreUpdateTest.java | 35 ++ .../cache/query/IndexingSpiQuerySelfTest.java | 69 ++- .../IndexingSpiQueryWithH2IndexingSelfTest.java | 36 ++ .../tcp/TcpCommunicationSpiDropNodesTest.java | 322 +++++++++++++ .../TcpCommunicationSpiFaultyClientTest.java | 270 +++++++++++ .../ignite/testframework/GridTestNode.java | 1 + .../testframework/junits/GridAbstractTest.java | 2 + .../IgniteCacheFailoverTestSuite.java | 3 + .../testsuites/IgniteCacheTestSuite2.java | 7 + .../IgniteSpiCommunicationSelfTestSuite.java | 5 + .../IgniteSpiDiscoverySelfTestSuite.java | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 30 +- ...CacheScanPartitionQueryFallbackSelfTest.java | 2 +- .../cache/IgniteCacheAbstractQuerySelfTest.java | 295 +++++++++++- .../IgniteCachePartitionedQuerySelfTest.java | 85 ++++ .../h2/GridIndexingSpiAbstractSelfTest.java | 29 +- 66 files changed, 3159 insertions(+), 550 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/09ed1284/modules/core/src/main/java/org/apache/ignite/IgniteSystemProperties.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/09ed1284/modules/core/src/main/java/org/apache/ignite/cache/QueryEntity.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/09ed1284/modules/core/src/main/java/org/apache/ignite/internal/client/impl/connection/GridClientConnectionManagerAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/09ed1284/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/09ed1284/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/09ed1284/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/09ed1284/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/09ed1284/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/09ed1284/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/09ed1284/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/09ed1284/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/09ed1284/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/09ed1284/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java index 719cf38,f05d90d..04ca50c --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java @@@ -473,20 -475,22 +475,22 @@@ public abstract class IgniteTxLocalAdap CacheObject cacheVal = cacheCtx.toCacheObject(val); while (true) { - GridCacheEntryEx entry = cacheCtx.cache().entryEx(key); + GridCacheEntryEx entry = cacheCtx.cache().entryEx(key, topVer); try { - GridCacheVersion setVer = entry.versionedValue(cacheVal, ver, null); - - boolean set = setVer != null; + T2<CacheObject, GridCacheVersion> verVal = entry.versionedValue(cacheVal, + ver, + null, + null); - if (set) - ver = setVer; + if (log.isDebugEnabled()) { + log.debug("Set value loaded from store into entry [" + + "oldVer=" + ver + + ", newVer=" + verVal.get2() + + ", entry=" + entry + ']'); + } - if (log.isDebugEnabled()) - log.debug("Set value loaded from store into entry [set=" + set + - ", curVer=" + ver + ", newVer=" + setVer + ", " + - "entry=" + entry + ']'); + ver = verVal.get2(); break; } http://git-wip-us.apache.org/repos/asf/ignite/blob/09ed1284/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/09ed1284/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/09ed1284/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryTypeDescriptor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/09ed1284/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/09ed1284/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/09ed1284/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/09ed1284/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheFailoverTestSuite.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/09ed1284/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/09ed1284/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSpiCommunicationSelfTestSuite.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/09ed1284/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java ---------------------------------------------------------------------- diff --cc modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java index 9037943,cbf2ebd..e375867 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java @@@ -1075,10 -1051,9 +1075,10 @@@ public class IgniteH2Indexing implement final TableDescriptor tbl = tableDescriptor(spaceName, type); if (tbl == null) - throw new CacheException("Failed to find SQL table for type: " + type.name()); + throw new IgniteSQLException("Failed to find SQL table for type: " + type.name(), + IgniteQueryErrorCode.TABLE_NOT_FOUND); - String sql = generateQuery(qry, tbl); + String sql = generateQuery(qry, alias, tbl); Connection conn = connectionForThread(tbl.schemaName()); http://git-wip-us.apache.org/repos/asf/ignite/blob/09ed1284/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/h2/GridIndexingSpiAbstractSelfTest.java ----------------------------------------------------------------------
