[ignite] 01/01: ignite-11704
This is an automated email from the ASF dual-hosted git repository. sboikov pushed a commit to branch ignite-11704-1 in repository https://gitbox.apache.org/repos/asf/ignite.git commit 2394c5653782027ca9998a80a06942f9cf0b97b9 Author: sboikov AuthorDate: Wed Jul 31 23:48:51 2019 +0300 ignite-11704 --- .../ignite/internal/processors/cache/CacheGroupContext.java | 2 +- .../apache/ignite/internal/processors/cache/GridCacheContext.java | 8 ++-- .../ignite/internal/processors/cache/GridCacheMapEntry.java | 3 +++ .../internal/processors/cache/IgniteCacheOffheapManagerImpl.java | 2 ++ .../cache/distributed/dht/topology/GridDhtLocalPartition.java | 2 -- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java index 3a7a445..c2cba6b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java @@ -1296,7 +1296,7 @@ public class CacheGroupContext { * @return {@code True} if need create temporary tombstones entries for removed data. */ public boolean supportsTombstone() { -return !sharedGroup() && !hasAtomicCaches && !mvccEnabled && !isLocal(); +return !mvccEnabled && !isLocal(); } /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java index 959095c..4c51981 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java @@ -625,8 +625,12 @@ public class GridCacheContext implements Externalizable { public void cache(GridCacheAdapter cache) { this.cache = cache; -deferredDel = !grp.supportsTombstone() && (cache.isDht() || cache.isDhtAtomic() || cache.isColocated() || -(cache.isNear() && cache.configuration().getAtomicityMode() == ATOMIC)); +if (grp.supportsTombstone() && cache.configuration().getAtomicityMode() == TRANSACTIONAL) +deferredDel = false; +else { +deferredDel = (cache.isDht() || cache.isDhtAtomic() || cache.isColocated() || +(cache.isNear() && cache.configuration().getAtomicityMode() == ATOMIC)); +} } /** diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index 1133085..db066b6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -4505,6 +4505,9 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme CacheDataRow row = cctx.offheap().read(this); +if (cctx.offheap().isTombstone(row)) +return; + if (row != null && (filter == null || filter.apply(row))) clo.apply(row); } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java index 1f3a22d..9d15358 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java @@ -628,6 +628,8 @@ public class IgniteCacheOffheapManagerImpl implements IgniteCacheOffheapManager GridCacheVersion ver, GridDhtLocalPartition part) throws IgniteCheckedException { assert part != null; +assert !cctx.isNear(); +assert !cctx.isLocal(); dataStore(part).removeWithTombstone(cctx, key, ver, part); } diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtLocalPartition.java index d9b34c6..f098e99 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtLocalPartition.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtLocalPartition.java @@ -1174,8 +1174,6 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements
[ignite] branch ignite-11704-1 created (now 2394c56)
This is an automated email from the ASF dual-hosted git repository. sboikov pushed a change to branch ignite-11704-1 in repository https://gitbox.apache.org/repos/asf/ignite.git. at 2394c56 ignite-11704 This branch includes the following new commits: new 2394c56 ignite-11704 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[ignite-teamcity-bot] branch master updated: Link to suite history bug fixed
This is an automated email from the ASF dual-hosted git repository. dpavlov pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git The following commit(s) were added to refs/heads/master by this push: new 908168a Link to suite history bug fixed 908168a is described below commit 908168ac08c9db86f5ffc533dcbc66dba4a15746 Author: Dmitriy Pavlov AuthorDate: Wed Jul 31 21:40:45 2019 +0300 Link to suite history bug fixed --- .../java/org/apache/ignite/tcbot/engine/ui/DsChainUi.java | 3 +-- .../java/org/apache/ignite/tcbot/engine/ui/DsSuiteUi.java | 13 - 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/ui/DsChainUi.java b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/ui/DsChainUi.java index 14a1c06..47b7d0b 100644 --- a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/ui/DsChainUi.java +++ b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/ui/DsChainUi.java @@ -37,7 +37,6 @@ import org.apache.ignite.tcbot.persistence.IStringCompactor; import org.apache.ignite.tcignited.ITeamcityIgnited; import org.apache.ignite.tcservice.model.conf.BuildType; -import static org.apache.ignite.tcbot.engine.ui.DsSuiteUi.branchForLink; import static org.apache.ignite.tcbot.engine.ui.DsSuiteUi.createOccurForLogConsumer; import static org.apache.ignite.tcbot.engine.ui.DsSuiteUi.createOrrucForLongRun; import static org.apache.ignite.tcignited.history.RunHistSync.normalizeBranch; @@ -277,7 +276,7 @@ public class DsChainUi { } private static String buildWebLink(ITeamcityIgnited teamcity, FullChainRunCtx suite) { -final String branch = branchForLink(suite.branchName()); +final String branch = normalizeBranch(suite.branchName()); return teamcity.host() + "viewType.html?buildTypeId=" + suite.suiteId() + "=" + UrlUtil.escape(branch) + "=buildTypeStatusDiv"; diff --git a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/ui/DsSuiteUi.java b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/ui/DsSuiteUi.java index ab99a53..a4bb266 100644 --- a/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/ui/DsSuiteUi.java +++ b/tcbot-engine/src/main/java/org/apache/ignite/tcbot/engine/ui/DsSuiteUi.java @@ -249,7 +249,7 @@ public class DsSuiteUi extends ShortSuiteUi { queuedBuildCount = suite.queuedBuildCount(); serverId = tcIgnited.serverCode(); suiteId = suite.suiteId(); -branchName = branchForLink(suite.branchName()); +branchName = normalizeBranch(suite.branchName()); tags = suite.tags(); @@ -353,24 +353,19 @@ public class DsSuiteUi extends ShortSuiteUi { return buildWebLinkToHist(teamcity, suite, branchName); } - @Nonnull private static String buildWebLinkToHist(ITeamcityIgnited teamcity, MultBuildRunCtx suite, String branchName) { -final String branch = branchForLink(branchName); +final String branch = normalizeBranch(branchName); return teamcity.host() + "buildConfiguration/" + suite.suiteId() -+ "?branch" + UrlUtil.escape(branch) ; ++ "?branch=" + UrlUtil.escape(branch); } @Nonnull private static String buildWebLinkToHistOldUi(ITeamcityIgnited teamcity, MultBuildRunCtx suite, String branchName) { -final String branch = branchForLink(branchName); +final String branch = normalizeBranch(branchName); return teamcity.host() + "viewType.html?buildTypeId=" + suite.suiteId() + "=" + UrlUtil.escape(branch) + "=buildTypeStatusDiv"; } -public static String branchForLink(@Nullable String branchName) { -return normalizeBranch(branchName); -} - /** {@inheritDoc} */ @Override public boolean equals(Object o) { if (this == o)
[ignite-teamcity-bot] branch master updated: Blockers short models created to reduce GC; Full Test Ocurrence convert removed (#141)
This is an automated email from the ASF dual-hosted git repository. dpavlov pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git The following commit(s) were added to refs/heads/master by this push: new 8c1af84 Blockers short models created to reduce GC; Full Test Ocurrence convert removed (#141) 8c1af84 is described below commit 8c1af8473a1d4367bc72f6f1797e36ef6d26309f Author: Dmitriy Pavlov AuthorDate: Wed Jul 31 19:58:59 2019 +0300 Blockers short models created to reduce GC; Full Test Ocurrence convert removed (#141) --- .../tcbot/visa/TcBotTriggerAndSignOffService.java | 18 ++--- .../ci/tcbot/chain/PrChainsProcessorTest.java | 32 - .../tcbot/engine/chain/SingleBuildRunCtx.java | 7 -- .../tcbot/engine/chain/TestCompactedMult.java | 13 ++-- .../ignite/tcbot/engine/pr/PrChainsProcessor.java | 32 +++-- .../apache/ignite/tcbot/engine/ui/DsSuiteUi.java | 64 +++-- .../ignite/tcbot/engine/ui/DsTestFailureUi.java| 74 +++ .../ignite/tcbot/engine/ui/ShortSuiteUi.java | 84 ++ .../ignite/tcbot/engine/ui/ShortTestFailureUi.java | 69 ++ .../teamcity/ignited/fatbuild/TestCompacted.java | 1 - 10 files changed, 244 insertions(+), 150 deletions(-) diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/visa/TcBotTriggerAndSignOffService.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/visa/TcBotTriggerAndSignOffService.java index 3a11a14..b6272c1 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/visa/TcBotTriggerAndSignOffService.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/visa/TcBotTriggerAndSignOffService.java @@ -67,6 +67,8 @@ import org.apache.ignite.tcbot.engine.pr.BranchTicketMatcher; import org.apache.ignite.tcbot.engine.pr.PrChainsProcessor; import org.apache.ignite.tcbot.engine.ui.DsSuiteUi; import org.apache.ignite.tcbot.engine.ui.DsTestFailureUi; +import org.apache.ignite.tcbot.engine.ui.ShortSuiteUi; +import org.apache.ignite.tcbot.engine.ui.ShortTestFailureUi; import org.apache.ignite.tcbot.persistence.IStringCompactor; import org.apache.ignite.tcignited.ITeamcityIgnited; import org.apache.ignite.tcignited.ITeamcityIgnitedProvider; @@ -753,13 +755,13 @@ public class TcBotTriggerAndSignOffService { String tcBranch) { CurrentVisaStatus status = new CurrentVisaStatus(); -List suitesStatuses +List suitesStatuses = prChainsProcessor.getBlockersSuitesStatuses(buildTypeId, tcBranch, srvCode, prov, SyncMode.NONE, null); if (suitesStatuses == null) return status; -status.blockers = suitesStatuses.stream().mapToInt(DsSuiteUi::totalBlockers).sum(); +status.blockers = suitesStatuses.stream().mapToInt(ShortSuiteUi::totalBlockers).sum(); return status; } @@ -806,7 +808,7 @@ public class TcBotTriggerAndSignOffService { try { String baseBranch = Strings.isNullOrEmpty(baseBranchForTc) ? prChainsProcessor.dfltBaseTcBranch(srvCodeOrAlias) : baseBranchForTc; -List suitesStatuses = prChainsProcessor.getBlockersSuitesStatuses(buildTypeId, build.branchName, srvCodeOrAlias, prov, +List suitesStatuses = prChainsProcessor.getBlockersSuitesStatuses(buildTypeId, build.branchName, srvCodeOrAlias, prov, SyncMode.RELOAD_QUEUED, baseBranch); @@ -814,7 +816,7 @@ public class TcBotTriggerAndSignOffService { return new Visa("JIRA wasn't commented - no finished builds to analyze." + " Check builds availabiliy for branch: " + build.branchName + "/" + baseBranch); -blockers = suitesStatuses.stream().mapToInt(DsSuiteUi::totalBlockers).sum(); +blockers = suitesStatuses.stream().mapToInt(ShortSuiteUi::totalBlockers).sum(); String comment = generateJiraComment(suitesStatuses, build.webUrl, buildTypeId, tcIgnited, blockers, build.branchName, baseBranch); @@ -843,7 +845,7 @@ public class TcBotTriggerAndSignOffService { * @param baseBranch TC Base branch used for comment * @return Comment, which should be sent to the JIRA ticket. */ -private String generateJiraComment(List suites, String webUrl, String buildTypeId, +private String generateJiraComment(List suites, String webUrl, String buildTypeId, ITeamcityIgnited tcIgnited, int blockers, String branchName, String baseBranch) { BuildTypeRefCompacted bt = tcIgnited.getBuildTypeRef(buildTypeId); @@ -853,12 +855,12 @@ public class TcBotTriggerAndSignOffService { String baseBranchDisp = (Strings.isNullOrEmpty(baseBranch) || ITeamcity.DEFAULT.equals(baseBranch)) ? "master" : baseBranch ; -for (DsSuiteUi suite :
[ignite-teamcity-bot] branch master updated: Run All should be default instead of Run All Nightly; automatic selecting default configuration
nn, String prId) { -ContributionCheckStatus status = new ContributionCheckStatus(); - -status.suiteId = suiteId; +ContributionCheckStatus status = new ContributionCheckStatus(suiteId); List finishedOrCancelled = builds.stream() .filter(t -> t.isFinished(compactor)).collect(Collectors.toList()); diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java index d5af68e..b1ce2f9 100644 --- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java +++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/model/Version.java @@ -28,7 +28,7 @@ package org.apache.ignite.ci.web.model; public static final String GITHUB_REF = "https://github.com/apache/ignite-teamcity-bot;; /** TC Bot Version. */ -public static final String VERSION = "20190729"; +public static final String VERSION = "20190731"; /** Java version, where Web App is running. */ public String javaVer; diff --git a/ignite-tc-helper-web/src/main/webapp/js/prs-1.1.js b/ignite-tc-helper-web/src/main/webapp/js/prs-1.2.js similarity index 97% rename from ignite-tc-helper-web/src/main/webapp/js/prs-1.1.js rename to ignite-tc-helper-web/src/main/webapp/js/prs-1.2.js index e92ab77..8c0b59b 100644 --- a/ignite-tc-helper-web/src/main/webapp/js/prs-1.1.js +++ b/ignite-tc-helper-web/src/main/webapp/js/prs-1.2.js @@ -313,19 +313,26 @@ function formatContributionDetails(row, srvId) { function (result) { let selectHtml = ""; -let isCompleted = [], +let isDefault = [], +isCompleted = [], isIncompleted = [], suites = new Map(); +//See also org.apache.ignite.ci.tcbot.visa.ContributionCheckStatus for (let status of result) { suites.set(status.suiteId, status); -if (isDefinedAndFilled(status.branchWithFinishedSuite)) +if (isDefinedAndFilled(status.defaultBuildType) && status.defaultBuildType === true) +isDefault.push(status); +else if (isDefinedAndFilled(status.branchWithFinishedSuite)) isCompleted.push(status); else isIncompleted.push(status); } +for (let status of isDefault) +selectHtml += "" + status.suiteId + ""; + for (let status of isCompleted) selectHtml += "" + status.suiteId + ""; diff --git a/ignite-tc-helper-web/src/main/webapp/prs.html b/ignite-tc-helper-web/src/main/webapp/prs.html index 473591a..9b57866 100644 --- a/ignite-tc-helper-web/src/main/webapp/prs.html +++ b/ignite-tc-helper-web/src/main/webapp/prs.html @@ -19,7 +19,7 @@ - +
[ignite] branch ignite-11704 updated (a6cd27d -> b4e5941)
This is an automated email from the ASF dual-hosted git repository. sboikov pushed a change to branch ignite-11704 in repository https://gitbox.apache.org/repos/asf/ignite.git. from a6cd27d ignite-11704 add 1ea1505 IGNITE-7883 Cluster can have inconsistent affinity configuration. add 88ab8f7 IGNITE-11961: JMX metrics for PME timings (#6701) add c1af01a IGNITE-9633: [ML] Hyper-parameter tuning via Genetic Algorithm (#6731) new b4e5941 Merge remote-tracking branch 'remotes/origin/master' into ignite-11704 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../ml/TrainingWithBinaryObjectExample.java| 2 + .../clustering/CustomersClusterizationExample.java | 6 +- .../ml/clustering/GmmClusterizationExample.java| 5 +- .../ml/clustering/KMeansClusterizationExample.java | 6 +- .../dataset/AlgorithmSpecificDatasetExample.java | 34 +- .../ml/dataset/CacheBasedDatasetExample.java | 3 +- .../IgniteModelDistributedInferenceExample.java| 11 +- .../examples/ml/inference/ModelStorageExample.java | 2 + .../TensorFlowDistributedInferenceExample.java | 2 + .../inference/TensorFlowLocalInferenceExample.java | 1 + .../TensorFlowThreadedInferenceExample.java| 1 + .../examples/ml/knn/ANNClassificationExample.java | 2 + .../examples/ml/knn/IrisClassificationExample.java | 6 +- .../examples/ml/knn/KNNClassificationExample.java | 13 +- .../examples/ml/knn/KNNRegressionExample.java | 6 +- .../multiclass/OneVsRestClassificationExample.java | 9 +- .../DiscreteNaiveBayesTrainerExample.java | 10 +- .../GaussianNaiveBayesTrainerExample.java | 6 +- .../ignite/examples/ml/nn/MLPTrainerExample.java | 2 + .../ml/preprocessing/BinarizationExample.java | 2 + .../examples/ml/preprocessing/ImputingExample.java | 2 + .../ml/preprocessing/MaxAbsScalerExample.java | 4 +- .../ml/preprocessing/MinMaxScalerExample.java | 4 +- .../ml/preprocessing/NormalizationExample.java | 2 + .../ml/preprocessing/StandardScalerExample.java| 4 +- .../linear/BostonHousePricesPredictionExample.java | 9 +- .../linear/LinearRegressionLSQRTrainerExample.java | 14 +- ...gressionLSQRTrainerWithMinMaxScalerExample.java | 9 +- .../linear/LinearRegressionSGDTrainerExample.java | 6 +- .../BaggedLogisticRegressionSGDTrainerExample.java | 26 +- .../LogisticRegressionSGDTrainerExample.java | 9 +- .../ml/selection/cv/CrossValidationExample.java| 31 +- .../ml/selection/scoring/EvaluatorExample.java | 6 +- .../selection/scoring/MultipleMetricsExample.java | 6 +- .../selection/scoring/RegressionMetricExample.java | 6 +- .../split/TrainTestDatasetSplitterExample.java | 9 +- ...eeClassificationTrainerSQLInferenceExample.java | 5 +- ...onTreeClassificationTrainerSQLTableExample.java | 5 +- .../ml/svm/SVMBinaryClassificationExample.java | 6 +- .../DecisionTreeClassificationTrainerExample.java | 5 +- .../tree/DecisionTreeRegressionTrainerExample.java | 2 + .../examples/ml/tree/FraudDetectionExample.java| 9 +- .../GDBOnTreesClassificationTrainerExample.java| 2 + .../GDBOnTreesRegressionTrainerExample.java| 2 + .../RandomForestClassificationExample.java | 18 +- .../RandomForestRegressionExample.java | 15 +- .../ml/tutorial/Step_1_Read_and_Learn.java | 5 +- .../examples/ml/tutorial/Step_2_Imputing.java | 5 +- .../examples/ml/tutorial/Step_3_Categorial.java| 7 +- .../Step_3_Categorial_with_One_Hot_Encoder.java| 7 +- .../examples/ml/tutorial/Step_4_Add_age_fare.java | 7 +- .../examples/ml/tutorial/Step_5_Scaling.java | 7 +- .../ml/tutorial/Step_5_Scaling_with_Pipeline.java | 5 +- .../ignite/examples/ml/tutorial/Step_6_KNN.java| 5 +- .../ml/tutorial/Step_7_Split_train_test.java | 5 +- .../ignite/examples/ml/tutorial/Step_8_CV.java | 24 +- .../ml/tutorial/Step_8_CV_with_Param_Grid.java | 30 +- .../Step_8_CV_with_Param_Grid_and_metrics.java | 31 +- ...V_with_Param_Grid_and_metrics_and_pipeline.java | 30 +- .../ml/tutorial/Step_9_Scaling_With_Stacking.java | 21 +- .../ml/tutorial/TutorialStepByStepExample.java | 12 + .../Step_10_RandomSearch.java} | 54 ++- .../Step_11_Parallel_BrutForce_Search.java}| 58 ++- .../Step_12_Parallel_Random_Search.java} | 63 +-- .../Step_13_Genetic_Programming_Search.java} | 50 ++- ...ep_14_Parallel_Genetic_Programming_Search.java} | 56 ++- .../ignite/examples/ml/util/DatasetHelper.java | 2 + .../ParametricVectorGeneratorExample.java | 1 + .../util/generators/StandardGeneratorsExample.java | 1 +
[ignite] 01/01: Merge remote-tracking branch 'remotes/origin/master' into ignite-11704
This is an automated email from the ASF dual-hosted git repository. sboikov pushed a commit to branch ignite-11704 in repository https://gitbox.apache.org/repos/asf/ignite.git commit b4e5941cd7843e7e067fa7872c3851ec6e3964b5 Merge: a6cd27d c1af01a Author: sboikov AuthorDate: Wed Jul 31 16:27:29 2019 +0300 Merge remote-tracking branch 'remotes/origin/master' into ignite-11704 .../ml/TrainingWithBinaryObjectExample.java| 2 + .../clustering/CustomersClusterizationExample.java | 6 +- .../ml/clustering/GmmClusterizationExample.java| 5 +- .../ml/clustering/KMeansClusterizationExample.java | 6 +- .../dataset/AlgorithmSpecificDatasetExample.java | 34 +- .../ml/dataset/CacheBasedDatasetExample.java | 3 +- .../IgniteModelDistributedInferenceExample.java| 11 +- .../examples/ml/inference/ModelStorageExample.java | 2 + .../TensorFlowDistributedInferenceExample.java | 2 + .../inference/TensorFlowLocalInferenceExample.java | 1 + .../TensorFlowThreadedInferenceExample.java| 1 + .../examples/ml/knn/ANNClassificationExample.java | 2 + .../examples/ml/knn/IrisClassificationExample.java | 6 +- .../examples/ml/knn/KNNClassificationExample.java | 13 +- .../examples/ml/knn/KNNRegressionExample.java | 6 +- .../multiclass/OneVsRestClassificationExample.java | 9 +- .../DiscreteNaiveBayesTrainerExample.java | 10 +- .../GaussianNaiveBayesTrainerExample.java | 6 +- .../ignite/examples/ml/nn/MLPTrainerExample.java | 2 + .../ml/preprocessing/BinarizationExample.java | 2 + .../examples/ml/preprocessing/ImputingExample.java | 2 + .../ml/preprocessing/MaxAbsScalerExample.java | 4 +- .../ml/preprocessing/MinMaxScalerExample.java | 4 +- .../ml/preprocessing/NormalizationExample.java | 2 + .../ml/preprocessing/StandardScalerExample.java| 4 +- .../linear/BostonHousePricesPredictionExample.java | 9 +- .../linear/LinearRegressionLSQRTrainerExample.java | 14 +- ...gressionLSQRTrainerWithMinMaxScalerExample.java | 9 +- .../linear/LinearRegressionSGDTrainerExample.java | 6 +- .../BaggedLogisticRegressionSGDTrainerExample.java | 26 +- .../LogisticRegressionSGDTrainerExample.java | 9 +- .../ml/selection/cv/CrossValidationExample.java| 31 +- .../ml/selection/scoring/EvaluatorExample.java | 6 +- .../selection/scoring/MultipleMetricsExample.java | 6 +- .../selection/scoring/RegressionMetricExample.java | 6 +- .../split/TrainTestDatasetSplitterExample.java | 9 +- ...eeClassificationTrainerSQLInferenceExample.java | 5 +- ...onTreeClassificationTrainerSQLTableExample.java | 5 +- .../ml/svm/SVMBinaryClassificationExample.java | 6 +- .../DecisionTreeClassificationTrainerExample.java | 5 +- .../tree/DecisionTreeRegressionTrainerExample.java | 2 + .../examples/ml/tree/FraudDetectionExample.java| 9 +- .../GDBOnTreesClassificationTrainerExample.java| 2 + .../GDBOnTreesRegressionTrainerExample.java| 2 + .../RandomForestClassificationExample.java | 18 +- .../RandomForestRegressionExample.java | 15 +- .../ml/tutorial/Step_1_Read_and_Learn.java | 5 +- .../examples/ml/tutorial/Step_2_Imputing.java | 5 +- .../examples/ml/tutorial/Step_3_Categorial.java| 7 +- .../Step_3_Categorial_with_One_Hot_Encoder.java| 7 +- .../examples/ml/tutorial/Step_4_Add_age_fare.java | 7 +- .../examples/ml/tutorial/Step_5_Scaling.java | 7 +- .../ml/tutorial/Step_5_Scaling_with_Pipeline.java | 5 +- .../ignite/examples/ml/tutorial/Step_6_KNN.java| 5 +- .../ml/tutorial/Step_7_Split_train_test.java | 5 +- .../ignite/examples/ml/tutorial/Step_8_CV.java | 24 +- .../ml/tutorial/Step_8_CV_with_Param_Grid.java | 30 +- .../Step_8_CV_with_Param_Grid_and_metrics.java | 31 +- ...V_with_Param_Grid_and_metrics_and_pipeline.java | 30 +- .../ml/tutorial/Step_9_Scaling_With_Stacking.java | 21 +- .../ml/tutorial/TutorialStepByStepExample.java | 12 + .../Step_10_RandomSearch.java} | 54 ++- .../Step_11_Parallel_BrutForce_Search.java}| 58 ++- .../Step_12_Parallel_Random_Search.java} | 63 +-- .../Step_13_Genetic_Programming_Search.java} | 50 ++- ...ep_14_Parallel_Genetic_Programming_Search.java} | 56 ++- .../ignite/examples/ml/util/DatasetHelper.java | 2 + .../ParametricVectorGeneratorExample.java | 1 + .../util/generators/StandardGeneratorsExample.java | 1 + .../generators/VectorGeneratorFamilyExample.java | 1 + .../VectorGeneratorPrimitivesExample.java | 1 + .../ml/xgboost/XGBoostModelParserExample.java | 2 + .../apache/ignite/cache/CacheKeyConfiguration.java | 26 ++ .../managers/discovery/ClusterMetricsImpl.java | 16 +- .../processors/cache/ClusterCachesInfo.java| 3 + .../cache/GridCachePartitionExchangeManager.java |
[ignite] branch ignite-11704 updated: ignite-11704
This is an automated email from the ASF dual-hosted git repository. sboikov pushed a commit to branch ignite-11704 in repository https://gitbox.apache.org/repos/asf/ignite.git The following commit(s) were added to refs/heads/ignite-11704 by this push: new a6cd27d ignite-11704 a6cd27d is described below commit a6cd27dbd0ec5a7e9d82d4904f6b30c2cb5d7b6e Author: sboikov AuthorDate: Wed Jul 31 10:58:06 2019 +0300 ignite-11704 --- .../CacheRemoveWithTombstonesLoadTest.java| 19 ++- .../ignite/testframework/MvccFeatureChecker.java | 3 +-- .../ignite/testsuites/IgniteCacheMvccTestSuite9.java | 4 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheRemoveWithTombstonesLoadTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheRemoveWithTombstonesLoadTest.java index cb144b9..6b0aefd 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheRemoveWithTombstonesLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/CacheRemoveWithTombstonesLoadTest.java @@ -33,6 +33,7 @@ import org.apache.ignite.spi.metric.LongMetric; import org.apache.ignite.testframework.GridTestUtils; import org.apache.ignite.testframework.MvccFeatureChecker; import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest; +import org.junit.Assume; import org.junit.Test; import java.util.ArrayList; @@ -80,7 +81,7 @@ public class CacheRemoveWithTombstonesLoadTest extends GridCommonAbstractTest { @Override protected void beforeTestsStarted() throws Exception { super.beforeTestsStarted(); - MvccFeatureChecker.skipIfNotSupported(MvccFeatureChecker.Feature.TOMBSTONES); +Assume.assumeFalse(MvccFeatureChecker.forcedMvcc()); } /** {@inheritDoc} */ @@ -138,8 +139,8 @@ public class CacheRemoveWithTombstonesLoadTest extends GridCommonAbstractTest { Map data = new HashMap<>(); -final int KEYS = 10_000; -final int ADD_NODES = 3; +final int KEYS = persistence ? 5_000 : 10_000; +final int ADD_NODES = persistence ? 2 : 3; for (int i = 0; i < KEYS; i++) { TestKey key = new TestKey(i, new byte[rnd.nextInt(pageSize * 3)]); @@ -164,7 +165,7 @@ public class CacheRemoveWithTombstonesLoadTest extends GridCommonAbstractTest { } }); -long endTime = System.currentTimeMillis() + 5000; +long endTime = System.currentTimeMillis() + 2500; while (System.currentTimeMillis() < endTime) { for (int i = 0; i < 100; i++) { @@ -180,6 +181,8 @@ public class CacheRemoveWithTombstonesLoadTest extends GridCommonAbstractTest { cache0.put(key, val); data.put(key, val); } + +Thread.sleep(10); } } @@ -209,7 +212,7 @@ public class CacheRemoveWithTombstonesLoadTest extends GridCommonAbstractTest { } }); -long endTime = System.currentTimeMillis() + 5000; +long endTime = System.currentTimeMillis() + 2500; while (System.currentTimeMillis() < endTime) { for (int i = 0; i < 100; i++) { @@ -226,6 +229,8 @@ public class CacheRemoveWithTombstonesLoadTest extends GridCommonAbstractTest { data.put(key, val); } } + +Thread.sleep(10); } fut.get(30_000); @@ -238,6 +243,10 @@ public class CacheRemoveWithTombstonesLoadTest extends GridCommonAbstractTest { } } +/** + * @param keys Keys to check. + * @param data Expected data. + */ private void checkData(List keys, Map data) { for (Ignite node : Ignition.allGrids()) { if (!node.name().endsWith("CacheRemoveWithTombstonesLoadTest1")) diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/MvccFeatureChecker.java b/modules/core/src/test/java/org/apache/ignite/testframework/MvccFeatureChecker.java index dce8c8d..1daeab4 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/MvccFeatureChecker.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/MvccFeatureChecker.java @@ -47,8 +47,7 @@ public class MvccFeatureChecker { EVICTION, EXPIRATION, METRICS, -INTERCEPTOR, -TOMBSTONES +INTERCEPTOR } /** diff --git a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite9.java b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheMvccTestSuite9.java index 243fb4b..e5dff20 100644 ---