ignite git commit: IGNITE-10237 Fixed inspections
Repository: ignite Updated Branches: refs/heads/master e4760980a -> 3ad2034c0 IGNITE-10237 Fixed inspections Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3ad2034c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3ad2034c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3ad2034c Branch: refs/heads/master Commit: 3ad2034c0473e02fb8c7142cb9b2f7b74ecccded Parents: e476098 Author: Alexey Goncharuk Authored: Thu Nov 15 20:05:52 2018 +0300 Committer: Alexey Goncharuk Committed: Thu Nov 15 20:05:52 2018 +0300 -- .../apache/ignite/internal/processors/cache/CacheGroupContext.java | 1 - .../internal/processors/cache/GridCacheConcurrentMapImpl.java | 1 - .../ignite/internal/processors/cache/GridCacheEvictionManager.java | 1 - .../cache/distributed/dht/preloader/GridDhtPartitionDemander.java | 1 - .../cache/distributed/dht/topology/GridDhtLocalPartition.java | 1 - 5 files changed, 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/3ad2034c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java -- 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 7f0b4ed..95fc08f 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 @@ -64,7 +64,6 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiInClosure; import org.apache.ignite.lang.IgniteFuture; import org.apache.ignite.lang.IgnitePredicate; -import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.mxbean.CacheGroupMetricsMXBean; import org.jetbrains.annotations.Nullable; http://git-wip-us.apache.org/repos/asf/ignite/blob/3ad2034c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java index 005fdfb..a463500 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMapImpl.java @@ -26,7 +26,6 @@ import java.util.Set; import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.lang.IgnitePredicate; -import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.Nullable; import static org.apache.ignite.events.EventType.EVT_CACHE_ENTRY_CREATED; http://git-wip-us.apache.org/repos/asf/ignite/blob/3ad2034c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java index b3b8810..a1bf0ff 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java @@ -30,7 +30,6 @@ import org.apache.ignite.internal.processors.cache.version.GridCacheVersionManag import org.apache.ignite.internal.util.GridBusyLock; import org.apache.ignite.internal.util.typedef.X; import org.apache.ignite.internal.util.typedef.internal.U; -import org.apache.ignite.lang.IgniteUuid; import org.apache.ignite.mxbean.IgniteMBeanAware; import org.jetbrains.annotations.Nullable; http://git-wip-us.apache.org/repos/asf/ignite/blob/3ad2034c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemander.java index 7ea943d..a75fae7 100644 ---
ignite git commit: IGNITE-10246 StandaloneWALRecordIterator must throw checkBounds exception - Fixes #5398.
Repository: ignite
Updated Branches:
refs/heads/master a74d9c4f6 -> 43ebe7a5b
IGNITE-10246 StandaloneWALRecordIterator must throw checkBounds exception -
Fixes #5398.
Signed-off-by: Ivan Rakov
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/43ebe7a5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/43ebe7a5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/43ebe7a5
Branch: refs/heads/master
Commit: 43ebe7a5b3a4a19a1ef842b6d80417a4fc3580a0
Parents: a74d9c4
Author: Alexey Stelmak
Authored: Thu Nov 15 16:33:07 2018 +0300
Committer: Ivan Rakov
Committed: Thu Nov 15 16:33:07 2018 +0300
--
.../wal/reader/IgniteWalIteratorFactory.java | 3 ++-
.../wal/reader/StandaloneWalRecordsIterator.java | 6 +++---
.../wal/reader/StrictBoundsCheckException.java| 18 ++
3 files changed, 23 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/43ebe7a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/IgniteWalIteratorFactory.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/IgniteWalIteratorFactory.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/IgniteWalIteratorFactory.java
index f4ebec5..697dded 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/IgniteWalIteratorFactory.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/IgniteWalIteratorFactory.java
@@ -564,7 +564,8 @@ public class IgniteWalIteratorFactory {
.marshallerMappingFileStoreDir(marshallerMappingFileStoreDir)
.from(lowBound)
.to(highBound)
-.filter(filter);
+.filter(filter)
+.strictBoundsCheck(strictBoundsCheck);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/43ebe7a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneWalRecordsIterator.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneWalRecordsIterator.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneWalRecordsIterator.java
index e6191dd..21275d8 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneWalRecordsIterator.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneWalRecordsIterator.java
@@ -177,7 +177,7 @@ class StandaloneWalRecordsIterator extends
AbstractWalRecordsIterator {
}
if (idx == walFiles.size())
-throw new IgniteCheckedException("Wal segments not in bounds.
loBoundIndex=" + lowBound.index() +
+throw new StrictBoundsCheckException("Wal segments not in bounds.
loBoundIndex=" + lowBound.index() +
", indexes=" +
printIndexes(walFiles));
long curWalSegmIdx = walFiles.get(idx).idx();
@@ -188,11 +188,11 @@ class StandaloneWalRecordsIterator extends
AbstractWalRecordsIterator {
assert desc != null;
if (curWalSegmIdx != desc.idx())
-throw new IgniteCheckedException("Wal segment " +
curWalSegmIdx + " not found in files " + printIndexes(walFiles));
+throw new StrictBoundsCheckException("Wal segment " +
curWalSegmIdx + " not found in files " + printIndexes(walFiles));
}
if (highBound.index() < Long.MAX_VALUE && curWalSegmIdx <=
highBound.index())
-throw new IgniteCheckedException("Wal segments not in bounds.
hiBoundIndex=" + highBound.index() +
+throw new StrictBoundsCheckException("Wal segments not in bounds.
hiBoundIndex=" + highBound.index() +
", indexes=" +
printIndexes(walFiles));
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/43ebe7a5/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StrictBoundsCheckException.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StrictBoundsCheckException.java
ignite git commit: IGNITE-9897: ODBC fix for PDO when used with unixODBC
Repository: ignite Updated Branches: refs/heads/master 43ebe7a5b -> 59db29138 IGNITE-9897: ODBC fix for PDO when used with unixODBC This closes #5248 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/59db2913 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/59db2913 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/59db2913 Branch: refs/heads/master Commit: 59db29138406b6986200910ef8de44666f993fcd Parents: 43ebe7a Author: Igor Sapego Authored: Thu Nov 15 16:59:54 2018 +0300 Committer: Igor Sapego Committed: Thu Nov 15 16:59:54 2018 +0300 -- modules/platforms/cpp/odbc-test/src/sql_get_info_test.cpp | 2 +- modules/platforms/cpp/odbc/src/config/connection_info.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/59db2913/modules/platforms/cpp/odbc-test/src/sql_get_info_test.cpp -- diff --git a/modules/platforms/cpp/odbc-test/src/sql_get_info_test.cpp b/modules/platforms/cpp/odbc-test/src/sql_get_info_test.cpp index d8ed087..96e6164 100644 --- a/modules/platforms/cpp/odbc-test/src/sql_get_info_test.cpp +++ b/modules/platforms/cpp/odbc-test/src/sql_get_info_test.cpp @@ -165,7 +165,7 @@ BOOST_AUTO_TEST_CASE(TestValues) CheckIntInfo(SQL_POS_OPERATIONS, 0); CheckIntInfo(SQL_SQL92_DATETIME_FUNCTIONS, SQL_SDF_CURRENT_DATE | SQL_SDF_CURRENT_TIMESTAMP); CheckIntInfo(SQL_SQL92_VALUE_EXPRESSIONS, SQL_SVE_CASE | SQL_SVE_CAST | SQL_SVE_COALESCE | SQL_SVE_NULLIF); -CheckIntInfo(SQL_STATIC_CURSOR_ATTRIBUTES1, SQL_CA1_NEXT); +CheckIntInfo(SQL_STATIC_CURSOR_ATTRIBUTES1, SQL_CA1_NEXT | SQL_CA1_ABSOLUTE); CheckIntInfo(SQL_STATIC_CURSOR_ATTRIBUTES2, 0); CheckIntInfo(SQL_PARAM_ARRAY_ROW_COUNTS, SQL_PARC_BATCH); CheckIntInfo(SQL_PARAM_ARRAY_SELECTS, SQL_PAS_NO_SELECT); http://git-wip-us.apache.org/repos/asf/ignite/blob/59db2913/modules/platforms/cpp/odbc/src/config/connection_info.cpp -- diff --git a/modules/platforms/cpp/odbc/src/config/connection_info.cpp b/modules/platforms/cpp/odbc/src/config/connection_info.cpp index 5885381..fde8ca5 100644 --- a/modules/platforms/cpp/odbc/src/config/connection_info.cpp +++ b/modules/platforms/cpp/odbc/src/config/connection_info.cpp @@ -1103,7 +1103,7 @@ namespace ignite // Bitmask that describes the attributes of a static cursor that are supported by the driver. This // bitmask contains the first subset of attributes; for the second subset, see // SQL_STATIC_CURSOR_ATTRIBUTES2. -intParams[SQL_STATIC_CURSOR_ATTRIBUTES1] = SQL_CA1_NEXT; +intParams[SQL_STATIC_CURSOR_ATTRIBUTES1] = SQL_CA1_NEXT | SQL_CA1_ABSOLUTE; #endif // SQL_STATIC_CURSOR_ATTRIBUTES1 #ifdef SQL_STATIC_CURSOR_ATTRIBUTES2
ignite git commit: ignite-10043
Repository: ignite
Updated Branches:
refs/heads/ignite-10043 [created] 5f6141927
ignite-10043
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5f614192
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5f614192
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5f614192
Branch: refs/heads/ignite-10043
Commit: 5f61419270ca4813e8d0edbb4c23341591fa1816
Parents: 3c54f38
Author: sboikov
Authored: Thu Nov 15 17:14:21 2018 +0300
Committer: sboikov
Committed: Thu Nov 15 17:14:21 2018 +0300
--
.../GridDhtPartitionsExchangeFuture.java| 5 +-
.../dht/topology/GridDhtPartitionTopology.java | 5 +-
.../topology/GridDhtPartitionTopologyImpl.java | 115 ---
.../IgniteCachePartitionLossPolicySelfTest.java | 6 +-
4 files changed, 57 insertions(+), 74 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/5f614192/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index 3702a51..2499c8e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -3008,7 +3008,10 @@ public class GridDhtPartitionsExchangeFuture extends
GridDhtTopologyFutureAdapte
for (CacheGroupContext grp : cctx.cache().cacheGroups()) {
if (!grp.isLocal()) {
-boolean detectedOnGrp =
grp.topology().detectLostPartitions(resTopVer, events().lastEvent());
+// Do not trigger lost partition events on start.
+boolean event = !localJoinExchange() && !activateCluster();
+
+boolean detectedOnGrp =
grp.topology().detectLostPartitions(resTopVer, event ? events().lastEvent() :
null);
detected |= detectedOnGrp;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/5f614192/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopology.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopology.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopology.java
index 25b284e..bdf16da 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopology.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopology.java
@@ -25,6 +25,7 @@ import java.util.UUID;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.events.DiscoveryEvent;
+import org.apache.ignite.events.EventType;
import org.apache.ignite.internal.IgniteInterruptedCheckedException;
import org.apache.ignite.internal.managers.discovery.DiscoCache;
import org.apache.ignite.internal.processors.affinity.AffinityAssignment;
@@ -327,10 +328,10 @@ public interface GridDhtPartitionTopology {
* This method should be called on topology coordinator after all
partition messages are received.
*
* @param resTopVer Exchange result version.
- * @param discoEvt Discovery event for which we detect lost partitions.
+ * @param discoEvt Discovery event for which we detect lost partitions if
{@link EventType#EVT_CACHE_REBALANCE_PART_DATA_LOST} event should be fired.
* @return {@code True} if partitions state got updated.
*/
-public boolean detectLostPartitions(AffinityTopologyVersion resTopVer,
DiscoveryEvent discoEvt);
+public boolean detectLostPartitions(AffinityTopologyVersion resTopVer,
@Nullable DiscoveryEvent discoEvt);
/**
* Resets the state of all LOST partitions to OWNING.
http://git-wip-us.apache.org/repos/asf/ignite/blob/5f614192/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopologyImpl.java
--
diff --git
[ignite-teamcity-bot] branch ignite-10243 updated: IGNITE-10243 Notify JIRA migrated to new cache
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-10243
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/ignite-10243 by this push:
new 69ed13b IGNITE-10243 Notify JIRA migrated to new cache
69ed13b is described below
commit 69ed13be38d382e6a172097035e0bf44fc66fa19
Author: Dmitriy Pavlov
AuthorDate: Thu Nov 15 18:21:58 2018 +0300
IGNITE-10243 Notify JIRA migrated to new cache
---
.../ignite/ci/tcbot/chain/TrackedBranchChainsProcessor.java| 10 ++
.../apache/ignite/ci/teamcity/ignited/TeamcityIgnitedImpl.java | 4 +++-
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchChainsProcessor.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchChainsProcessor.java
index 5096e31..fe67693 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchChainsProcessor.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/TrackedBranchChainsProcessor.java
@@ -19,7 +19,6 @@ package org.apache.ignite.ci.tcbot.chain;
import java.util.Comparator;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
import javax.inject.Inject;
import org.apache.ignite.ci.HelperConfig;
import org.apache.ignite.ci.IAnalyticsEnabledTeamcity;
@@ -28,8 +27,6 @@ import org.apache.ignite.ci.analysis.mode.LatestRebuildMode;
import org.apache.ignite.ci.analysis.mode.ProcessLogsMode;
import org.apache.ignite.ci.conf.BranchTracked;
import org.apache.ignite.ci.di.AutoProfiling;
-import org.apache.ignite.ci.tcmodel.hist.BuildRef;
-import org.apache.ignite.ci.teamcity.ignited.IStringCompactor;
import org.apache.ignite.ci.teamcity.ignited.ITeamcityIgnited;
import org.apache.ignite.ci.teamcity.ignited.ITeamcityIgnitedProvider;
import org.apache.ignite.ci.teamcity.restcached.ITcServerProvider;
@@ -143,14 +140,11 @@ public class TrackedBranchChainsProcessor {
final String branchForTc =
chainTracked.getBranchForRestMandatory();
-IAnalyticsEnabledTeamcity teamcity = srvProv.server(srvId,
creds);
-
ITeamcityIgnited tcIgnited = tcIgnitedProv.server(srvId,
creds);
+List hist =
tcIgnited.getLastNBuildsFromHistory(chainTracked.getSuiteIdMandatory(),
branchForTc, 1);
-List history =
tcIgnited.getLastNBuildsFromHistory(chainTracked.getSuiteIdMandatory(),
branchForTc, 1);
-
-return chainProc.loadLongRunningTestsSummary(tcIgnited,
history);
+return chainProc.loadLongRunningTestsSummary(tcIgnited, hist);
})
.forEach(summary::addSuiteSummaries);
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedImpl.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedImpl.java
index 0bef2b9..dfef3c5 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedImpl.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedImpl.java
@@ -297,9 +297,11 @@ public class TeamcityIgnitedImpl implements
ITeamcityIgnited {
@Override @NotNull public List getLastNBuildsFromHistory(String
btId, String branchForTc, int cnt) {
List hist = getBuildHistoryCompacted(btId,
branchForTc);
+//todo revise if queued buidl may be ok here
+
List chains = hist.stream()
.filter(ref -> !ref.isFakeStub())
-.filter(t -> t.isNotCancelled(compactor))
+.filter(t -> !t.isCancelled(compactor))
.sorted(Comparator.comparing(BuildRefCompacted::id).reversed())
.limit(cnt)
.map(BuildRefCompacted::id)
ignite git commit: IGNITE-10246 Added license header.
Repository: ignite Updated Branches: refs/heads/master 3ad2034c0 -> a8020741c IGNITE-10246 Added license header. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a8020741 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a8020741 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a8020741 Branch: refs/heads/master Commit: a8020741c276618331900078d86e90c63bf2dcf4 Parents: 3ad2034 Author: Ivan Rakov Authored: Thu Nov 15 20:14:33 2018 +0300 Committer: Ivan Rakov Committed: Thu Nov 15 20:14:33 2018 +0300 -- .../wal/reader/StrictBoundsCheckException.java | 17 + 1 file changed, 17 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/a8020741/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StrictBoundsCheckException.java -- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StrictBoundsCheckException.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StrictBoundsCheckException.java index 4a52e08..89d54eb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StrictBoundsCheckException.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StrictBoundsCheckException.java @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.apache.ignite.internal.processors.cache.persistence.wal.reader; import org.apache.ignite.IgniteCheckedException;
[ignite-teamcity-bot] branch ignite-10243 updated: IGNITE-10243 Notify JIRA migrated to new cache
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-10243
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/ignite-10243 by this push:
new b8880b1 IGNITE-10243 Notify JIRA migrated to new cache
b8880b1 is described below
commit b8880b1b5d51b0a5266bcaeef7732fabff77acb8
Author: Dmitriy Pavlov
AuthorDate: Thu Nov 15 18:24:12 2018 +0300
IGNITE-10243 Notify JIRA migrated to new cache
---
.../java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessor.java| 2 +-
.../org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedImpl.java| 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessor.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessor.java
index 81bfbfc..280a40e 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessor.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessor.java
@@ -290,7 +290,7 @@ public class BuildChainProcessor {
final String buildTypeId = buildCompacted.buildTypeId(compactor);
Stream hist =
teamcityIgnited.getBuildHistoryCompacted(buildTypeId, branch)
.stream()
-.filter(t -> t.isNotCancelled(compactor))
+.filter(t -> !t.isCancelled(compactor))
.filter(t -> t.isFinished(compactor));
if (includeLatestRebuild == LatestRebuildMode.LATEST) {
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedImpl.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedImpl.java
index dfef3c5..607f41c 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedImpl.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedImpl.java
@@ -297,11 +297,10 @@ public class TeamcityIgnitedImpl implements
ITeamcityIgnited {
@Override @NotNull public List getLastNBuildsFromHistory(String
btId, String branchForTc, int cnt) {
List hist = getBuildHistoryCompacted(btId,
branchForTc);
-//todo revise if queued buidl may be ok here
-
List chains = hist.stream()
.filter(ref -> !ref.isFakeStub())
.filter(t -> !t.isCancelled(compactor))
+.filter(t -> t.isFinished(compactor))
.sorted(Comparator.comparing(BuildRefCompacted::id).reversed())
.limit(cnt)
.map(BuildRefCompacted::id)
@@ -311,6 +310,7 @@ public class TeamcityIgnitedImpl implements
ITeamcityIgnited {
// probably there are no not-cacelled builds at all
chains = hist.stream()
.filter(ref -> !ref.isFakeStub())
+.filter(t -> t.isFinished(compactor))
.sorted(Comparator.comparing(BuildRefCompacted::id).reversed())
.map(BuildRefCompacted::id)
.limit(cnt)
[ignite-teamcity-bot] branch ignite-10243 updated: IGNITE-10243 Notify JIRA migrated to new cache
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-10243
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/ignite-10243 by this push:
new 975a51a IGNITE-10243 Notify JIRA migrated to new cache
975a51a is described below
commit 975a51a37b4a8236ece932d2d8e24e396d5cac94
Author: Dmitriy Pavlov
AuthorDate: Thu Nov 15 18:17:59 2018 +0300
IGNITE-10243 Notify JIRA migrated to new cache
---
.../main/java/org/apache/ignite/ci/ITeamcity.java | 24 --
.../apache/ignite/ci/IgnitePersistentTeamcity.java | 89 ++
.../apache/ignite/ci/IgniteTeamcityConnection.java | 12 ---
.../main/java/org/apache/ignite/ci/TcHelper.java | 41 +++---
.../java/org/apache/ignite/ci/db/DbMigrations.java | 12 +--
5 files changed, 43 insertions(+), 135 deletions(-)
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java
index f6e8949..f22a6bf 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java
@@ -59,30 +59,6 @@ public interface ITeamcity extends ITeamcityConn {
CompletableFuture> getProjectSuites(String projectId);
-/**
- * Includes snapshot dependencies failed builds into list.
- *
- * @param projectId suite ID (string without spaces).
- * @param branch branch in TC identification.
- * @return list of builds in historical order, recent builds coming last.
- */
-@Deprecated
-default List getFinishedBuildsIncludeSnDepFailed(String
projectId, String branch){
-return getFinishedBuildsIncludeSnDepFailed(projectId, branch, null);
-};
-
-/**
- * Includes 'snapshot dependencies failed' builds into list.
- * loads build history with following parameter:
defaultFilter:false,state:finished
- *
- * @param projectId suite ID (string without spaces).
- * @param branch branch in TC identification.
- * @param sinceBuildId limit builds export with some build number, not
operational for Persistent connection.
- * @return list of builds in historical order, recent builds coming last.
- */
-@Deprecated
-List getFinishedBuildsIncludeSnDepFailed(String projectId,
String branch, Integer sinceBuildId);
-
/** */
@Deprecated
CompletableFuture> getQueuedBuilds(@Nullable String branch);
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java
index 0222d95..2229694 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java
@@ -103,7 +103,6 @@ public class IgnitePersistentTeamcity implements
IAnalyticsEnabledTeamcity, ITea
private static final String TEST_FULL = "testFull";
private static final String BUILD_PROBLEMS = "buildProblems";
-private static final String BUILD_HIST_FINISHED_OR_FAILED =
"buildHistFinishedOrFailed";
public static final String BOT_DETECTED_ISSUES = "botDetectedIssues";
public static final String TEST_REFS = "testRefs";
public static final String CONFIGURATIONS = "configurations";
@@ -159,8 +158,7 @@ public class IgnitePersistentTeamcity implements
IAnalyticsEnabledTeamcity, ITea
buildsCache(), this::addBuildOccurrenceToFailuresStat,
buildsFailureRunStatCache(), testRunStatCache(),
testFullCache(),
-buildProblemsCache(),
-buildHistIncFailedCache());
+buildProblemsCache());
}
@Override
@@ -241,13 +239,6 @@ public class IgnitePersistentTeamcity implements
IAnalyticsEnabledTeamcity, ITea
return getOrCreateCacheV2(ignCacheNme(BUILD_PROBLEMS));
}
-/**
- * @return Build history: {@link BuildRef} lists cache, 32 parts,
transactional.
- */
-private IgniteCache>>
buildHistIncFailedCache() {
-return
getOrCreateCacheV2Tx(ignCacheNme(BUILD_HIST_FINISHED_OR_FAILED));
-}
-
/** {@inheritDoc} */
@AutoProfiling
@Override public CompletableFuture>
getProjectSuites(String projectId) {
@@ -398,62 +389,6 @@ public class IgnitePersistentTeamcity implements
IAnalyticsEnabledTeamcity, ITea
return lock;
}
-/**
- * @param buildRefs Build refs list.
- * @param fromIdx From index.
- * @param toIdx To index.
- * @param key Key.
- * @param since {@code true} If key is sinceDate, {@code false} is
untilDate.
- *
- * @return {@value >= 0} Build id from list with min interval between key.
If since {@code true}, min interval
- * between key and same day
[ignite-teamcity-bot] branch ignite-10243 updated: IGNITE-10243 Removal of usage og deprecated caches
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-10243
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/ignite-10243 by this push:
new 764aa05 IGNITE-10243 Removal of usage og deprecated caches
764aa05 is described below
commit 764aa052f5c245fdb6764f34acfc47a0dd5a
Author: Dmitriy Pavlov
AuthorDate: Thu Nov 15 17:23:54 2018 +0300
IGNITE-10243 Removal of usage og deprecated caches
---
.../main/java/org/apache/ignite/ci/ITeamcity.java | 23
.../apache/ignite/ci/IgnitePersistentTeamcity.java | 127 +
.../apache/ignite/ci/IgniteTeamcityConnection.java | 18 ---
.../java/org/apache/ignite/ci/db/DbMigrations.java | 10 +-
.../ignite/ci/tcbot/chain/BuildChainProcessor.java | 4 +-
.../tcbot/chain/TrackedBranchChainsProcessor.java | 11 +-
6 files changed, 13 insertions(+), 180 deletions(-)
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java
index 59f8e82..f6e8949 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/ITeamcity.java
@@ -60,17 +60,6 @@ public interface ITeamcity extends ITeamcityConn {
CompletableFuture> getProjectSuites(String projectId);
/**
- * @param projectId suite ID (string without spaces).
- * @param branch Branch name in TC identification.
- * @param sinceDate Since date.
- * @param untilDate Until date.
- * @param sinceBuildId Some build ID in the past to to use as minimal
build to export.
- * @return list of builds in historical order, recent builds coming last.
- */
-@Deprecated
-List getFinishedBuilds(String projectId, String branch, Date
sinceDate, Date untilDate, Integer sinceBuildId);
-
-/**
* Includes snapshot dependencies failed builds into list.
*
* @param projectId suite ID (string without spaces).
@@ -98,18 +87,6 @@ public interface ITeamcity extends ITeamcityConn {
@Deprecated
CompletableFuture> getQueuedBuilds(@Nullable String branch);
-/**
- * @param projectId Suite ID (string without spaces).
- * @param branchNameForHist Branch in TC identification.
- * @param sinceDate Since date.
- * @param untilDate Until date.
- * @return List of build numbers in historical order in date interval,
recent builds coming last.
- */
-@Deprecated
-default int[] getBuildNumbersFromHistory(String projectId, String
branchNameForHist, Date sinceDate, Date untilDate) {
-return getFinishedBuilds(projectId, branchNameForHist, sinceDate,
untilDate, null).stream().mapToInt(BuildRef::getId).toArray();
-}
-
@Deprecated
Build getBuild(String href);
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java
index e9befbe..0222d95 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/IgnitePersistentTeamcity.java
@@ -36,12 +36,10 @@ import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
-import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.Lock;
import java.util.function.BiFunction;
import java.util.function.Function;
import java.util.function.Predicate;
-import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
import javax.annotation.Nullable;
@@ -83,7 +81,6 @@ import org.apache.ignite.ci.util.CollectionUtil;
import org.apache.ignite.ci.util.ObjectInterner;
import org.apache.ignite.ci.web.rest.parms.FullQueryParams;
import org.jetbrains.annotations.NotNull;
-import org.xml.sax.SAXParseException;
import static
org.apache.ignite.ci.tcbot.chain.BuildChainProcessor.normalizeBranch;
@@ -105,7 +102,7 @@ public class IgnitePersistentTeamcity implements
IAnalyticsEnabledTeamcity, ITea
@Deprecated
private static final String TEST_FULL = "testFull";
private static final String BUILD_PROBLEMS = "buildProblems";
-private static final String BUILD_HIST_FINISHED = "buildHistFinished";
+
private static final String BUILD_HIST_FINISHED_OR_FAILED =
"buildHistFinishedOrFailed";
public static final String BOT_DETECTED_ISSUES = "botDetectedIssues";
public static final String TEST_REFS = "testRefs";
@@ -163,7 +160,6 @@ public class IgnitePersistentTeamcity implements
IAnalyticsEnabledTeamcity, ITea
buildsFailureRunStatCache(), testRunStatCache(),
testFullCache(),
ignite git commit: IGNITE-10009: ODBC fix for escaped table names
Repository: ignite
Updated Branches:
refs/heads/master 59db29138 -> 665aa9508
IGNITE-10009: ODBC fix for escaped table names
This closes #5080
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/665aa950
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/665aa950
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/665aa950
Branch: refs/heads/master
Commit: 665aa9508687e0c37fa81ad0832b60d0e2b7e7b3
Parents: 59db291
Author: Igor Sapego
Authored: Thu Nov 15 17:08:00 2018 +0300
Committer: Igor Sapego
Committed: Thu Nov 15 17:08:00 2018 +0300
--
.../odbc/odbc/OdbcRequestHandler.java | 12 ++
.../processors/odbc/odbc/OdbcUtils.java | 22 ++
.../cpp/odbc-test/src/meta_queries_test.cpp | 43
3 files changed, 68 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/665aa950/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcRequestHandler.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcRequestHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcRequestHandler.java
index 723ce5c..10cfd6d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcRequestHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcRequestHandler.java
@@ -868,15 +868,12 @@ public class OdbcRequestHandler implements
ClientListenerRequestHandler {
if (str == null)
return false;
-String pattern = ptrn.toUpperCase().replace("%", ".*").replace("_",
".");
+String pattern = OdbcUtils.preprocessPattern(ptrn);
String[] types = pattern.split(",");
for (String type0 : types) {
-String type = type0.trim();
-
-if (type.length() >= 2 && type.matches("['\"].*['\"]"))
-type = type.substring(1, type.length() - 1);
+String type = OdbcUtils.removeQuotationMarksIfNeeded(type0.trim());
if (str.toUpperCase().matches(type))
return true;
@@ -899,10 +896,7 @@ public class OdbcRequestHandler implements
ClientListenerRequestHandler {
if (str == null)
return false;
-String pattern = ptrn.toUpperCase().replace("%", ".*").replace("_",
".");
-
-if (pattern.length() >= 2 && pattern.matches("['\"].*['\"]"))
-pattern = pattern.substring(1, pattern.length() - 1);
+String pattern = OdbcUtils.preprocessPattern(ptrn);
return str.toUpperCase().matches(pattern);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/665aa950/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcUtils.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcUtils.java
index 966d7bb..d294ac2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/odbc/OdbcUtils.java
@@ -25,6 +25,7 @@ import
org.apache.ignite.internal.processors.cache.QueryCursorImpl;
import org.apache.ignite.internal.processors.cache.query.IgniteQueryErrorCode;
import org.apache.ignite.internal.processors.odbc.SqlListenerDataTypes;
import org.apache.ignite.internal.processors.query.IgniteSQLException;
+import org.apache.ignite.internal.util.typedef.F;
/**
* Various ODBC utility methods.
@@ -57,6 +58,27 @@ public class OdbcUtils {
}
/**
+ * Pre-process table or column pattern.
+ *
+ * @param ptrn Pattern to pre-process.
+ * @return Processed pattern.
+ */
+public static String preprocessPattern(String ptrn) {
+if (F.isEmpty(ptrn))
+return ptrn;
+
+String ptrn0 = ' ' + removeQuotationMarksIfNeeded(ptrn.toUpperCase());
+
+ptrn0 = ptrn0.replaceAll("([^])%", "$1.*");
+
+ptrn0 = ptrn0.replaceAll("([^])_", "$1.");
+
+ptrn0 = ptrn0.replaceAll("(.)", "$1");
+
+return ptrn0.substring(1);
+}
+
+/**
* Private constructor.
*/
private OdbcUtils() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/665aa950/modules/platforms/cpp/odbc-test/src/meta_queries_test.cpp
--
diff --git a/modules/platforms/cpp/odbc-test/src/meta_queries_test.cpp
b/modules/platforms/cpp/odbc-test/src/meta_queries_test.cpp
ignite git commit: IGNITE-10207 Fixed missed loss policy checks - Fixes #5360.
Repository: ignite
Updated Branches:
refs/heads/master 665aa9508 -> e4760980a
IGNITE-10207 Fixed missed loss policy checks - Fixes #5360.
Signed-off-by: Dmitriy Govorukhin
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e4760980
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e4760980
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e4760980
Branch: refs/heads/master
Commit: e4760980ab6077ee398965f551fdf8302820ae0e
Parents: 665aa95
Author: Dmitriy Govorukhin
Authored: Thu Nov 15 19:15:13 2018 +0300
Committer: Dmitriy Govorukhin
Committed: Thu Nov 15 19:15:13 2018 +0300
--
.../processors/cache/GridCacheContext.java | 19 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 40 +-
.../distributed/dht/GridDhtGetSingleFuture.java | 41 +-
.../dht/GridDhtTopologyFutureAdapter.java | 233 ---
.../dht/GridPartitionedGetFuture.java | 2 +-
.../dht/GridPartitionedSingleGetFuture.java | 9 +-
.../GridDhtPartitionsExchangeFuture.java| 4 +-
.../distributed/near/GridNearGetFuture.java | 2 +-
...CacheResultIsNotNullOnPartitionLossTest.java | 23 +-
.../IgniteCachePartitionLossPolicySelfTest.java | 652 +++
...ndexingCachePartitionLossPolicySelfTest.java | 2 +-
11 files changed, 483 insertions(+), 544 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/e4760980/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java
--
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 44d067c..53c0bf0 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
@@ -2241,9 +2241,14 @@ public class GridCacheContext implements
Externalizable {
*
* @param affNodes All affinity nodes.
* @param canRemap Flag indicating that 'get' should be done on a locked
topology version.
+ * @param partitionId Partition ID.
* @return Affinity node to get key from or {@code null} if there is no
suitable alive node.
*/
-@Nullable public ClusterNode selectAffinityNodeBalanced(List
affNodes, boolean canRemap) {
+@Nullable public ClusterNode selectAffinityNodeBalanced(
+List affNodes,
+int partitionId,
+boolean canRemap
+) {
if (!readLoadBalancingEnabled) {
if (!canRemap) {
for (ClusterNode node : affNodes) {
@@ -2267,7 +2272,7 @@ public class GridCacheContext implements
Externalizable {
ClusterNode n0 = null;
for (ClusterNode node : affNodes) {
-if (canRemap || discovery().alive(node)) {
+if ((canRemap || discovery().alive(node) && isOwner(node,
partitionId))) {
if (locMacs.equals(node.attribute(ATTR_MACS)))
return node;
@@ -2282,6 +2287,16 @@ public class GridCacheContext implements
Externalizable {
}
/**
+ * Check that node is owner for partition.
+ * @param node Cluster node.
+ * @param partitionId Partition ID.
+ * @return {@code}
+ */
+private boolean isOwner(ClusterNode node, int partitionId) {
+return topology().partitionState(node.id(), partitionId) == OWNING;
+}
+
+/**
* Prepare affinity field for builder (if possible).
*
* @param buider Builder.
http://git-wip-us.apache.org/repos/asf/ignite/blob/e4760980/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
index 024e262..96d1769 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtGetFuture.java
@@ -37,6 +37,7 @@ import
org.apache.ignite.internal.processors.cache.GridCacheEntryRemovedExceptio
import org.apache.ignite.internal.processors.cache.IgniteCacheExpiryPolicy;
import org.apache.ignite.internal.processors.cache.KeyCacheObject;
import org.apache.ignite.internal.processors.cache.ReaderArguments;
+import
ignite git commit: ignite-10043
Repository: ignite
Updated Branches:
refs/heads/ignite-10043 5f6141927 -> 51933a8e1
ignite-10043
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/51933a8e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/51933a8e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/51933a8e
Branch: refs/heads/ignite-10043
Commit: 51933a8e1f3840a4e6a18e8d32de33b775a35321
Parents: 5f61419
Author: sboikov
Authored: Thu Nov 15 22:04:46 2018 +0300
Committer: sboikov
Committed: Thu Nov 15 22:04:46 2018 +0300
--
.../IgniteCachePartitionLossPolicySelfTest.java| 13 +
1 file changed, 5 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/51933a8e/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java
--
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java
index a016865..9b1ea41 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCachePartitionLossPolicySelfTest.java
@@ -520,16 +520,13 @@ public class IgniteCachePartitionLossPolicySelfTest
extends GridCommonAbstractTe
info("Newly started node: " + grd.cluster().localNode().id());
// Check that partition state does not change after we start each
node.
-// TODO With persistence enabled LOST partitions become OWNING
after a node joins back - https://issues.apache.org/jira/browse/IGNITE-10044.
-if (!isPersistenceEnabled) {
-for (Ignite ig : G.allGrids()) {
-verifyCacheOps(canWrite, safe, ig);
+for (Ignite ig : G.allGrids()) {
+verifyCacheOps(canWrite, safe, ig);
-// TODO Query effectively waits for rebalance due to
https://issues.apache.org/jira/browse/IGNITE-10057
-// TODO and after resetLostPartition there is another
OWNING copy in the cluster due to
https://issues.apache.org/jira/browse/IGNITE-10058.
-// TODO Uncomment after
https://issues.apache.org/jira/browse/IGNITE-10058 is fixed.
+// TODO Query effectively waits for rebalance due to
https://issues.apache.org/jira/browse/IGNITE-10057
+// TODO and after resetLostPartition there is another OWNING
copy in the cluster due to https://issues.apache.org/jira/browse/IGNITE-10058.
+// TODO Uncomment after
https://issues.apache.org/jira/browse/IGNITE-10058 is fixed.
//validateQuery(safe, ig);
-}
}
}
ignite git commit: IGNITE-10253: SQL: Merged SqlQuery execution logic with SqlFieldsQuery. Now the first one is simply an additional converter on top of the second. This closes #5395.
Repository: ignite
Updated Branches:
refs/heads/master a8020741c -> c4ec543a8
IGNITE-10253: SQL: Merged SqlQuery execution logic with SqlFieldsQuery. Now the
first one is simply an additional converter on top of the second. This closes
#5395.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c4ec543a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c4ec543a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c4ec543a
Branch: refs/heads/master
Commit: c4ec543a8b0da9c5d9a2e25739ac31fd68d13a5d
Parents: a802074
Author: devozerov
Authored: Thu Nov 15 22:40:22 2018 +0300
Committer: devozerov
Committed: Thu Nov 15 22:40:22 2018 +0300
--
.../processors/query/GridQueryIndexing.java | 23 +-
.../processors/query/GridQueryProcessor.java| 275
.../processors/query/QueryKeyValueIterable.java | 53 ++
.../processors/query/QueryKeyValueIterator.java | 68 ++
...IgniteClientCacheInitializationFailTest.java | 19 +-
.../processors/query/h2/IgniteH2Indexing.java | 285 ++---
...CacheAbstractQueryDetailMetricsSelfTest.java | 15 +-
.../CacheAbstractQueryMetricsSelfTest.java | 13 -
...niteCacheLockPartitionOnAffinityRunTest.java | 2 +
.../h2/GridIndexingSpiAbstractSelfTest.java | 639 +--
...H2ResultSetIteratorNullifyOnEndSelfTest.java | 186 --
11 files changed, 337 insertions(+), 1241 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/c4ec543a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
index 60b0221..3eb732c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java
@@ -21,11 +21,9 @@ import java.sql.PreparedStatement;
import java.sql.SQLException;
import java.util.Collection;
import java.util.List;
-import javax.cache.Cache;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteDataStreamer;
import org.apache.ignite.cache.query.FieldsQueryCursor;
-import org.apache.ignite.cache.query.QueryCursor;
import org.apache.ignite.cache.query.SqlFieldsQuery;
import org.apache.ignite.cache.query.SqlQuery;
import org.apache.ignite.internal.GridKernalContext;
@@ -70,16 +68,13 @@ public interface GridQueryIndexing {
public void onClientDisconnect() throws IgniteCheckedException;
/**
- * Parses SQL query into two step query and executes it.
+ * Generate SqlFieldsQuery from SqlQuery.
*
- * @param schemaName Schema name.
* @param cacheName Cache name.
* @param qry Query.
- * @param keepBinary Keep binary flag.
- * @throws IgniteCheckedException If failed.
+ * @return Fields query.
*/
-public QueryCursor> queryDistributedSql(String
schemaName, String cacheName, SqlQuery qry,
-boolean keepBinary) throws IgniteCheckedException;
+public SqlFieldsQuery generateFieldsQuery(String cacheName, SqlQuery qry);
/**
* Detect whether SQL query should be executed in distributed or local
manner and execute it.
@@ -121,18 +116,6 @@ public interface GridQueryIndexing {
SqlClientContext cliCtx) throws IgniteCheckedException;
/**
- * Executes regular query.
- *
- * @param schemaName Schema name.
- * @param cacheName Cache name.
- * @param qry Query.
- * @param filter Cache name and key filter.
- * @param keepBinary Keep binary flag.@return Cursor.
- */
-public QueryCursor> queryLocalSql(String
schemaName, String cacheName, SqlQuery qry,
-IndexingQueryFilter filter, boolean keepBinary) throws
IgniteCheckedException;
-
-/**
* Queries individual fields (generally used by JDBC drivers).
*
* @param schemaName Schema name.
http://git-wip-us.apache.org/repos/asf/ignite/blob/c4ec543a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index 957d3ae..30c28b1 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++
[2/2] ignite git commit: IGNITE-9274: Added optional labels to transactions. This closes #4600.
IGNITE-9274: Added optional labels to transactions. This closes #4600. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3c54f389 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3c54f389 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3c54f389 Branch: refs/heads/master Commit: 3c54f389415ae317c6d5e8140fc4d23c39ac51db Parents: d37f1d7 Author: Yuriy Gerzhedovich Authored: Thu Nov 15 12:08:54 2018 +0300 Committer: devozerov Committed: Thu Nov 15 12:08:54 2018 +0300 -- .../ignite/codegen/MessageCodeGenerator.java| 11 +- .../org/apache/ignite/events/CacheEvent.java| 24 +- .../processors/cache/CacheGroupContext.java | 3 +- .../cache/ExchangeDiscoveryEvents.java | 1 + .../processors/cache/GridCacheAdapter.java | 4 + .../cache/GridCacheConcurrentMapImpl.java | 9 +- .../processors/cache/GridCacheEventManager.java | 29 +- .../cache/GridCacheEvictionManager.java | 4 +- .../processors/cache/GridCacheMapEntry.java | 18 +- .../GridDistributedTxRemoteAdapter.java | 14 +- .../distributed/dht/GridDhtCacheAdapter.java| 11 + .../cache/distributed/dht/GridDhtGetFuture.java | 8 + .../distributed/dht/GridDhtGetSingleFuture.java | 8 + .../distributed/dht/GridDhtLockFuture.java | 7 +- .../distributed/dht/GridDhtLockRequest.java | 32 +- .../dht/GridDhtTransactionalCacheAdapter.java | 12 +- .../cache/distributed/dht/GridDhtTxLocal.java | 14 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 4 +- .../dht/GridDhtTxPrepareRequest.java| 89 ++-- .../cache/distributed/dht/GridDhtTxRemote.java | 14 +- .../dht/GridPartitionedGetFuture.java | 10 + .../dht/GridPartitionedSingleGetFuture.java | 10 + .../dht/atomic/GridDhtAtomicCache.java | 3 + .../dht/colocated/GridDhtColocatedCache.java| 55 ++- .../colocated/GridDhtColocatedLockFuture.java | 3 +- .../dht/preloader/GridDhtForceKeysFuture.java | 4 +- .../dht/preloader/GridDhtPartitionDemander.java | 4 +- .../dht/topology/GridDhtLocalPartition.java | 3 +- .../distributed/near/GridNearGetFuture.java | 2 + .../distributed/near/GridNearGetRequest.java| 55 ++- .../distributed/near/GridNearLockFuture.java| 3 +- .../distributed/near/GridNearLockRequest.java | 31 +- .../near/GridNearSingleGetRequest.java | 47 +- .../near/GridNearTransactionalCache.java| 3 +- .../near/GridNearTxEnlistFuture.java| 3 +- .../cache/distributed/near/GridNearTxLocal.java | 10 +- .../near/GridNearTxPrepareRequest.java | 30 +- .../GridNearTxQueryResultsEnlistFuture.java | 3 +- .../distributed/near/GridNearTxRemote.java | 40 +- .../local/atomic/GridLocalAtomicCache.java | 1 + .../cache/transactions/IgniteInternalTx.java| 7 + .../cache/transactions/IgniteTxAdapter.java | 5 + .../cache/transactions/IgniteTxHandler.java | 9 +- .../cache/CashEventWithTxLabelTest.java | 487 +++ .../mvcc/CacheMvccOperationChecksTest.java | 1 - .../platform/PlatformEventsWriteEventTask.java | 2 +- .../testsuites/IgniteCacheTestSuite4.java | 3 + 47 files changed, 1014 insertions(+), 136 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ignite/blob/3c54f389/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java -- diff --git a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java index 7492e51..615ffca 100644 --- a/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java +++ b/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java @@ -43,6 +43,11 @@ import org.apache.ignite.internal.GridDirectCollection; import org.apache.ignite.internal.GridDirectMap; import org.apache.ignite.internal.GridDirectTransient; import org.apache.ignite.internal.IgniteCodeGeneratingFail; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtLockRequest; +import org.apache.ignite.internal.processors.cache.distributed.dht.GridDhtTxPrepareRequest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridNearGetRequest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridNearSingleGetRequest; +import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPrepareRequest; import org.apache.ignite.internal.processors.cache.mvcc.msg.MvccRecoveryFinishedMessage; import org.apache.ignite.internal.util.IgniteUtils; import
ignite git commit: IGNITE-6295: SQL: Deprecated "replicatedOnly" flag (part 2).
Repository: ignite
Updated Branches:
refs/heads/master 0b067af67 -> d37f1d709
IGNITE-6295: SQL: Deprecated "replicatedOnly" flag (part 2).
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d37f1d70
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d37f1d70
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d37f1d70
Branch: refs/heads/master
Commit: d37f1d70918ed34f8932cb85fdb59c667a8f86b2
Parents: 0b067af
Author: devozerov
Authored: Thu Nov 15 11:55:35 2018 +0300
Committer: devozerov
Committed: Thu Nov 15 11:55:35 2018 +0300
--
.../internal/processors/query/h2/sql/GridSqlQueryParser.java | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/d37f1d70/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
--
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
index 1208f6a..122a9f7 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/sql/GridSqlQueryParser.java
@@ -1730,6 +1730,9 @@ public class GridSqlQueryParser {
if (tbl != null) {
GridCacheContext cctx = tbl.cache();
+if (cctx.mvccEnabled())
+return false;
+
if (cctx.isPartitioned())
return false;
[1/2] ignite git commit: IGNITE-9274: Added optional labels to transactions. This closes #4600.
Repository: ignite
Updated Branches:
refs/heads/master d37f1d709 -> 3c54f3894
http://git-wip-us.apache.org/repos/asf/ignite/blob/3c54f389/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
index f594e2b..2531143 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
@@ -108,6 +108,9 @@ public class GridNearGetRequest extends GridCacheIdMessage
implements GridCacheD
/** TTL for read operation. */
private long accessTtl;
+/** Transaction label. */
+private @Nullable String txLbl;
+
/** */
private MvccSnapshot mvccSnapshot;
@@ -133,6 +136,7 @@ public class GridNearGetRequest extends GridCacheIdMessage
implements GridCacheD
* @param createTtl New TTL to set after entry is created, -1 to leave
unchanged.
* @param accessTtl New TTL to set after entry is accessed, -1 to leave
unchanged.
* @param addDepInfo Deployment info.
+ * @param txLbl Transaction label.
* @param mvccSnapshot Mvcc snapshot.
*/
public GridNearGetRequest(
@@ -151,6 +155,7 @@ public class GridNearGetRequest extends GridCacheIdMessage
implements GridCacheD
boolean skipVals,
boolean addDepInfo,
boolean recovery,
+@Nullable String txLbl,
@Nullable MvccSnapshot mvccSnapshot
) {
assert futId != null;
@@ -180,6 +185,7 @@ public class GridNearGetRequest extends GridCacheIdMessage
implements GridCacheD
this.createTtl = createTtl;
this.accessTtl = accessTtl;
this.addDepInfo = addDepInfo;
+this.txLbl = txLbl;
this.mvccSnapshot = mvccSnapshot;
if (readThrough)
@@ -297,6 +303,15 @@ public class GridNearGetRequest extends GridCacheIdMessage
implements GridCacheD
}
/**
+ * Get transaction label (may be null).
+ *
+ * @return Possible transaction label;
+ */
+@Nullable public String txLabel() {
+return txLbl;
+}
+
+/**
* @param ctx Cache context.
* @throws IgniteCheckedException If failed.
*/
@@ -397,37 +412,43 @@ public class GridNearGetRequest extends
GridCacheIdMessage implements GridCacheD
writer.incrementState();
case 9:
-if (!writer.writeCollection("readersFlags", readersFlags,
MessageCollectionItemType.BOOLEAN))
+if (!writer.writeMessage("mvccSnapshot", mvccSnapshot))
return false;
writer.incrementState();
case 10:
-if (!writer.writeUuid("subjId", subjId))
+if (!writer.writeCollection("readersFlags", readersFlags,
MessageCollectionItemType.BOOLEAN))
return false;
writer.incrementState();
case 11:
-if (!writer.writeInt("taskNameHash", taskNameHash))
+if (!writer.writeUuid("subjId", subjId))
return false;
writer.incrementState();
case 12:
-if (!writer.writeMessage("topVer", topVer))
+if (!writer.writeInt("taskNameHash", taskNameHash))
return false;
writer.incrementState();
case 13:
-if (!writer.writeMessage("ver", ver))
+if (!writer.writeMessage("topVer", topVer))
return false;
writer.incrementState();
case 14:
-if (!writer.writeMessage("mvccSnapshot", mvccSnapshot))
+if (!writer.writeString("txLbl", txLbl))
+return false;
+
+writer.incrementState();
+
+case 15:
+if (!writer.writeMessage("ver", ver))
return false;
writer.incrementState();
@@ -497,7 +518,7 @@ public class GridNearGetRequest extends GridCacheIdMessage
implements GridCacheD
reader.incrementState();
case 9:
-readersFlags = reader.readCollection("readersFlags",
MessageCollectionItemType.BOOLEAN);
+mvccSnapshot = reader.readMessage("mvccSnapshot");
if (!reader.isLastRead())
return false;
@@ -505,7 +526,7 @@ public class GridNearGetRequest extends GridCacheIdMessage
implements GridCacheD
reader.incrementState();
case 10:
-subjId =
ignite git commit: IGNITE-6295: SQL: Deprecated "replicatedOnly" flag. This closes #4164. This closes #5373.
Repository: ignite
Updated Branches:
refs/heads/master bf2f05e32 -> 0b067af67
IGNITE-6295: SQL: Deprecated "replicatedOnly" flag. This closes #4164. This
closes #5373.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0b067af6
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0b067af6
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0b067af6
Branch: refs/heads/master
Commit: 0b067af679fe53993960df2fda0dc36c4ae3ed45
Parents: bf2f05e
Author: devozerov
Authored: Thu Nov 15 11:49:03 2018 +0300
Committer: devozerov
Committed: Thu Nov 15 11:49:03 2018 +0300
--
.../ignite/cache/query/SqlFieldsQuery.java | 4
.../org/apache/ignite/cache/query/SqlQuery.java | 4
.../processors/query/GridQueryProcessor.java| 3 ---
.../cache/mvcc/CacheMvccAbstractTest.java | 7 +++---
.../processors/query/h2/IgniteH2Indexing.java | 2 +-
.../query/h2/sql/GridSqlQueryParser.java| 25 +++-
.../query/h2/sql/GridSqlQuerySplitter.java | 11 +++--
.../IgniteCacheAbstractFieldsQuerySelfTest.java | 2 +-
.../cache/IgniteCacheAbstractQuerySelfTest.java | 2 ++
.../IgniteCacheReplicatedQuerySelfTest.java | 9 +++
.../query/IgniteCachelessQueriesSelfTest.java | 2 +-
.../h2/twostep/RetryCauseMessageSelfTest.java | 3 +++
.../Cache/Query/CacheQueriesTest.cs | 4
.../Query/Linq/CacheLinqTest.Introspection.cs | 4
.../Cache/Query/Linq/CacheLinqTest.Misc.cs | 3 ++-
.../Cache/Query/SqlFieldsQuery.cs | 3 +++
.../Apache.Ignite.Core/Cache/Query/SqlQuery.cs | 5
.../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 2 ++
.../Impl/Client/Cache/CacheClient.cs| 4
.../Impl/CacheFieldsQueryExecutor.cs| 2 ++
.../dotnet/Apache.Ignite.Linq/QueryOptions.cs | 1 +
21 files changed, 78 insertions(+), 24 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/0b067af6/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
b/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
index 4e12b8c..6945f25 100644
---
a/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
+++
b/modules/core/src/main/java/org/apache/ignite/cache/query/SqlFieldsQuery.java
@@ -273,7 +273,9 @@ public class SqlFieldsQuery extends Query> {
*
* @param replicatedOnly The query contains only replicated tables.
* @return {@code this} For chaining.
+ * @deprecated No longer used as of Apache Ignite 2.8.
*/
+@Deprecated
public SqlFieldsQuery setReplicatedOnly(boolean replicatedOnly) {
this.replicatedOnly = replicatedOnly;
@@ -284,7 +286,9 @@ public class SqlFieldsQuery extends Query> {
* Check is the query contains only replicated tables.
*
* @return {@code true} If the query contains only replicated tables.
+ * @deprecated No longer used as of Apache Ignite 2.8.
*/
+@Deprecated
public boolean isReplicatedOnly() {
return replicatedOnly;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0b067af6/modules/core/src/main/java/org/apache/ignite/cache/query/SqlQuery.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/query/SqlQuery.java
b/modules/core/src/main/java/org/apache/ignite/cache/query/SqlQuery.java
index a5994b9..5b0667c 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/query/SqlQuery.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/query/SqlQuery.java
@@ -238,7 +238,9 @@ public final class SqlQuery extends
Query> {
*
* @param replicatedOnly The query contains only replicated tables.
* @return {@code this} For chaining.
+ * @deprecated No longer used as of Apache Ignite 2.8.
*/
+@Deprecated
public SqlQuery setReplicatedOnly(boolean replicatedOnly) {
this.replicatedOnly = replicatedOnly;
@@ -249,7 +251,9 @@ public final class SqlQuery extends
Query> {
* Check is the query contains only replicated tables.
*
* @return {@code true} If the query contains only replicated tables.
+ * @deprecated No longer used as of Apache Ignite 2.8.
*/
+@Deprecated
public boolean isReplicatedOnly() {
return replicatedOnly;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/0b067af6/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
--
diff --git
ignite git commit: IGNITE-8735 Metastorage creates its own index partition - Fixes #5383.
Repository: ignite
Updated Branches:
refs/heads/master 3c54f3894 -> a74d9c4f6
IGNITE-8735 Metastorage creates its own index partition - Fixes #5383.
Signed-off-by: Ivan Rakov
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a74d9c4f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a74d9c4f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a74d9c4f
Branch: refs/heads/master
Commit: a74d9c4f66f407bfde56173a727b2545cc3bfb99
Parents: 3c54f38
Author: Alexey Stelmak
Authored: Thu Nov 15 15:28:22 2018 +0300
Committer: Ivan Rakov
Committed: Thu Nov 15 15:28:22 2018 +0300
--
.../internal/pagemem/PageIdAllocator.java | 3 +
.../persistence/metastorage/MetaStorage.java| 7 ++
.../metastorage/MetastorageTree.java| 9 +++
.../metastorage/IgniteMetaStorageBasicTest.java | 78
4 files changed, 97 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ignite/blob/a74d9c4f/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageIdAllocator.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageIdAllocator.java
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageIdAllocator.java
index c6aeabe..b3e4b07 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageIdAllocator.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/pagemem/PageIdAllocator.java
@@ -35,6 +35,9 @@ public interface PageIdAllocator {
/** Special partition reserved for index space. */
public static final int INDEX_PARTITION = 0x;
+/** Special partition reserved for metastore space. */
+public static final int METASTORE_PARTITION = 0x0;
+
/**
* Allocates a page from the space for the given partition ID and the
given flags.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/a74d9c4f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetaStorage.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetaStorage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetaStorage.java
index 4a243aa..91fbec0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetaStorage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetaStorage.java
@@ -28,6 +28,7 @@ import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.internal.pagemem.FullPageId;
+import org.apache.ignite.internal.pagemem.PageIdAllocator;
import org.apache.ignite.internal.pagemem.PageIdUtils;
import org.apache.ignite.internal.pagemem.PageMemory;
import org.apache.ignite.internal.pagemem.wal.IgniteWriteAheadLogManager;
@@ -62,6 +63,7 @@ import org.apache.ignite.marshaller.Marshaller;
import org.apache.ignite.marshaller.jdk.JdkMarshaller;
import org.jetbrains.annotations.NotNull;
+import static org.apache.ignite.internal.pagemem.PageIdAllocator.FLAG_DATA;
import static org.apache.ignite.internal.pagemem.PageIdUtils.itemId;
import static org.apache.ignite.internal.pagemem.PageIdUtils.pageId;
@@ -507,6 +509,11 @@ public class MetaStorage implements DbCheckpointListener,
ReadOnlyMetastorage, R
return SimpleDataPageIO.VERSIONS;
}
+/** {@inheritDoc} */
+@Override protected long allocatePageNoReuse() throws
IgniteCheckedException {
+return pageMem.allocatePage(grpId,
PageIdAllocator.METASTORE_PARTITION, FLAG_DATA);
+}
+
/**
* Read row from data pages.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/a74d9c4f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetastorageTree.java
--
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetastorageTree.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetastorageTree.java
index 00db5cd..27de684 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetastorageTree.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/metastorage/MetastorageTree.java
@@ -19,6 +19,7 @@ package
[ignite-teamcity-bot] branch master updated: One more build removal from cache
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 e73f085 One more build removal from cache
e73f085 is described below
commit e73f085b9294ef4af4ac95fb2012522feb05b228
Author: Dmitriy Pavlov
AuthorDate: Thu Nov 15 15:36:17 2018 +0300
One more build removal from cache
---
.../ignite/ci/runners/RemoteClientTmpHelper.java | 26 +-
1 file changed, 15 insertions(+), 11 deletions(-)
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/runners/RemoteClientTmpHelper.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/runners/RemoteClientTmpHelper.java
index 9e37c79..f3f3802 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/runners/RemoteClientTmpHelper.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/runners/RemoteClientTmpHelper.java
@@ -93,19 +93,23 @@ public class RemoteClientTmpHelper {
CompactBuildsInfo cbi = new CompactBuildsInfo();
-
-cbi.userName(253483);
+cbi.userName(62541);
cbi.srvId(245001);
cbi.buildTypeId(113);
-cbi.branchForTc(231783);
-cbi.ticket(253484);
-cbi.date(1542027258436l);
-
-cbi.addBuild(2300387, 2300395, 2300385, 2300393, 2300391, 2300389);
-boolean remove = cache.remove(cbi);
-Preconditions.checkState(remove, "can't remove " + cbi);
-
//"finishedBuilds":{"2300387":false,"2300395":false,"2300385":false,"2300393":false,"2300391":false,"2300389":false}
-ignite.close();
+cbi.branchForTc(2008);
+cbi.ticket(263594);
+cbi.date(1542263949429L);
+
+cbi.addBuild(2322291, 2322298, 2322296, 2322294, 2322292, 2322300);
+
+boolean rmv = cache.remove(cbi);
+
+try {
+Preconditions.checkState(rmv, "can't remove " + cbi);
+}
+finally {
+ignite.close();
+}
}
[ignite-teamcity-bot] branch ignite-10243 updated: IGNITE-10243 Dependencies resolve moved to bgpool - one by one
This is an automated email from the ASF dual-hosted git repository.
dpavlov pushed a commit to branch ignite-10243
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git
The following commit(s) were added to refs/heads/ignite-10243 by this push:
new 89ae2f5 IGNITE-10243 Dependencies resolve moved to bgpool - one by one
89ae2f5 is described below
commit 89ae2f55eb60d61c7e7873fc0cc47eaf639386ac
Author: Dmitriy Pavlov
AuthorDate: Thu Nov 15 16:10:47 2018 +0300
IGNITE-10243 Dependencies resolve moved to bgpool - one by one
---
.../ignite/ci/tcbot/chain/BuildChainProcessor.java | 34 +++---
.../ci/teamcity/ignited/TeamcityIgnitedImpl.java | 10 +--
2 files changed, 32 insertions(+), 12 deletions(-)
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessor.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessor.java
index 4835690..24778e9 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessor.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/tcbot/chain/BuildChainProcessor.java
@@ -17,6 +17,7 @@
package org.apache.ignite.ci.tcbot.chain;
+import com.google.common.util.concurrent.Futures;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -182,16 +183,18 @@ public class BuildChainProcessor {
final ExecutorService svc = tcUpdatePool.getService();
final Stream depsFirstLevel = entryPointsFatBuilds
-.map(ref -> svc.submit(() -> dependencies(teamcityIgnited,
builds, ref)))
+.flatMap(ref -> dependencies(teamcityIgnited, builds, ref));
+ /* .map(ref -> svc.submit(() -> dependencies(teamcityIgnited,
builds, ref)))
.collect(Collectors.toList())
.stream()
-.flatMap(fut -> FutureUtil.getResult(fut));
+.flatMap(fut -> FutureUtil.getResult(fut));*/
Stream secondLevelDeps = depsFirstLevel
-.map(ref -> svc.submit(() -> dependencies(teamcityIgnited,
builds, ref)))
+.flatMap(ref-> dependencies(teamcityIgnited, builds, ref));
+/*.map(ref -> svc.submit(() -> dependencies(teamcityIgnited,
builds, ref)))
.collect(Collectors.toList())
.stream()
-.flatMap(fut -> FutureUtil.getResult(fut));
+.flatMap(fut -> FutureUtil.getResult(fut))*/;
// builds may became non unique because of race in filtering and
acquiring deps
final List>> phase3Submitted =
secondLevelDeps
@@ -368,19 +371,30 @@ public class BuildChainProcessor {
ITeamcityIgnited teamcityIgnited,
Map builds,
FatBuildCompacted build) {
-return Stream.concat(
-Stream.of(build),
-IntStream.of(build.snapshotDependencies())
-.mapToObj(id -> {
+
+Stream stream =
IntStream.of(build.snapshotDependencies())
+.mapToObj(id -> {
+if (builds.containsKey(id))
+return Futures.immediateFuture(null);
//load and propagate only new dependencies
+
+return tcUpdatePool.getService().submit(() -> {
if (builds.containsKey(id))
-return null; //load and propagate only new dependencies
+return null;
FatBuildCompacted buildLoaded =
teamcityIgnited.getFatBuild(id);
FatBuildCompacted prevVal = builds.putIfAbsent(id,
buildLoaded);
return prevVal == null ? buildLoaded : null;
-}))
+});
+})
+.collect(Collectors.toList())
+.stream()
+.map(future -> FutureUtil.getResult(future))
.filter(Objects::nonNull);
+
+return Stream.concat(
+Stream.of(build),
+stream);
}
}
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedImpl.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedImpl.java
index 0f95218..0bef2b9 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedImpl.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/teamcity/ignited/TeamcityIgnitedImpl.java
@@ -354,8 +354,7 @@ public class TeamcityIgnitedImpl implements
ITeamcityIgnited {
/** {@inheritDoc} */
@Override public FatBuildCompacted getFatBuild(int buildId, boolean
acceptQueued) {
-ensureActualizeRequested();
-FatBuildCompacted existingBuild =
fatBuildDao.getFatBuild(srvIdMaskHigh, buildId);
+FatBuildCompacted existingBuild = getFatBuildFromIgnite(buildId);
FatBuildCompacted savedVer = buildSync.loadBuild(conn,
[ignite-teamcity-bot] 02/02: Version update
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 commit b62fcd789fd12a3a636e91db5998a57402502ed7 Author: Dmitriy Pavlov AuthorDate: Thu Nov 15 16:13:19 2018 +0300 Version update --- .../src/main/java/org/apache/ignite/ci/web/model/Version.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 44c1aa1..8deea67 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 @@ -23,7 +23,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 = "20181113"; +public static final String VERSION = "20181115"; /** TC Bot Version. */ public String version = VERSION;
[ignite-teamcity-bot] 01/02: IGNITE-10275 Jira spam fast fix - Fixes #72.
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
commit 3302a0ea031d28a8c2ab539a8298cf8934cc32e7
Author: ololo3000
AuthorDate: Thu Nov 15 16:12:51 2018 +0300
IGNITE-10275 Jira spam fast fix - Fixes #72.
Signed-off-by: Dmitriy Pavlov
---
.../apache/ignite/ci/observer/ObserverTask.java| 45 +++---
1 file changed, 23 insertions(+), 22 deletions(-)
diff --git
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/observer/ObserverTask.java
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/observer/ObserverTask.java
index 5ad1350..8676868 100644
---
a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/observer/ObserverTask.java
+++
b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/observer/ObserverTask.java
@@ -141,7 +141,7 @@ public class ObserverTask extends TimerTask {
if (info.isFinishedWithFailures(teamcity)) {
boolean rmv = compactInfos().remove(compactInfo);
-
+
Preconditions.checkState(rmv, "Key not found: " + compactInfo);
logger.error("JIRA will not be commented." +
@@ -157,34 +157,35 @@ public class ObserverTask extends TimerTask {
continue;
}
-ICredentialsProv creds = tcHelper.getServerAuthorizerCreds();
+try {
+rmvdVisas.add(objMapper.writeValueAsString(compactInfo));
+}
+catch (Exception e) {
+logger.error("JSON string parse failed: " + e.getMessage(), e);
-Visa visa = jiraIntegration.notifyJira(info.srvId, creds,
info.buildTypeId,
-info.branchForTc, info.ticket);
+return "Exception while JSON parsing: " +
e.getClass().getSimpleName() + ": " + e.getMessage();
+}
-
visasHistoryStorage.updateVisaRequestRes(info.getContributionKey(), info.date,
visa);
+try {
+boolean rmv = compactInfos().remove(compactInfo);
-if (visa.isSuccess()) {
-ticketsNotified.add(info.ticket);
+if (!rmv)
+continue;
+}
+catch (Exception e) {
+logger.error("cache remove: " + e.getMessage(), e);
+
+return X.getFullStackTrace(e);
+}
-try {
-rmvdVisas.add(objMapper.writeValueAsString(compactInfo));
-}
-catch (Exception e) {
-logger.error("JSON string parse failed: " +
e.getMessage(), e);
+ICredentialsProv creds = tcHelper.getServerAuthorizerCreds();
-return "Exception while JSON parsing: " +
e.getClass().getSimpleName() + ": " + e.getMessage();
-}
+Visa visa = jiraIntegration.notifyJira(info.srvId, creds,
info.buildTypeId,
+info.branchForTc, info.ticket);
-try {
-compactInfos().remove(compactInfo);
-}
-catch (Exception e) {
-logger.error("cache remove: " + e.getMessage(), e);
+
visasHistoryStorage.updateVisaRequestRes(info.getContributionKey(), info.date,
visa);
-return X.getFullStackTrace(e);
-}
-}
+ticketsNotified.add(info.ticket);
}
return "Checked " + checkedBuilds + " not finished " +
notFinishedBuilds + " notified: " + ticketsNotified +
[ignite-teamcity-bot] branch master updated (e73f085 -> b62fcd7)
This is an automated email from the ASF dual-hosted git repository. dpavlov pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git. from e73f085 One more build removal from cache new 3302a0e IGNITE-10275 Jira spam fast fix - Fixes #72. new b62fcd7 Version update The 2 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: .../apache/ignite/ci/observer/ObserverTask.java| 45 +++--- .../org/apache/ignite/ci/web/model/Version.java| 2 +- 2 files changed, 24 insertions(+), 23 deletions(-)
