Merge remote-tracking branch 'remotes/origin/master' into ignite-2.1.2 # Conflicts: # modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4debe5b8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4debe5b8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4debe5b8 Branch: refs/heads/ignite-2.1.2-exchange Commit: 4debe5b8c1383d10770a024e179a9a64787105ba Parents: 9e06773 039c02a Author: sboikov <[email protected]> Authored: Fri Jun 23 14:06:39 2017 +0300 Committer: sboikov <[email protected]> Committed: Fri Jun 23 14:06:39 2017 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteCache.java | 3 +- .../ignite/internal/GridJobSiblingImpl.java | 34 +- .../internal/IgniteDiagnosticMessage.java | 19 +- .../managers/communication/GridIoManager.java | 116 +++-- .../deployment/GridDeploymentCommunication.java | 6 + .../eventstorage/GridEventStorageManager.java | 5 + .../processors/cache/GridCacheIoManager.java | 135 +---- .../GridCachePartitionExchangeManager.java | 6 +- .../processors/cache/GridCachePreloader.java | 4 +- .../cache/GridCachePreloaderAdapter.java | 4 +- .../cache/binary/BinaryMetadataTransport.java | 5 + .../dht/atomic/GridDhtAtomicCache.java | 2 +- .../dht/preloader/GridDhtPartitionDemander.java | 17 +- .../GridDhtPartitionsExchangeFuture.java | 21 +- .../dht/preloader/GridDhtPreloader.java | 2 +- .../cache/distributed/near/GridNearTxLocal.java | 5 +- .../query/GridCacheDistributedQueryFuture.java | 19 +- .../query/GridCacheDistributedQueryManager.java | 18 +- .../cache/transactions/IgniteTxManager.java | 8 + .../continuous/GridContinuousProcessor.java | 2 +- .../datastreamer/DataStreamerImpl.java | 5 + .../internal/processors/igfs/IgfsContext.java | 15 - .../processors/job/GridJobProcessor.java | 3 +- .../internal/processors/job/GridJobWorker.java | 2 +- .../GridMarshallerMappingProcessor.java | 5 + .../processors/odbc/SqlListenerNioListener.java | 4 +- .../odbc/odbc/OdbcQueryFetchResult.java | 4 +- .../odbc/odbc/OdbcRequestHandler.java | 66 ++- .../processors/task/GridTaskProcessor.java | 3 +- .../processors/task/GridTaskWorker.java | 6 +- .../communication/tcp/TcpCommunicationSpi.java | 55 ++- .../managers/IgniteDiagnosticMessagesTest.java | 289 ++++++++++- .../communication/GridIoManagerSelfTest.java | 2 +- ...cTransactionsWithFilterSingleServerTest.java | 28 ++ ...cheOptimisticTransactionsWithFilterTest.java | 493 +++++++++++++++++++ .../IgniteRejectConnectOnNodeStopTest.java | 188 +++++++ .../rebalancing/CacheManualRebalancingTest.java | 178 +++++++ .../ignite/testframework/GridStringLogger.java | 35 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 3 + .../testsuites/IgniteCacheTestSuite2.java | 5 + .../testsuites/IgniteCacheTestSuite5.java | 2 + .../query/h2/twostep/GridMapQueryExecutor.java | 2 +- .../compute-example/src/compute_example.cpp | 2 + .../src/continuous_query_example.cpp | 2 + .../examples/odbc-example/src/odbc_example.cpp | 5 +- .../put-get-example/src/put_get_example.cpp | 5 +- .../query-example/src/query_example.cpp | 5 +- .../cpp/odbc-test/src/configuration_test.cpp | 56 ++- .../include/ignite/odbc/config/configuration.h | 52 ++ .../cpp/odbc/include/ignite/odbc/connection.h | 2 +- .../cpp/odbc/include/ignite/odbc/message.h | 11 +- .../odbc/system/ui/dsn_configuration_window.h | 8 + .../src/system/ui/dsn_configuration_window.cpp | 34 +- .../cpp/odbc/src/config/configuration.cpp | 4 + modules/platforms/cpp/odbc/src/connection.cpp | 14 +- modules/platforms/cpp/odbc/src/dsn_config.cpp | 6 + modules/platforms/cpp/odbc/src/message.cpp | 9 +- .../platforms/cpp/odbc/src/query/data_query.cpp | 5 +- modules/platforms/cpp/odbc/src/result_page.cpp | 2 +- .../Cache/Query/CacheLinqTest.cs | 32 +- .../Impl/CacheQueryExpressionVisitor.cs | 5 + 61 files changed, 1744 insertions(+), 339 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4debe5b8/modules/core/src/main/java/org/apache/ignite/internal/IgniteDiagnosticMessage.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4debe5b8/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4debe5b8/modules/core/src/main/java/org/apache/ignite/internal/managers/eventstorage/GridEventStorageManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4debe5b8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4debe5b8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4debe5b8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataTransport.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4debe5b8/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/4debe5b8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4debe5b8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java index 6cc269a,c8138f7..fe250bd --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java @@@ -217,25 -211,11 +218,25 @@@ public class GridDhtPartitionsExchangeF private boolean exchangeOnChangeGlobalState; /** */ - private final ConcurrentMap<UUID, GridDhtPartitionsAbstractMessage> msgs = new ConcurrentHashMap8<>(); + private ConcurrentMap<UUID, GridDhtPartitionsSingleMessage> msgs = new ConcurrentHashMap8<>(); + + /** */ + @GridToStringExclude + private volatile IgniteDhtPartitionHistorySuppliersMap partHistSuppliers = new IgniteDhtPartitionHistorySuppliersMap(); /** Forced Rebalance future. */ - private GridFutureAdapter<Boolean> forcedRebFut; + private GridCompoundFuture<Boolean, Boolean> forcedRebFut; + /** */ + private volatile Map<Integer, Map<Integer, Long>> partHistReserved; + + /** */ + @GridToStringExclude + private volatile IgniteDhtPartitionsToReloadMap partsToReload = new IgniteDhtPartitionsToReloadMap(); + + /** */ + private final AtomicBoolean done = new AtomicBoolean(); + /** * Dummy future created to trigger reassignments if partition * topology changed while preloading. http://git-wip-us.apache.org/repos/asf/ignite/blob/4debe5b8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPreloader.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4debe5b8/modules/core/src/main/java/org/apache/ignite/internal/processors/continuous/GridContinuousProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4debe5b8/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4debe5b8/modules/core/src/main/java/org/apache/ignite/internal/processors/marshaller/GridMarshallerMappingProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4debe5b8/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4debe5b8/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4debe5b8/modules/core/src/test/java/org/apache/ignite/testframework/GridStringLogger.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4debe5b8/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java index 83b8df5,158b118..5ff5b08 --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite2.java @@@ -278,8 -279,9 +280,11 @@@ public class IgniteCacheTestSuite2 exte suite.addTest(new TestSuite(IgniteNearClientCacheCloseTest.class)); suite.addTest(new TestSuite(IgniteClientCacheStartFailoverTest.class)); + suite.addTest(new TestSuite(CacheOptimisticTransactionsWithFilterSingleServerTest.class)); + suite.addTest(new TestSuite(CacheOptimisticTransactionsWithFilterTest.class)); + + suite.addTest(new TestSuite(NonAffinityCoordinatorDynamicStartStopTest.class)); + return suite; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/4debe5b8/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite5.java ----------------------------------------------------------------------
