Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/eea7a3b9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/eea7a3b9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/eea7a3b9 Branch: refs/heads/master Commit: eea7a3b914f59df1bb4e2b2d27ca36af2acdde2f Parents: b887587 cbf0b2a Author: Denis Magda <dma...@gridgain.com> Authored: Tue May 23 13:52:56 2017 -0700 Committer: Denis Magda <dma...@gridgain.com> Committed: Tue May 23 13:52:56 2017 -0700 ---------------------------------------------------------------------- examples/config/filesystem/example-igfs.xml | 4 + .../store/cassandra/CassandraCacheStore.java | 15 +- .../ignite/tests/IgnitePersistentStoreTest.java | 62 +- .../persistence/loadall_blob/ignite-config.xml | 90 ++ .../loadall_blob/persistence-settings.xml | 29 + 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 | 7 +- .../ignite/binary/BinaryBasicNameMapper.java | 2 +- .../rendezvous/RendezvousAffinityFunction.java | 20 +- .../ignite/cache/query/FieldsQueryCursor.java | 39 + .../store/jdbc/CacheAbstractJdbcStore.java | 6 +- .../configuration/AtomicConfiguration.java | 25 + .../configuration/MemoryConfiguration.java | 3 +- .../MemoryPolicyConfiguration.java | 4 +- .../ignite/configuration/TopologyValidator.java | 10 +- .../internal/ComputeTaskInternalFuture.java | 3 - .../ignite/internal/GridKernalContext.java | 8 +- .../ignite/internal/GridKernalContextImpl.java | 12 +- .../apache/ignite/internal/IgniteKernal.java | 6 +- .../internal/IgniteNeedReconnectException.java | 2 +- .../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 | 366 ++++- .../communication/GridIoMessageFactory.java | 2 + .../communication/IgniteIoTestMessage.java | 362 ++++- .../discovery/GridDiscoveryManager.java | 19 +- .../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 +- .../affinity/AffinityTopologyVersion.java | 9 + .../affinity/GridAffinityAssignmentCache.java | 3 - .../cache/CacheAffinitySharedManager.java | 286 ++-- .../CacheClientReconnectDiscoveryData.java | 133 ++ .../internal/processors/cache/CacheData.java | 157 ++ .../cache/CacheJoinNodeDiscoveryData.java | 147 ++ .../cache/CacheNodeCommonDiscoveryData.java | 82 + .../cache/CacheStoreBalancingWrapper.java | 3 - .../processors/cache/ClusterCachesInfo.java | 913 +++++++++++ .../cache/DynamicCacheChangeBatch.java | 92 +- .../cache/DynamicCacheChangeRequest.java | 102 +- .../cache/DynamicCacheDescriptor.java | 171 +-- .../processors/cache/ExchangeActions.java | 338 +++++ .../processors/cache/GridCacheAdapter.java | 12 +- .../cache/GridCacheAffinityManager.java | 2 +- .../processors/cache/GridCacheContext.java | 48 +- .../cache/GridCacheDeploymentManager.java | 2 +- .../cache/GridCacheFutureAdapter.java | 1 + .../processors/cache/GridCacheLogger.java | 2 +- .../cache/GridCacheMultiTxFuture.java | 3 - .../processors/cache/GridCacheMvccManager.java | 3 - .../GridCachePartitionExchangeManager.java | 57 +- .../processors/cache/GridCacheProcessor.java | 1413 +++++------------- .../cache/GridCacheSharedContext.java | 17 +- .../processors/cache/GridCacheUtils.java | 146 +- .../processors/cache/IgniteCacheProxy.java | 11 +- .../processors/cache/QueryCursorImpl.java | 19 +- .../IgniteCacheDatabaseSharedManager.java | 51 +- .../dht/GridClientPartitionTopology.java | 2 +- .../dht/GridDhtAffinityAssignmentRequest.java | 36 +- .../dht/GridDhtAffinityAssignmentResponse.java | 36 +- .../dht/GridDhtAssignmentFetchFuture.java | 63 +- .../distributed/dht/GridDhtCacheAdapter.java | 3 - .../distributed/dht/GridDhtEmbeddedFuture.java | 3 - .../distributed/dht/GridDhtGetSingleFuture.java | 3 - .../dht/GridDhtPartitionTopologyImpl.java | 12 +- .../distributed/dht/GridDhtTxFinishFuture.java | 3 - .../GridDhtAtomicAbstractUpdateRequest.java | 2 + .../dht/preloader/GridDhtForceKeysFuture.java | 7 +- .../dht/preloader/GridDhtPartitionDemander.java | 13 +- .../GridDhtPartitionsExchangeFuture.java | 166 +- .../dht/preloader/GridDhtPreloader.java | 4 +- .../distributed/near/GridNearGetFuture.java | 3 - .../distributed/near/GridNearLockFuture.java | 3 - .../processors/cache/local/GridLocalCache.java | 31 +- .../cache/local/GridLocalLockFuture.java | 41 +- .../cache/query/GridCacheQueryManager.java | 53 +- .../continuous/CacheContinuousQueryHandler.java | 42 +- .../continuous/CacheContinuousQueryManager.java | 11 +- .../store/GridCacheStoreManagerAdapter.java | 4 +- .../cluster/GridClusterStateProcessor.java | 26 +- .../continuous/GridContinuousProcessor.java | 3 - .../datastreamer/DataStreamerFuture.java | 3 - .../GridAtomicCacheQueueImpl.java | 7 +- .../processors/igfs/IgfsDataManager.java | 3 - .../marshaller/MarshallerMappingTransport.java | 3 - .../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 ------- .../platform/cache/PlatformCache.java | 28 +- .../processors/query/GridQueryIndexing.java | 90 +- .../processors/query/GridQueryProcessor.java | 289 ++-- .../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 +- .../service/GridServiceDeploymentFuture.java | 3 - .../ignite/internal/util/IgniteUtils.java | 17 + .../util/future/GridEmbeddedFuture.java | 3 - .../util/nio/GridNioEmbeddedFuture.java | 3 - .../internal/util/nio/GridNioFutureImpl.java | 3 - .../ignite/internal/util/nio/GridNioServer.java | 3 - .../internal/util/worker/GridWorkerFuture.java | 3 - .../node/VisorAffinityTopologyVersion.java | 87 ++ .../visor/node/VisorNodeDataCollectorJob.java | 6 + .../node/VisorNodeDataCollectorJobResult.java | 38 + .../visor/node/VisorNodeDataCollectorTask.java | 4 + .../node/VisorNodeDataCollectorTaskResult.java | 28 +- .../apache/ignite/marshaller/Marshaller.java | 3 - .../ignite/marshaller/jdk/JdkMarshaller.java | 5 +- .../org/apache/ignite/spi/IgniteSpiAdapter.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 3 - .../ignite/spi/discovery/DiscoveryDataBag.java | 18 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 4 +- .../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 +- .../core/src/test/config/examples.properties | 1 + .../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 +- ...ityFunctionBackupFilterAbstractSelfTest.java | 13 +- ...dbcPojoStoreOptimizedMarshallerSelfTest.java | 31 - ...ptimizedMarshallerWithSqlEscapeSelfTest.java | 28 - .../apache/ignite/igfs/IgfsPathSelfTest.java | 7 +- .../internal/GridLifecycleAwareSelfTest.java | 3 +- .../internal/GridNodeMetricsLogSelfTest.java | 13 +- .../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 +++ .../processors/cache/CacheGetFromJobTest.java | 5 + .../CacheStartupInDeploymentModesTest.java | 37 - .../GridCacheAbstractLocalStoreSelfTest.java | 41 +- .../cache/GridCacheEntryMemorySizeSelfTest.java | 2 +- .../cache/GridCacheP2PUndeploySelfTest.java | 12 - ...ridCacheStoreManagerDeserializationTest.java | 4 +- .../cache/GridCacheVersionSelfTest.java | 7 +- .../cache/IgniteCacheContainsKeyAtomicTest.java | 103 ++ ...gniteCacheP2pUnmarshallingNearErrorTest.java | 6 +- .../processors/cache/IgniteCacheStartTest.java | 191 +++ .../cache/IgniteDynamicCacheStartSelfTest.java | 2 +- ...niteTopologyValidatorGridSplitCacheTest.java | 8 +- .../IgniteTxExceptionAbstractSelfTest.java | 6 +- .../distributed/CacheAffinityEarlyTest.java | 7 +- .../CacheDiscoveryDataConcurrentJoinTest.java | 198 +++ .../CacheGetFutureHangsSelfTest.java | 6 +- .../CacheLateAffinityAssignmentTest.java | 4 +- .../cache/distributed/CacheStartOnJoinTest.java | 10 + .../IgniteCacheCreatePutMultiNodeSelfTest.java | 7 +- .../distributed/IgniteCacheCreatePutTest.java | 7 +- .../IgniteCachePartitionLossPolicySelfTest.java | 1 + .../IgniteCrossCacheTxStoreSelfTest.java | 12 +- ...ePartitionedBasicStoreMultiNodeSelfTest.java | 22 +- .../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 +- .../loadtests/hashmap/GridCacheTestContext.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 - .../testsuites/IgniteCacheTestSuite3.java | 2 +- .../testsuites/IgniteCacheTestSuite4.java | 7 + ...teBasicConfigVariationsFullApiTestSuite.java | 2 +- .../ignite/testsuites/IgniteIgfsTestSuite.java | 3 - .../testsuites/IgniteKernalSelfTestSuite.java | 4 - .../IgniteMarshallerSelfTestSuite.java | 8 +- ...essagingConfigVariationFullApiTestSuite.java | 2 +- ...ServiceConfigVariationsFullApiTestSuite.java | 2 +- .../IgniteTopologyValidatorTestSuit.java | 44 - .../IgniteTopologyValidatorTestSuite.java | 50 + .../webapp/META-INF/ignite-webapp-config.xml | 15 +- .../hadoop/impl/igfs/HadoopIgfsFuture.java | 3 - .../external/HadoopExternalTaskExecutor.java | 3 - .../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 +- .../cache/query/GridCacheTwoStepQuery.java | 84 +- .../processors/cache/query/QueryTable.java | 164 ++ .../query/h2/DmlStatementsProcessor.java | 53 +- .../processors/query/h2/IgniteH2Indexing.java | 368 ++--- .../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 | 14 +- .../processors/query/h2/opt/GridH2Table.java | 177 ++- .../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 | 21 +- .../query/h2/twostep/GridMapQueryExecutor.java | 21 +- .../h2/twostep/GridReduceQueryExecutor.java | 263 ++-- .../h2/twostep/msg/GridH2QueryRequest.java | 13 +- .../twostep/msg/GridH2ValueMessageFactory.java | 4 + .../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 | 136 +- .../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 - .../ignite/ml/math/d3-matrix-template.html | 17 +- .../ignite/ml/math/d3-vector-template.html | 15 +- .../core/include/ignite/cache/query/query_sql.h | 2 + .../ignite/cache/query/query_sql_fields.h | 3 + .../cpp/odbc/include/ignite/odbc/message.h | 10 + .../Apache.Ignite.Core.Tests.csproj | 1 + .../Binary/BinaryDateTimeTest.cs | 204 +++ .../Binary/BinarySelfTest.cs | 2 +- .../Cache/Query/CacheLinqTest.cs | 38 +- .../Cache/Query/CacheQueriesTest.cs | 60 +- .../Apache.Ignite.Core.Tests/MarshallerTest.cs | 2 +- .../Apache.Ignite.Core.csproj | 1 + .../Binary/BinaryReflectiveSerializer.cs | 44 +- .../Binary/TimestampAttribute.cs | 40 + .../Cache/Query/SqlFieldsQuery.cs | 29 +- .../Apache.Ignite.Core/Cache/Query/SqlQuery.cs | 31 + .../Impl/Binary/BinaryReflectiveActions.cs | 89 +- .../BinaryReflectiveSerializerInternal.cs | 10 +- .../Impl/Binary/BinaryUtils.cs | 4 +- .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 3 + .../Apache.Ignite.Linq/CacheExtensions.cs | 10 + .../Impl/CacheFieldsQueryExecutor.cs | 42 +- .../Apache.Ignite.Linq/Impl/CacheQueryable.cs | 3 +- .../dotnet/Apache.Ignite.Linq/QueryOptions.cs | 23 + .../processors/schedule/ScheduleFutureImpl.java | 2 +- modules/spark/pom.xml | 6 - .../spring/SpringTransactionManager.java | 13 + .../jdbc/CacheJdbcPojoStoreFactorySelfTest.java | 2 +- .../GridSpringBeanSerializationSelfTest.java | 15 +- .../GridSpringTransactionManagerSelfTest.java | 45 + modules/web-console/frontend/app/app.js | 4 +- .../activities-user-dialog.tpl.pug | 1 + .../app/components/ignite-icon/directive.js | 67 + .../app/components/ignite-icon/index.js | 25 + .../app/components/ignite-icon/style.scss | 21 + .../list-of-registered-users.tpl.pug | 6 +- .../components/web-console-header/component.js | 19 +- .../components/web-console-header/style.scss | 39 +- .../components/web-console-header/template.pug | 17 +- .../frontend/app/helpers/jade/mixins.pug | 10 +- .../states/configuration/igfs/secondary.pug | 2 +- .../frontend/app/primitives/btn/index.scss | 58 +- .../app/primitives/datepicker/index.pug | 2 +- .../frontend/app/primitives/dropdown/index.pug | 7 +- .../frontend/app/primitives/dropdown/index.scss | 88 +- .../frontend/app/primitives/modal/index.scss | 18 +- .../app/primitives/ui-grid-settings/index.scss | 30 +- .../frontend/app/primitives/ui-grid/index.scss | 6 +- .../frontend/gulpfile.babel.js/paths.js | 1 + .../gulpfile.babel.js/webpack/common.js | 10 +- modules/web-console/frontend/package.json | 1 + .../frontend/public/images/icons/clock.svg | 1 + .../frontend/public/images/icons/cross.svg | 2 +- .../frontend/public/images/icons/csv.svg | 1 + .../frontend/public/images/icons/download.svg | 2 + .../frontend/public/images/icons/export.svg | 1 - .../frontend/public/images/icons/gear.svg | 2 +- .../frontend/public/images/icons/index.js | 23 + .../frontend/public/images/icons/manual.svg | 1 + .../frontend/public/stylesheets/style.scss | 10 +- .../frontend/public/stylesheets/variables.scss | 1 + modules/web-console/frontend/views/index.pug | 1 + .../webapp2/META-INF/ignite-webapp-config.xml | 15 +- .../ignite-int-max-values-onheap-config.xml | 4 +- modules/yardstick/config/ignite-jdbc-config.xml | 4 +- parent/pom.xml | 2 +- 353 files changed, 10554 insertions(+), 5707 deletions(-) ----------------------------------------------------------------------