Merge remote-tracking branch 'remotes/origin/master' into ignite-5075 # Conflicts: # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java # modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoClassQuerySelfTest.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ca176a7d Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ca176a7d Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ca176a7d Branch: refs/heads/ignite-5075 Commit: ca176a7d76548c41eb6cf22a5a6ad26b33edc56c Parents: 7fc0168 8c75e4d Author: sboikov <[email protected]> Authored: Wed May 24 16:35:54 2017 +0300 Committer: sboikov <[email protected]> Committed: Wed May 24 16:35:54 2017 +0300 ---------------------------------------------------------------------- examples/config/filesystem/example-igfs.xml | 4 + .../examples/datagrid/CacheQueryExample.java | 2 +- modules/clients/src/test/config/jdbc-config.xml | 6 - .../internal/jdbc2/JdbcMetadataSelfTest.java | 5 +- .../internal/jdbc2/JdbcResultSetSelfTest.java | 24 +- .../ignite/jdbc/JdbcMetadataSelfTest.java | 4 +- .../ignite/jdbc/JdbcResultSetSelfTest.java | 121 +- .../jdbc/suite/IgniteJdbcDriverTestSuite.java | 3 + .../jdbc/thin/JdbcConnectionSelfTest.java | 195 ++ .../java/org/apache/ignite/IgniteCache.java | 13 + .../org/apache/ignite/IgniteJdbcThinDriver.java | 312 +++ .../apache/ignite/IgniteSystemProperties.java | 2 +- .../ignite/binary/BinaryBasicNameMapper.java | 2 +- .../ignite/cache/query/FieldsQueryCursor.java | 39 + .../configuration/AtomicConfiguration.java | 25 + .../configuration/MemoryConfiguration.java | 3 +- .../MemoryPolicyConfiguration.java | 4 +- .../ignite/internal/GridKernalContext.java | 8 +- .../ignite/internal/GridKernalContextImpl.java | 12 +- .../apache/ignite/internal/IgniteKernal.java | 6 +- .../org/apache/ignite/internal/IgnitionEx.java | 1 + .../internal/binary/BinaryClassDescriptor.java | 1 + .../ignite/internal/binary/BinaryContext.java | 58 +- .../internal/binary/BinaryWriterExImpl.java | 16 +- .../GridClientOptimizedMarshaller.java | 2 +- .../GridClientZipOptimizedMarshaller.java | 2 +- .../internal/jdbc/thin/JdbcConnection.java | 529 +++++ .../ignite/internal/jdbc/thin/JdbcTcpIo.java | 207 ++ .../ignite/internal/jdbc2/JdbcConnection.java | 3 +- .../managers/communication/GridIoManager.java | 380 +++- .../communication/IgniteIoTestMessage.java | 362 ++- .../managers/indexing/GridIndexingManager.java | 19 +- .../optimized/OptimizedClassDescriptor.java | 2 +- .../optimized/OptimizedMarshaller.java | 2 +- .../marshaller/optimized/package-info.java | 22 + .../mem/unsafe/UnsafeMemoryProvider.java | 18 +- .../pagemem/impl/PageMemoryNoStoreImpl.java | 22 +- .../processors/cache/GridCacheMapEntry.java | 4 +- .../processors/cache/IgniteCacheProxy.java | 24 +- .../processors/cache/QueryCursorImpl.java | 19 +- .../IgniteCacheDatabaseSharedManager.java | 51 +- .../cache/database/tree/BPlusTree.java | 64 +- .../cache/query/GridCacheQueryManager.java | 32 +- .../processors/odbc/OdbcNioListener.java | 242 -- .../internal/processors/odbc/OdbcProcessor.java | 199 -- .../odbc/SqlListenerAbstractMessageParser.java | 265 +++ .../odbc/SqlListenerAbstractObjectReader.java | 137 ++ .../odbc/SqlListenerAbstractObjectWriter.java | 111 + .../processors/odbc/SqlListenerNioListener.java | 263 +++ .../processors/odbc/SqlListenerProcessor.java | 191 ++ .../odbc/SqlListenerRequestHandlerImpl.java | 494 ++++ .../processors/odbc/jdbc/JdbcMessageParser.java | 50 + .../processors/odbc/jdbc/JdbcObjectReader.java | 33 + .../processors/odbc/jdbc/JdbcObjectWriter.java | 33 + .../processors/odbc/odbc/OdbcMessageParser.java | 249 +- .../processors/odbc/odbc/OdbcObjectReader.java | 33 + .../processors/odbc/odbc/OdbcObjectWriter.java | 32 + .../odbc/odbc/OdbcRequestHandler.java | 513 ----- .../processors/query/GridQueryIndexing.java | 101 +- .../processors/query/GridQueryProcessor.java | 312 +-- .../processors/query/QueryIndexKey.java | 20 +- .../query/QueryTypeDescriptorImpl.java | 16 +- .../processors/query/QueryTypeIdKey.java | 26 +- .../processors/query/QueryTypeNameKey.java | 12 +- .../internal/processors/query/QueryUtils.java | 14 +- .../schema/SchemaIndexCacheVisitorImpl.java | 12 +- .../processors/query/schema/SchemaKey.java | 59 - .../message/SchemaProposeDiscoveryMessage.java | 7 +- .../operation/SchemaAbstractOperation.java | 27 +- .../operation/SchemaIndexAbstractOperation.java | 7 +- .../operation/SchemaIndexCreateOperation.java | 8 +- .../operation/SchemaIndexDropOperation.java | 7 +- .../handlers/GridRestCommandHandlerAdapter.java | 3 + .../handlers/cache/GridCacheCommandHandler.java | 2 +- .../handlers/query/QueryCommandHandler.java | 13 +- .../ignite/internal/util/IgniteUtils.java | 17 + .../apache/ignite/marshaller/Marshaller.java | 3 - .../ignite/marshaller/jdk/JdkMarshaller.java | 5 +- .../spi/indexing/IndexingQueryFilter.java | 8 +- .../apache/ignite/spi/indexing/IndexingSpi.java | 17 +- .../spi/indexing/noop/NoopIndexingSpi.java | 6 +- modules/core/src/test/config/example-cache.xml | 5 +- .../src/test/config/spring-start-nodes-attr.xml | 4 +- .../core/src/test/config/spring-start-nodes.xml | 4 +- .../config/websession/example-cache-base.xml | 5 +- .../IgniteExternalizableAbstractTest.java | 15 +- ...dbcPojoStoreOptimizedMarshallerSelfTest.java | 31 - ...ptimizedMarshallerWithSqlEscapeSelfTest.java | 28 - .../apache/ignite/igfs/IgfsPathSelfTest.java | 7 +- .../internal/GridLifecycleAwareSelfTest.java | 3 +- .../BinarySimpleNameTestPropertySelfTest.java | 17 + .../managers/GridManagerStopSelfTest.java | 3 +- .../GridDiscoveryManagerAttributesSelfTest.java | 2 +- .../optimized/OptimizedMarshallerTest.java | 8 + .../marshaller/optimized/package-info.java | 22 + .../pagemem/impl/PageMemoryNoLoadSelfTest.java | 31 +- .../AtomicCacheAffinityConfigurationTest.java | 175 ++ .../CacheStartupInDeploymentModesTest.java | 37 - .../cache/GridCacheEntryMemorySizeSelfTest.java | 2 +- ...ridCacheStoreManagerDeserializationTest.java | 4 +- .../cache/GridCacheVersionSelfTest.java | 7 +- .../IgniteTxExceptionAbstractSelfTest.java | 6 +- .../distributed/CacheAffinityEarlyTest.java | 7 +- .../CacheGetFutureHangsSelfTest.java | 6 +- .../IgniteCacheCreatePutMultiNodeSelfTest.java | 7 +- .../distributed/IgniteCacheCreatePutTest.java | 7 +- .../IgniteCachePartitionLossPolicySelfTest.java | 1 + .../paged/PageEvictionMultinodeTest.java | 22 +- .../cache/query/IndexingSpiQuerySelfTest.java | 14 +- .../cache/query/IndexingSpiQueryTxSelfTest.java | 6 +- .../CacheEntryProcessorNonSerializableTest.java | 5 +- .../igfs/IgfsAbstractBaseSelfTest.java | 10 - .../processors/igfs/IgfsFileInfoSelfTest.java | 16 +- .../IgfsPrimaryOptimziedMarshallerSelfTest.java | 28 - .../odbc/OdbcProcessorValidationSelfTest.java | 182 -- .../SqlListenerProcessorValidationSelfTest.java | 184 ++ .../service/ClosureServiceClientsNodesTest.java | 4 +- ...namicProxySerializationMultiJvmSelfTest.java | 13 - .../GridMarshallerPerformanceTest.java | 8 +- .../IgniteMessagingWithClientTest.java | 4 +- ...pClientDiscoveryMarshallerCheckSelfTest.java | 4 +- .../TcpDiscoveryMarshallerCheckSelfTest.java | 4 +- .../ignite/testframework/GridTestUtils.java | 2 +- .../config/GridTestProperties.java | 3 +- .../configvariations/ConfigVariations.java | 14 +- .../testframework/junits/GridAbstractTest.java | 33 + .../junits/IgniteTestResources.java | 8 +- .../multijvm/IgniteCacheProcessProxy.java | 8 + ...naryObjectsTxDeadlockDetectionTestSuite.java | 37 - .../ignite/testsuites/IgniteBasicTestSuite.java | 4 +- .../testsuites/IgniteBinaryBasicTestSuite.java | 14 +- .../IgniteBinaryCacheFullApiTestSuite.java | 37 - .../testsuites/IgniteBinaryCacheTestSuite.java | 4 - ...ObjectsCacheDataStructuresSelfTestSuite.java | 42 - ...BinaryObjectsCacheExpiryPolicyTestSuite.java | 38 - ...gniteBinaryObjectsCacheRestartTestSuite.java | 37 - .../IgniteBinaryObjectsCacheTestSuite2.java | 37 - .../IgniteBinaryObjectsCacheTestSuite3.java | 2 - .../IgniteBinaryObjectsCacheTestSuite4.java | 37 - ...IgniteBinaryObjectsComputeGridTestSuite.java | 4 - .../IgniteCacheDataStructuresSelfTestSuite.java | 3 + .../ignite/testsuites/IgniteCacheTestSuite.java | 4 - ...teBasicConfigVariationsFullApiTestSuite.java | 2 +- .../ignite/testsuites/IgniteIgfsTestSuite.java | 3 - .../testsuites/IgniteKernalSelfTestSuite.java | 4 - .../IgniteMarshallerSelfTestSuite.java | 8 +- ...essagingConfigVariationFullApiTestSuite.java | 2 +- ...ServiceConfigVariationsFullApiTestSuite.java | 2 +- .../webapp/META-INF/ignite-webapp-config.xml | 15 +- .../test/config/hadoop-fs-open-test/grid-0.xml | 3 +- .../test/config/hadoop-fs-open-test/grid-1.xml | 3 +- .../test/config/hadoop-fs-open-test/grid-2.xml | 3 +- .../test/config/igfs-cli-config-dual-async.xml | 3 +- .../test/config/igfs-cli-config-dual-sync.xml | 3 +- .../src/test/config/igfs-cli-config-primary.xml | 3 +- .../src/test/config/igfs-cli-config-proxy.xml | 3 +- .../IgniteHadoopFileSystemAbstractSelfTest.java | 4 +- .../query/h2/DmlStatementsProcessor.java | 71 +- .../query/h2/GridH2ResultSetIterator.java | 191 -- .../query/h2/H2ConnectionWrapper.java | 67 + .../processors/query/h2/H2DatabaseType.java | 161 ++ .../processors/query/h2/H2FieldsIterator.java | 50 + .../processors/query/h2/H2KeyValueIterator.java | 48 + .../query/h2/H2ResultSetIterator.java | 191 ++ .../processors/query/h2/H2RowDescriptor.java | 479 ++++ .../internal/processors/query/h2/H2Schema.java | 135 ++ .../processors/query/h2/H2SqlFieldMetadata.java | 111 + .../processors/query/h2/H2StatementCache.java | 73 + .../processors/query/h2/H2TableDescriptor.java | 345 +++ .../processors/query/h2/H2TableEngine.java | 89 + .../query/h2/H2TwoStepCachedQuery.java | 49 + .../query/h2/H2TwoStepCachedQueryKey.java | 107 + .../internal/processors/query/h2/H2Utils.java | 299 +++ .../processors/query/h2/IgniteH2Indexing.java | 2146 +++--------------- .../query/h2/database/H2PkHashIndex.java | 4 +- .../query/h2/database/H2TreeIndex.java | 4 +- .../query/h2/ddl/DdlStatementsProcessor.java | 25 +- .../query/h2/opt/GridH2CollocationModel.java | 6 +- .../query/h2/opt/GridH2IndexBase.java | 12 +- .../processors/query/h2/opt/GridH2Table.java | 149 +- .../query/h2/opt/GridH2TreeIndex.java | 2 +- .../query/h2/opt/GridLuceneIndex.java | 15 +- .../query/h2/sql/GridSqlDropIndex.java | 14 +- .../query/h2/sql/GridSqlQueryParser.java | 2 +- .../query/h2/sql/GridSqlQuerySplitter.java | 4 +- .../query/h2/twostep/GridMapQueryExecutor.java | 10 +- .../h2/twostep/GridReduceQueryExecutor.java | 31 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 12 +- .../cache/IgniteCacheNoClassQuerySelfTest.java | 4 +- .../cache/SqlFieldsQuerySelfTest.java | 12 +- .../DynamicIndexAbstractBasicSelfTest.java | 26 +- .../DynamicIndexAbstractConcurrentSelfTest.java | 74 +- .../cache/index/SchemaExchangeSelfTest.java | 2 +- .../query/IgniteQueryDedicatedPoolTest.java | 6 +- .../query/IgniteSqlSegmentedIndexSelfTest.java | 25 + .../h2/GridIndexingSpiAbstractSelfTest.java | 140 +- .../h2/sql/AbstractH2CompareQueryTest.java | 4 +- .../query/h2/sql/GridQueryParsingTest.java | 6 +- .../FetchingQueryCursorStressTest.java | 4 +- .../IgniteBinaryCacheQueryTestSuite.java | 4 - .../IgniteBinaryCacheQueryTestSuite2.java | 4 - .../IgniteBinaryCacheQueryTestSuite3.java | 39 - .../IgniteBinaryCacheQueryTestSuite4.java | 39 - .../cpp/odbc/include/ignite/odbc/message.h | 10 + .../Apache.Ignite.Core.Tests/MarshallerTest.cs | 2 +- .../GridSpringBeanSerializationSelfTest.java | 15 +- .../webapp2/META-INF/ignite-webapp-config.xml | 15 +- .../ignite-int-max-values-onheap-config.xml | 4 +- modules/yardstick/config/ignite-jdbc-config.xml | 4 +- 209 files changed, 7872 insertions(+), 5023 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ca176a7d/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ca176a7d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ca176a7d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/BPlusTree.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ca176a7d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ca176a7d/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ca176a7d/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ca176a7d/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/H2PkHashIndex.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ca176a7d/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java ---------------------------------------------------------------------- diff --cc modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java index bba5fca,a31263f..2ed5200 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java @@@ -1049,12 -1052,12 +1052,12 @@@ public class GridReduceQueryExecutor private Set<ClusterNode> replicatedUnstableDataNodes(GridCacheContext<?,?> cctx) { assert cctx.isReplicated() : cctx.name() + " must be replicated"; - String space = cctx.name(); + String cacheName = cctx.name(); - Set<ClusterNode> dataNodes = new HashSet<>(dataNodes(cacheName, NONE)); + Set<ClusterNode> dataNodes = new HashSet<>(dataNodes(cctx.groupId(), NONE)); if (dataNodes.isEmpty()) - throw new CacheException("Failed to find data nodes for cache: " + space); + throw new CacheException("Failed to find data nodes for cache: " + cacheName); // Find all the nodes owning all the partitions for replicated cache. for (int p = 0, parts = cctx.affinity().partitions(); p < parts; p++) { http://git-wip-us.apache.org/repos/asf/ignite/blob/ca176a7d/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoClassQuerySelfTest.java ---------------------------------------------------------------------- diff --cc modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoClassQuerySelfTest.java index d50cb4c,e0148b3..770770e --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoClassQuerySelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheNoClassQuerySelfTest.java @@@ -24,7 -26,8 +24,7 @@@ import org.apache.ignite.cache.QueryEnt import org.apache.ignite.cache.QueryIndex; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; - import org.apache.ignite.internal.marshaller.optimized.OptimizedMarshaller; -import org.apache.ignite.configuration.NearCacheConfiguration; + import org.apache.ignite.internal.binary.BinaryMarshaller; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
