Merge remote-tracking branch 'remotes/origin/master' into ignite-3478
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7f4defd0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7f4defd0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7f4defd0 Branch: refs/heads/ignite-3478 Commit: 7f4defd0926325dfb9d6840156dfa64309ae7956 Parents: ac475bc afaa5e0 Author: sboikov <[email protected]> Authored: Fri Sep 29 14:20:00 2017 +0300 Committer: sboikov <[email protected]> Committed: Fri Sep 29 14:20:00 2017 +0300 ---------------------------------------------------------------------- .../jdbc/thin/JdbcThinStatementSelfTest.java | 138 +++++++++++-- ...itePersistenceCompatibilityAbstractTest.java | 6 +- .../junits/IgniteCompatibilityAbstractTest.java | 19 +- .../org/apache/ignite/cache/QueryEntity.java | 24 ++- .../org/apache/ignite/cache/QueryIndex.java | 31 ++- .../ignite/cache/query/SqlFieldsQuery.java | 18 ++ .../query/annotations/QueryGroupIndex.java | 2 +- .../jdbc/thin/JdbcThinDatabaseMetadata.java | 2 +- .../jdbc/thin/JdbcThinPreparedStatement.java | 2 +- .../internal/jdbc/thin/JdbcThinResultSet.java | 8 +- .../internal/jdbc/thin/JdbcThinStatement.java | 196 +++++++++++++------ .../internal/jdbc/thin/JdbcThinTcpIo.java | 9 +- .../managers/communication/GridIoManager.java | 4 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 4 +- .../persistence/file/FilePageStoreManager.java | 5 +- .../odbc/jdbc/JdbcConnectionContext.java | 10 +- ...dbcQueryExecuteMultipleStatementsResult.java | 134 +++++++++++++ .../odbc/jdbc/JdbcRequestHandler.java | 82 ++++++-- .../processors/odbc/jdbc/JdbcResult.java | 8 + .../processors/odbc/jdbc/JdbcResultInfo.java | 95 +++++++++ .../utils/PlatformConfigurationUtils.java | 10 +- .../processors/query/GridQueryIndexing.java | 7 +- .../processors/query/GridQueryProcessor.java | 28 ++- .../processors/query/QueryEntityEx.java | 7 +- .../internal/processors/query/QueryUtils.java | 11 +- ...IgniteClientCacheInitializationFailTest.java | 6 +- .../IgnitePdsCacheRebalancingAbstractTest.java | 5 +- .../IgnitePdsClientNearCachePutGetTest.java | 6 +- .../IgnitePdsContinuousRestartTest.java | 4 +- .../persistence/IgnitePdsDynamicCacheTest.java | 4 +- .../IgnitePdsExchangeDuringCheckpointTest.java | 6 +- .../IgnitePdsMultiNodePutGetRestartTest.java | 6 +- .../persistence/IgnitePdsPageSizesTest.java | 6 +- ...gnitePdsRecoveryAfterFileCorruptionTest.java | 4 +- .../IgnitePdsRemoveDuringRebalancingTest.java | 12 +- ...gnitePdsSingleNodePutGetPersistenceTest.java | 6 +- .../db/IgnitePdsMultiNodePutGetRestartTest.java | 6 +- ...PdsPageEvictionDuringPartitionClearTest.java | 6 +- .../db/IgnitePdsPageEvictionTest.java | 6 +- ...tePdsRebalancingOnNotStableTopologyTest.java | 6 +- .../db/IgnitePdsTransactionsHangTest.java | 5 +- .../db/IgnitePdsWholeClusterRestartTest.java | 4 +- ...faultPageSizeBackwardsCompatibilityTest.java | 4 +- .../db/file/IgnitePdsCacheIntegrationTest.java | 6 +- ...ckpointSimulationWithRealCpDisabledTest.java | 4 +- .../db/file/IgnitePdsEvictionTest.java | 4 +- .../file/IgnitePdsNoActualWalHistoryTest.java | 6 +- .../file/IgnitePdsThreadInterruptionTest.java | 4 +- .../persistence/db/wal/IgnitePdsWalTlbTest.java | 5 +- .../db/wal/IgniteWalFlushFailoverTest.java | 3 +- .../wal/IgniteWalHistoryReservationsTest.java | 3 +- .../IgniteWalRecoverySeveralRestartsTest.java | 6 +- .../db/wal/IgniteWalRecoveryTest.java | 8 +- .../db/wal/WalRecoveryTxLogicalRecordsTest.java | 6 +- .../db/wal/reader/IgniteWalReaderTest.java | 7 +- .../pagemem/PagesWriteThrottleSandboxTest.java | 4 +- .../pagemem/PagesWriteThrottleSmokeTest.java | 3 +- .../AbstractNodeJoinTemplate.java | 5 +- .../IgniteStandByClusterTest.java | 6 +- ...gniteAbstractStandByClientReconnectTest.java | 5 +- .../TxOptimisticDeadlockDetectionTest.java | 78 ++++++-- .../database/IgniteDbAbstractTest.java | 5 +- .../ignite/testframework/GridTestUtils.java | 3 +- .../query/h2/DmlStatementsProcessor.java | 35 ++-- .../processors/query/h2/IgniteH2Indexing.java | 181 +++++++++++++---- .../query/h2/ddl/DdlStatementsProcessor.java | 11 +- .../query/h2/sql/GridSqlQueryParser.java | 81 ++++++++ .../query/h2/sql/GridSqlQuerySplitter.java | 17 +- ...leNodeWithIndexingPutGetPersistenceTest.java | 6 +- .../cache/index/LongIndexNameTest.java | 4 +- ...eDbSingleNodeWithIndexingWalRestoreTest.java | 7 +- ...oreQueryWithMultipleClassesPerCacheTest.java | 3 +- .../IgnitePersistentStoreSchemaLoadTest.java | 3 +- .../query/IgniteSqlNotNullConstraintTest.java | 8 +- .../MultipleStatementsSqlQuerySelfTest.java | 154 +++++++++++++++ .../IgniteCacheQuerySelfTestSuite.java | 2 + .../Apache.Ignite.Core.Tests.csproj | 3 + .../Cache/CacheConfigurationTest.cs | 10 +- .../Query/CacheQueriesCodeConfigurationTest.cs | 31 ++- .../Cache/Query/CacheQueriesTest.cs | 31 +++ .../Config/cache-query.xml | 1 + .../Config/full-config.xml | 134 +++++++++++++ .../IgniteConfigurationSerializerTest.cs | 118 ++--------- .../IgniteConfigurationTest.cs | 7 +- .../Cache/Configuration/CacheConfiguration.cs | 13 ++ .../Cache/Configuration/QueryEntity.cs | 5 +- .../Cache/Configuration/QueryIndex.cs | 50 ++++- .../Configuration/QuerySqlFieldAttribute.cs | 15 ++ .../IgniteConfigurationSection.xsd | 15 ++ .../PersistentStoreConfiguration.cs | 15 ++ 90 files changed, 1664 insertions(+), 429 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7f4defd0/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7f4defd0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ----------------------------------------------------------------------
