Merge remote-tracking branch 'remotes/origin/master' into ignite-601
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0b4e230c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0b4e230c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0b4e230c Branch: refs/heads/ignite-601 Commit: 0b4e230c6d2841f56d538cec7ada97955d26907e Parents: 2d482d0 f764226 Author: sboikov <sboi...@apache.org> Authored: Thu Dec 27 19:38:53 2018 +0300 Committer: sboikov <sboi...@apache.org> Committed: Thu Dec 27 19:38:53 2018 +0300 ---------------------------------------------------------------------- assembly/dependencies-apache-ignite.xml | 1 + examples/pom.xml | 25 + ...niteFunctionDistributedInferenceExample.java | 4 +- .../LogRegFromSparkThroughPMMLExample.java | 108 ++ .../ml/inference/ModelStorageExample.java | 2 +- .../TensorFlowDistributedInferenceExample.java | 4 +- .../TensorFlowLocalInferenceExample.java | 4 +- .../TensorFlowThreadedInferenceExample.java | 4 +- .../ml/tutorial/Step_1_Read_and_Learn.java | 10 +- .../ml/xgboost/XGBoostModelParserExample.java | 9 +- .../src/main/resources/models/spark/iris.pmml | 30 + .../IgniteLgplExamplesSelfTestSuite.java | 37 +- .../testsuites/IgniteExamplesMLTestSuite.java | 79 +- .../testsuites/IgniteExamplesSelfTestSuite.java | 92 +- .../IgniteExamplesSparkSelfTestSuite.java | 27 +- modules/aws/pom.xml | 6 + .../tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java | 173 +- .../encrypt/AsymmetricKeyEncryptionService.java | 109 ++ .../s3/encrypt/AwsKmsEncryptionService.java | 154 ++ .../ipfinder/s3/encrypt/EncryptionService.java | 47 + .../encrypt/SymmetricKeyEncryptionService.java | 98 + .../tcp/ipfinder/s3/encrypt/package-info.java | 21 + .../discovery/tcp/ipfinder/s3/package-info.java | 3 +- .../TcpDiscoveryS3IpFinderAbstractSelfTest.java | 26 +- ...yS3IpFinderClientSideEncryptionSelfTest.java | 72 + .../AsymmetricKeyEncryptionServiceTest.java | 100 + .../s3/encrypt/AwsKmsEncryptionServiceTest.java | 76 + .../s3/encrypt/MockEncryptionService.java | 66 + .../s3/encrypt/MockEncryptionServiceTest.java | 52 + .../SymmetricKeyEncryptionServiceTest.java | 57 + .../tcp/ipfinder/s3/encrypt/package-info.java | 21 + .../ignite/testsuites/IgniteS3TestSuite.java | 26 +- .../suite/IgniteJdbcDriverMvccTestSuite.java | 37 +- .../jdbc/suite/IgniteJdbcDriverTestSuite.java | 256 ++- .../apache/ignite/IgniteSystemProperties.java | 13 + .../apache/ignite/internal/GridComponent.java | 5 +- .../ignite/internal/GridKernalContext.java | 4 +- .../ignite/internal/GridKernalContextImpl.java | 12 +- .../org/apache/ignite/internal/GridTopic.java | 5 +- .../apache/ignite/internal/IgniteKernal.java | 23 +- .../ignite/internal/IgniteNodeAttributes.java | 4 + .../communication/GridIoMessageFactory.java | 18 + .../discovery/GridDiscoveryManager.java | 23 + .../pagemem/wal/record/LazyDataEntry.java | 18 +- .../pagemem/wal/record/LazyMvccDataEntry.java | 18 +- .../pagemem/wal/record/MarshalledDataEntry.java | 45 + .../pagemem/wal/record/UnwrapDataEntry.java | 20 +- .../pagemem/wal/record/UnwrapMvccDataEntry.java | 20 +- .../pagemem/wal/record/UnwrappedDataEntry.java | 39 + .../cache/CacheAffinitySharedManager.java | 46 +- .../cache/DynamicCacheChangeBatch.java | 20 + .../GridCachePartitionExchangeManager.java | 2 +- .../processors/cache/GridCacheProcessor.java | 7 +- .../processors/cache/WalStateManager.java | 2 +- .../GridDhtPartitionsExchangeFuture.java | 36 +- .../GridCacheDatabaseSharedManager.java | 2 + .../reader/StandaloneWalRecordsIterator.java | 10 +- .../cluster/ChangeGlobalStateMessage.java | 19 + .../cluster/GridClusterStateProcessor.java | 9 +- .../continuous/GridContinuousProcessor.java | 4 +- .../service/GridServiceAssignments.java | 3 + .../service/GridServiceAssignmentsKey.java | 3 + .../service/GridServiceDeployment.java | 3 + .../GridServiceDeploymentCompoundFuture.java | 15 +- .../service/GridServiceDeploymentFuture.java | 24 +- .../service/GridServiceDeploymentKey.java | 3 + .../service/GridServiceProcessor.java | 187 +- .../processors/service/GridServiceProxy.java | 10 +- .../service/IgniteServiceProcessor.java | 1784 ++++++++++++++++++ .../service/PreparedConfigurations.java | 7 +- .../service/ServiceChangeAbstractRequest.java | 53 + .../service/ServiceChangeBatchRequest.java | 113 ++ .../service/ServiceClusterDeploymentResult.java | 73 + .../ServiceClusterDeploymentResultBatch.java | 125 ++ .../service/ServiceDeploymentActions.java | 115 ++ .../service/ServiceDeploymentManager.java | 562 ++++++ .../service/ServiceDeploymentProcessId.java | 172 ++ .../service/ServiceDeploymentRequest.java | 56 + .../service/ServiceDeploymentTask.java | 859 +++++++++ .../service/ServiceDescriptorImpl.java | 4 + .../processors/service/ServiceInfo.java | 170 ++ .../service/ServiceProcessorAdapter.java | 162 ++ .../ServiceProcessorCommonDiscoveryData.java | 55 + .../ServiceProcessorJoinNodeDiscoveryData.java | 53 + .../ServiceSingleNodeDeploymentResult.java | 162 ++ .../ServiceSingleNodeDeploymentResultBatch.java | 155 ++ .../service/ServiceUndeploymentRequest.java | 42 + .../ignite/internal/util/IgniteUtils.java | 239 +-- .../apache/ignite/internal/util/TimeBag.java | 4 +- .../ignite/services/ServiceConfiguration.java | 2 + .../ignite/spi/discovery/tcp/ServerImpl.java | 44 + .../ignite/ssl/DelegatingSSLContextSpi.java | 4 +- .../ignite/ssl/SSLSocketFactoryWrapper.java | 64 +- .../ignite/internal/GridDeploymentSelfTest.java | 2 +- .../IgniteClientReconnectServicesTest.java | 49 + .../GridDiscoveryManagerAttributesSelfTest.java | 12 + .../IgniteMvccTxMultiThreadedAbstractTest.java | 11 +- ...rtitionsExchangeCoordinatorFailoverTest.java | 176 +- .../distributed/CacheExchangeMergeTest.java | 8 +- .../IgniteCacheConnectionRecoveryTest.java | 20 +- ...dCachePartitionedTopologyChangeSelfTest.java | 4 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 4 +- .../CheckpointReadLockFailureTest.java | 27 +- ...teRebalanceScheduleResendPartitionsTest.java | 2 +- ...itePdsCacheWalDisabledOnRebalancingTest.java | 195 +- .../db/wal/reader/IgniteWalReaderTest.java | 24 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 9 +- .../cache/transactions/TxRollbackAsyncTest.java | 33 +- .../GridServiceContinuousQueryRedeployTest.java | 6 +- ...ServiceDeploymentCompoundFutureSelfTest.java | 7 +- ...rviceDeploymentExceptionPropagationTest.java | 43 +- .../GridServiceProcessorAbstractSelfTest.java | 54 +- ...GridServiceProcessorBatchDeploySelfTest.java | 54 +- ...ServiceProcessorMultiNodeConfigSelfTest.java | 40 +- .../GridServiceProcessorMultiNodeSelfTest.java | 25 +- .../GridServiceProcessorProxySelfTest.java | 5 +- .../GridServiceProcessorSingleNodeSelfTest.java | 20 +- .../GridServiceProcessorStopSelfTest.java | 2 +- .../GridServiceReassignmentSelfTest.java | 18 +- .../GridServiceSerializationSelfTest.java | 2 +- ...gniteServiceConfigVariationsFullApiTest.java | 80 +- .../IgniteServiceDynamicCachesSelfTest.java | 26 +- .../service/IgniteServiceReassignmentTest.java | 50 +- ...tDiscoveryListenerNotificationOrderTest.java | 115 ++ ...tNonSerializableStaticConfigurationTest.java | 119 ++ .../ServiceDeploymentOnActivationTest.java | 110 +- ...ServiceDeploymentOnClientDisconnectTest.java | 228 +++ .../ServiceDeploymentOutsideBaselineTest.java | 12 +- .../ServiceDeploymentProcessAbstractTest.java | 127 ++ .../ServiceDeploymentProcessIdSelfTest.java | 105 ++ ...ploymentProcessingOnCoordinatorFailTest.java | 34 + ...ploymentProcessingOnCoordinatorLeftTest.java | 125 ++ ...viceDeploymentProcessingOnNodesFailTest.java | 34 + ...viceDeploymentProcessingOnNodesLeftTest.java | 117 ++ .../processors/service/ServiceInfoSelfTest.java | 137 ++ .../ServicePredicateAccessCacheTest.java | 52 +- .../ServiceReassignmentFunctionSelfTest.java | 220 +++ .../inner/LongInitializedTestService.java | 52 + .../discovery/tcp/IgniteClientConnectTest.java | 6 +- .../ConfigVariationsTestSuiteBuilder.java | 2 - .../junits/common/GridCommonAbstractTest.java | 33 + ...rySimpleNameMapperCacheFullApiTestSuite.java | 19 +- ...eCacheDataStructuresBinarySelfTestSuite.java | 33 +- .../IgniteCacheDataStructuresSelfTestSuite.java | 204 +- .../IgniteCacheFailoverTestSuite2.java | 55 +- .../IgniteCacheFailoverTestSuite3.java | 23 +- ...IgniteCacheFullApiMultiJvmSelfTestSuite.java | 74 +- .../IgniteCacheFullApiSelfTestSuite.java | 178 +- .../IgniteCacheLoadConsistencyTestSuite.java | 23 +- .../testsuites/IgniteCacheMvccTestSuite.java | 66 +- .../testsuites/IgniteCacheRestartTestSuite.java | 31 +- .../IgniteCacheRestartTestSuite2.java | 35 +- .../IgniteCacheTxRecoverySelfTestSuite.java | 43 +- .../testsuites/IgniteClientNodesTestSuite.java | 29 +- .../IgniteClientReconnectTestSuite.java | 51 +- .../testsuites/IgniteKernalSelfTestSuite.java | 25 +- ...ServiceConfigVariationsFullApiTestSuite.java | 9 - modules/flink/pom.xml | 21 +- .../ignite/source/flink/IgniteSource.java | 223 +++ .../ignite/source/flink/TaskRemoteFilter.java | 60 + .../ignite/source/flink/package-info.java | 21 + .../source/flink/FlinkIgniteSourceSelfTest.java | 157 ++ .../flink/FlinkIgniteSourceSelfTestSuite.java | 42 + .../query/h2/opt/GridH2SpatialIndex.java | 5 +- ...ileSystemShmemExternalDualAsyncSelfTest.java | 9 +- .../HadoopExternalTaskExecutionSelfTest.java | 4 +- .../HadoopExternalCommunicationSelfTest.java | 6 +- .../IgniteBinaryHibernateTestSuite.java | 22 +- .../testsuites/IgniteHibernateTestSuite.java | 40 +- .../IgniteBinaryHibernate5TestSuite.java | 22 +- .../testsuites/IgniteHibernate5TestSuite.java | 40 +- .../IgniteBinaryHibernate53TestSuite.java | 24 +- .../testsuites/IgniteHibernate53TestSuite.java | 43 +- .../internal/processors/query/h2/H2Utils.java | 62 + .../processors/query/h2/IgniteH2Indexing.java | 4 +- .../query/h2/database/H2PkHashIndex.java | 2 +- .../query/h2/database/H2TreeClientIndex.java | 2 +- .../query/h2/database/H2TreeIndex.java | 23 +- .../query/h2/opt/DistributedJoinMode.java | 51 - .../query/h2/opt/GridH2CollocationModel.java | 838 -------- .../query/h2/opt/GridH2IndexBase.java | 1085 +---------- .../query/h2/opt/GridH2QueryContext.java | 163 +- .../query/h2/opt/QueryContextKey.java | 127 ++ .../query/h2/opt/join/BroadcastCursor.java | 155 ++ .../query/h2/opt/join/CollocationModel.java | 841 +++++++++ .../h2/opt/join/CursorIteratorWrapper.java | 68 + .../query/h2/opt/join/DistributedJoinMode.java | 51 + .../h2/opt/join/DistributedLookupBatch.java | 430 +++++ .../query/h2/opt/join/RangeSource.java | 137 ++ .../query/h2/opt/join/RangeStream.java | 296 +++ .../query/h2/opt/join/SegmentKey.java | 81 + .../processors/query/h2/opt/join/SourceKey.java | 66 + .../query/h2/opt/join/UnicastCursor.java | 64 + .../query/h2/sql/GridSqlQuerySplitter.java | 2 +- .../query/h2/twostep/GridMapQueryExecutor.java | 6 +- .../h2/twostep/GridReduceQueryExecutor.java | 2 +- .../mvcc/CacheMvccBasicContinuousQueryTest.java | 9 +- .../h2/twostep/RetryCauseMessageSelfTest.java | 4 +- .../IgniteCacheAffinityRunTestSuite.java | 29 +- .../testsuites/IgniteCacheMvccSqlTestSuite.java | 168 +- .../IgniteCacheQuerySelfTestSuite3.java | 83 +- .../IgniteCacheQuerySelfTestSuite4.java | 41 +- .../IgniteCacheQuerySelfTestSuite5.java | 54 +- .../IgniteCacheQuerySelfTestSuite6.java | 54 +- ...acheWithIndexingAndPersistenceTestSuite.java | 21 +- .../IgniteCacheWithIndexingTestSuite.java | 67 +- ...IgniteDbMemoryLeakWithIndexingTestSuite.java | 21 +- .../IgnitePdsWithIndexingCoreTestSuite.java | 73 +- .../IgnitePdsWithIndexingTestSuite.java | 37 +- .../ignite/testsuites/IgniteJclTestSuite.java | 19 +- .../ignite/testsuites/IgniteJtaTestSuite.java | 44 +- .../kafka/IgniteKafkaStreamerSelfTestSuite.java | 29 +- .../testsuites/IgniteLog4j2TestSuite.java | 25 +- .../org/apache/ignite/IgniteMesosTestSuite.java | 19 +- .../main/java/org/apache/ignite/ml/Model.java | 8 +- .../apache/ignite/ml/inference/InfModel.java | 8 +- .../ignite/ml/inference/ModelDescriptor.java | 6 +- .../inference/builder/AsyncInfModelBuilder.java | 2 +- .../IgniteDistributedInfModelBuilder.java | 20 +- .../builder/SingleInfModelBuilder.java | 4 +- .../inference/builder/SyncInfModelBuilder.java | 4 +- .../builder/ThreadedInfModelBuilder.java | 6 +- .../parser/IgniteFunctionInfModelParser.java | 4 +- .../ml/inference/parser/InfModelParser.java | 4 +- .../parser/TensorFlowBaseInfModelParser.java | 4 +- .../minmaxscaling/MinMaxScalerPreprocessor.java | 12 +- .../scoring/cursor/LocalLabelPairCursor.java | 9 +- .../BinaryClassificationEvaluator.java | 279 ++- .../metric/BinaryClassificationMetrics.java | 9 +- .../ignite/ml/trainers/DatasetTrainer.java | 2 +- .../org/apache/ignite/ml/tree/DecisionTree.java | 3 +- .../ml/tree/DecisionTreeConditionalNode.java | 43 +- .../ml/util/generators/DataStreamGenerator.java | 134 ++ .../util/generators/DatasetBuilderAdapter.java | 69 + .../ignite/ml/util/generators/package-info.java | 25 + .../generators/primitives/package-info.java | 22 + .../scalar/DiscreteRandomProducer.java | 204 ++ .../primitives/scalar/GaussRandomProducer.java | 77 + .../primitives/scalar/RandomProducer.java | 78 + .../scalar/RandomProducerWithGenerator.java | 51 + .../scalar/UniformRandomProducer.java | 66 + .../primitives/scalar/package-info.java | 22 + .../vector/ParametricVectorGenerator.java | 62 + .../primitives/vector/VectorGenerator.java | 224 +++ .../vector/VectorGeneratorPrimitives.java | 154 ++ .../vector/VectorGeneratorsFamily.java | 189 ++ .../primitives/vector/package-info.java | 22 + .../standard/GaussianMixtureDataStream.java | 99 + .../standard/RegressionDataStream.java | 119 ++ .../generators/standard/RingsDataStream.java | 91 + .../standard/TwoSeparableClassesDataStream.java | 95 + .../util/generators/standard/package-info.java | 22 + .../org/apache/ignite/ml/IgniteMLTestSuite.java | 56 +- .../ignite/ml/dataset/DatasetTestSuite.java | 37 +- .../ignite/ml/inference/InferenceTestSuite.java | 25 +- .../builder/InfModelBuilderTestUtil.java | 4 +- .../builder/SingleInfModelBuilderTest.java | 2 +- .../builder/ThreadedInfModelBuilderTest.java | 2 +- .../ignite/ml/knn/KNNClassificationTest.java | 6 +- .../org/apache/ignite/ml/nn/MLPTestSuite.java | 23 +- .../MinMaxScalerPreprocessorTest.java | 17 + .../ignite/ml/selection/SelectionTestSuite.java | 43 +- .../BinaryClassificationEvaluatorTest.java | 96 + .../scoring/evaluator/EvaluatorTest.java | 6 +- .../metric/BinaryClassificationMetricsTest.java | 159 ++ .../BinaryClassificationMetricsValuesTest.java | 48 + .../ignite/ml/tree/DecisionTreeTestSuite.java | 37 +- .../RandomForestClassifierTrainerTest.java | 8 +- .../generators/DataStreamGeneratorTest.java | 210 +++ .../scalar/DiscreteRandomProducerTest.java | 102 + .../scalar/GaussRandomProducerTest.java | 66 + .../primitives/scalar/RandomProducerTest.java | 79 + .../scalar/UniformRandomProducerTest.java | 68 + .../vector/ParametricVectorGeneratorTest.java | 50 + .../vector/VectorGeneratorPrimitivesTest.java | 110 ++ .../primitives/vector/VectorGeneratorTest.java | 194 ++ .../vector/VectorGeneratorsFamilyTest.java | 118 ++ .../ignite/ml/xgboost/MapBasedXGObject.java | 61 - .../apache/ignite/ml/xgboost/XGLeafNode.java | 38 - .../org/apache/ignite/ml/xgboost/XGModel.java | 53 - .../ignite/ml/xgboost/XGModelComposition.java | 108 ++ .../org/apache/ignite/ml/xgboost/XGNode.java | 29 - .../org/apache/ignite/ml/xgboost/XGObject.java | 33 - .../apache/ignite/ml/xgboost/XGSplitNode.java | 74 - .../ignite/ml/xgboost/parser/XGModelParser.java | 9 +- .../xgboost/parser/visitor/XGModelVisitor.java | 50 +- .../parser/visitor/XGTreeDictionaryVisitor.java | 40 + .../xgboost/parser/visitor/XGTreeVisitor.java | 37 +- .../xgboost/parser/XGBoostModelParserTest.java | 11 +- .../Services/ServicesTest.cs | 16 +- .../protocols/http/jetty/GridRestSuite.java | 19 +- .../rocketmq/RocketMQStreamerTestSuite.java | 19 +- .../testsuites/IgniteSchedulerTestSuite.java | 19 +- .../ignite/testsuites/IgniteSlf4jTestSuite.java | 19 +- .../ignite/testsuites/IgniteRDDTestSuite.java | 21 +- .../repository/query/IgniteQueryGenerator.java | 14 +- .../repository/query/IgniteRepositoryQuery.java | 17 +- .../support/IgniteRepositoryFactory.java | 16 +- .../IgniteSpringDataCrudSelfTest.java | 124 +- .../springdata/misc/PersonRepository.java | 28 + .../testsuites/IgniteSpringData2TestSuite.java | 21 +- .../testsuites/IgniteSpringDataTestSuite.java | 21 +- .../storm/IgniteStormStreamerSelfTestSuite.java | 19 +- .../twitter/IgniteTwitterStreamerTestSuite.java | 19 +- .../testsuites/IgniteToolsSelfTestSuite.java | 19 +- .../IgniteUriDeploymentTestSuite.java | 52 +- modules/web-console/assembly/README.txt | 46 +- .../web-console/backend/app/browsersHandler.js | 34 +- modules/web-console/backend/app/settings.js | 66 +- .../backend/config/settings.json.sample | 51 +- modules/web-console/backend/launch-tools.js | 6 +- modules/web-console/backend/package.json | 2 +- modules/web-console/frontend/app/app.js | 3 - .../connected-clusters-badge/controller.js | 11 +- .../app/modules/agent/AgentManager.service.js | 12 +- .../frontend/app/modules/demo/Demo.module.js | 24 +- .../frontend/app/utils/SimpleWorkerPool.js | 2 +- modules/web-console/frontend/app/vendor.js | 1 - modules/web-console/frontend/package.json | 5 +- .../web-console/frontend/webpack/webpack.dev.js | 25 +- modules/web-console/web-agent/pom.xml | 18 +- .../console/agent/AgentConfiguration.java | 330 +++- .../ignite/console/agent/AgentLauncher.java | 89 +- .../apache/ignite/console/agent/AgentUtils.java | 140 +- .../agent/handlers/AbstractListener.java | 9 +- .../console/agent/handlers/ClusterListener.java | 77 +- .../console/agent/handlers/RestListener.java | 6 +- .../ignite/console/agent/rest/RestExecutor.java | 84 +- .../agent/rest/RestExecutorSelfTest.java | 329 ++++ .../testsuites/IgniteWebAgentTestSuite.java | 33 + .../web-agent/src/test/resources/ca.jks | Bin 0 -> 1394 bytes .../web-agent/src/test/resources/client.jks | Bin 0 -> 2030 bytes .../web-agent/src/test/resources/generate.bat | 122 ++ .../web-agent/src/test/resources/generate.sh | 111 ++ .../src/test/resources/jetty-with-ciphers-0.xml | 94 + .../src/test/resources/jetty-with-ciphers-1.xml | 94 + .../src/test/resources/jetty-with-ciphers-2.xml | 94 + .../src/test/resources/jetty-with-ssl.xml | 89 + .../web-agent/src/test/resources/server.jks | Bin 0 -> 1419 bytes modules/yardstick/pom.xml | 7 + .../org/apache/ignite/IgniteYarnTestSuite.java | 19 +- .../zeromq/IgniteZeroMqStreamerTestSuite.java | 19 +- ...CacheEntryListenerWithZkDiscoAtomicTest.java | 4 +- .../ZookeeperDiscoverySpiAbstractTestSuite.java | 3 +- .../zk/ZookeeperDiscoverySpiTestSuite2.java | 35 +- .../zk/ZookeeperDiscoverySpiTestSuite3.java | 41 +- .../zk/ZookeeperDiscoverySpiTestSuite4.java | 37 +- .../zk/internal/ZookeeperDiscoverySpiTest.java | 10 +- parent/pom.xml | 7 +- 349 files changed, 18813 insertions(+), 5413 deletions(-) ----------------------------------------------------------------------
