GitHub user AMashenkov opened a pull request: https://github.com/apache/ignite/pull/4623
IGNITE-9373: Fix mvcc tests. You can merge this pull request into a Git repository by running: $ git pull https://github.com/gridgain/apache-ignite IGNITE-9373 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/ignite/pull/4623.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #4623 ---- commit 6150d94c51b748fff361df32391131f1e68095e5 Author: Igor Seliverstov <gvvinblade@...> Date: 2017-12-27T11:32:58Z Fix no query in update plan. commit 2c212c18159848e413927dd05cf330e2be1cd97d Author: Alexander Paschenko <alexander.a.paschenko@...> Date: 2017-12-27T11:49:11Z IGNITE-7280: JDBC tests. commit e50c81e9ec3597414d8dbe775626654e0dc86eb0 Author: Alexander Paschenko <alexander.a.paschenko@...> Date: 2017-12-27T13:06:00Z IGNITE-7302: Fixed INFORMATIONAL_SCHEMA processing. This closes #3294. commit 04f949483333bbd89136d4555a2e3fccd9367169 Author: Igor Seliverstov <gvvinblade@...> Date: 2017-12-27T14:04:58Z IGNITE-7321 DML operation hangs in case exception is thrown from DHT enlist future commit 3818bc9d74b2bba594ef89cc2d1ac975da816b54 Author: Igor Seliverstov <gvvinblade@...> Date: 2017-12-27T14:33:18Z fix tests. commit eb7a615c9d32e648eceeafb09893b226fe276467 Author: Igor Seliverstov <gvvinblade@...> Date: 2017-12-27T14:47:39Z fix exception types. commit f4ce065ce863a741e0d14901e087ff69856b7d9f Author: Alexander Paschenko <alexander.a.paschenko@...> Date: 2017-12-27T16:23:23Z Merge branch 'master' into ignite-5571 commit 73bedeb4979d5474be654c6f8f80c168c9a0606f Author: Alexander Paschenko <alexander.a.paschenko@...> Date: 2017-12-27T19:00:36Z IGNITE-5571 More tests commit ccf16fcc4d819e33b71a3322ae99d48755ee6b76 Author: Alexander Paschenko <alexander.a.paschenko@...> Date: 2017-12-28T07:49:25Z IGNITE-7259: Fixed GridIndexRebuildSelfTest. This closes #3304. commit 53466fc059d027edb24b3d7f5da05b6be2e997fc Author: Igor Seliverstov <gvvinblade@...> Date: 2017-12-28T11:24:16Z fix partition checking. commit b9aa9ebca0dca79fec278415beb5753ef49a4c60 Author: Igor Seliverstov <gvvinblade@...> Date: 2017-12-29T12:18:30Z fix mvcc version checking on lock acquire commit a86af95ea1ee08c2f66751a8e2fc440e4671d686 Author: Igor Seliverstov <gvvinblade@...> Date: 2018-01-11T12:45:02Z TODOs, right tickets numbers, minors commit 59ba16afcab00326a60f53b3a7592d2978f19313 Author: Igor Seliverstov <gvvinblade@...> Date: 2018-01-11T14:45:53Z Merge branch 'master' into ignite-4191-master commit 79d876bce306802bf097a69030e1fcca61cec859 Author: Igor Seliverstov <gvvinblade@...> Date: 2018-01-11T14:49:22Z Merge branch 'master' into ignite-4191-master commit 9bd874c8d132f23842ae4bf8caa2c633b42b0789 Author: Igor Seliverstov <gvvinblade@...> Date: 2018-01-11T14:52:15Z Merge branch 'master' into ignite-4191-master # Conflicts: # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java commit cbae5040399f433c0689df76e697df5a637ca1bc Author: Igor Seliverstov <gvvinblade@...> Date: 2018-01-11T15:29:13Z Disable DROP COLUMN with enabled mvcc commit c5bb6c68a3faf9f236ae8a1639bfaf495c825eb7 Author: Igor Seliverstov <gvvinblade@...> Date: 2018-01-12T09:09:52Z Merge branch 'master' into ignite-4191-master commit 02f4ffa82a6ebaaaeaf96c31f15c4e8191c188d0 Author: Igor Seliverstov <gvvinblade@...> Date: 2018-01-12T09:23:00Z Merge branch 'master' into ignite-4191-master # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java # modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java # modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java commit 21f9acdee409265f98893a2910e04effa63bcc2d Author: Igor Seliverstov <gvvinblade@...> Date: 2018-01-12T10:34:45Z Merge branch 'master' into ignite-4191-master # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2Tree.java # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2TreeIndex.java # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/io/H2ExtrasInnerIO.java # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/io/H2ExtrasLeafIO.java # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/io/H2InnerIO.java # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/io/H2LeafIO.java commit 5684b7224d077e285af35c5741d50332dec31eae Author: Igor Seliverstov <gvvinblade@...> Date: 2018-01-12T10:36:04Z Merge branch 'master' into ignite-4191-master commit 284c4335897fc82388baa99c960693b59a460e61 Author: Alexander Paschenko <alexander.a.paschenko@...> Date: 2018-01-17T09:20:35Z Merge remote-tracking branch 'apache/master' into ignite-5571 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java # modules/indexing/src/test/java/org/apache/ignite/internal/processors/database/IgnitePersistentStoreSchemaLoadTest.java # modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java commit e3341a4b9d94600533fed000c195a81294393f28 Author: Alexander Paschenko <alexander.a.paschenko@...> Date: 2018-01-17T09:37:25Z IGNITE-5571 Post-merge fixes commit 8893f13918b74311e386ab82c7abbaa799240f03 Author: Igor Seliverstov <gvvinblade@...> Date: 2018-01-18T12:07:44Z IGNITE-7313 Recovery process doesn't propagate MVCC version (rollback tx in case mvcc is enabled) commit fd58c53273f4c3f6f0d23fb883daf50849e86d6c Author: Igor Seliverstov <gvvinblade@...> Date: 2018-01-18T12:54:28Z Merge branch 'master' into 4191-master # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java commit 10a131d836ccb4d4c22eb393af4e48ae2b8f8b1f Author: Igor Seliverstov <gvvinblade@...> Date: 2018-01-18T14:02:59Z Merge branch 'master' into 4191-master # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/SqlFieldsQueryEx.java # modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/DmlStatementsProcessor.java # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java commit e138979eea89838621091b7a769d40f44ec9092a Author: Igor Seliverstov <gvvinblade@...> Date: 2018-01-19T09:16:40Z fix tx rollback on dml exception commit 3cedba622a170f4651a5057d4ba3d3b67ae3725f Author: Igor Seliverstov <gvvinblade@...> Date: 2018-01-19T11:48:07Z Merge branch 'master' into 4191-master # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/managers/discovery/DiscoCache.java # modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUpdateTxResult.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtPartitionTopologyImpl.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheDatabaseSharedManager.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/GridCacheOffheapManager.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/AbstractFreeList.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java # modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java commit e26186fe3d39bce2ee64c0928dde762b796bf07f Author: Igor Seliverstov <gvvinblade@...> Date: 2018-01-19T12:34:35Z fix compilation commit 73bce4706975371135c8f5953a57fff592bb5699 Author: Igor Seliverstov <gvvinblade@...> Date: 2018-01-19T13:18:53Z fix row size calculation commit 1b4bd5487c751055b898e1d589d8412a364accfb Author: Igor Seliverstov <gvvinblade@...> Date: 2018-01-19T13:26:06Z Merge branch 'master' into 4191-master # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java # modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java ---- ---