Merge remote-tracking branch 'remotes/origin/master' into ignite-zk-ce
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2b74163c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2b74163c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2b74163c Branch: refs/heads/ignite-zk-ce Commit: 2b74163c0a06767683a8d7c784ca94fc469c6b72 Parents: cbe9980 061ec6a Author: sboikov <[email protected]> Authored: Fri Dec 15 11:03:47 2017 +0300 Committer: sboikov <[email protected]> Committed: Fri Dec 15 11:03:47 2017 +0300 ---------------------------------------------------------------------- bin/control.bat | 1 + bin/control.sh | 1 + .../ml/clustering/FuzzyCMeansExample.java | 4 +- .../KMeansDistributedClustererExample.java | 2 +- .../clustering/KMeansLocalClustererExample.java | 4 +- .../KNNClassificationExample.java | 151 +++++ .../ml/knn/classification/package-info.java | 22 + .../ignite/examples/ml/knn/package-info.java | 22 + .../ml/knn/regression/KNNRegressionExample.java | 152 +++++ .../ml/knn/regression/package-info.java | 22 + .../src/main/resources/datasets/knn/README.md | 2 + .../resources/datasets/knn/cleared_machines.txt | 209 ++++++ .../src/main/resources/datasets/knn/iris.txt | 150 +++++ .../spi/checkpoint/s3/S3CheckpointSpi.java | 46 +- .../spi/checkpoint/s3/S3CheckpointSpiMBean.java | 6 + .../tcp/ipfinder/s3/TcpDiscoveryS3IpFinder.java | 39 +- ...ckpointSpiStartStopSSEAlgorithmSelfTest.java | 49 ++ .../TcpDiscoveryS3IpFinderAbstractSelfTest.java | 22 +- ...scoveryS3IpFinderBucketEndpointSelfTest.java | 16 +- ...DiscoveryS3IpFinderSSEAlgorithmSelfTest.java | 48 ++ .../ignite/testsuites/IgniteS3TestSuite.java | 4 + .../configuration/MemoryConfiguration.java | 2 +- .../ignite/internal/ClusterMetricsSnapshot.java | 4 +- .../apache/ignite/internal/IgniteKernal.java | 2 +- .../internal/commandline/CommandHandler.java | 2 +- .../pagemem/impl/PageMemoryNoStoreImpl.java | 2 +- .../internal/pagemem/store/PageStore.java | 5 +- .../processors/affinity/AffinityAssignment.java | 5 + .../affinity/GridAffinityAssignment.java | 45 +- .../affinity/HistoryAffinityAssignment.java | 15 + .../cache/CacheAffinitySharedManager.java | 31 +- .../processors/cache/GridCacheTtlManager.java | 3 +- .../processors/cache/GridCacheUtils.java | 6 +- .../cache/IgniteCacheOffheapManagerImpl.java | 41 +- .../dht/GridDhtPartitionTopologyImpl.java | 475 +++++++------- .../distributed/dht/GridDhtTxPrepareFuture.java | 5 + .../dht/GridPartitionedGetFuture.java | 2 +- .../dht/GridPartitionedSingleGetFuture.java | 3 +- .../GridDhtPartitionsExchangeFuture.java | 14 +- .../distributed/near/GridNearGetFuture.java | 2 +- .../local/atomic/GridLocalAtomicCache.java | 171 ++--- .../GridCacheDatabaseSharedManager.java | 9 +- .../persistence/GridCacheOffheapManager.java | 4 + .../processors/cache/persistence/RowStore.java | 2 + .../cache/persistence/file/FilePageStore.java | 32 +- .../persistence/file/FilePageStoreManager.java | 7 +- .../persistence/pagemem/PageMemoryImpl.java | 58 +- .../persistence/pagemem/PagesWriteThrottle.java | 3 +- .../cache/persistence/tree/BPlusTree.java | 10 +- .../processors/cache/tree/CacheDataTree.java | 2 + .../cache/tree/PendingEntriesTree.java | 2 + .../schema/SchemaIndexCacheVisitorImpl.java | 2 +- .../internal/util/OffheapReadWriteLock.java | 8 +- .../internal/util/lang/GridTreePrinter.java | 19 +- .../cache/VisorCacheEvictionConfiguration.java | 4 +- .../cache/VisorCacheNearConfiguration.java | 8 +- .../internal/visor/util/VisorTaskUtils.java | 14 +- .../pagemem/impl/PageMemoryNoLoadSelfTest.java | 10 +- .../cache/persistence/DummyPageIO.java | 41 ++ .../IgnitePdsContinuousRestartTest.java | 5 - ...gnitePdsRecoveryAfterFileCorruptionTest.java | 83 ++- ...ckpointSimulationWithRealCpDisabledTest.java | 53 +- .../db/file/IgnitePdsEvictionTest.java | 30 + .../query/h2/DmlStatementsProcessor.java | 637 ++---------------- .../processors/query/h2/IgniteH2Indexing.java | 69 +- .../processors/query/h2/UpdateResult.java | 4 +- .../processors/query/h2/database/H2Tree.java | 6 +- .../query/h2/database/H2TreeIndex.java | 220 ++++--- .../processors/query/h2/dml/DmlAstUtils.java | 609 ++++++++++++++++++ .../processors/query/h2/dml/DmlBatchSender.java | 232 +++++++ .../query/h2/dml/DmlDistributedPlanInfo.java | 56 ++ .../h2/dml/DmlPageProcessingErrorResult.java | 76 +++ .../query/h2/dml/DmlPageProcessingResult.java | 68 ++ .../processors/query/h2/dml/DmlUtils.java | 118 ++++ .../processors/query/h2/dml/FastUpdate.java | 175 +++++ .../query/h2/dml/FastUpdateArguments.java | 53 -- .../processors/query/h2/dml/UpdatePlan.java | 389 ++++++++--- .../query/h2/dml/UpdatePlanBuilder.java | 82 ++- .../processors/query/h2/sql/DmlAstUtils.java | 644 ------------------- .../query/h2/sql/GridSqlQueryParser.java | 1 + .../h2/twostep/GridReduceQueryExecutor.java | 44 +- .../cache/GridCacheFullTextQuerySelfTest.java | 30 +- .../IgniteCacheAbstractFieldsQuerySelfTest.java | 43 +- ...ldsQueryJoinNoPrimaryPartitionsSelfTest.java | 151 +++++ .../cache/index/H2ConnectionLeaksSelfTest.java | 169 +++++ .../IgniteCacheQuerySelfTestSuite.java | 4 + .../ignite/ml/FuzzyCMeansModelFormat.java | 2 +- .../org/apache/ignite/ml/KMeansModelFormat.java | 2 +- .../ml/clustering/BaseFuzzyCMeansClusterer.java | 2 +- .../ml/clustering/BaseKMeansClusterer.java | 2 +- .../FuzzyCMeansDistributedClusterer.java | 2 +- .../clustering/FuzzyCMeansLocalClusterer.java | 2 +- .../ignite/ml/clustering/FuzzyCMeansModel.java | 2 +- .../clustering/KMeansDistributedClusterer.java | 2 +- .../ml/clustering/KMeansLocalClusterer.java | 2 +- .../ignite/ml/clustering/KMeansModel.java | 2 +- .../apache/ignite/ml/knn/models/KNNModel.java | 233 +++++++ .../ignite/ml/knn/models/KNNModelFormat.java | 92 +++ .../ignite/ml/knn/models/KNNStrategy.java | 27 + .../ignite/ml/knn/models/Normalization.java | 32 + .../ignite/ml/knn/models/package-info.java | 22 + .../org/apache/ignite/ml/knn/package-info.java | 22 + .../regression/KNNMultipleLinearRegression.java | 83 +++ .../ignite/ml/knn/regression/package-info.java | 22 + .../apache/ignite/ml/math/DistanceMeasure.java | 38 -- .../ignite/ml/math/EuclideanDistance.java | 58 -- .../ml/math/distances/DistanceMeasure.java | 39 ++ .../ml/math/distances/EuclideanDistance.java | 59 ++ .../ml/math/distances/HammingDistance.java | 65 ++ .../ml/math/distances/ManhattanDistance.java | 59 ++ .../ignite/ml/math/distances/package-info.java | 22 + .../ignite/ml/math/distributed/CacheUtils.java | 2 +- .../distributed/keys/impl/SparseMatrixKey.java | 1 + .../math/exceptions/knn/EmptyFileException.java | 37 ++ .../exceptions/knn/FileParsingException.java | 39 ++ .../exceptions/knn/NoLabelVectorException.java | 37 ++ .../knn/SmallTrainingDatasetSizeException.java | 38 ++ .../ml/math/exceptions/knn/package-info.java | 22 + .../math/functions/IgniteToDoubleFunction.java | 6 +- .../ignite/ml/structures/LabeledDataset.java | 475 ++++++++++++++ .../structures/LabeledDatasetTestTrainPair.java | 116 ++++ .../ignite/ml/structures/LabeledVector.java | 37 +- .../org/apache/ignite/ml/IgniteMLTestSuite.java | 2 + .../org/apache/ignite/ml/LocalModelsTest.java | 39 +- .../FuzzyCMeansDistributedClustererTest.java | 4 +- .../FuzzyCMeansLocalClustererTest.java | 4 +- ...KMeansDistributedClustererTestMultiNode.java | 2 +- ...MeansDistributedClustererTestSingleNode.java | 4 +- .../ml/clustering/KMeansLocalClustererTest.java | 2 +- .../org/apache/ignite/ml/knn/BaseKNNTest.java | 91 +++ .../ignite/ml/knn/KNNClassificationTest.java | 153 +++++ .../ml/knn/KNNMultipleLinearRegressionTest.java | 157 +++++ .../org/apache/ignite/ml/knn/KNNTestSuite.java | 33 + .../ignite/ml/knn/LabeledDatasetTest.java | 266 ++++++++ .../ignite/ml/math/MathImplLocalTestSuite.java | 4 +- .../ignite/ml/math/distances/DistanceTest.java | 75 +++ .../OLSMultipleLinearRegressionTest.java | 1 + .../ml/trees/ColumnDecisionTreeTrainerTest.java | 6 +- .../ColumnDecisionTreeTrainerBenchmark.java | 6 +- .../ml/src/test/resources/datasets/README.md | 2 + .../resources/datasets/knn/cleared_machines.txt | 209 ++++++ .../src/test/resources/datasets/knn/empty.txt | 0 .../ml/src/test/resources/datasets/knn/iris.txt | 150 +++++ .../resources/datasets/knn/iris_incorrect.txt | 150 +++++ .../resources/datasets/knn/machine.data.txt | 209 ++++++ .../test/resources/datasets/knn/missed_data.txt | 3 + .../src/test/resources/datasets/knn/no_data.txt | 6 + .../include/ignite/common/platform_utils.h | 20 +- .../os/linux/src/common/platform_utils.cpp | 34 +- .../common/os/win/src/common/platform_utils.cpp | 29 +- .../platforms/cpp/core-test/src/test_utils.cpp | 8 +- modules/platforms/cpp/core/src/ignition.cpp | 10 +- .../cpp/jni/include/ignite/jni/utils.h | 17 +- .../platforms/cpp/jni/os/linux/src/utils.cpp | 120 ++-- modules/platforms/cpp/jni/os/win/src/utils.cpp | 133 ++-- .../platforms/cpp/odbc-test/src/test_utils.cpp | 8 +- .../ignite/visor/commands/VisorConsole.scala | 2 +- .../commands/common/VisorConsoleCommand.scala | 5 +- .../commands/tasks/VisorTasksCommand.scala | 34 +- .../scala/org/apache/ignite/visor/visor.scala | 3 +- modules/web-console/DEVNOTES.txt | 2 +- modules/web-console/backend/.eslintrc | 185 ------ modules/web-console/backend/app/agentSocket.js | 8 +- .../web-console/backend/app/agentsHandler.js | 35 +- modules/web-console/backend/app/apiServer.js | 9 +- .../web-console/backend/app/browsersHandler.js | 15 +- modules/web-console/backend/app/configure.js | 14 +- modules/web-console/backend/app/mongo.js | 14 +- modules/web-console/backend/app/mongoose.js | 8 +- modules/web-console/backend/app/nconf.js | 6 +- modules/web-console/backend/app/settings.js | 6 +- .../backend/config/settings.json.sample | 8 +- .../1508395969410-init-registered-date.js | 33 + modules/web-console/backend/package.json | 2 + .../web-console/backend/routes/activities.js | 37 +- modules/web-console/backend/routes/admin.js | 8 +- modules/web-console/backend/routes/caches.js | 6 +- modules/web-console/backend/routes/clusters.js | 6 +- .../web-console/backend/routes/configuration.js | 6 +- modules/web-console/backend/routes/demo.js | 7 +- modules/web-console/backend/routes/domains.js | 6 +- modules/web-console/backend/routes/downloads.js | 6 +- modules/web-console/backend/routes/igfss.js | 6 +- modules/web-console/backend/routes/notebooks.js | 7 +- modules/web-console/backend/routes/profile.js | 10 +- modules/web-console/backend/routes/public.js | 9 +- modules/web-console/backend/services/Utils.js | 51 ++ .../web-console/backend/services/activities.js | 7 +- modules/web-console/backend/services/auth.js | 27 +- modules/web-console/backend/services/caches.js | 11 +- .../web-console/backend/services/clusters.js | 11 +- .../backend/services/configurations.js | 5 +- modules/web-console/backend/services/domains.js | 11 +- .../web-console/backend/services/downloads.js | 13 +- modules/web-console/backend/services/igfss.js | 11 +- modules/web-console/backend/services/mails.js | 89 +-- .../web-console/backend/services/notebooks.js | 11 +- .../backend/services/notifications.js | 5 +- .../web-console/backend/services/sessions.js | 5 +- modules/web-console/backend/services/users.js | 26 +- modules/web-console/frontend/app/app.js | 8 + .../app/components/bs-select-menu/style.scss | 10 +- .../app/components/bs-select-menu/template.pug | 15 +- .../components/connected-clusters/controller.js | 36 ++ .../app/components/connected-clusters/index.js | 29 + .../components/connected-clusters/style.scss | 40 ++ .../components/connected-clusters/template.pug | 18 + .../app/components/grid-export/component.js | 52 ++ .../app/components/grid-export/index.js | 24 + .../app/components/grid-export/template.pug | 18 + .../app/components/grid-no-data/component.js | 33 + .../app/components/grid-no-data/controller.js | 50 ++ .../app/components/grid-no-data/index.js | 24 + .../app/components/grid-no-data/style.scss | 31 + .../list-editable-cols/cols.template.pug | 1 - .../list-editable-cols/row.directive.js | 2 +- .../app/components/list-editable/style.scss | 12 +- .../app/components/list-editable/template.pug | 6 +- .../list-of-registered-users.column-defs.js | 49 +- .../list-of-registered-users.tpl.pug | 2 +- .../app/components/page-queries/controller.js | 5 +- .../app/components/page-queries/style.scss | 55 ++ .../components/page-queries/template.tpl.pug | 27 +- .../app/components/ui-grid-filters/directive.js | 62 ++ .../app/components/ui-grid-filters/index.js | 43 ++ .../app/components/ui-grid-filters/style.scss | 36 ++ .../app/components/ui-grid-filters/template.pug | 47 ++ .../components/web-console-header/component.js | 11 + .../web-console-header-extension/component.js | 22 + .../web-console-header-extension/template.pug | 15 + .../app/components/web-console-header/index.js | 4 +- .../components/web-console-header/style.scss | 2 +- .../components/web-console-header/template.pug | 8 +- .../app/directives/information/information.pug | 2 +- .../app/directives/information/information.scss | 5 +- .../frontend/app/filters/duration.filter.js | 2 +- .../app/modules/agent/AgentManager.service.js | 6 + .../generator/AbstractTransformer.js | 8 +- .../generator/ConfigurationGenerator.js | 66 +- .../generator/PlatformGenerator.js | 6 +- .../generator/defaults/Cache.service.js | 14 +- .../app/modules/form/field/input/text.scss | 1 + .../frontend/app/modules/user/permissions.js | 4 +- .../frontend/app/primitives/btn/index.scss | 17 + .../app/primitives/form-field/index.scss | 2 +- .../app/primitives/ui-grid-settings/index.scss | 12 + .../frontend/app/primitives/ui-grid/index.scss | 2 + .../frontend/app/services/Version.service.js | 4 + modules/web-console/frontend/package.json | 3 +- .../frontend/public/images/checkbox-active.svg | 25 + .../frontend/public/images/checkbox.svg | 22 + .../frontend/public/images/icons/alert.svg | 1 + .../frontend/public/images/icons/attention.svg | 3 + .../frontend/public/images/icons/checkmark.svg | 3 + .../public/images/icons/connectedClusters.svg | 1 + .../frontend/public/images/icons/index.js | 4 + .../frontend/public/images/icons/sort.svg | 2 +- .../frontend/views/includes/header-left.pug | 8 +- .../frontend/views/includes/header-right.pug | 4 +- .../frontend/views/settings/profile.tpl.pug | 9 +- modules/web-console/pom.xml | 111 +++- modules/yardstick/DEVNOTES-standalone.txt | 11 +- modules/yardstick/DEVNOTES.txt | 11 + .../yardstick/config/benchmark-ml.properties | 90 +++ modules/yardstick/pom-standalone.xml | 58 +- modules/yardstick/pom.xml | 56 ++ .../apache/ignite/yardstick/ml/DataChanger.java | 65 ++ ...niteKMeansDistributedClustererBenchmark.java | 75 +++ .../IgniteKMeansLocalClustererBenchmark.java | 50 ++ .../yardstick/ml/clustering/package-info.java | 22 + .../IgniteCholeskyDecompositionBenchmark.java | 69 ++ .../IgniteEigenDecompositionBenchmark.java | 69 ++ .../IgniteLUDecompositionBenchmark.java | 75 +++ ...niteSingularValueDecompositionBenchmark.java | 59 ++ .../ml/decomposition/package-info.java | 22 + .../math/IgniteAbstractMatrixMulBenchmark.java | 107 +++ ...niteDenseLocalOffHeapMatrixMulBenchmark.java | 32 + ...gniteDenseLocalOnHeapMatrixMulBenchmark.java | 32 + ...parseBlockDistributedMatrixMulBenchmark.java | 32 + ...niteSparseDistributedMatrixMulBenchmark.java | 35 + .../IgniteSparseLocalMatrixMulBenchmark.java | 32 + .../ignite/yardstick/ml/math/package-info.java | 22 + .../ignite/yardstick/ml/package-info.java | 22 + ...iteOLSMultipleLinearRegressionBenchmark.java | 92 +++ .../yardstick/ml/regression/package-info.java | 22 + .../IgniteColumnDecisionTreeGiniBenchmark.java | 70 ++ ...niteColumnDecisionTreeVarianceBenchmark.java | 71 ++ .../yardstick/ml/trees/SplitDataGenerator.java | 426 ++++++++++++ .../ignite/yardstick/ml/trees/package-info.java | 22 + parent/pom.xml | 1 + 290 files changed, 10617 insertions(+), 2816 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2b74163c/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2b74163c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2b74163c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2b74163c/modules/yardstick/pom-standalone.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2b74163c/modules/yardstick/pom.xml ----------------------------------------------------------------------
