(ignite) branch master updated: IGNITE-14823 Query abbrevation (#11232)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 968e6ec622e IGNITE-14823 Query abbrevation (#11232)
968e6ec622e is described below
commit 968e6ec622e3bd9e3ba6e39a8235fa97b118c606
Author: Nikolay
AuthorDate: Tue Feb 6 13:43:53 2024 +0300
IGNITE-14823 Query abbrevation (#11232)
---
.../query/calcite/CalciteQueryProcessorTest.java | 50 +++---
.../KillQueryCommandDdlIntegrationTest.java| 6 +--
.../calcite/integration/PartitionPruneTest.java| 16 +++
.../integration/SqlDiagnosticIntegrationTest.java | 8 ++--
.../integration/TableDdlIntegrationTest.java | 4 +-
.../integration/TableDmlIntegrationTest.java | 48 ++---
.../query/calcite/jdbc/JdbcQueryTest.java | 4 +-
.../query/calcite/sql/SqlCustomParserTest.java | 46 ++--
.../checkstyle/src/main/resources/abbrevations.csv | 2 +-
.../ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java | 16 +++
.../java/org/apache/ignite/cache/QueryEntity.java | 24 +--
.../jdbc/thin/ConnectionPropertiesImpl.java| 6 +--
.../processors/cache/ClusterCachesInfo.java| 6 +--
.../CachePartitionDefragmentationManager.java | 4 +-
.../processors/odbc/odbc/OdbcMessageParser.java| 20 -
.../processors/odbc/odbc/OdbcRequestHandler.java | 34 +++
.../FilePerformanceStatisticsReader.java | 8 ++--
...latformDotNetEntityFrameworkCacheExtension.java | 8 ++--
.../PlatformDotNetEntityFrameworkCacheKey.java | 6 +--
.../internal/processors/query/QuerySchema.java | 10 ++---
...JdbcPojoWriteBehindStoreWithCoalescingTest.java | 22 +-
.../distributed/dht/IgniteCacheRecreateTest.java | 6 +--
.../query/GridCacheQueryTransformerSelfTest.java | 6 +--
.../IgniteCacheQueryCacheDestroySelfTest.java | 6 +--
.../p2p/ClassLoadingProblemExceptionTest.java | 10 ++---
.../p2p/GridP2PScanQueryWithTransformerTest.java | 20 -
.../p2p/P2PClassLoadingFailureHandlingTest.java| 16 +++
.../startup/servlet/GridServletLoaderTest.java | 6 +--
.../processors/query/h2/opt/GridLuceneIndex.java | 4 +-
.../internal/metric/UserQueriesTestBase.java | 4 +-
...finityKeyNameAndValueFieldNameConflictTest.java | 4 +-
.../cache/BinarySerializationQuerySelfTest.java| 14 +++---
.../cache/CacheSqlQueryValueCopySelfTest.java | 4 +-
.../ClientReconnectAfterClusterRestartTest.java| 6 +--
.../cache/IgniteCacheAbstractQuerySelfTest.java| 8 ++--
.../cache/IgniteCacheDistributedJoinTest.java | 4 +-
.../processors/cache/IncorrectQueryEntityTest.java | 8 ++--
.../cache/QueryEntityCaseMismatchTest.java | 8 ++--
.../cache/index/IgniteDecimalSelfTest.java | 22 +-
.../cache/index/IndexCorruptionRebuildTest.java| 4 +-
.../transaction/DmlInsideTransactionTest.java | 28 ++--
.../PerformanceStatisticsQueryTest.java| 6 +--
.../IgniteSqlSkipReducerOnUpdateDmlSelfTest.java | 4 +-
.../internal/processors/query/KillQueryTest.java | 18
.../processors/query/RunningQueriesTest.java | 8 ++--
.../query/h2/IgniteSqlBigIntegerKeyTest.java | 4 +-
.../org/apache/ignite/sqltests/BaseSqlTest.java| 10 ++---
.../spring/IgniteExcludeInConfigurationTest.java | 6 +--
.../cache/jdbc/JdbcAbstractBenchmark.java | 4 +-
.../yardstick/cache/jdbc/RdbmsBenchmark.java | 20 -
.../load/IgniteCacheRandomOperationBenchmark.java | 16 +++
51 files changed, 316 insertions(+), 316 deletions(-)
diff --git
a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/CalciteQueryProcessorTest.java
b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/CalciteQueryProcessorTest.java
index 7839badbd9d..9493fcb9701 100644
---
a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/CalciteQueryProcessorTest.java
+++
b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/CalciteQueryProcessorTest.java
@@ -437,16 +437,16 @@ public class CalciteQueryProcessorTest extends
GridCommonAbstractTest {
QueryEngine engine = Commons.lookupComponent(grid(1).context(),
QueryEngine.class);
-List>> query = engine.query(null, "PUBLIC",
+List>> qry = engine.query(null, "PUBLIC",
"SELECT * FROM employer1 " +
"UNION " +
"SELECT * FROM employer2 " +
"UNION " +
"SELECT * FROM employer3 ");
-assertEquals(1, query.size());
+assertEquals(1, qry.size());
-
(ignite) branch master updated: IGNITE-14823 Group abbrevation (#11231)
This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ignite.git The following commit(s) were added to refs/heads/master by this push: new d5cf8087e33 IGNITE-14823 Group abbrevation (#11231) d5cf8087e33 is described below commit d5cf8087e3348754c28cc40c1b8f724ac4c90b75 Author: Nikolay AuthorDate: Tue Feb 6 10:32:00 2024 +0300 IGNITE-14823 Group abbrevation (#11231) --- .../query/calcite/exec/LogicalRelImplementor.java | 4 +-- .../query/calcite/exec/exp/agg/GroupKey.java | 4 +-- .../query/calcite/metadata/FragmentMapping.java| 24 ++--- .../query/calcite/rel/IgniteAggregate.java | 10 +++--- .../query/calcite/exec/rel/BaseAggregateTest.java | 14 .../calcite/integration/PartitionPruneTest.java| 6 ++-- .../checkstyle/src/main/resources/abbrevations.csv | 3 +- .../testframework/util/MavenUtils.java | 4 +-- .../snapshot/SnapshotCompressionBasicTest.java | 4 +-- .../DiskPageCompressionIntegrationTest.java| 4 +-- .../commandline/CommandHandlerParsingTest.java | 6 ++-- ...GridCommandHandlerScheduleIndexRebuildTest.java | 6 ++-- .../java/org/apache/ignite/cache/QueryEntity.java | 4 +-- .../java/org/apache/ignite/dump/DumpReader.java| 12 +++ .../apache/ignite/internal/CheckCpHistTask.java| 4 +-- .../internal/client/thin/ClientAtomicLongImpl.java | 4 +-- .../distribution/CacheDistributionTaskResult.java | 8 ++--- .../CacheResetLostPartitionsTask.java | 12 +++ .../cache/CacheScheduleIndexesRebuildCommand.java | 8 ++--- .../FindAndDeleteGarbageInPersistenceClosure.java | 32 - .../internal/management/cache/IndexListTask.java | 4 +-- .../management/cache/ScheduleIndexRebuildTask.java | 14 .../management/cache/ValidateIndexesClosure.java | 12 +++ .../cache/VerifyBackupPartitionsTaskV2.java| 4 +-- .../internal/management/tx/TxInfoCommand.java | 6 ++-- .../ignite/internal/management/tx/TxTask.java | 12 +++ .../encryption/CacheGroupEncryptionKeys.java | 10 +++--- .../managers/encryption/GroupKeyChangeProcess.java | 14 .../cache/CacheAffinitySharedManager.java | 14 .../internal/processors/cache/CachesRegistry.java | 4 +-- .../processors/cache/GridCacheProcessor.java | 18 +- .../internal/processors/cache/GridCacheUtils.java | 6 ++-- .../dht/preloader/GridDhtPartitionDemander.java| 4 +-- .../preloader/GridDhtPartitionsExchangeFuture.java | 10 +++--- .../preloader/GridDhtPartitionsFullMessage.java| 6 ++-- .../dht/topology/GridDhtPartitionTopologyImpl.java | 6 ++-- .../GridCacheDatabaseSharedManager.java| 40 +++--- .../persistence/checkpoint/CheckpointHistory.java | 16 - .../checkpoint/EarliestCheckpointMapSnapshot.java | 14 .../persistence/file/FilePageStoreManager.java | 10 +++--- .../snapshot/IgniteSnapshotManager.java| 8 ++--- .../cache/persistence/wal/scanner/WalScanner.java | 8 ++--- .../odbc/jdbc/JdbcCachePartitionsResult.java | 4 +-- .../cache/ClientCachePartitionAwarenessGroup.java | 4 +-- .../client/cache/ClientCachePartitionsRequest.java | 6 ++-- .../internal/client/thin/AtomicLongTest.java | 12 +++ .../ignite/internal/client/thin/IgniteSetTest.java | 8 ++--- .../encryption/CacheGroupReencryptionTest.java | 12 +++ .../CacheGroupLocalConfigurationSelfTest.java | 16 - .../IgniteDiscoDataHandlingInNewClusterTest.java | 20 +-- .../dht/topology/BlockedEvictionsTest.java | 6 ++-- .../IgniteDataStorageMetricsSelfTest.java | 6 ++-- .../IgnitePdsCacheAssignmentNodeRestartsTest.java | 6 ++-- ...IgnitePdsDiscoDataHandlingInNewClusterTest.java | 20 +-- .../IgnitePdsRecoveryAfterFileCorruptionTest.java | 4 +-- .../persistence/db/IgniteLogicalRecoveryTest.java | 8 ++--- ...IgnitePdsCacheWalDisabledOnRebalancingTest.java | 8 ++--- .../db/IgniteSequentialNodeCrashRecoveryTest.java | 4 +-- .../persistence/defragmentation/LinkMapTest.java | 8 ++--- .../wal/memtracker/PageMemoryTracker.java | 16 - .../persistence/wal/scanner/WalScannerTest.java| 34 +- .../testframework/MessageOrderLogListener.java | 26 +++--- .../query/h2/IgniteSqlQueryMinMaxTest.java | 40 +++--- .../org/apache/ignite/sqltests/BaseSqlTest.java| 16 - 64 files changed, 349 insertions(+), 348 deletions(-) diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/LogicalRelImplementor.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/LogicalRelImplementor.java index 4e43787d34f..941ea64c494 100644 --- a/modules/calcite/src/main/java
(ignite) branch master updated: IGNITE-14823 Local abbrevation (#11230)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 6cc7bb2abab IGNITE-14823 Local abbrevation (#11230)
6cc7bb2abab is described below
commit 6cc7bb2ababe0e905378a033edf75f2df2217785
Author: Nikolay
AuthorDate: Mon Feb 5 19:33:48 2024 +0300
IGNITE-14823 Local abbrevation (#11230)
---
.../GridDhtPartitionsStateValidatorBenchmark.java | 8 +++
.../query/calcite/exec/LogicalRelImplementor.java | 4 ++--
.../query/calcite/metadata/ColocationGroup.java| 6 ++---
.../query/calcite/schema/CacheIndexImpl.java | 6 ++---
.../integration/LocalQueryIntegrationTest.java | 8 +++
.../StatisticsCommandDdlIntegrationTest.java | 14 +--
.../checkstyle/src/main/resources/abbrevations.csv | 2 +-
.../testframework/util/MavenUtils.java | 12 +-
.../apache/ignite/util/SystemViewCommandTest.java | 4 ++--
.../org/apache/ignite/internal/IgnitionEx.java | 8 +++
.../management/cdc/CdcCacheDataResendTask.java | 4 ++--
.../management/persistence/PersistenceTask.java| 6 ++---
.../internal/plugin/IgniteLogInfoProviderImpl.java | 4 ++--
.../processors/cache/ClusterCachesInfo.java| 6 ++---
.../cache/GridCacheDeploymentManager.java | 4 ++--
.../processors/cache/GridCacheProcessor.java | 6 ++---
.../processors/cache/GridCacheSharedContext.java | 6 ++---
.../binary/CacheObjectBinaryProcessorImpl.java | 18 +++---
.../cache/distributed/dht/GridDhtCacheAdapter.java | 16 ++---
.../preloader/GridDhtPartitionsExchangeFuture.java | 24 +--
.../persistence/file/FilePageStoreManager.java | 4 ++--
...latformDotNetEntityFrameworkCacheExtension.java | 12 +-
.../processors/query/GridQueryProcessor.java | 6 ++---
.../internal/processors/query/QuerySchema.java | 10
.../query/stat/IgniteGlobalStatisticsManager.java | 10
.../query/stat/IgniteStatisticsRepository.java | 4 ++--
.../stat/view/ColumnLocalDataViewSupplier.java | 10
.../apache/ignite/internal/util/IgniteUtils.java | 6 ++---
.../org/apache/ignite/internal/util/TimeBag.java | 6 ++---
.../ClusterBaselineNodesMetricsSelfTest.java | 4 ++--
.../ignite/internal/GridNodeLocalSelfTest.java | 10
.../ignite/internal/TransactionMetricsTest.java| 6 ++---
.../processors/cache/CacheGroupMetricsTest.java| 6 ++---
.../processors/cache/CacheMetricsManageTest.java | 8 +++
...OffheapCacheMetricsForClusterGroupSelfTest.java | 12 +-
.../datastructures/IgniteLockAbstractSelfTest.java | 28 +++---
.../GridCachePartitionsStateValidatorSelfTest.java | 6 ++---
.../near/GridCacheNearMetricsSelfTest.java | 4 ++--
.../TxRollbackOnIncorrectParamsTest.java | 16 ++---
.../ignite/internal/util/IgniteUtilsSelfTest.java | 20
.../PlatformComputeActiveTaskFuturesTask.java | 4 ++--
.../platform/PlatformIsPartitionReservedTask.java | 4 ++--
.../junits/multijvm/IgniteProcessProxy.java| 14 +--
.../processors/query/h2/opt/GridH2Table.java | 6 ++---
.../query/h2/twostep/GridMapQueryExecutor.java | 8 +++
.../cache/GridCacheFullTextQuerySelfTest.java | 4 ++--
.../processors/query/oom/AbstractQueryOOMTest.java | 8 +++
.../query/stat/SqlStatisticsCommandTests.java | 14 +--
.../query/stat/StatisticsGatheringTest.java| 8 +++
.../processors/query/stat/StatisticsViewsTest.java | 8 +++
50 files changed, 216 insertions(+), 216 deletions(-)
diff --git
a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/misc/GridDhtPartitionsStateValidatorBenchmark.java
b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/misc/GridDhtPartitionsStateValidatorBenchmark.java
index e044d501680..6f9f4ff309a 100644
---
a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/misc/GridDhtPartitionsStateValidatorBenchmark.java
+++
b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/misc/GridDhtPartitionsStateValidatorBenchmark.java
@@ -115,21 +115,21 @@ public class GridDhtPartitionsStateValidatorBenchmark
extends JmhAbstractBenchma
Mockito.when(topologyMock.partitions()).thenReturn(PARTS);
-List localPartitions = Lists.newArrayList();
+List locPartitions = Lists.newArrayList();
Map> updateCountersMap = new HashMap<>();
Map cacheSizesMap = new HashMap<>();
IntStream.range(0, PARTS).forEach(k -> {
-localPartitions.add(partitionMock(k, k + 1, k + 1));
+locPartitions.add(partitionMo
(ignite) branch master updated: IGNITE-14823 Topology abbrevation (#11227)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new aa8f5578a25 IGNITE-14823 Topology abbrevation (#11227)
aa8f5578a25 is described below
commit aa8f5578a2566311761ca1237c638da4257f76ad
Author: Nikolay
AuthorDate: Mon Feb 5 19:25:43 2024 +0300
IGNITE-14823 Topology abbrevation (#11227)
---
modules/checkstyle/src/main/resources/abbrevations.csv | 2 +-
.../test/java/org/apache/ignite/util/CdcCommandTest.java | 6 +++---
.../dht/preloader/GridDhtPartitionsExchangeFuture.java | 4 ++--
.../processors/cache/query/GridCacheQueryAdapter.java| 10 +-
.../ignite/internal/processors/job/GridJobProcessor.java | 8
.../ClientClusterGroupGetNodesEndpointsResponse.java | 6 +++---
.../cache/distributed/CacheBaselineTopologyTest.java | 4 ++--
.../IgnitePdsPartitionsStateRecoveryTest.java| 16
.../LongRunningTransactionsGenerator.java| 10 +-
.../query/h2/twostep/ReducePartitionMapper.java | 14 +++---
10 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index 8b23538cfce..bf8396af523 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -70,7 +70,7 @@ source,src
string,s,str
subject,subj
system,sys
-#topology,top
+topology,top
#topologyversion,topVer
#value,val
version,ver
\ No newline at end of file
diff --git
a/modules/control-utility/src/test/java/org/apache/ignite/util/CdcCommandTest.java
b/modules/control-utility/src/test/java/org/apache/ignite/util/CdcCommandTest.java
index 5bf38d626a9..abecc825547 100644
---
a/modules/control-utility/src/test/java/org/apache/ignite/util/CdcCommandTest.java
+++
b/modules/control-utility/src/test/java/org/apache/ignite/util/CdcCommandTest.java
@@ -448,7 +448,7 @@ public class CdcCommandTest extends
GridCommandHandlerAbstractTest {
addData(srv0.cache(DEFAULT_CACHE_NAME), 0, KEYS_CNT);
CountDownLatch preload = new CountDownLatch(1);
-CountDownLatch topologyChanged = new CountDownLatch(1);
+CountDownLatch topChanged = new CountDownLatch(1);
AtomicInteger cnt = new AtomicInteger();
@@ -458,7 +458,7 @@ public class CdcCommandTest extends
GridCommandHandlerAbstractTest {
preload.countDown();
-U.await(topologyChanged);
+U.await(topChanged);
};
IgniteInternalFuture fut = GridTestUtils.runAsync(() -> {
@@ -473,7 +473,7 @@ public class CdcCommandTest extends
GridCommandHandlerAbstractTest {
startGrid(3);
-topologyChanged.countDown();
+topChanged.countDown();
fut.get();
}
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 b420134f72f..f1202f0005f 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
@@ -1193,9 +1193,9 @@ public class GridDhtPartitionsExchangeFuture extends
GridDhtTopologyFutureAdapte
* @return {@code true} if local node is in baseline and {@code false}
otherwise.
*/
private boolean isLocalNodeInBaseline() {
-BaselineTopology topology =
cctx.discovery().discoCache().state().baselineTopology();
+BaselineTopology top =
cctx.discovery().discoCache().state().baselineTopology();
-return topology != null &&
topology.consistentIds().contains(cctx.localNode().consistentId());
+return top != null &&
top.consistentIds().contains(cctx.localNode().consistentId());
}
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
index 2c22dec13e6..1915448feaa 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java
@@ -653,12 +653,12 @@ public class GridCacheQueryAdapter implements
CacheQuery {
if (prj != null || part != null)
return nodes(cctx, prj, part);
-GridD
(ignite) branch master updated: IGNITE-14823 Iterator abbrevation (#11226)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new c2137972d14 IGNITE-14823 Iterator abbrevation (#11226)
c2137972d14 is described below
commit c2137972d1434b8fd0c161fd34a405b344fc090c
Author: Nikolay
AuthorDate: Mon Feb 5 19:01:40 2024 +0300
IGNITE-14823 Iterator abbrevation (#11226)
---
.../calcite/exec/ClosableIteratorsHolderTest.java | 6 ++--
.../checkstyle/src/main/resources/abbrevations.csv | 2 +-
.../defragmentation/IndexingDefragmentation.java | 4 +--
.../cache/IgniteCacheOffheapManagerImpl.java | 4 +--
.../preloader/GridDhtPartitionsFullMessage.java| 28 +--
.../persistence/checkpoint/CheckpointHistory.java | 6 ++--
.../internal/processors/query/stat/hll/HLL.java| 6 ++--
.../processors/query/stat/hll/util/BitVector.java | 4 +--
.../apache/ignite/internal/util/IgniteUtils.java | 4 +--
.../ignite/internal/client/thin/IgniteSetTest.java | 14 +-
...ailIsReachedDuringIterationOverArchiveTest.java | 10 +++
.../internal/util/collection/BitSetIntSetTest.java | 32 +++---
.../development/utils/IgniteWalConverter.java | 8 +++---
13 files changed, 64 insertions(+), 64 deletions(-)
diff --git
a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/exec/ClosableIteratorsHolderTest.java
b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/exec/ClosableIteratorsHolderTest.java
index 7e61a9470f3..0310edd8049 100644
---
a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/exec/ClosableIteratorsHolderTest.java
+++
b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/exec/ClosableIteratorsHolderTest.java
@@ -75,9 +75,9 @@ public class ClosableIteratorsHolderTest extends
GridCommonAbstractTest {
/** */
private Iterator newIterator() {
-final ClosableIterator iterator = new ClosableIterator();
-iterators.add(iterator);
-return iterator;
+final ClosableIterator iter = new ClosableIterator();
+iterators.add(iter);
+return iter;
}
/** */
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index 2ffe088086f..8b23538cfce 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -33,7 +33,7 @@ implementation,impl
index,idx
initial,init
initialize,init
-#iterator,iter
+iterator,iter
label,lbl
#local,loc
logger,log
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/defragmentation/IndexingDefragmentation.java
b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/defragmentation/IndexingDefragmentation.java
index 4f1a38a1d95..a1474569bcc 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/defragmentation/IndexingDefragmentation.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/cache/query/index/sorted/defragmentation/IndexingDefragmentation.java
@@ -137,7 +137,7 @@ public class IndexingDefragmentation {
cpLock.checkpointReadLock();
try {
-TreeIterator treeIterator = new TreeIterator(pageSize);
+TreeIterator treeIter = new TreeIterator(pageSize);
GridCacheContext cctx = indexes.cctx;
@@ -155,7 +155,7 @@ public class IndexingDefragmentation {
int segments = oldIdx.segmentsCount();
for (int i = 0; i < segments; ++i) {
-treeIterator.iterate(oldIdx.segment(i), oldCachePageMem,
(theTree, io, pageAddr, idx) -> {
+treeIter.iterate(oldIdx.segment(i), oldCachePageMem,
(theTree, io, pageAddr, idx) -> {
cancellationChecker.run();
if (System.currentTimeMillis() - lastCpLockTs.get() >=
cpLockThreshold) {
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 fd52e8ca93c..142653e5f8c 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
@@ -1170,9 +1170,9 @@ public class IgniteCacheOffheapManagerImpl implements
IgniteCacheOffheapManager
iterators.put(p, partIter);
}
-IgniteHistoricalIterator historicalIterator =
historicalIterator(parts.historicalMap(), missing);
+IgniteHistor
(ignite) branch master updated: IGNITE-14823 String abbrevation (#11213)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 855b617d484 IGNITE-14823 String abbrevation (#11213)
855b617d484 is described below
commit 855b617d4840776cd6b82963b48b0553e9b7c63f
Author: Nikolay
AuthorDate: Thu Feb 1 15:51:38 2024 +0300
IGNITE-14823 String abbrevation (#11213)
---
.../query/calcite/exec/exp/RexImpTable.java| 22 +++---
.../checkstyle/src/main/resources/abbrevations.csv | 6 +++---
.../ignite/jdbc/thin/JdbcThinMetadataSelfTest.java | 6 +++---
.../internal/sql/command/SqlBulkLoadCommand.java | 4 ++--
...rNodeAttributeAffinityBackupFilterSelfTest.java | 6 +++---
.../internal/cluster/IgniteClusterIdTagTest.java | 4 ++--
.../internal/metric/MetricsConfigurationTest.java | 4 ++--
.../IgniteSemaphoreAbstractSelfTest.java | 8
.../IgniteAbstractStandByClientReconnectTest.java | 6 +++---
.../p2p/P2PClassLoadingFailureHandlingTest.java| 6 +++---
.../ignite/platform/PlatformProcessUtils.java | 8
11 files changed, 40 insertions(+), 40 deletions(-)
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
index 44f70ff2ad4..c5c8a378b2a 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
@@ -520,19 +520,19 @@ public class RexImpTable {
NullPolicy.NONE, false)));
// System functions.
-final SystemFunctionImplementor systemFunctionImplementor = new
SystemFunctionImplementor();
-map.put(SYSTEM_RANGE, systemFunctionImplementor);
+final SystemFunctionImplementor sysFunctionImplementor = new
SystemFunctionImplementor();
+map.put(SYSTEM_RANGE, sysFunctionImplementor);
// Current time functions.
-map.put(CURRENT_TIME, systemFunctionImplementor);
-map.put(CURRENT_TIMESTAMP, systemFunctionImplementor);
-map.put(CURRENT_DATE, systemFunctionImplementor);
-map.put(LOCALTIME, systemFunctionImplementor);
-map.put(LOCALTIMESTAMP, systemFunctionImplementor);
-
-map.put(TYPEOF, systemFunctionImplementor);
-map.put(QUERY_ENGINE, systemFunctionImplementor);
-map.put(NULL_BOUND, systemFunctionImplementor);
+map.put(CURRENT_TIME, sysFunctionImplementor);
+map.put(CURRENT_TIMESTAMP, sysFunctionImplementor);
+map.put(CURRENT_DATE, sysFunctionImplementor);
+map.put(LOCALTIME, sysFunctionImplementor);
+map.put(LOCALTIMESTAMP, sysFunctionImplementor);
+
+map.put(TYPEOF, sysFunctionImplementor);
+map.put(QUERY_ENGINE, sysFunctionImplementor);
+map.put(NULL_BOUND, sysFunctionImplementor);
defineMethod(LEAST2, IgniteMethod.LEAST2.method(), NullPolicy.ALL);
defineMethod(GREATEST2, IgniteMethod.GREATEST2.method(),
NullPolicy.ALL);
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index 044b652ed05..2ffe088086f 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -60,16 +60,16 @@ repository,repo
request,req
resource,rsrc
response,res
-#returnValue,retVal
+returnValue,retVal
sender,snd
service,srvc
session,ses
sequence,seq
socket,sock
source,src
-#string,s,str
+string,s,str
subject,subj
-#system,sys
+system,sys
#topology,top
#topologyversion,topVer
#value,val
diff --git
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
index 2a7547d59fb..135c6fc6a24 100644
---
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
@@ -641,7 +641,7 @@ public class JdbcThinMetadataSelfTest extends
JdbcThinAbstractSelfTest {
Set actualUserCols = new TreeSet<>();
-Set actualSystemCols = new TreeSet<>();
+Set actualSysCols = new TreeSet<>();
while (rs.next()) {
int precision = rs.getInt("COLUMN_SIZE");
@@ -660,7 +660,7 @@ public class JdbcThinMetadataSelfTest extends
JdbcThinAbstractSelfTest {
if (!schemaName.equals(SCHEMA_SYS))
actualUserCols.add(colDefinition);
else
-actual
(ignite) branch master updated: IGNITE-14823 Version, subject abbrevations (#11211)
This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ignite.git The following commit(s) were added to refs/heads/master by this push: new f4c1d6be9b4 IGNITE-14823 Version, subject abbrevations (#11211) f4c1d6be9b4 is described below commit f4c1d6be9b4f5184349bde54443ad8cb56c6dcda Author: Nikolay AuthorDate: Wed Jan 31 14:34:49 2024 +0300 IGNITE-14823 Version, subject abbrevations (#11211) --- .../integration/StatisticsCommandDdlIntegrationTest.java | 6 +++--- modules/checkstyle/src/main/resources/abbrevations.csv | 4 ++-- .../compatibility/clients/JavaThinCompatibilityTest.java | 4 ++-- .../compatibility/clients/JdbcThinCompatibilityTest.java | 4 ++-- .../persistence/IndexTypesCompatibilityTest.java | 4 ++-- .../persistence/InlineJavaObjectCompatibilityTest.java | 4 ++-- .../persistence/PersistenceBasicCompatibilityTest.java | 6 +++--- .../compatibility/testframework/util/MavenUtils.java | 6 +++--- .../org/apache/ignite/internal/IgniteMessagingImpl.java | 4 ++-- .../org/apache/ignite/internal/mem/file/MappedFile.java | 6 +++--- .../internal/processors/cache/ClusterCachesInfo.java | 4 ++-- .../persistence/wal/filehandle/FileWriteHandleImpl.java | 4 ++-- .../query/continuous/CacheContinuousQueryManager.java| 4 ++-- .../cache/tree/mvcc/search/MvccFirstRowTreeClosure.java | 4 ++-- .../processors/platform/PlatformProcessorImpl.java | 4 ++-- .../query/stat/IgniteGlobalStatisticsManager.java| 6 +++--- .../internal/processors/query/stat/StatisticsUtils.java | 16 .../ignite/internal/processors/query/stat/hll/HLL.java | 6 +++--- .../query/stat/hll/serialization/SchemaVersionOne.java | 4 ++-- .../query/stat/hll/serialization/SerializationUtil.java | 12 ++-- .../internal/client/thin/ServiceAwarenessTest.java | 12 ++-- .../junits/multijvm/IgniteProcessProxy.java | 10 +- .../junits/multijvm/JavaVersionCommand.java | 4 ++-- .../junits/multijvm/JavaVersionCommandParser.java| 4 ++-- .../LongRunningTransactionsGenerator.java| 10 +- .../processors/query/stat/StatisticsAbstractTest.java| 6 +++--- .../internal/processors/query/stat/hll/FullHLLTest.java | 10 +- 27 files changed, 84 insertions(+), 84 deletions(-) diff --git a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/StatisticsCommandDdlIntegrationTest.java b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/StatisticsCommandDdlIntegrationTest.java index dca7529c544..6e6e3db899c 100644 --- a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/StatisticsCommandDdlIntegrationTest.java +++ b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/StatisticsCommandDdlIntegrationTest.java @@ -128,11 +128,11 @@ public class StatisticsCommandDdlIntegrationTest extends AbstractDdlIntegrationT assertFalse(res.isEmpty()); assertFalse(res.get(0).isEmpty() || res.get(0).size() < 10); -long version = (Long)res.get(0).get(9); +long ver = (Long)res.get(0).get(9); assertThat(res, hasItems( -Lists.newArrayList(PUBLIC_SCHEMA, "TABLE", TABLE_NAME, ID_FIELD, (byte)2, 6L, 5L, 7L, 8, version), -Lists.newArrayList(PUBLIC_SCHEMA, "TABLE", TABLE_NAME, NAME_FIELD, (byte)2, 7L, 6L, 8L, null, version) +Lists.newArrayList(PUBLIC_SCHEMA, "TABLE", TABLE_NAME, ID_FIELD, (byte)2, 6L, 5L, 7L, 8, ver), +Lists.newArrayList(PUBLIC_SCHEMA, "TABLE", TABLE_NAME, NAME_FIELD, (byte)2, 7L, 6L, 8L, null, ver) )); } diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv b/modules/checkstyle/src/main/resources/abbrevations.csv index 388657f7683..044b652ed05 100644 --- a/modules/checkstyle/src/main/resources/abbrevations.csv +++ b/modules/checkstyle/src/main/resources/abbrevations.csv @@ -68,9 +68,9 @@ sequence,seq socket,sock source,src #string,s,str -#subject,subj +subject,subj #system,sys #topology,top #topologyversion,topVer #value,val -#version,ver \ No newline at end of file +version,ver \ No newline at end of file diff --git a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/clients/JavaThinCompatibilityTest.java b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/clients/JavaThinCompatibilityTest.java index ba14f2eeb02..51fb0519586 100644 --- a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/clients/JavaThinCompatibilityTest.java +++ b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/clients/JavaThinCompatibilityTest.java @@ -107,9 +107,9 @@ pub
(ignite) branch master updated: IGNITE-14823 Sequence, socket, source abbrevations (#11208)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new aec5f953949 IGNITE-14823 Sequence, socket, source abbrevations (#11208)
aec5f953949 is described below
commit aec5f9539494e1b9216de427e15ecec4a3874881
Author: Nikolay
AuthorDate: Tue Jan 30 14:31:04 2024 +0300
IGNITE-14823 Sequence, socket, source abbrevations (#11208)
---
.../processors/query/calcite/exec/exp/RexImpTable.java | 6 +++---
.../query/calcite/exec/exp/RexToLixTranslator.java | 6 +++---
.../query/calcite/metadata/ColocationGroup.java| 8
.../query/calcite/prepare/FragmentSplitter.java| 8
.../query/calcite/prepare/IgniteSqlToRelConvertor.java | 6 +++---
.../query/calcite/prepare/IgniteSqlValidator.java | 16
.../processors/query/calcite/prepare/Splitter.java | 8
.../query/calcite/rel/AbstractIgniteJoin.java | 4 ++--
modules/checkstyle/src/main/resources/abbrevations.csv | 6 +++---
.../commandline/CommandHandlerParsingTest.java | 12 ++--
.../ignite/internal/jdbc/thin/JdbcThinSSLUtil.java | 4 ++--
.../internal/util/io/GridReversedLinesFileReader.java | 10 +-
...acheJdbcPojoWriteBehindStoreWithCoalescingTest.java | 10 +-
.../java/org/apache/ignite/client/ConnectionTest.java | 18 +-
.../IgnitePersistentStoreDataStructuresTest.java | 8
.../ServiceHotRedeploymentViaDeploymentSpiTest.java| 4 ++--
.../org/apache/ignite/internal/util/EchoServer.java| 4 ++--
.../ignite/internal/util/IgniteUtilsSelfTest.java | 4 ++--
.../tcp/TcpCommunicationHandshakeTimeoutTest.java | 6 +++---
.../spi/discovery/tcp/DiscoveryClientSocketTest.java | 16
.../tcp/TcpClientDiscoveryUnresolvedHostTest.java | 6 +++---
21 files changed, 85 insertions(+), 85 deletions(-)
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
index 2d8d047ff3b..44f70ff2ad4 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
@@ -1531,11 +1531,11 @@ public class RexImpTable {
@Override Expression implementSafe(final RexToLixTranslator translator,
final RexCall call, final List argValueList) {
assert call.getOperands().size() == 1;
-final RelDataType sourceType = call.getOperands().get(0).getType();
+final RelDataType srcType = call.getOperands().get(0).getType();
// Short-circuit if no cast is required
RexNode arg = call.getOperands().get(0);
-if (call.getType().equals(sourceType)) {
+if (call.getType().equals(srcType)) {
// No cast required, omit cast
return argValueList.get(0);
}
@@ -1548,7 +1548,7 @@ public class RexImpTable {
}
final RelDataType targetType =
nullifyType(translator.typeFactory, call.getType(), false);
-return translator.translateCast(sourceType,
+return translator.translateCast(srcType,
targetType, argValueList.get(0));
}
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexToLixTranslator.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexToLixTranslator.java
index 94de7699a27..95ff5d77780 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexToLixTranslator.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexToLixTranslator.java
@@ -577,12 +577,12 @@ public class RexToLixTranslator implements
RexVisitor
case BINARY:
case VARBINARY:
// If this is a widening cast, no need to truncate.
-final int sourcePrecision =
sourceType.getPrecision();
-if (SqlTypeUtil.comparePrecision(sourcePrecision,
targetPrecision) <= 0)
+final int srcPrecision = sourceType.getPrecision();
+if (SqlTypeUtil.comparePrecision(srcPrecision,
targetPrecision) <= 0)
truncate = false;
// If this is a widening cast, no need to pad.
-if (SqlTypeUtil.comparePrecision(sourcePre
(ignite) branch master updated: IGNITE-14823 Session abbrevation (#11205)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new e6438eeaa87 IGNITE-14823 Session abbrevation (#11205)
e6438eeaa87 is described below
commit e6438eeaa8777acdb2164220d54247a8ba6e727e
Author: Nikolay
AuthorDate: Tue Jan 30 11:39:18 2024 +0300
IGNITE-14823 Session abbrevation (#11205)
---
modules/checkstyle/src/main/resources/abbrevations.csv | 2 +-
.../internal/processors/cache/GridCacheProcessor.java | 4 ++--
.../ignite/internal/processors/job/GridJobProcessor.java | 6 +++---
.../ignite/internal/processors/task/GridTaskProcessor.java | 8
.../ignite/internal/websession/WebSessionSelfTest.java | 14 +++---
5 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index 1ef3b8caf6a..591ab9c475f 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -63,7 +63,7 @@ response,res
#returnValue,retVal
sender,snd
service,srvc
-#session,ses
+session,ses
#sequence,seq
#socket,sock
#source,src
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 4cae900bef5..99f5559febe 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -593,10 +593,10 @@ public class GridCacheProcessor extends
GridProcessorAdapter {
"(it is recommended that you change deployment mode and
restart): " + depMode);
}
-Collection sessionListeners =
+Collection sesListeners =
CU.startStoreSessionListeners(ctx,
ctx.config().getCacheStoreSessionListenerFactories());
-sharedCtx = createSharedContext(ctx, sessionListeners);
+sharedCtx = createSharedContext(ctx, sesListeners);
locCfgMgr = new GridLocalConfigManager(this, ctx);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
index 75708954230..2a1074636c7 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/job/GridJobProcessor.java
@@ -1484,12 +1484,12 @@ public class GridJobProcessor extends
GridProcessorAdapter {
* @return Deployment.
*/
public GridDeployment currentDeployment() {
-GridJobSessionImpl session = currSess.get();
+GridJobSessionImpl ses = currSess.get();
-if (session == null || session.deployment() == null)
+if (ses == null || ses.deployment() == null)
return null;
-return session.deployment();
+return ses.deployment();
}
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
index d40938a3e88..8764d9e3eb8 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/task/GridTaskProcessor.java
@@ -1195,16 +1195,16 @@ public class GridTaskProcessor extends
GridProcessorAdapter implements IgniteCha
if (worker.endTime() < Long.MAX_VALUE)
ctx.timeout().addTimeoutObject(worker);
-GridTaskSessionImpl session = worker.getSession();
+GridTaskSessionImpl ses = worker.getSession();
-notifyTaskStatusMonitors(ComputeTaskStatus.snapshot(session),
false);
+notifyTaskStatusMonitors(ComputeTaskStatus.snapshot(ses), false);
}
/** {@inheritDoc} */
@Override public void onJobsMapped(GridTaskWorker worker) {
-GridTaskSessionImpl session = worker.getSession();
+GridTaskSessionImpl ses = worker.getSession();
-notifyTaskStatusMonitors(ComputeTaskStatus.snapshot(session),
false);
+notifyTaskStatusMonitors(ComputeTaskStatus.snapshot(ses), false);
}
/** {@inheritDoc} */
diff --git
a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
index 1e138f24db0..04ea7435645 100644
---
a/modules/web/src/test/java/org/apache/ig
(ignite) branch master updated: IGNITE-14823 Service abbrevation (#11195)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 628e42489ac IGNITE-14823 Service abbrevation (#11195)
628e42489ac is described below
commit 628e42489acbec0a7d21f2c0117b7b0e8ff1db26
Author: Nikolay
AuthorDate: Mon Jan 29 15:42:05 2024 +0300
IGNITE-14823 Service abbrevation (#11195)
---
.../servicegrid/ServiceMiddlewareExample.java | 8 +--
.../query/calcite/CalciteQueryProcessor.java | 12 ++---
.../integration/KillCommandDdlIntegrationTest.java | 8 +--
.../query/calcite/sql/SqlCustomParserTest.java | 8 +--
.../checkstyle/src/main/resources/abbrevations.csv | 2 +-
.../internal/managers/IgniteMBeansManager.java | 4 +-
.../processors/service/IgniteServiceProcessor.java | 12 ++---
.../org/apache/ignite/client/ReliabilityTest.java | 12 ++---
.../IgniteSemaphoreAbstractSelfTest.java | 12 ++---
.../GridServiceDeployClusterReadOnlyModeTest.java | 60 +++---
.../ignite/internal/util/IgniteUtilsSelfTest.java | 38 +++---
.../p2p/P2PClassLoadingFailureHandlingTest.java| 4 +-
.../tcp/TcpDiscoveryClientSuspensionSelfTest.java | 4 +-
.../startup/servlet/GridServletLoaderTest.java | 6 +--
.../internal/websession/WebSessionSelfTest.java| 8 +--
15 files changed, 99 insertions(+), 99 deletions(-)
diff --git
a/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServiceMiddlewareExample.java
b/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServiceMiddlewareExample.java
index 8139c64e5fd..d42a0261155 100644
---
a/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServiceMiddlewareExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/servicegrid/ServiceMiddlewareExample.java
@@ -124,18 +124,18 @@ public class ServiceMiddlewareExample {
/** {@inheritDoc} */
@Override public Object invoke(String mtd, Object[] args,
ServiceContext ctx, Callable next) throws Exception {
-String serviceName = ctx.name();
+String srvcName = ctx.name();
ServiceCallContext callCtx = ctx.currentCallContext();
String user = callCtx == null ? null : callCtx.attribute("user");
-recordEvent(user, serviceName, mtd, "start");
+recordEvent(user, srvcName, mtd, "start");
try {
// Execute service method.
Object res = next.call();
// Record finish event after execution of the service method.
-recordEvent(user, serviceName, mtd, "result " + res);
+recordEvent(user, srvcName, mtd, "result " + res);
return res;
}
@@ -143,7 +143,7 @@ public class ServiceMiddlewareExample {
log.error("Intercepted error", e);
// Record error.
-recordEvent(user, serviceName, mtd, "error: " +
e.getMessage());
+recordEvent(user, srvcName, mtd, "error: " + e.getMessage());
// Re-throw exception to initiator.
throw e;
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/CalciteQueryProcessor.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/CalciteQueryProcessor.java
index 196d1283b98..c1f4f90aeeb 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/CalciteQueryProcessor.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/CalciteQueryProcessor.java
@@ -685,17 +685,17 @@ public class CalciteQueryProcessor extends
GridProcessorAdapter implements Query
/** */
private void onStart(GridKernalContext ctx, Service... services) {
-for (Service service : services) {
-if (service instanceof LifecycleAware)
-((LifecycleAware)service).onStart(ctx);
+for (Service srvc : services) {
+if (srvc instanceof LifecycleAware)
+((LifecycleAware)srvc).onStart(ctx);
}
}
/** */
private void onStop(Service... services) {
-for (Service service : services) {
-if (service instanceof LifecycleAware)
-((LifecycleAware)service).onStop();
+for (Service srvc : services) {
+if (srvc instanceof LifecycleAware)
+((LifecycleAware)srvc).onStop();
}
}
diff --git
a/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/KillCommandDdlIntegrationTest.java
b/modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/integration/KillCommandDdlInteg
(ignite) branch master updated: IGNITE-14823 Sender abbrevation (#11168)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 06e80f47927 IGNITE-14823 Sender abbrevation (#11168)
06e80f47927 is described below
commit 06e80f47927adf00fdc8cb0bcfa9c2c8015c2d7f
Author: Nikolay
AuthorDate: Wed Jan 10 09:17:02 2024 +0300
IGNITE-14823 Sender abbrevation (#11168)
---
.../query/calcite/prepare/ExecutionPlan.java | 4 +-
.../query/calcite/prepare/FragmentSplitter.java| 4 +-
.../query/calcite/prepare/QueryTemplate.java | 10 ++---
.../processors/query/calcite/prepare/Splitter.java | 4 +-
.../checkstyle/src/main/resources/abbrevations.csv | 2 +-
.../odbc/jdbc/JdbcConnectionContext.java | 4 +-
.../odbc/odbc/OdbcConnectionContext.java | 4 +-
.../internal/processors/query/h2/dml/DmlUtils.java | 44 +++---
8 files changed, 38 insertions(+), 38 deletions(-)
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/ExecutionPlan.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/ExecutionPlan.java
index e129333da0e..8a7058d7b09 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/ExecutionPlan.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/ExecutionPlan.java
@@ -76,8 +76,8 @@ public class ExecutionPlan {
if (fragment.rootFragment())
return null;
-IgniteSender sender = (IgniteSender)fragment.root();
-return
mapping(sender.targetFragmentId()).findGroup(sender.exchangeId());
+IgniteSender snd = (IgniteSender)fragment.root();
+return mapping(snd.targetFragmentId()).findGroup(snd.exchangeId());
}
/** */
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/FragmentSplitter.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/FragmentSplitter.java
index 78624744420..6757fdf711f 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/FragmentSplitter.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/FragmentSplitter.java
@@ -110,10 +110,10 @@ public class FragmentSplitter extends IgniteRelShuttle {
long exchangeId = sourceFragmentId;
IgniteReceiver receiver = new IgniteReceiver(cluster, traits, rowType,
exchangeId, sourceFragmentId);
-IgniteSender sender = new IgniteSender(cluster, traits, input,
exchangeId, targetFragmentId, rel.distribution());
+IgniteSender snd = new IgniteSender(cluster, traits, input,
exchangeId, targetFragmentId, rel.distribution());
curr.remotes.add(receiver);
-stack.push(new FragmentProto(sourceFragmentId, sender));
+stack.push(new FragmentProto(sourceFragmentId, snd));
return receiver;
}
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/QueryTemplate.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/QueryTemplate.java
index 33a17384661..1958488fcc5 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/QueryTemplate.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/QueryTemplate.java
@@ -124,14 +124,14 @@ public class QueryTemplate {
if (fragment0 == fragment)
fragment0 = F.first(replacement);
else if (!fragment0.rootFragment()) {
-IgniteSender sender = (IgniteSender)fragment0.root();
-Long newTargetId = newTargets.get(sender.exchangeId());
+IgniteSender snd = (IgniteSender)fragment0.root();
+Long newTargetId = newTargets.get(snd.exchangeId());
if (newTargetId != null) {
-sender = new IgniteSender(sender.getCluster(),
sender.getTraitSet(),
-sender.getInput(), sender.exchangeId(), newTargetId,
sender.distribution());
+snd = new IgniteSender(snd.getCluster(), snd.getTraitSet(),
+snd.getInput(), snd.exchangeId(), newTargetId,
snd.distribution());
-fragment0 = new Fragment(fragment0.fragmentId(), sender,
fragment0.remotes());
+fragment0 = new Fragment(fragment0.fragmentId(), snd,
fragment0.remotes());
}
}
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/Splitter.java
b/modules/calcite/src/main/java/org/apache/ignite/internal
(ignite) branch master updated: IGNITE-14823 Request, response abbrevation (#11159)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new ae7eb6629d1 IGNITE-14823 Request, response abbrevation (#11159)
ae7eb6629d1 is described below
commit ae7eb6629d1ac7f183a05bccd30864aac2257ccf
Author: Nikolay
AuthorDate: Fri Dec 29 13:20:53 2023 +0300
IGNITE-14823 Request, response abbrevation (#11159)
---
.../checkstyle/src/main/resources/abbrevations.csv | 4 ++--
.../internal/client/rest/GridProbeCommandTest.java | 24 +++---
.../internal/client/thin/TcpClientChannel.java | 18
.../deployment/GridDeploymentClassLoader.java | 14 ++---
.../managers/encryption/GridEncryptionManager.java | 6 +++---
.../cache/GridCachePartitionExchangeManager.java | 12 +--
.../snapshot/IgniteSnapshotManager.java| 6 +++---
.../cluster/GridClusterStateProcessor.java | 4 ++--
.../query/running/RunningQueryManager.java | 16 +++
.../rest/protocols/tcp/GridTcpRestNioListener.java | 6 +++---
.../ignite/internal/util/nio/GridNioServer.java| 6 +++---
.../client/thin/events/FakeIgniteServer.java | 4 ++--
.../p2p/ClassLoadingProblemExceptionTest.java | 10 -
.../p2p/GridP2PScanQueryWithTransformerTest.java | 8
14 files changed, 69 insertions(+), 69 deletions(-)
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index 5691de426ec..196b21af103 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -57,9 +57,9 @@ receive,rcv
reference,ref
#regularexpression,regex
repository,repo
-#request,req
+request,req
resource,rsrc
-#response,res
+response,res
#returnValue,retVal
#sender,snd
#service,srvc
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/client/rest/GridProbeCommandTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/rest/GridProbeCommandTest.java
index 5a0b83dc35e..b0ac8d346d4 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/client/rest/GridProbeCommandTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/client/rest/GridProbeCommandTest.java
@@ -58,22 +58,22 @@ public class GridProbeCommandTest extends
GridCommonAbstractTest {
boolean isHTTP_OK = conn.getResponseCode() ==
HttpURLConnection.HTTP_OK;
-Map restResponse = null;
+Map restRes = null;
try (InputStreamReader streamReader = new InputStreamReader(isHTTP_OK
? conn.getInputStream() : conn.getErrorStream())) {
ObjectMapper objMapper = new ObjectMapper();
-restResponse = objMapper.readValue(streamReader,
+restRes = objMapper.readValue(streamReader,
new TypeReference>() {
});
-log.info("probe command response is: " + restResponse);
+log.info("probe command response is: " + restRes);
}
catch (Exception e) {
log.error("error executing probe rest command", e);
}
-return restResponse;
+return restRes;
}
@@ -146,21 +146,21 @@ public class GridProbeCommandTest extends
GridCommonAbstractTest {
}
}).start();
-Map probeRestCmdResponse;
+Map probeRestCmdRes;
log.info("awaiting plugin handler latch");
triggerPluginStartLatch.await();
log.info("starting rest command url call");
try {
-probeRestCmdResponse = executeProbeRestRequest();
+probeRestCmdRes = executeProbeRestRequest();
log.info("finished rest command url call");
}
finally {
triggerRestCmdLatch.countDown(); //make sure the grid shuts down
}
-assertTrue(probeRestCmdResponse.get("error").equals("grid has not
started"));
-assertEquals(GridRestResponse.SERVICE_UNAVAILABLE,
probeRestCmdResponse.get("successStatus"));
+assertTrue(probeRestCmdRes.get("error").equals("grid has not
started"));
+assertEquals(GridRestResponse.SERVICE_UNAVAILABLE,
probeRestCmdRes.get("successStatus"));
}
/**
@@ -172,12 +172,12 @@ public class GridProbeCommandTest extends
GridCommonAbstractTest {
public void testRestProbeCommandGridStarted() throws Exception {
startGrid("regular");
-Map probeRestCmdResponse;
+Map probeRestCmdRes;
-probeRestCmdResponse = executeProbeRestRequest();
+probeRestCmdRes = executeProbeRestRequest();
-assertTrue(probeRestCmdResponse.g
(ignite) branch master updated: IGNITE-14823 Resource abbrevation (#11158)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 1c32eb284cb IGNITE-14823 Resource abbrevation (#11158)
1c32eb284cb is described below
commit 1c32eb284cb010479e8bbc60108992ccd84ba864
Author: Nikolay
AuthorDate: Fri Dec 29 12:51:02 2023 +0300
IGNITE-14823 Resource abbrevation (#11158)
---
modules/checkstyle/src/main/resources/abbrevations.csv | 2 +-
.../org/apache/ignite/internal/client/thin/ClientIgniteSetImpl.java | 6 +++---
.../internal/processors/query/h2/opt/GridLuceneInputStream.java | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index 92fd60cca4e..5691de426ec 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -58,7 +58,7 @@ reference,ref
#regularexpression,regex
repository,repo
#request,req
-#resource,rsrc
+resource,rsrc
#response,res
#returnValue,retVal
#sender,snd
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientIgniteSetImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientIgniteSetImpl.java
index 71195d14f2b..0cffda9635d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientIgniteSetImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientIgniteSetImpl.java
@@ -133,10 +133,10 @@ class ClientIgniteSetImpl implements
ClientIgniteSet {
Function>
payloadReader = in -> {
List page = readPage(in);
boolean hasNext = in.in().readBoolean();
-Long resourceId = hasNext ? in.in().readLong() : null;
-ClientChannel resourceCh = hasNext ? in.clientChannel() : null;
+Long rsrcId = hasNext ? in.in().readLong() : null;
+ClientChannel rsrcCh = hasNext ? in.clientChannel() : null;
-return new PagedIterator(resourceCh, resourceId, page);
+return new PagedIterator(rsrcCh, rsrcId, page);
};
if (colocated) {
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneInputStream.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneInputStream.java
index c8552a27a92..abc3ca96911 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneInputStream.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneInputStream.java
@@ -189,9 +189,9 @@ public class GridLuceneInputStream extends IndexInput
implements Cloneable {
if (offset < 0 || length < 0 || offset + length > this.length)
throw new IllegalArgumentException("slice() " + sliceDescription +
" out of bounds: " + this);
-final String newResourceDescription = (sliceDescription == null) ?
toString() : (toString() + " [slice=" + sliceDescription + "]");
+final String newRsrcDescription = (sliceDescription == null) ?
toString() : (toString() + " [slice=" + sliceDescription + "]");
-return new SlicedInputStream(newResourceDescription, offset, length);
+return new SlicedInputStream(newRsrcDescription, offset, length);
}
/**
(ignite) branch IGNITE-14823-resource updated (480c6868217 -> b16ebecb57d)
This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a change to branch IGNITE-14823-resource in repository https://gitbox.apache.org/repos/asf/ignite.git from 480c6868217 IGNITE-14823 Resource abbrevation add a773c1b6128 IGNITE-14823 Receive abbrevation (#11157) add b16ebecb57d Merge branch 'master' into IGNITE-14823-resource No new revisions were added by this update. Summary of changes:
(ignite) branch master updated (7270b5c40fe -> a773c1b6128)
This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/ignite.git from 7270b5c40fe IGNITE-14823 Process abbrevation (#11155) add a773c1b6128 IGNITE-14823 Receive abbrevation (#11157) No new revisions were added by this update. Summary of changes: modules/checkstyle/src/main/resources/abbrevations.csv | 6 +++--- .../IgniteMarshallerCacheClientRequestsMappingTest.java | 6 +++--- .../GridCacheAtomicReferenceApiSelfAbstractTest.java | 16 .../apache/ignite/internal/util/IgniteUtilsSelfTest.java | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-)
(ignite) 01/01: IGNITE-14823 Resource abbrevation
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch IGNITE-14823-resource
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 480c6868217c00bec316c4705f588fab9237aae0
Author: nizhikov
AuthorDate: Fri Dec 29 12:41:38 2023 +0300
IGNITE-14823 Resource abbrevation
---
modules/checkstyle/src/main/resources/abbrevations.csv | 2 +-
.../org/apache/ignite/internal/client/thin/ClientIgniteSetImpl.java | 6 +++---
.../internal/processors/query/h2/opt/GridLuceneInputStream.java | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index 92fd60cca4e..5691de426ec 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -58,7 +58,7 @@ reference,ref
#regularexpression,regex
repository,repo
#request,req
-#resource,rsrc
+resource,rsrc
#response,res
#returnValue,retVal
#sender,snd
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientIgniteSetImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientIgniteSetImpl.java
index 71195d14f2b..0cffda9635d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientIgniteSetImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientIgniteSetImpl.java
@@ -133,10 +133,10 @@ class ClientIgniteSetImpl implements
ClientIgniteSet {
Function>
payloadReader = in -> {
List page = readPage(in);
boolean hasNext = in.in().readBoolean();
-Long resourceId = hasNext ? in.in().readLong() : null;
-ClientChannel resourceCh = hasNext ? in.clientChannel() : null;
+Long rsrcId = hasNext ? in.in().readLong() : null;
+ClientChannel rsrcCh = hasNext ? in.clientChannel() : null;
-return new PagedIterator(resourceCh, resourceId, page);
+return new PagedIterator(rsrcCh, rsrcId, page);
};
if (colocated) {
diff --git
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneInputStream.java
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneInputStream.java
index c8552a27a92..abc3ca96911 100644
---
a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneInputStream.java
+++
b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridLuceneInputStream.java
@@ -189,9 +189,9 @@ public class GridLuceneInputStream extends IndexInput
implements Cloneable {
if (offset < 0 || length < 0 || offset + length > this.length)
throw new IllegalArgumentException("slice() " + sliceDescription +
" out of bounds: " + this);
-final String newResourceDescription = (sliceDescription == null) ?
toString() : (toString() + " [slice=" + sliceDescription + "]");
+final String newRsrcDescription = (sliceDescription == null) ?
toString() : (toString() + " [slice=" + sliceDescription + "]");
-return new SlicedInputStream(newResourceDescription, offset, length);
+return new SlicedInputStream(newRsrcDescription, offset, length);
}
/**
(ignite) branch IGNITE-14823-resource created (now 480c6868217)
This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a change to branch IGNITE-14823-resource in repository https://gitbox.apache.org/repos/asf/ignite.git at 480c6868217 IGNITE-14823 Resource abbrevation This branch includes the following new commits: new 480c6868217 IGNITE-14823 Resource abbrevation 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) branch master updated: IGNITE-14823 Process abbrevation (#11155)
This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ignite.git The following commit(s) were added to refs/heads/master by this push: new 7270b5c40fe IGNITE-14823 Process abbrevation (#11155) 7270b5c40fe is described below commit 7270b5c40fe17c5d805fd1c4de96429a31d368bd Author: Nikolay AuthorDate: Thu Dec 28 14:05:29 2023 +0300 IGNITE-14823 Process abbrevation (#11155) --- .../checkstyle/src/main/resources/abbrevations.csv | 4 +- .../JdbcThinCacheToJdbcDataTypesCoverageTest.java | 8 ++-- .../util/GridCommandHandlerIndexingUtils.java | 4 +- .../org/apache/ignite/internal/IgniteKernal.java | 8 ++-- .../management/cache/IndexForceRebuildTask.java| 6 +-- .../management/cache/ScheduleIndexRebuildTask.java | 6 +-- .../management/cache/ValidateIndexesClosure.java | 8 ++-- .../cache/EntryProcessorResourceInjectorProxy.java | 4 +- .../processors/cache/GridCacheMapEntry.java| 12 +++--- .../distributed/dht/GridDhtTxPrepareFuture.java| 8 ++-- .../distributed/dht/atomic/GridDhtAtomicCache.java | 44 +++--- .../atomic/GridNearAtomicFullUpdateRequest.java| 8 ++-- .../preloader/GridDhtPartitionsExchangeFuture.java | 12 +++--- .../distributed/near/GridNearAtomicCache.java | 6 +-- .../wal/reader/StandaloneGridKernalContext.java| 6 +-- .../wal/reader/StandaloneWalRecordsIterator.java | 6 +-- .../cache/transactions/IgniteTxEntry.java | 4 +- .../processors/failure/FailureProcessor.java | 6 +-- .../processors/odbc/jdbc/JdbcRequestHandler.java | 22 +-- .../spi/communication/tcp/TcpCommunicationSpi.java | 6 +-- .../tcp/internal/CommunicationWorker.java | 8 ++-- .../tcp/internal/InboundConnectionHandler.java | 6 +-- ...gniteCacheEntryProcessorSequentialCallTest.java | 12 +++--- .../BinaryObjectBuilderAdditionalSelfTest.java | 6 +-- .../cache/GridCacheAbstractFullApiSelfTest.java| 4 +- .../cache/GridCacheDataTypesCoverageTest.java | 10 ++--- .../GridCacheGetAndTransformStoreAbstractTest.java | 4 +- .../cache/GridCacheProcessorActiveTxTest.java | 4 +- .../IgniteCacheConfigVariationsFullApiTest.java| 4 +- .../cache/IgniteCacheInvokeAbstractTest.java | 24 ++-- .../RestorePartitionStateDuringCheckpointTest.java | 10 ++--- ...cheContinuousQueryFailoverAbstractSelfTest.java | 6 +-- .../DistributedProcessCoordinatorLeftTest.java | 6 +-- .../util/DistributedProcessErrorHandlingTest.java | 6 +-- .../p2p/P2PClassLoadingFailureHandlingTest.java| 8 ++-- .../junits/multijvm/JavaVersionCommand.java| 12 +++--- .../utils/IgniteWalConverterArguments.java | 10 ++--- .../processors/query/h2/CommandProcessor.java | 4 +- .../internal/processors/query/KillQueryTest.java | 8 ++-- .../query/stat/IgniteStatisticsRepositoryTest.java | 6 +-- .../query/stat/StatisticsStorageUnitTest.java | 6 +-- ...achePartitionedAtomicColumnConstraintsTest.java | 12 +++--- .../zk/internal/ZookeeperDiscoveryImpl.java| 6 +-- 43 files changed, 185 insertions(+), 185 deletions(-) diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv b/modules/checkstyle/src/main/resources/abbrevations.csv index b19101fffa0..4a1aed94f65 100644 --- a/modules/checkstyle/src/main/resources/abbrevations.csv +++ b/modules/checkstyle/src/main/resources/abbrevations.csv @@ -50,8 +50,8 @@ password,pwd policy,plc property,prop properties,props -#process,proc -#processor,proc +process,proc +processor,proc #query,qry #receive,rcv #reference,ref diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinCacheToJdbcDataTypesCoverageTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinCacheToJdbcDataTypesCoverageTest.java index dc03826a939..9f6027a40c4 100644 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinCacheToJdbcDataTypesCoverageTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinCacheToJdbcDataTypesCoverageTest.java @@ -404,7 +404,7 @@ public class JdbcThinCacheToJdbcDataTypesCoverageTest extends GridCacheDataTypes // so that EqualsBuilder.reflectionEquals returns false. // As a result in case of BigDecimal data type Objects.equals is used. // Same is about BigInteger. -BiFunction equalsProcessor = +BiFunction equalsProc = originalValItem instanceof BigDecimal || originalValItem instanceof BigInteger ? Objects::equals : (lhs, rhs) -> EqualsBuilder.reflectionEquals( @@ -463,7 +463,7 @@ public class JdbcThinCacheToJdbcDataTypesCoverageTest extends GridCacheDataTypes // Check SELECT query. try (PreparedStatement stmt = prepareStatement(cacheName, "SELECT * FROM &qu
(ignite) branch master updated: IGNITE-14823 Property abbrevation (#11153)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 7954435cf85 IGNITE-14823 Property abbrevation (#11153)
7954435cf85 is described below
commit 7954435cf8596da318d7863c24bb8ec1606b95eb
Author: Nikolay
AuthorDate: Thu Dec 28 13:33:27 2023 +0300
IGNITE-14823 Property abbrevation (#11153)
---
modules/checkstyle/src/main/resources/abbrevations.csv | 4 ++--
.../ignite/testframework/junits/common/GridCommonAbstractTest.java | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index 2de9e450050..b19101fffa0 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -48,8 +48,8 @@ package,pkg
parameter,param
password,pwd
policy,plc
-#property,prop
-#properties,props
+property,prop
+properties,props
#process,proc
#processor,proc
#query,qry
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
index 0b2f3d3c6b5..859716e779b 100755
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java
@@ -2815,11 +2815,11 @@ public abstract class GridCommonAbstractTest extends
GridAbstractTest {
* @return Distributed property: {@code
GridJobProcessor#computeJobWorkerInterruptTimeout}.
*/
protected DistributedChangeableProperty
computeJobWorkerInterruptTimeout(Ignite n) {
-DistributedChangeableProperty timeoutProperty =
((IgniteEx)n).context().distributedConfiguration()
+DistributedChangeableProperty timeoutProp =
((IgniteEx)n).context().distributedConfiguration()
.property(GridJobProcessor.COMPUTE_JOB_WORKER_INTERRUPT_TIMEOUT);
-assertThat(timeoutProperty, notNullValue());
+assertThat(timeoutProp, notNullValue());
-return timeoutProperty;
+return timeoutProp;
}
}
(ignite) branch master updated (35358912d24 -> b520625c47c)
This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/ignite.git from 35358912d24 IGNITE-21161 Fix node failure on timeout objects intersection - Fixes #11149. add b520625c47c IGNITE-14823 Parameter abbrevation (#11152) No new revisions were added by this update. Summary of changes: .idea/inspectionProfiles/Project_Default.xml | 37 -- .../jmh/notify/JmhWaitStategyBenchmark.java| 4 +-- .../checkstyle/src/main/resources/abbrevations.csv | 6 ++-- .../commandline/CommandHandlerParsingTest.java | 6 ++-- .../apache/ignite/util/GridCommandHandlerTest.java | 20 ++-- .../java/org/apache/ignite/ShutdownPolicy.java | 8 ++--- .../eviction/fifo/FifoEvictionPolicyFactory.java | 10 +++--- .../eviction/lru/LruEvictionPolicyFactory.java | 10 +++--- .../sorted/SortedEvictionPolicyFactory.java| 10 +++--- .../org/apache/ignite/internal/IgnitionEx.java | 6 ++-- .../managers/discovery/GridDiscoveryManager.java | 10 +++--- .../platform/services/PlatformServices.java| 6 ++-- .../query/stat/StatisticsUsageState.java | 4 +-- .../IgniteCacheLoadRebalanceEvictionSelfTest.java | 6 ++-- .../distributed/dht/GracefulShutdownTest.java | 18 +-- 15 files changed, 83 insertions(+), 78 deletions(-)
(ignite) branch master updated: IGNITE-14823 Package abbrevation (#11150)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 7081017590d IGNITE-14823 Package abbrevation (#11150)
7081017590d is described below
commit 7081017590d4aca9eea245aee451c3ddd2ddd59f
Author: Nikolay
AuthorDate: Wed Dec 27 12:37:07 2023 +0300
IGNITE-14823 Package abbrevation (#11150)
---
.../internal/processors/query/calcite/externalize/RelJson.java | 10 +-
modules/checkstyle/src/main/resources/abbrevations.csv | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/externalize/RelJson.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/externalize/RelJson.java
index f7fdcd3ae61..7eacd2d8ea5 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/externalize/RelJson.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/externalize/RelJson.java
@@ -137,8 +137,8 @@ class RelJson {
Class clazz = null;
if (!typeName.contains(".")) {
-for (String package_ : PACKAGES) {
-if ((clazz = classForName(package_ + typeName, true)) != null)
+for (String pkg_ : PACKAGES) {
+if ((clazz = classForName(pkg_ + typeName, true)) != null)
break;
}
}
@@ -250,9 +250,9 @@ class RelJson {
return class_.getSimpleName();
String canonicalName = class_.getName();
-for (String package_ : PACKAGES) {
-if (canonicalName.startsWith(package_)) {
-String remaining = canonicalName.substring(package_.length());
+for (String pkg_ : PACKAGES) {
+if (canonicalName.startsWith(pkg_)) {
+String remaining = canonicalName.substring(pkg_.length());
if (remaining.indexOf('.') < 0 && remaining.indexOf('$') < 0)
return remaining;
}
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index 107a054559a..4cd49aa732b 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -44,7 +44,7 @@ messages,msgs
mutex,mux
network,net
object,obj
-#package,pkg
+package,pkg
#parameter,param
#password,pwd
#policy,plc
(ignite) branch master updated: IGNITE-14823 Object abbrevation (#11147)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new a0fc658f599 IGNITE-14823 Object abbrevation (#11147)
a0fc658f599 is described below
commit a0fc658f5996c5115c61e81143644544c163bfb5
Author: Nikolay
AuthorDate: Wed Dec 27 12:28:14 2023 +0300
IGNITE-14823 Object abbrevation (#11147)
---
.../checkstyle/src/main/resources/abbrevations.csv | 2 +-
.../ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java | 4 +--
.../java/org/apache/ignite/cache/CacheManager.java | 6 ++--
.../optimized/OptimizedObjectInputStream.java | 4 +--
.../query/stat/IgniteGlobalStatisticsManager.java | 12
.../tcp/internal/GridNioServerWrapper.java | 6 ++--
.../internal/binary/BinaryMarshallerSelfTest.java | 34 +++---
.../BinaryObjectBuilderAdditionalSelfTest.java | 6 ++--
.../GridBinaryMarshallerCtxDisabledSelfTest.java | 16 +-
.../cache/CacheMetricsCacheSizeTest.java | 6 ++--
.../IgniteTxRemoveTimeoutObjectsTest.java | 4 +--
.../ignite/lang/utils/GridStripedLockSelfTest.java | 4 +--
.../startup/servlet/GridServletLoaderTest.java | 8 ++---
.../classloadproblem/P2PClassLoadingProblems.java | 2 +-
.../internal/processors/query/h2/H2Utils.java | 4 +--
.../persistence/db/wal/IgniteWalRecoveryTest.java | 6 ++--
16 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index cf0af19ceaf..107a054559a 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -43,7 +43,7 @@ message,msg
messages,msgs
mutex,mux
network,net
-#object,obj
+object,obj
#package,pkg
#parameter,param
#password,pwd
diff --git
a/modules/clients/src/test/java/org/apache/ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java
index 77476d9ed20..1c9961b0311 100644
---
a/modules/clients/src/test/java/org/apache/ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/jdbc/AbstractJdbcPojoQuerySelfTest.java
@@ -83,10 +83,10 @@ public abstract class AbstractJdbcPojoQuerySelfTest extends
GridCommonAbstractTe
builder2.setField("id", 1);
builder2.setField("boolVal", true);
-BinaryObject testObject = builder2.build();
+BinaryObject testObj = builder2.build();
builder.setField("id", 1);
-builder.setField("testObject", testObject);
+builder.setField("testObject", testObj);
BinaryObject binObj = builder.build();
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
index 17d40726f10..e6724b314c1 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheManager.java
@@ -395,12 +395,12 @@ public class CacheManager implements
javax.cache.CacheManager {
Set registeredObjNames =
mBeanSrv.queryNames(getObjectName(name, beanType), null);
//should just be one
-for (ObjectName registeredObjectName : registeredObjNames) {
+for (ObjectName registeredObjName : registeredObjNames) {
try {
-mBeanSrv.unregisterMBean(registeredObjectName);
+mBeanSrv.unregisterMBean(registeredObjName);
}
catch (Exception e) {
-throw new CacheException("Error unregistering object instance
" + registeredObjectName
+throw new CacheException("Error unregistering object instance
" + registeredObjName
+ " . Error was " + e.getMessage(), e);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectInputStream.java
b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectInputStream.java
index fdf375388da..d496548dfd1 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectInputStream.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/marshaller/optimized/OptimizedObjectInputStream.java
@@ -521,10 +521,10 @@ class OptimizedObjectInputStream extends
ObjectInputStream {
break;
case OTHER:
-Object resObject = readObject();
+Object resObj = readObject();
if (t.field() != null)
-s
(ignite) branch master updated (b590b16ee55 -> 1a5048a1ab9)
This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/ignite.git from b590b16ee55 IGNITE-20927 Update IgniteReleasedVersion for compatibility tests to 2.16.0 (#11146) add 1a5048a1ab9 IGNITE-14823 Network abbrevation (#11148) No new revisions were added by this update. Summary of changes: modules/checkstyle/src/main/resources/abbrevations.csv | 4 ++-- .../ignite/internal/plugin/IgniteLogInfoProviderImpl.java | 10 +- .../communication/GridIoManagerFileTransmissionSelfTest.java | 4 ++-- .../spi/discovery/tcp/TcpDiscoveryNetworkIssuesTest.java | 8 4 files changed, 13 insertions(+), 13 deletions(-)
(ignite) branch master updated: IGNITE-14823 Message abbrevation (#11143)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 6b873474176 IGNITE-14823 Message abbrevation (#11143)
6b873474176 is described below
commit 6b873474176845acd350500a7b96dc70873dc0ba
Author: Nikolay
AuthorDate: Tue Dec 26 13:25:52 2023 +0300
IGNITE-14823 Message abbrevation (#11143)
---
.../GridDhtPartitionsStateValidatorBenchmark.java | 6 +-
.../checkstyle/src/main/resources/abbrevations.csv | 3 +-
.../apache/ignite/jdbc/thin/JdbcThinTcpIoTest.java | 4 +-
.../CacheResetLostPartitionsTaskResult.java| 4 +-
.../defragmentation/DefragmentationTask.java | 20 +++---
.../cache/GridCachePartitionExchangeManager.java | 4 +-
.../cache/ValidationOnNodeJoinUtils.java | 8 +--
.../dht/preloader/GridDhtPartitionDemander.java| 6 +-
.../preloader/GridDhtPartitionsExchangeFuture.java | 14 ++--
.../topology/GridDhtPartitionsStateValidator.java | 12 ++--
.../spi/communication/tcp/TcpCommunicationSpi.java | 6 +-
.../ignite/cache/NotOptimizedRebalanceTest.java| 8 +--
.../ignite/cache/RebalanceCancellationTest.java| 10 +--
.../cache/RebalanceCompleteDuringExchangeTest.java | 10 +--
.../GridCacheHashMapPutAllWarningsTest.java| 76 +++---
.../internal/client/thin/ComputeTaskTest.java | 4 +-
.../GridIoManagerFileTransmissionSelfTest.java | 6 +-
.../IgniteClientDataStructuresAbstractTest.java| 12 ++--
.../distributed/CacheBlockOnReadAbstractTest.java | 4 +-
.../GridCachePartitionsStateValidationTest.java| 12 ++--
.../GridCachePartitionsStateValidatorSelfTest.java | 16 ++---
.../preloader/latch/ExchangeLatchManagerTest.java | 6 +-
...gniteRebalanceScheduleResendPartitionsTest.java | 6 +-
.../db/wal/IgniteWalRebalanceLoggingTest.java | 6 +-
.../IgniteNoParrallelClusterIsAllowedTest.java | 4 +-
.../IgniteMessagingConfigVariationFullApiTest.java | 30 -
.../nio/FastSessionMoveAndKeyCancellationTest.java | 6 +-
.../communication/GridCacheMessageSelfTest.java| 6 +-
.../tcp/TcpDiscoverySpiReconnectDelayTest.java | 24 +++
.../apache/ignite/testframework/GridTestUtils.java | 8 +--
.../query/h2/twostep/GridMapQueryExecutor.java | 6 +-
.../cache/BinaryTypeMismatchLoggingTest.java | 10 +--
.../cache/GridCacheFullTextQueryPagesTest.java | 4 +-
.../cache/IgniteCacheSqlDmlErrorSelfTest.java | 8 +--
34 files changed, 185 insertions(+), 184 deletions(-)
diff --git
a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/misc/GridDhtPartitionsStateValidatorBenchmark.java
b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/misc/GridDhtPartitionsStateValidatorBenchmark.java
index 2bdd40c9414..e044d501680 100644
---
a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/misc/GridDhtPartitionsStateValidatorBenchmark.java
+++
b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/misc/GridDhtPartitionsStateValidatorBenchmark.java
@@ -132,15 +132,15 @@ public class GridDhtPartitionsStateValidatorBenchmark
extends JmhAbstractBenchma
Mockito.when(topologyMock.currentLocalPartitions()).thenReturn(localPartitions);
// Form single messages map.
-Map messages = new
HashMap<>();
+Map msgs = new HashMap<>();
for (int n = 0; n < NODES; ++n) {
UUID remoteNode = UUID.randomUUID();
-messages.put(remoteNode, from(updateCountersMap,
cacheSizesMap));
+msgs.put(remoteNode, from(updateCountersMap, cacheSizesMap));
}
-messages.put(ignoreNode, from(updateCountersMap, cacheSizesMap));
+msgs.put(ignoreNode, from(updateCountersMap, cacheSizesMap));
validator = new GridDhtPartitionsStateValidator(cctxMock);
}
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index f7ca8b5ec4d..2a54ba51ca4 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -39,7 +39,8 @@ label,lbl
logger,log
loader,ldr
manager,mgr
-#message,msg
+message,msg
+messages,msgs
#mutex,mux
#network,net
#object,obj
diff --git
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinTcpIoTest.java
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinTcpIoTest.java
index b22842957a0..9ebada5defc 100644
---
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinTcpIoTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinTcpIoTest.java
@@ -71,8 +71,8 @@ public class JdbcThinTcpIoTest extends GridCom
(ignite) branch master updated: IGNITE-14823 Manager abbrevation (#11142)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new df6bd46cc5c IGNITE-14823 Manager abbrevation (#11142)
df6bd46cc5c is described below
commit df6bd46cc5c94925cb78d752f9fd06372b66428e
Author: Nikolay
AuthorDate: Tue Dec 26 12:57:51 2023 +0300
IGNITE-14823 Manager abbrevation (#11142)
---
.../benchmarks/jmh/tree/BPlusTreeBenchmark.java| 6 +++---
.../checkstyle/src/main/resources/abbrevations.csv | 2 +-
.../util/GridCommandHandlerIndexingTest.java | 4 ++--
.../org/apache/ignite/cache/CachingProvider.java | 4 ++--
.../GridCacheDatabaseSharedManager.java| 6 +++---
.../cache/persistence/GridCacheOffheapManager.java | 6 +++---
.../transactions/TransactionMetricsAdapter.java| 6 +++---
.../GridCollisionManagerLoggingSelfTest.java | 4 ++--
.../processors/cache/CacheMetricsManageTest.java | 22 +++---
.../cache/IgniteCachePeekModesAbstractTest.java| 4 ++--
.../GridCacheRebalancingWithAsyncClearingTest.java | 6 +++---
.../cache/persistence/db/IgnitePdsWithTtlTest.java | 4 ++--
.../db/checkpoint/LightweightCheckpointTest.java | 8
.../persistence/defragmentation/LinkMapTest.java | 6 +++---
.../transactions/TxWithKeyContentionSelfTest.java | 10 +-
.../database/BPlusTreeReuseSelfTest.java | 6 +++---
.../processors/database/CacheFreeListSelfTest.java | 6 +++---
.../processors/database/IndexStorageSelfTest.java | 6 +++---
18 files changed, 58 insertions(+), 58 deletions(-)
diff --git
a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/tree/BPlusTreeBenchmark.java
b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/tree/BPlusTreeBenchmark.java
index 0af6e889b9f..870249f5db9 100644
---
a/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/tree/BPlusTreeBenchmark.java
+++
b/modules/benchmarks/src/main/java/org/apache/ignite/internal/benchmarks/jmh/tree/BPlusTreeBenchmark.java
@@ -224,11 +224,11 @@ public class BPlusTreeBenchmark extends
JmhAbstractBenchmark {
/** */
private static PageLockTrackerManager mockPageLockTrackerManager() {
-PageLockTrackerManager manager =
mock(PageLockTrackerManager.class);
+PageLockTrackerManager mgr = mock(PageLockTrackerManager.class);
-
when(manager.createPageLockTracker(anyString())).thenReturn(PageLockTrackerManager.NOOP_LSNR);
+
when(mgr.createPageLockTracker(anyString())).thenReturn(PageLockTrackerManager.NOOP_LSNR);
-return manager;
+return mgr;
}
}
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index dad4c74e05f..f7ca8b5ec4d 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -38,7 +38,7 @@ label,lbl
#local,loc
logger,log
loader,ldr
-#manager,mgr
+manager,mgr
#message,msg
#mutex,mux
#network,net
diff --git
a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingTest.java
b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingTest.java
index 773ff1b51b2..46535d73e8b 100644
---
a/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingTest.java
+++
b/modules/control-utility/src/test/java/org/apache/ignite/util/GridCommandHandlerIndexingTest.java
@@ -311,9 +311,9 @@ public class GridCommandHandlerIndexingTest extends
GridCommandHandlerClusterPer
private File indexPartition(Ignite ig, String groupName) {
IgniteEx ig0 = (IgniteEx)ig;
-FilePageStoreManager pageStoreManager =
((FilePageStoreManager)ig0.context().cache().context().pageStore());
+FilePageStoreManager pageStoreMgr =
((FilePageStoreManager)ig0.context().cache().context().pageStore());
-return new File(pageStoreManager.cacheWorkDir(true, groupName),
INDEX_FILE_NAME);
+return new File(pageStoreMgr.cacheWorkDir(true, groupName),
INDEX_FILE_NAME);
}
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/CachingProvider.java
b/modules/core/src/main/java/org/apache/ignite/cache/CachingProvider.java
index a35b28503d2..a1f0d1367f4 100644
--- a/modules/core/src/main/java/org/apache/ignite/cache/CachingProvider.java
+++ b/modules/core/src/main/java/org/apache/ignite/cache/CachingProvider.java
@@ -245,9 +245,9 @@ public class CachingProvider implements
javax.cache.spi.CachingProvider {
if (fut != null && fut.isDone() && !fut.isFailed()) {
try {
-CacheManager cachedManager = fut.get();
+CacheM
(ignite) branch master updated: IGNITE-14823 Loader abbrevation (#11136)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 941061ff7e5 IGNITE-14823 Loader abbrevation (#11136)
941061ff7e5 is described below
commit 941061ff7e54428cde6d0b16ef5b4d34a80cbe51
Author: Nikolay
AuthorDate: Mon Dec 25 14:59:33 2023 +0300
IGNITE-14823 Loader abbrevation (#11136)
---
.../datagrid/store/CacheLoadOnlyStoreExample.java | 10 ++--
.../checkstyle/src/main/resources/abbrevations.csv | 2 +-
.../preloader/GridDhtPartitionsFullMessage.java| 6 +--
.../internal/MarshallerContextLockingSelfTest.java | 6 +--
.../dht/IgniteCacheStartWithLoadTest.java | 4 +-
.../persistence/db/IgniteLogicalRecoveryTest.java | 54 +++---
.../p2p/DeploymentClassLoaderCallableTest.java | 8 ++--
.../classloadproblem/P2PClassLoadingProblems.java | 4 +-
8 files changed, 47 insertions(+), 47 deletions(-)
diff --git
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheLoadOnlyStoreExample.java
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheLoadOnlyStoreExample.java
index ac3d27b8fbe..74e1bbf6054 100644
---
a/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheLoadOnlyStoreExample.java
+++
b/examples/src/main/java/org/apache/ignite/examples/datagrid/store/CacheLoadOnlyStoreExample.java
@@ -63,13 +63,13 @@ public class CacheLoadOnlyStoreExample {
System.out.println();
System.out.println(">>> CacheLoadOnlyStoreExample started.");
-ProductLoader productLoader = new
ProductLoader("examples/src/main/resources/person.csv");
+ProductLoader productLdr = new
ProductLoader("examples/src/main/resources/person.csv");
-productLoader.setThreadsCount(2);
-productLoader.setBatchSize(10);
-productLoader.setBatchQueueSize(1);
+productLdr.setThreadsCount(2);
+productLdr.setBatchSize(10);
+productLdr.setBatchQueueSize(1);
-try (IgniteCache cache =
ignite.getOrCreateCache(cacheConfiguration(productLoader))) {
+try (IgniteCache cache =
ignite.getOrCreateCache(cacheConfiguration(productLdr))) {
// load data.
cache.loadCache(null);
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index ebcce0795aa..dad4c74e05f 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -37,7 +37,7 @@ initialize,init
label,lbl
#local,loc
logger,log
-#loader,ldr
+loader,ldr
#manager,mgr
#message,msg
#mutex,mux
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
index 19be85dd733..ecfb2343e85 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsFullMessage.java
@@ -566,7 +566,7 @@ public class GridDhtPartitionsFullMessage extends
GridDhtPartitionsAbstractMessa
@Override public void finishUnmarshal(GridCacheSharedContext ctx,
ClassLoader ldr) throws IgniteCheckedException {
super.finishUnmarshal(ctx, ldr);
-ClassLoader clsLoader = U.resolveClassLoader(ldr, ctx.gridConfig());
+ClassLoader clsLdr = U.resolveClassLoader(ldr, ctx.gridConfig());
Collection objectsToUnmarshall = new ArrayList<>();
@@ -598,8 +598,8 @@ public class GridDhtPartitionsFullMessage extends
GridDhtPartitionsAbstractMessa
new IgniteThrowableFunction() {
@Override public Object apply(byte[] binary) throws
IgniteCheckedException {
return compressed()
-? U.unmarshalZip(ctx.marshaller(), binary, clsLoader)
-: U.unmarshal(ctx, binary, clsLoader);
+? U.unmarshalZip(ctx.marshaller(), binary, clsLdr)
+: U.unmarshal(ctx, binary, clsLdr);
}
}
);
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/MarshallerContextLockingSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/MarshallerContextLockingSelfTest.java
index 33be648ebbb..d5e6ac61bf0 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/MarshallerContextLockingSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/Marshal
(ignite) branch master updated: IGNITE-14823 Logger abbrevation (#11135)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 967e355e1fd IGNITE-14823 Logger abbrevation (#11135)
967e355e1fd is described below
commit 967e355e1fd709a8b897df08bcad39410f94139e
Author: Nikolay
AuthorDate: Mon Dec 25 14:33:03 2023 +0300
IGNITE-14823 Logger abbrevation (#11135)
---
.../checkstyle/src/main/resources/abbrevations.csv | 2 +-
.../junits/IgniteCompatibilityAbstractTest.java| 10 ++---
.../indexreader/IgniteIndexReaderTest.java | 8 ++--
.../util/GridCommandHandlerAbstractTest.java | 6 +--
.../GridCommandHandlerInterruptCommandTest.java| 6 +--
.../dotnet/PlatformDotNetConfigurationClosure.java | 10 ++---
.../cache/CacheDataRegionConfigurationTest.java| 50 +++---
.../IgniteSemaphoreAbstractSelfTest.java | 8 ++--
...ueryRemoteFilterMissingInClassPathSelfTest.java | 6 +--
.../p2p/GridP2PScanQueryWithTransformerTest.java | 12 +++---
.../tcp/GridTcpCommunicationSpiConfigSelfTest.java | 8 ++--
.../internal/processors/query/SqlMergeTest.java| 4 +-
.../h2/twostep/RetryCauseMessageSelfTest.java | 8 ++--
.../log4j2/Log4j2LoggerVerboseModeSelfTest.java| 4 +-
14 files changed, 71 insertions(+), 71 deletions(-)
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index c4aa9b3a1b6..ebcce0795aa 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -36,7 +36,7 @@ initialize,init
#iterator,iter
label,lbl
#local,loc
-#logger,log
+logger,log
#loader,ldr
#manager,mgr
#message,msg
diff --git
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/junits/IgniteCompatibilityAbstractTest.java
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/junits/IgniteCompatibilityAbstractTest.java
index 49519e020bf..a49e5275ae3 100644
---
a/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/junits/IgniteCompatibilityAbstractTest.java
+++
b/modules/compatibility/src/test/java/org/apache/ignite/compatibility/testframework/junits/IgniteCompatibilityAbstractTest.java
@@ -148,11 +148,11 @@ public abstract class IgniteCompatibilityAbstractTest
extends GridCommonAbstract
final IgniteConfiguration cfg = getConfiguration(igniteInstanceName);
// stub - won't be used at node startup
-final ListeningTestLogger logger = new ListeningTestLogger(log);
+final ListeningTestLogger listeningLog = new ListeningTestLogger(log);
-IgniteProcessProxy ignite = new IgniteProcessProxy(cfg, logger,
locJvmInstance == null ? null : () -> locJvmInstance, true) {
+IgniteProcessProxy ignite = new IgniteProcessProxy(cfg, listeningLog,
locJvmInstance == null ? null : () -> locJvmInstance, true) {
@Override protected IgniteLogger logger(IgniteLogger log, Object
ctgr) {
-return logger.getLogger(ctgr + "#" + ver.replaceAll("\\.",
"_"));
+return listeningLog.getLogger(ctgr + "#" +
ver.replaceAll("\\.", "_"));
}
@Override protected String igniteNodeRunnerClassName() throws
Exception {
@@ -177,14 +177,14 @@ public abstract class IgniteCompatibilityAbstractTest
extends GridCommonAbstract
LogListener lsnr = LogListener.matches(SYNCHRONIZATION_LOG_MESSAGE
+ nodeId).build();
-logger.registerListener(lsnr);
+listeningLog.registerListener(lsnr);
final long joinTimeout = getNodeJoinTimeout();
assertTrue("Node has not joined [id=" + nodeId + "]/" +
"or does not completed its startup during timeout: " +
joinTimeout + " ms.", lsnr.check(joinTimeout));
-logger.clearListeners();
+listeningLog.clearListeners();
}
if (rmJvmInstance == null)
diff --git
a/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReaderTest.java
b/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReaderTest.java
index a3f6022c9a8..fdc404820ce 100644
---
a/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReaderTest.java
+++
b/modules/control-utility/src/test/java/org/apache/ignite/internal/commandline/indexreader/IgniteIndexReaderTest.java
@@ -743,7 +743,7 @@ public class IgniteIndexReaderTest extends
GridCommandHandlerAbstractTest {
) throws IgniteCheckedException {
testOut.reset();
-IgniteLogger logger = crea
(ignite) branch master updated: IGNITE-14823 Label abbrevation (#11134)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new f0a810c9b73 IGNITE-14823 Label abbrevation (#11134)
f0a810c9b73 is described below
commit f0a810c9b736b6b2803a34f542688530e9a4fe95
Author: Nikolay
AuthorDate: Mon Dec 25 13:57:07 2023 +0300
IGNITE-14823 Label abbrevation (#11134)
---
modules/checkstyle/src/main/resources/abbrevations.csv | 2 +-
.../ignite/internal/processors/odbc/ClientListenerMetrics.java | 6 +++---
.../tests/control_utility/LongRunningTransactionsGenerator.java | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index 71df5acaf27..c4aa9b3a1b6 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -34,7 +34,7 @@ index,idx
initial,init
initialize,init
#iterator,iter
-#label,lbl
+label,lbl
#local,loc
#logger,log
#loader,ldr
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerMetrics.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerMetrics.java
index 0e6f19b5343..b2044dda216 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerMetrics.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerMetrics.java
@@ -106,10 +106,10 @@ public class ClientListenerMetrics {
"The number of affinity-aware query requests that were sent not to
the primary node");
for (byte clientType : CLI_TYPES) {
-String clientLabel = clientTypeLabel(clientType);
+String clientLbl = clientTypeLabel(clientType);
-String labelAccepted = MetricUtils.metricName(clientLabel,
METRIC_ACEPTED);
-accepted[clientType] = mreg.intMetric(labelAccepted,
+String lblAccepted = MetricUtils.metricName(clientLbl,
METRIC_ACEPTED);
+accepted[clientType] = mreg.intMetric(lblAccepted,
"Number of successfully established sessions for the
client type.");
}
}
diff --git
a/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/control_utility/LongRunningTransactionsGenerator.java
b/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/control_utility/LongRunningTransactionsGenerator.java
index b0b88dee03c..7e4bc904cf8 100644
---
a/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/control_utility/LongRunningTransactionsGenerator.java
+++
b/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/control_utility/LongRunningTransactionsGenerator.java
@@ -59,7 +59,7 @@ public class LongRunningTransactionsGenerator extends
IgniteAwareApplication {
String keyPrefix = jsonNode.get("key_prefix") != null ?
jsonNode.get("key_prefix").asText() : LOCKED_KEY_PREFIX;
-String label = jsonNode.get("label") != null ?
jsonNode.get("label").asText() : null;
+String lbl = jsonNode.get("label") != null ?
jsonNode.get("label").asText() : null;
long expectedTopologyVersion =
jsonNode.get("wait_for_topology_version") != null ?
jsonNode.get("wait_for_topology_version").asLong() : -1L;
@@ -124,7 +124,7 @@ public class LongRunningTransactionsGenerator extends
IgniteAwareApplication {
data.put(key, key);
}
-IgniteTransactions igniteTransactions = label != null ?
ignite.transactions().withLabel(label) :
+IgniteTransactions igniteTransactions = lbl != null ?
ignite.transactions().withLabel(lbl) :
ignite.transactions();
pool.execute(() -> {
(ignite) branch master updated: IGNITE-14823 Initialize abbrevation (#11133)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 6a13ec79d4a IGNITE-14823 Initialize abbrevation (#11133)
6a13ec79d4a is described below
commit 6a13ec79d4afe2b694a577102a7f10a7cd33a744
Author: Nikolay
AuthorDate: Mon Dec 25 13:47:43 2023 +0300
IGNITE-14823 Initialize abbrevation (#11133)
---
.../checkstyle/src/main/resources/abbrevations.csv | 4 +-
.../dht/topology/GridDhtPartitionTopologyImpl.java | 4 +-
.../metric/MetricsClusterActivationTest.java | 4 +-
.../CacheExchangeMessageDuplicatedStateTest.java | 6 +--
...teMarshallerCacheClientRequestsMappingTest.java | 6 +--
.../distributed/CacheBaselineTopologyTest.java | 46 +++---
...CheckpointSimulationWithRealCpDisabledTest.java | 4 +-
.../processors/query/h2/QueryDataPageScanTest.java | 8 ++--
.../zk/internal/ZookeeperDiscoveryImpl.java| 8 ++--
9 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index e42f1360a53..71df5acaf27 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -31,8 +31,8 @@ handler,hnd
header,hdr
implementation,impl
index,idx
-#initial,init
-#initialize,init
+initial,init
+initialize,init
#iterator,iter
#label,lbl
#local,loc
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopologyImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopologyImpl.java
index a39212117ae..7625fe7e813 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopologyImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtPartitionTopologyImpl.java
@@ -1754,11 +1754,11 @@ public class GridDhtPartitionTopologyImpl implements
GridDhtPartitionTopology {
for (int i = 0; i < cntrMap.size(); i++) {
int pId = cntrMap.partitionAt(i);
-long initialUpdateCntr = cntrMap.initialUpdateCounterAt(i);
+long initUpdateCntr = cntrMap.initialUpdateCounterAt(i);
long updateCntr = cntrMap.updateCounterAt(i);
if (this.cntrMap.updateCounter(pId) < updateCntr) {
-this.cntrMap.initialUpdateCounter(pId, initialUpdateCntr);
+this.cntrMap.initialUpdateCounter(pId, initUpdateCntr);
this.cntrMap.updateCounter(pId, updateCntr);
}
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/metric/MetricsClusterActivationTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/metric/MetricsClusterActivationTest.java
index 427278314ec..96a8a4c82a7 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/metric/MetricsClusterActivationTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/metric/MetricsClusterActivationTest.java
@@ -159,12 +159,12 @@ public class MetricsClusterActivationTest extends
GridCommonAbstractTest {
}
long offHeapSize = mreg.findMetric("OffHeapSize").value();
-long initialSize = mreg.findMetric("InitialSize").value();
+long initSize = mreg.findMetric("InitialSize").value();
long maxSize = mreg.findMetric("MaxSize").value();
assertTrue(offHeapSize > 0);
assertTrue(offHeapSize <= region.config().getMaxSize());
-assertEquals(region.config().getInitialSize(), initialSize);
+assertEquals(region.config().getInitialSize(), initSize);
assertEquals(region.config().getMaxSize(), maxSize);
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
index 0c521545372..648e2e90f70 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheExchangeMessageDuplicatedStateTest.java
@@ -234,11 +234,11 @@ public class CacheExchangeMessageDuplicatedStateTest
extends GridCommonAbstractT
if (partCntrs != null) {
for (CachePartitionFullCountersMap cntrs : partCntrs.values()) {
-long[] initialUpdCntrs = getFieldValue(cntrs,
"initialUpdCntrs");
+
(ignite) branch master updated: IGNITE-14823 Index abbrevation (#11124)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 6e1ebaebe10 IGNITE-14823 Index abbrevation (#11124)
6e1ebaebe10 is described below
commit 6e1ebaebe10514e0b231695814c465af4b6e3a28
Author: Nikolay
AuthorDate: Fri Dec 22 15:02:29 2023 +0300
IGNITE-14823 Index abbrevation (#11124)
---
.../query/calcite/exec/exp/RexToLixTranslator.java | 10 +--
.../query/calcite/rel/IgniteProject.java | 6 +-
.../calcite/rule/CorrelatedNestedLoopJoinRule.java | 4 +-
.../checkstyle/src/main/resources/abbrevations.csv | 4 +-
.../commandline/indexreader/IgniteIndexReader.java | 8 +-
.../util/GridCommandHandlerClusterByClassTest.java | 8 +-
.../util/GridCommandHandlerIndexListTest.java | 8 +-
.../GridCommandHandlerIndexRebuildStatusTest.java | 6 +-
...GridCommandHandlerScheduleIndexRebuildTest.java | 12 +--
.../java/org/apache/ignite/cache/QueryEntity.java | 20 ++---
.../java/org/apache/ignite/cache/QueryIndex.java | 10 +--
.../ignite/internal/binary/BinaryContext.java | 6 +-
.../query/index/sorted/inline/InlineIndexTree.java | 6 +-
.../CheckIndexInlineSizesTask.java | 4 +-
.../cache/CacheCheckIndexInlineSizesCommand.java | 12 +--
.../management/cache/ValidateIndexesClosure.java | 4 +-
.../cache/persistence/GridCacheOffheapManager.java | 4 +-
.../UpgradePendingTreeToPerPartitionTask.java | 6 +-
.../cache/persistence/pagemem/FullPageIdTable.java | 24 +++---
.../snapshot/SnapshotRestoreProcess.java | 6 +-
.../processors/odbc/jdbc/JdbcMetadataInfo.java | 6 +-
.../cache/ClientCacheConfigurationSerializer.java | 4 +-
.../platform/utils/PlatformConfigurationUtils.java | 4 +-
.../processors/query/GridQueryProcessor.java | 10 +--
.../internal/processors/query/stat/hll/HLL.java| 50 +--
.../BigEndianAscendingWordDeserializer.java| 24 +++---
.../processors/query/stat/hll/util/BitVector.java | 68 +++
.../processors/query/stat/hll/util/NumberUtil.java | 4 +-
.../ignite/internal/util/io/GridFilenameUtils.java | 36
...PdsMarshallerMappingRestoreOnNodeStartTest.java | 4 +-
.../db/IgnitePdsStartWIthEmptyArchive.java | 12 +--
...ailIsReachedDuringIterationOverArchiveTest.java | 6 +-
.../db/wal/WalDeletionArchiveAbstractTest.java | 10 +--
.../persistence/wal/aware/SegmentAwareTest.java| 4 +-
.../development/utils/IgniteWalConverterTest.java | 96 +++---
.../query/h2/opt/GridLuceneDirectory.java | 4 +-
.../processors/query/h2/opt/H2IndexCostedBase.java | 16 ++--
.../query/h2/sys/SystemViewH2Adapter.java | 4 +-
.../query/h2/twostep/GridReduceQueryExecutor.java | 6 +-
.../processors/query/h2/twostep/ReduceTable.java | 6 +-
.../query/h2/twostep/SortedReduceIndexAdapter.java | 6 +-
.../CacheGroupMetricsWithIndexBuildFailTest.java | 8 +-
.../cache/CacheGroupMetricsWithIndexTest.java | 10 +--
.../GridCacheSqlDdlClusterReadOnlyModeTest.java| 6 +-
.../processors/cache/index/BasicIndexTest.java | 12 +--
.../cache/index/IndexCorruptionRebuildTest.java| 4 +-
.../index/IoStatisticsBasicIndexSelfTest.java | 6 +-
.../processors/cache/index/LongIndexNameTest.java | 4 +-
.../processors/query/SqlSystemViewsSelfTest.java | 4 +-
.../query/stat/PSUStatisticsTypesTest.java | 6 +-
.../load/IgniteCacheRandomOperationBenchmark.java | 4 +-
51 files changed, 306 insertions(+), 306 deletions(-)
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexToLixTranslator.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexToLixTranslator.java
index ff90354b6d6..94de7699a27 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexToLixTranslator.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexToLixTranslator.java
@@ -1211,7 +1211,7 @@ public class RexToLixTranslator implements
RexVisitor
return rexWithStorageTypeResultMap.get(key);
final RexNode target = deref(fieldAccess.getReferenceExpr());
-int fieldIndex = fieldAccess.getField().getIndex();
+int fieldIdx = fieldAccess.getField().getIndex();
String fieldName = fieldAccess.getField().getName();
switch (target.getKind()) {
case CORREL_VARIABLE:
@@ -1222,7 +1222,7 @@ public class RexToLixTranslator implements
RexVisitor
final RexToLixTranslator.InputGetter getter =
correlates.apply(((RexCorrelVariable)target).getName());
final Expression input = getter.field(
-list, fieldIndex
(ignite) branch master updated: IGNITE-14823 Header abbrevation (#11123)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new f26bcb0f387 IGNITE-14823 Header abbrevation (#11123)
f26bcb0f387 is described below
commit f26bcb0f3875fc605ba67ee7a335b6db54009f55
Author: Nikolay
AuthorDate: Fri Dec 22 13:30:34 2023 +0300
IGNITE-14823 Header abbrevation (#11123)
---
modules/checkstyle/src/main/resources/abbrevations.csv | 2 +-
.../persistence/wal/AbstractWalRecordsIterator.java| 6 +++---
.../wal/reader/StandaloneWalRecordsIterator.java | 6 +++---
.../ignite/internal/websession/WebSessionSelfTest.java | 18 +-
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index 9db1e380a09..7a81ceb40be 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -28,7 +28,7 @@ frequency,freq
future,fut
#group,grp
handler,hnd
-#header,hdr
+header,hdr
#implementation,impl
#index,idx
#initial,init
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/AbstractWalRecordsIterator.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/AbstractWalRecordsIterator.java
index c020a30be29..42c7006acb8 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/AbstractWalRecordsIterator.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/AbstractWalRecordsIterator.java
@@ -420,10 +420,10 @@ public abstract class AbstractWalRecordsIterator
try {
fileIO = desc.toReadOnlyIO(ioFactory);
-SegmentHeader segmentHeader;
+SegmentHeader segmentHdr;
try {
-segmentHeader = readSegmentHeader(fileIO,
segmentFileInputFactory);
+segmentHdr = readSegmentHeader(fileIO,
segmentFileInputFactory);
}
catch (SegmentEofException | EOFException ignore) {
try {
@@ -441,7 +441,7 @@ public abstract class AbstractWalRecordsIterator
throw e;
}
-return initReadHandle(desc, start, fileIO, segmentHeader);
+return initReadHandle(desc, start, fileIO, segmentHdr);
}
catch (FileNotFoundException e) {
U.closeQuiet(fileIO);
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 26dd7c3e647..e23543789a5 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
@@ -318,12 +318,12 @@ class StandaloneWalRecordsIterator extends
AbstractWalRecordsIterator {
AbstractFileDescriptor fd = desc;
SegmentIO fileIO = null;
-SegmentHeader segmentHeader;
+SegmentHeader segmentHdr;
while (true) {
try {
fileIO = fd.toReadOnlyIO(ioFactory);
-segmentHeader = readSegmentHeader(fileIO, FILE_INPUT_FACTORY);
+segmentHdr = readSegmentHeader(fileIO, FILE_INPUT_FACTORY);
break;
}
@@ -341,7 +341,7 @@ class StandaloneWalRecordsIterator extends
AbstractWalRecordsIterator {
}
}
-return initReadHandle(fd, start, fileIO, segmentHeader);
+return initReadHandle(fd, start, fileIO, segmentHdr);
}
/** {@inheritDoc} */
diff --git
a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
index 616117fd345..f4365c4f9cc 100644
---
a/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
+++
b/modules/web/src/test/java/org/apache/ignite/internal/websession/WebSessionSelfTest.java
@@ -1073,18 +1073,18 @@ public class WebSessionSelfTest extends
GridCommonAbstractTest {
private String getSessionIdFromCookie(URLConnection conn) {
String sessionCookieValue = null;
String sesId = null;
-Map> headerFields = conn.getHeaderFields();
-Set headerFieldsSet = headerFields.keySet();
-Iterator hearerFieldsIter = headerFieldsSet.iterator();
+Map> hdrFields = conn.getHeaderFields();
+Set hdrFieldsSet = hdrFields.
(ignite) branch master updated: IGNITE-14823 Handler abbrevation (#11117)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 431f5983570 IGNITE-14823 Handler abbrevation (#7)
431f5983570 is described below
commit 431f598357047a7bfdc51d1999524e9a8ccc4d98
Author: Nikolay
AuthorDate: Thu Dec 21 12:09:32 2023 +0300
IGNITE-14823 Handler abbrevation (#7)
---
.../calcite/exec/exp/ExpressionFactoryImpl.java| 6 +--
.../query/calcite/exec/rel/SortAggregateNode.java | 8 ++--
.../calcite/schema/CacheTableDescriptorImpl.java | 30 +++
.../processors/query/calcite/util/TypeUtils.java | 10 ++---
.../checkstyle/src/main/resources/abbrevations.csv | 2 +-
.../util/GridCommandHandlerIndexListTest.java | 26 ++---
.../GridCommandHandlerIndexRebuildStatusTest.java | 14 +++
.../processors/cache/GridCacheProcessor.java | 10 ++---
.../processors/odbc/ClientListenerNioListener.java | 10 ++---
.../FilePerformanceStatisticsReader.java | 44 +++---
...JdbcPojoWriteBehindStoreWithCoalescingTest.java | 12 +++---
.../pagelocktracker/SharedPageLockTrackerTest.java | 4 +-
.../handlers/log/GridLogCommandHandlerTest.java| 36 +-
.../internal/websession/WebSessionSelfTest.java| 6 +--
14 files changed, 109 insertions(+), 109 deletions(-)
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/ExpressionFactoryImpl.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/ExpressionFactoryImpl.java
index 69acc6028b3..82b3a1fd859 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/ExpressionFactoryImpl.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/ExpressionFactoryImpl.java
@@ -253,8 +253,8 @@ public class ExpressionFactoryImpl implements
ExpressionFactory {
/** {@inheritDoc} */
@Override public Iterable values(List values, RelDataType
rowType) {
-RowHandler handler = ctx.rowHandler();
-RowFactory factory = handler.factory(typeFactory, rowType);
+RowHandler hnd = ctx.rowHandler();
+RowFactory factory = hnd.factory(typeFactory, rowType);
int columns = rowType.getFieldCount();
assert values.size() % columns == 0;
@@ -273,7 +273,7 @@ public class ExpressionFactoryImpl implements
ExpressionFactory {
RexLiteral literal = values.get(i);
-handler.set(field, currRow, literal.getValueAs(types.get(field)));
+hnd.set(field, currRow, literal.getValueAs(types.get(field)));
}
return rows;
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/rel/SortAggregateNode.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/rel/SortAggregateNode.java
index cf7d8546dc6..3b261b936b3 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/rel/SortAggregateNode.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/rel/SortAggregateNode.java
@@ -184,10 +184,10 @@ public class SortAggregateNode extends
AggregateNode {
final Object[] grpKeys = new Object[grpSet.cardinality()];
List fldIdxs = grpSet.asList();
-final RowHandler rowHandler = rowFactory.handler();
+final RowHandler rowHnd = rowFactory.handler();
for (int i = 0; i < grpKeys.length; ++i)
-grpKeys[i] = rowHandler.get(fldIdxs.get(i), r);
+grpKeys[i] = rowHnd.get(fldIdxs.get(i), r);
Group grp = new Group(grpKeys);
@@ -249,10 +249,10 @@ public class SortAggregateNode extends
AggregateNode {
/** */
private void addOnReducer(Row row) {
-RowHandler handler = context().rowHandler();
+RowHandler hnd = context().rowHandler();
List accums = hasAccumulators() ?
-(List)handler.get(handler.columnCount(row) - 1,
row)
+(List)hnd.get(hnd.columnCount(row) - 1, row)
: Collections.emptyList();
for (int i = 0; i < accums.size(); i++) {
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/schema/CacheTableDescriptorImpl.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/schema/CacheTableDescriptorImpl.java
index e19a5420350..84f05bd14d2 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/schema/CacheTableDescriptorImpl.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/schema/CacheTableDescriptorImp
(ignite) branch master updated: IGNITE-14823 Future abbrevation (#11116)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 2689972654e IGNITE-14823 Future abbrevation (#6)
2689972654e is described below
commit 2689972654ef667de998a8c37e4132e1c14f474b
Author: Nikolay
AuthorDate: Thu Dec 21 11:50:15 2023 +0300
IGNITE-14823 Future abbrevation (#6)
---
.../checkstyle/src/main/resources/abbrevations.csv | 4 +-
.../cache/CacheAffinitySharedManager.java | 20 ++---
.../cache/GatewayProtectedCacheProxy.java | 16 ++--
.../processors/cache/GridCacheMapEntry.java| 4 +-
.../processors/cache/GridCacheMvccManager.java | 6 +-
.../processors/cache/GridCacheSharedContext.java | 6 +-
.../snapshot/IgniteSnapshotManager.java| 4 +-
.../snapshot/SnapshotRestoreProcess.java | 4 +-
.../datastructures/GridCacheSemaphoreImpl.java | 10 +--
.../platform/compute/PlatformCompute.java | 16 ++--
.../stat/IgniteStatisticsConfigurationManager.java | 24 +++---
.../internal/util/future/IgniteRemoteMapTask.java | 6 +-
.../GridMultithreadedJobStealingSelfTest.java | 4 +-
...ientCheckClusterGroupLocalIdAfterReconnect.java | 6 +-
...usterActivateDeactivateTestWithPersistence.java | 4 +-
.../IgniteSemaphoreAbstractSelfTest.java | 16 ++--
.../CacheLateAffinityAssignmentTest.java | 6 +-
.../GridCachePartitionsStateValidationTest.java| 12 +--
.../dht/IgniteCacheStartWithLoadTest.java | 8 +-
.../rebalancing/CacheManualRebalancingTest.java| 4 +-
.../CacheRebalanceWithRemovedWalSegment.java | 6 +-
.../persistence/IgnitePdsTaskCancelingTest.java| 4 +-
.../persistence/wal/aware/SegmentAwareTest.java| 90 +++---
.../TxPartitionCounterStateAbstractTest.java | 4 +-
.../IgniteComputeConfigVariationsFullApiTest.java | 8 +-
.../nio/FastSessionMoveAndKeyCancellationTest.java | 4 +-
.../tcp/TcpDiscoveryNodeJoinAndFailureTest.java| 6 +-
.../ClientReconnectWithSqlTableConfiguredTest.java | 8 +-
.../cache/index/IndexCorruptionRebuildTest.java| 6 +-
.../IgnitePdsIndexingDefragmentationTest.java | 6 +-
.../persistence/db/wal/IgniteWalRecoveryTest.java | 4 +-
.../processors/query/stat/BusyExecutorTest.java| 2 +-
.../processors/schedule/GridScheduleSelfTest.java | 10 +--
33 files changed, 169 insertions(+), 169 deletions(-)
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index d51d1ded1c8..e1969ffde81 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -24,8 +24,8 @@ event,evt
events,evts
exception,e,e2,ex
execute,exec
-#frequency,freq
-#future,fut
+frequency,freq
+future,fut
#group,grp
#handler,hnd
#header,hdr
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
index 94e880b0755..6b997cb1a14 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheAffinitySharedManager.java
@@ -1988,7 +1988,7 @@ public class CacheAffinitySharedManager extends
GridCacheSharedManagerAdap
assert idx >= 0 && idx < exchFuts.size() - 1 :
"Invalid exchange futures state [cur=" + idx +
", total=" + exchFuts.size() + ']';
-GridDhtPartitionsExchangeFuture futureToFetchAff =
null;
+GridDhtPartitionsExchangeFuture futToFetchAff = null;
for (int i = idx + 1; i < exchFuts.size(); i++) {
GridDhtPartitionsExchangeFuture prev =
exchFuts.get(i);
@@ -1998,40 +1998,40 @@ public class CacheAffinitySharedManager extends
GridCacheSharedManagerAdap
if (prev.isMerged())
continue;
-futureToFetchAff = prev;
+futToFetchAff = prev;
break;
}
-if (futureToFetchAff == null)
+if (futToFetchAff == null)
throw new IgniteCheckedException("Failed to find
completed exchange future to fetch affinity.");
if (log.isDebugEnabled()) {
log.debug("Need initialize affinity on coordinator
[" +
"cacheGrp=" +
(ignite) branch master updated: IGNITE-21125 Prevent duplicate keys written to dump (#11112)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new b583b7dc201 IGNITE-21125 Prevent duplicate keys written to dump
(#2)
b583b7dc201 is described below
commit b583b7dc201764f93ea65eb9ff554a0cdaa57957
Author: Nikolay
AuthorDate: Wed Dec 20 22:11:01 2023 +0300
IGNITE-21125 Prevent duplicate keys written to dump (#2)
---
.../snapshot/dump/CreateDumpFutureTask.java| 158 -
.../cache/persistence/snapshot/dump/Dump.java | 16 ---
.../processors/cache/tree/CacheDataTree.java | 11 ++
3 files changed, 130 insertions(+), 55 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/CreateDumpFutureTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/CreateDumpFutureTask.java
index 3f181b71a97..050ef15daff 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/CreateDumpFutureTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/CreateDumpFutureTask.java
@@ -47,12 +47,15 @@ import org.apache.ignite.dump.DumpEntry;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.CacheGroupContext;
import org.apache.ignite.internal.processors.cache.CacheObject;
+import org.apache.ignite.internal.processors.cache.CacheObjectContext;
import org.apache.ignite.internal.processors.cache.DynamicCacheDescriptor;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
import org.apache.ignite.internal.processors.cache.GridCacheSharedContext;
+import org.apache.ignite.internal.processors.cache.IgniteCacheOffheapManager;
import org.apache.ignite.internal.processors.cache.KeyCacheObject;
import org.apache.ignite.internal.processors.cache.StoredCacheData;
import org.apache.ignite.internal.processors.cache.persistence.CacheDataRow;
+import org.apache.ignite.internal.processors.cache.persistence.CacheSearchRow;
import org.apache.ignite.internal.processors.cache.persistence.file.FileIO;
import
org.apache.ignite.internal.processors.cache.persistence.file.FileIOFactory;
import
org.apache.ignite.internal.processors.cache.persistence.partstate.GroupPartitionId;
@@ -60,6 +63,8 @@ import
org.apache.ignite.internal.processors.cache.persistence.snapshot.Abstract
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotManager;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotFutureTaskResult;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotSender;
+import org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusIO;
+import org.apache.ignite.internal.processors.cache.tree.CacheDataTree;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import
org.apache.ignite.internal.processors.cache.version.GridCacheVersionManager;
import org.apache.ignite.internal.util.BasicRateLimiter;
@@ -266,6 +271,9 @@ public class CreateDumpFutureTask extends
AbstractCreateSnapshotFutureTask imple
long entriesCnt0 = 0;
long writtenEntriesCnt0 = 0;
+int coCtxCache = 0;
+CacheObjectContext coCtx = null;
+
try (PartitionDumpContext dumpCtx = dumpContext(grp, part)) {
try (GridCloseableIterator rows =
gctx.offheap().reservedIterator(part, dumpCtx.topVer)) {
if (rows == null)
@@ -278,12 +286,21 @@ public class CreateDumpFutureTask extends
AbstractCreateSnapshotFutureTask imple
int cache = row.cacheId() == 0 ? grp : row.cacheId();
-if (dumpCtx.writeForIterator(cache, row.expireTime(),
row.key(), row.value(), row.version()))
+if (cache != coCtxCache) {
+coCtxCache = cache;
+
+coCtx = cctx.cacheObjectContext(coCtxCache);
+}
+
+if (dumpCtx.writeForIterator(cache, row.expireTime(),
row.key(), row.value(), row.version(), coCtx))
writtenEntriesCnt0++;
entriesCnt0++;
}
}
+catch (IOException e) {
+throw new IgniteException(e);
+}
entriesCnt.addAndGet(entriesCnt0);
writtenEntriesCnt.addAndGet(writtenEntriesCnt0);
@@ -297,7 +314,6 @@ public class CreateDumpFutureTask extends
AbstractCreateSnapshotFutureTask imple
", iterEntriesCnt=" +
(ignite) branch master updated: IGNITE-14823 Execute abbrevation (#11114)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 571094b0446 IGNITE-14823 Execute abbrevation (#4)
571094b0446 is described below
commit 571094b04460e92e3a0985ea8cfb59be41b31985
Author: Nikolay
AuthorDate: Wed Dec 20 11:47:21 2023 +0300
IGNITE-14823 Execute abbrevation (#4)
---
modules/checkstyle/src/main/resources/abbrevations.csv | 2 +-
.../cache/persistence/IgniteDataStorageMetricsSelfTest.java | 12 ++--
.../internal/processors/query/h2/GridIndexRebuildTest.java | 4 ++--
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index e4c2bf90102..d51d1ded1c8 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -23,7 +23,7 @@ directory,dir
event,evt
events,evts
exception,e,e2,ex
-#execute,exec
+execute,exec
#frequency,freq
#future,fut
#group,grp
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteDataStorageMetricsSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteDataStorageMetricsSelfTest.java
index 88002b9eddb..b0339c0900f 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteDataStorageMetricsSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgniteDataStorageMetricsSelfTest.java
@@ -276,7 +276,7 @@ public class IgniteDataStorageMetricsSelfTest extends
GridCommonAbstractTest {
AtomicLong expLastCpBeforeLockDuration = new AtomicLong();
AtomicLong expLastCpLockWaitDuration = new AtomicLong();
-AtomicLong expLastCpListenersExecuteDuration = new AtomicLong();
+AtomicLong expLastCpListenersExecDuration = new AtomicLong();
AtomicLong expLastCpLockHoldDuration = new AtomicLong();
AtomicLong expLastCpWalRecordFsyncDuration = new AtomicLong();
AtomicLong expLastCpWriteEntryDuration = new AtomicLong();
@@ -291,7 +291,7 @@ public class IgniteDataStorageMetricsSelfTest extends
GridCommonAbstractTest {
expLastCpBeforeLockDuration.set(Long.parseLong(matcher.group(1)));
expLastCpLockWaitDuration.set(Long.parseLong(matcher.group(2)));
-
expLastCpListenersExecuteDuration.set(Long.parseLong(matcher.group(3)));
+
expLastCpListenersExecDuration.set(Long.parseLong(matcher.group(3)));
expLastCpLockHoldDuration.set(Long.parseLong(matcher.group(4)));
expLastCpWalRecordFsyncDuration.set(Long.parseLong(matcher.group(5)));
expLastCpWriteEntryDuration.set(Long.parseLong(matcher.group(6)));
@@ -314,7 +314,7 @@ public class IgniteDataStorageMetricsSelfTest extends
GridCommonAbstractTest {
AtomicLongMetric lastCpBeforeLockDuration =
mreg.findMetric("LastCheckpointBeforeLockDuration");
AtomicLongMetric lastCpLockWaitDuration =
mreg.findMetric("LastCheckpointLockWaitDuration");
-AtomicLongMetric lastCpListenersExecuteDuration =
mreg.findMetric("LastCheckpointListenersExecuteDuration");
+AtomicLongMetric lastCpListenersExecDuration =
mreg.findMetric("LastCheckpointListenersExecuteDuration");
AtomicLongMetric lastCpLockHoldDuration =
mreg.findMetric("LastCheckpointLockHoldDuration");
AtomicLongMetric lastCpWalRecordFsyncDuration =
mreg.findMetric("LastCheckpointWalRecordFsyncDuration");
AtomicLongMetric lastCpWriteEntryDuration =
mreg.findMetric("LastCheckpointWriteEntryDuration");
@@ -323,7 +323,7 @@ public class IgniteDataStorageMetricsSelfTest extends
GridCommonAbstractTest {
HistogramMetric cpBeforeLockHistogram =
mreg.findMetric("CheckpointBeforeLockHistogram");
HistogramMetric cpLockWaitHistogram =
mreg.findMetric("CheckpointLockWaitHistogram");
-HistogramMetric cpListenersExecuteHistogram =
mreg.findMetric("CheckpointListenersExecuteHistogram");
+HistogramMetric cpListenersExecHistogram =
mreg.findMetric("CheckpointListenersExecuteHistogram");
HistogramMetric cpMarkHistogram =
mreg.findMetric("CheckpointMarkHistogram");
HistogramMetric cpLockHoldHistogram =
mreg.findMetric("CheckpointLockHoldHistogram");
HistogramMetric cpPagesWriteHistogram =
mreg.findMetric("CheckpointPagesWriteHistogram");
@@ -337,7 +337,7 @@ public class IgniteDataStorageMetricsSelfTest extends
GridCommonAbstractTest {
(ignite) branch master updated: IGNITE-14823 Exception abbrevation (#11113)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new fe11df1327b IGNITE-14823 Exception abbrevation (#3)
fe11df1327b is described below
commit fe11df1327b9cd2a7746bdcb8f0a3b87b348cbae
Author: Nikolay
AuthorDate: Wed Dec 20 11:31:59 2023 +0300
IGNITE-14823 Exception abbrevation (#3)
---
.../query/calcite/exec/exp/RexToLixTranslator.java | 4 +--
.../checkstyle/src/main/resources/abbrevations.csv | 2 +-
.../jdbc/thin/JdbcThinConnectionSelfTest.java | 6 ++---
.../deployment/GridDeploymentClassLoader.java | 8 +++---
.../managers/discovery/GridDiscoveryManager.java | 6 ++---
.../cache/IgniteCacheOffheapManagerImpl.java | 10
.../processors/cache/IgniteCacheProxyImpl.java | 6 ++---
.../preloader/GridDhtPartitionsExchangeFuture.java | 6 ++---
.../processors/platform/cache/PlatformCache.java | 12 -
.../processors/platform/utils/PlatformUtils.java | 4 +--
.../communication/tcp/ClientExceptionsUtils.java | 6 ++---
.../GridCacheConcurrentGetCacheOnClientTest.java | 10
...acheAbstractDataStructuresFailoverSelfTest.java | 6 ++---
.../datastructures/IgniteLockAbstractSelfTest.java | 6 ++---
...niteBaselineAffinityTopologyActivationTest.java | 30 +++---
.../IgnitePdsCheckpointMapSnapshotTest.java| 4 +--
...ailIsReachedDuringIterationOverArchiveTest.java | 6 ++---
.../IgniteAbstractWalIteratorInvalidCrcTest.java | 4 +--
.../ignite/internal/util/IgniteUtilsSelfTest.java | 6 ++---
.../util/future/GridFutureAdapterSelfTest.java | 6 ++---
.../p2p/P2PClassLoadingFailureHandlingTest.java| 6 ++---
.../tcp/TcpDiscoveryNodeJoinAndFailureTest.java| 6 ++---
.../processors/query/h2/IgniteH2Indexing.java | 10
23 files changed, 85 insertions(+), 85 deletions(-)
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexToLixTranslator.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexToLixTranslator.java
index 3be0a7cf6b6..ff90354b6d6 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexToLixTranslator.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexToLixTranslator.java
@@ -1367,8 +1367,8 @@ public class RexToLixTranslator implements
RexVisitor
Statement st = Expressions.statement(Expressions.assign(methodCall,
callExpr));
// Catch Block, wrap checked exception in unchecked exception
ParameterExpression e = Expressions.parameter(0, Exception.class, "e");
-Expression uncheckedException =
Expressions.new_(RuntimeException.class, e);
-CatchBlock cb = Expressions.catch_(e,
Expressions.throw_(uncheckedException));
+Expression uncheckedEx = Expressions.new_(RuntimeException.class, e);
+CatchBlock cb = Expressions.catch_(e, Expressions.throw_(uncheckedEx));
list.add(Expressions.tryCatch(st, cb));
return methodCall;
}
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index 674da91fd6c..e4c2bf90102 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -22,7 +22,7 @@ destination,dest
directory,dir
event,evt
events,evts
-#exception,e,e2,ex
+exception,e,e2,ex
#execute,exec
#frequency,freq
#future,fut
diff --git
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java
index 17c871b0970..6f97da4c8c9 100644
---
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java
@@ -2221,14 +2221,14 @@ public class JdbcThinConnectionSelfTest extends
JdbcThinAbstractSelfTest {
f.get();
-boolean exceptionFound = false;
+boolean exFound = false;
for (SQLException e : exs) {
if (e != null && e.getMessage().contains("Concurrent access to
JDBC connection is not allowed"))
-exceptionFound = true;
+exFound = true;
}
-assertTrue("Concurrent access to JDBC connection is not allowed",
exceptionFound);
+assertTrue("Concurrent access to JDBC connection is not allowed",
exFound);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentCla
(ignite) branch master updated: IGNITE-14823 Event abbrevation (#11110)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new a0b9af0a76c IGNITE-14823 Event abbrevation (#0)
a0b9af0a76c is described below
commit a0b9af0a76cb0df5df47e6dcf963eeccb609ef38
Author: Nikolay
AuthorDate: Tue Dec 19 15:14:13 2023 +0300
IGNITE-14823 Event abbrevation (#0)
---
.../checkstyle/src/main/resources/abbrevations.csv | 3 +-
.../monitoring/EventListenerDemultiplexer.java | 12 +++---
.../affinity/GridAffinityAssignmentCache.java | 6 +--
.../processors/platform/events/PlatformEvents.java | 8 ++--
.../processors/service/ServiceDeploymentTask.java | 8 ++--
.../IgniteClientRequestEventListenerTest.java | 46 ++---
.../internal/cluster/IgniteClusterIdTagTest.java | 48 +++---
.../IgniteCacheEntryListenerAbstractTest.java | 6 +--
.../distributed/IgniteCacheManyClientsTest.java| 6 +--
.../GridCacheRebalancingOrderingTest.java | 6 +--
...cheContinuousQueryFailoverAbstractSelfTest.java | 4 +-
...ueryRemoteFilterMissingInClassPathSelfTest.java | 6 +--
...niteCacheContinuousQueryImmutableEntryTest.java | 16
.../cluster/ClusterStateChangeEventTest.java | 18
.../ContinuousQueryBuffersCleanupTest.java | 4 +-
.../GridServiceContinuousQueryRedeployTest.java| 4 +-
.../p2p/P2PClassLoadingFailureHandlingTest.java| 4 +-
.../platform/PlatformEventsWriteEventTask.java | 24 +--
...unicationInverseConnectionEstablishingTest.java | 6 +--
...mmunicationSpiInverseConnectionLoggingTest.java | 6 +--
.../TcpCommunicationSpiNodeLeftLoggingTest.java| 12 +++---
.../spi/discovery/tcp/TcpDiscoverySelfTest.java| 6 +--
.../testframework/MemorizingAppenderTest.java | 10 ++---
.../internal/ZookeeperDiscoverySpiTestHelper.java | 4 +-
24 files changed, 137 insertions(+), 136 deletions(-)
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index aa051de5cb4..674da91fd6c 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -20,7 +20,8 @@ database,db
default,dflt
destination,dest
directory,dir
-#event,evt
+event,evt
+events,evts
#exception,e,e2,ex
#execute,exec
#frequency,freq
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/client/monitoring/EventListenerDemultiplexer.java
b/modules/core/src/main/java/org/apache/ignite/internal/client/monitoring/EventListenerDemultiplexer.java
index af9f3c0b7e3..31d1eaa6eb9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/client/monitoring/EventListenerDemultiplexer.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/client/monitoring/EventListenerDemultiplexer.java
@@ -89,20 +89,20 @@ public class EventListenerDemultiplexer {
if (F.isEmpty(cfg.getEventListeners()))
return NO_OP;
-List qryEventListeners = new ArrayList<>();
-List connEventListeners = new ArrayList<>();
+List qryEvtListeners = new ArrayList<>();
+List connEvtListeners = new ArrayList<>();
for (EventListener l: cfg.getEventListeners()) {
if (l instanceof RequestEventListener)
-qryEventListeners.add((RequestEventListener)l);
+qryEvtListeners.add((RequestEventListener)l);
else if (l instanceof ConnectionEventListener)
-connEventListeners.add((ConnectionEventListener)l);
+connEvtListeners.add((ConnectionEventListener)l);
}
-if (F.isEmpty(qryEventListeners) && F.isEmpty(connEventListeners))
+if (F.isEmpty(qryEvtListeners) && F.isEmpty(connEvtListeners))
return NO_OP;
-return new EventListenerDemultiplexer(qryEventListeners,
connEventListeners, NullLogger.whenNull(cfg.getLogger()));
+return new EventListenerDemultiplexer(qryEvtListeners,
connEvtListeners, NullLogger.whenNull(cfg.getLogger()));
}
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
index 07f87c98b01..b4956adc0e8 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/affinity/GridAffinityAssignmentCache.java
@@ -366,10 +366,10 @@ public class GridAffinityAssignmentCache {
don't belong to affinity for current group (client node or
filtered by nodeFilter). */
boolean skipCalculation =
(ignite) branch master updated: IGNITE-14823 Directory abbrevation (#11109)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new dc68f6b922d IGNITE-14823 Directory abbrevation (#11109)
dc68f6b922d is described below
commit dc68f6b922d4823777dc1b1fb5210777adb0ec2b
Author: Nikolay
AuthorDate: Tue Dec 19 15:02:32 2023 +0300
IGNITE-14823 Directory abbrevation (#11109)
---
modules/checkstyle/src/main/resources/abbrevations.csv | 2 +-
.../persistence/snapshot/SnapshotPartitionsVerifyHandler.java | 6 +++---
.../org/apache/ignite/internal/util/io/GridFilenameUtils.java | 10 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index 2966dbf8624..aa051de5cb4 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -19,7 +19,7 @@ current,cur
database,db
default,dflt
destination,dest
-#directory,dir
+directory,dir
#event,evt
#exception,e,e2,ex
#execute,exec
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandler.java
index 0a12bfa03d2..0eb17ac4b12 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandler.java
@@ -474,7 +474,7 @@ public class SnapshotPartitionsVerifyHandler implements
SnapshotHandler grpIds) {
SnapshotMetadata meta = opCtx.metadata();
-Path snapshotDirectory = opCtx.snapshotDirectory().toPath();
+Path snapshotDir = opCtx.snapshotDirectory().toPath();
if (meta.hasCompressedGroups() &&
grpIds.stream().anyMatch(meta::isGroupWithCompresion)) {
try {
@@ -488,12 +488,12 @@ public class SnapshotPartitionsVerifyHandler implements
SnapshotHandler= prefix; j--) {
if (arr[j] == separator) {
@@ -427,7 +427,7 @@ public class GridFilenameUtils {
if (size <= prefix) { // should never be less than prefix
return new String(arr, 0, size);
}
-if (lastIsDirectory && keepSeparator)
+if (lastIsDir && keepSeparator)
return new String(arr, 0, size); // keep trailing separator
return new String(arr, 0, size - 1); // lose trailing separator
}
(ignite) branch master updated: IGNITE-14823 Default abbrevation (#11108)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new b0af6c10f88 IGNITE-14823 Default abbrevation (#11108)
b0af6c10f88 is described below
commit b0af6c10f884787efaa0f891d68ba5077f380fdf
Author: Nikolay
AuthorDate: Tue Dec 19 11:40:54 2023 +0300
IGNITE-14823 Default abbrevation (#11108)
---
.../query/calcite/exec/exp/RexImpTable.java| 26 -
.../checkstyle/src/main/resources/abbrevations.csv | 4 +--
.../CachePartitionDefragmentationManager.java | 6 ++--
.../ignite/internal/ThreadNameValidationTest.java | 4 +--
.../internal/client/thin/AtomicLongTest.java | 6 ++--
.../cache/CacheDataRegionConfigurationTest.java| 34 +++---
.../IgniteDiscoDataHandlingInNewClusterTest.java | 8 ++---
...IgnitePdsDiscoDataHandlingInNewClusterTest.java | 8 ++---
.../CheckpointListenerForRegionTest.java | 16 +-
.../query/IgniteSqlCreateTableTemplateTest.java| 6 ++--
.../cluster/ClusterStateXmlPropertiesTest.java | 10 +++
11 files changed, 64 insertions(+), 64 deletions(-)
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
index 4ab844ba73b..2d8d047ff3b 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
@@ -1056,32 +1056,32 @@ public class RexImpTable {
List leftExprs = Util.skip(argValueList, 2);
// Default value for JSON_VALUE behaviors.
Expression emptyBehavior =
Expressions.constant(SqlJsonValueEmptyOrErrorBehavior.NULL);
-Expression defaultValueOnEmpty = Expressions.constant(null);
+Expression dfltValueOnEmpty = Expressions.constant(null);
Expression errorBehavior =
Expressions.constant(SqlJsonValueEmptyOrErrorBehavior.NULL);
-Expression defaultValueOnError = Expressions.constant(null);
+Expression dfltValueOnError = Expressions.constant(null);
// Patched up with user defines.
if (!leftExprs.isEmpty()) {
for (int i = 0; i < leftExprs.size(); i++) {
Expression expr = leftExprs.get(i);
final Object exprVal = translator.getLiteralValue(expr);
if (exprVal != null) {
-int defaultSymbolIdx = i - 2;
+int dfltSymbolIdx = i - 2;
if (exprVal == SqlJsonEmptyOrError.EMPTY) {
-if (defaultSymbolIdx >= 0
-&&
translator.getLiteralValue(leftExprs.get(defaultSymbolIdx))
+if (dfltSymbolIdx >= 0
+&&
translator.getLiteralValue(leftExprs.get(dfltSymbolIdx))
== SqlJsonValueEmptyOrErrorBehavior.DEFAULT) {
-defaultValueOnEmpty = leftExprs.get(i - 1);
-emptyBehavior =
leftExprs.get(defaultSymbolIdx);
+dfltValueOnEmpty = leftExprs.get(i - 1);
+emptyBehavior = leftExprs.get(dfltSymbolIdx);
}
else
emptyBehavior = leftExprs.get(i - 1);
}
else if (exprVal == SqlJsonEmptyOrError.ERROR) {
-if (defaultSymbolIdx >= 0
-&&
translator.getLiteralValue(leftExprs.get(defaultSymbolIdx))
+if (dfltSymbolIdx >= 0
+&&
translator.getLiteralValue(leftExprs.get(dfltSymbolIdx))
== SqlJsonValueEmptyOrErrorBehavior.DEFAULT) {
-defaultValueOnError = leftExprs.get(i - 1);
-errorBehavior =
leftExprs.get(defaultSymbolIdx);
+dfltValueOnError = leftExprs.get(i - 1);
+errorBehavior = leftExprs.get(dfltSymbolIdx);
}
else
errorBehavior = leftExprs.get(i - 1);
@@ -1090,9 +1090,9 @@ public class RexImpTable {
}
}
newOperands.add(emptyBehavior);
-newOperands.add(defaultValueOnEmpty);
+newOperands.add(dfltValueOnEmpty);
newOperands.a
(ignite) branch master updated: IGNITE-14823 Database abbrevation (#11105)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 8a15d204b35 IGNITE-14823 Database abbrevation (#11105)
8a15d204b35 is described below
commit 8a15d204b35d1d654c816a6d948bd58964707550
Author: Nikolay
AuthorDate: Mon Dec 18 14:12:47 2023 +0300
IGNITE-14823 Database abbrevation (#11105)
---
modules/checkstyle/src/main/resources/abbrevations.csv | 2 +-
.../java/org/apache/ignite/internal/CheckCpHistTask.java | 8
.../cache/persistence/GridCacheOffheapManager.java | 12 ++--
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index 553798283e6..5d0e6bd7ffd 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -16,7 +16,7 @@ context,ctx
contexts,ctxs
count,cnt
current,cur
-#database,db
+database,db
#default,dflt
#destination,dest
#directory,dir
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/CheckCpHistTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/CheckCpHistTask.java
index 2b8cb062668..4cf535bdc48 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/CheckCpHistTask.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/CheckCpHistTask.java
@@ -132,8 +132,8 @@ public class CheckCpHistTask extends
ComputeTaskAdapter partsCounters = new HashMap<>();
@@ -1069,10 +1069,10 @@ public class GridCacheOffheapManager extends
IgniteCacheOffheapManagerImpl imple
}
try {
-WALPointer minPtr =
database.checkpointHistory().searchEarliestWalPointer(grp.groupId(),
+WALPointer minPtr =
db.checkpointHistory().searchEarliestWalPointer(grp.groupId(),
partsCounters, grp.hasAtomicCaches() ? walAtomicCacheMargin :
0L);
-WALPointer latestReservedPointer =
database.latestWalPointerReservedForPreloading();
+WALPointer latestReservedPointer =
db.latestWalPointerReservedForPreloading();
assert latestReservedPointer == null ||
latestReservedPointer.compareTo(minPtr) <= 0
: "Historical iterator tries to iterate WAL out of reservation
[cache=" + grp.cacheOrGroupName()
(ignite) branch master updated: IGNITE-14823 Current abbrevation (#11104)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new d2d9c3d7fed IGNITE-14823 Current abbrevation (#11104)
d2d9c3d7fed is described below
commit d2d9c3d7feda4c046c10f8228067c7e545e49dd9
Author: Nikolay
AuthorDate: Mon Dec 18 13:54:54 2023 +0300
IGNITE-14823 Current abbrevation (#11104)
---
.../query/calcite/exec/exp/RexToLixTranslator.java | 12 +-
.../checkstyle/src/main/resources/abbrevations.csv | 2 +-
.../java/org/apache/ignite/cache/QueryEntity.java | 8 +++
.../management/cache/ValidateIndexesClosure.java | 16 ++---
.../affinity/GridAffinityAssignmentCache.java | 10 -
.../bulkload/pipeline/CsvLineProcessorBlock.java | 26 +++---
.../internal/processors/cache/CachesRegistry.java | 6 ++---
.../processors/cache/GridCacheMapEntry.java| 8 +++
.../cache/GridCachePartitionExchangeManager.java | 4 ++--
.../processors/cache/IgniteCacheProxyImpl.java | 14 ++--
.../preloader/GridDhtPartitionsFullMessage.java| 4 ++--
.../topology/GridDhtPartitionsStateValidator.java | 8 +++
.../pagelocktracker/SharedPageLockTracker.java | 6 ++---
...edBasedMemoryConsumptionThrottlingStrategy.java | 18 +++
.../datastructures/GridCacheLockImpl.java | 16 ++---
.../internal/processors/query/stat/hll/HLL.java| 4 ++--
.../cluster/GridChangeStateCommandHandler.java | 4 ++--
.../CacheLateAffinityAssignmentTest.java | 4 ++--
.../pagemem/PagesWriteThrottleSandboxTest.java | 4 ++--
.../spi/discovery/ClusterMetricsSelfTest.java | 16 ++---
.../development/utils/IgniteWalConverter.java | 10 -
21 files changed, 100 insertions(+), 100 deletions(-)
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexToLixTranslator.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexToLixTranslator.java
index 8cba1b67875..3be0a7cf6b6 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexToLixTranslator.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexToLixTranslator.java
@@ -1110,13 +1110,13 @@ public class RexToLixTranslator implements
RexVisitor
*/
private void implementRecursively(final RexToLixTranslator
currentTranslator,
final List operandList, final ParameterExpression
valueVariable, int pos) {
-final BlockBuilder currentBlockBuilder =
currentTranslator.getBlockBuilder();
+final BlockBuilder curBlockBuilder =
currentTranslator.getBlockBuilder();
final List storageTypes =
ConverterUtils.internalTypes(operandList);
// [ELSE] clause
if (pos == operandList.size() - 1) {
Expression res = implementCallOperand2(operandList.get(pos),
storageTypes.get(pos), currentTranslator);
-currentBlockBuilder.add(
+curBlockBuilder.add(
Expressions.statement(
Expressions.assign(valueVariable,
ConverterUtils.convert(res,
valueVariable.getType();
@@ -1132,7 +1132,7 @@ public class RexToLixTranslator implements
RexVisitor
// Code for {if} branch
final RexNode ifTrueNode = operandList.get(pos + 1);
final BlockBuilder ifTrueBlockBuilder =
-new BlockBuilder(true, currentBlockBuilder);
+new BlockBuilder(true, curBlockBuilder);
final RexToLixTranslator ifTrueTranslator =
currentTranslator.setBlock(ifTrueBlockBuilder);
final Expression ifTrueRes = implementCallOperand2(ifTrueNode,
@@ -1145,18 +1145,18 @@ public class RexToLixTranslator implements
RexVisitor
final BlockStatement ifTrue = ifTrueBlockBuilder.toBlock();
// There is no [ELSE] clause
if (pos + 1 == operandList.size() - 1) {
-currentBlockBuilder.add(
+curBlockBuilder.add(
Expressions.ifThen(tester, ifTrue));
return;
}
// Generate code for {else} branch recursively
final BlockBuilder ifFalseBlockBuilder =
-new BlockBuilder(true, currentBlockBuilder);
+new BlockBuilder(true, curBlockBuilder);
final RexToLixTranslator ifFalseTranslator =
currentTranslator.setBlock(ifFalseBlockBuilder);
implementRecursively(ifFalseTranslator, operandList, valueVariable,
pos + 2);
final BlockStatement ifFalse = ifFalseBlockBuilder.toBlock();
-currentBlockBuilder.add(
+curBlockBuilder.add(
Expressions.ifThenElse(tester, ifTrue, ifFalse));
}
diff --git
(ignite) branch master updated: IGNITE-14823 Context abbrevation (#11096)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new b240ce3c744 IGNITE-14823 Context abbrevation (#11096)
b240ce3c744 is described below
commit b240ce3c74422235141d200552d4adf6266db890
Author: Nikolay
AuthorDate: Thu Dec 14 11:53:04 2023 +0300
IGNITE-14823 Context abbrevation (#11096)
---
.../query/calcite/exec/ExecutionContext.java | 4 +--
.../checkstyle/src/main/resources/abbrevations.csv | 3 ++-
.../ignite/internal/jdbc/thin/JdbcThinSSLUtil.java | 4 +--
.../FindAndDeleteGarbageInPersistenceClosure.java | 20 +++
.../management/cache/ViewCacheClosure.java | 24 -
.../processors/cache/CacheGroupContext.java| 12 -
.../cache/GatewayProtectedCacheProxy.java | 4 +--
.../processors/cache/GridCacheProcessor.java | 30 +++---
.../processors/cache/IgniteCacheProxyImpl.java | 6 ++---
.../internal/processors/cache/WalStateManager.java | 4 +--
.../dht/preloader/GridDhtPartitionSupplier.java| 20 +++
.../client/cache/ClientCachePartitionsRequest.java | 4 +--
.../GridCollisionManagerLoggingSelfTest.java | 6 ++---
.../internal/MarshallerContextLockingSelfTest.java | 6 ++---
.../GridBinaryMarshallerCtxDisabledSelfTest.java | 4 +--
.../optimized/OptimizedMarshallerEnumSelfTest.java | 6 ++---
.../cache/CacheMetricsCacheSizeTest.java | 4 +--
.../cache/distributed/CacheParallelStartTest.java | 4 +--
.../db/checkpoint/LightweightCheckpointTest.java | 22
.../wal/IgniteNodeStoppedDuringDisableWALTest.java | 16 ++--
.../processors/query/h2/opt/GridH2Table.java | 6 ++---
.../cache/index/SchemaExchangeSelfTest.java| 4 +--
22 files changed, 107 insertions(+), 106 deletions(-)
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/ExecutionContext.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/ExecutionContext.java
index 6e551258f6f..1ed10914db5 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/ExecutionContext.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/ExecutionContext.java
@@ -370,9 +370,9 @@ public class ExecutionContext extends
AbstractQueryContext implements DataC
if (o == null || getClass() != o.getClass())
return false;
-ExecutionContext context = (ExecutionContext)o;
+ExecutionContext ctx = (ExecutionContext)o;
-return qryId.equals(context.qryId) && fragmentDesc.fragmentId() ==
context.fragmentDesc.fragmentId();
+return qryId.equals(ctx.qryId) && fragmentDesc.fragmentId() ==
ctx.fragmentDesc.fragmentId();
}
/** {@inheritDoc} */
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index 7f205713cce..e7f4d4afc6b 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -12,7 +12,8 @@ class,cls
command,cmd
commands,cmds
config,cfg
-#context,ctx
+context,ctx
+contexts,ctxs
#count,cnt
#current,cur
#database,db
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinSSLUtil.java
b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinSSLUtil.java
index e410e4d1fa2..d52095fe336 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinSSLUtil.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinSSLUtil.java
@@ -181,9 +181,9 @@ public class JdbcThinSSLUtil {
f.setCipherSuites(cipherSuites.split(","));
try {
-final SSLContext sslContext = f.create();
+final SSLContext sslCtx = f.create();
-return sslContext.getSocketFactory();
+return sslCtx.getSocketFactory();
}
catch (IgniteException e) {
final Throwable cause = e.getCause();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/FindAndDeleteGarbageInPersistenceClosure.java
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/FindAndDeleteGarbageInPersistenceClosure.java
index a12b0617ea5..450869b3def 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/management/cache/FindAndDeleteGarbageInPersistenceClosure.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/management/cache/FindAndDeleteGarbageInPersistenceClosure.java
@@ -169,21 +169,21 @@ public class FindAndDeleteGarbageInPersistenceClosure
implements IgniteCallable&l
(ignite) branch master updated: IGNITE-14823 Config abbrevation (#11095)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new b2ba1628f92 IGNITE-14823 Config abbrevation (#11095)
b2ba1628f92 is described below
commit b2ba1628f922ec6c203a75be12609deca5034e47
Author: Nikolay
AuthorDate: Thu Dec 14 11:33:20 2023 +0300
IGNITE-14823 Config abbrevation (#11095)
---
.../query/calcite/prepare/IgnitePlanner.java | 4 ++--
.../checkstyle/src/main/resources/abbrevations.csv | 2 +-
.../snapshot/SnapshotCompressionBasicTest.java | 20 ++--
.../internal/processors/cache/ClusterCachesInfo.java | 4 ++--
.../CacheJdbcPojoWriteBehindConnectionLeakTest.java | 6 +++---
.../org/apache/ignite/client/ReliabilityTest.java| 12 ++--
.../GridDiscoveryManagerAttributesSelfTest.java | 4 ++--
.../GridCacheFastNodeLeftForTransactionTest.java | 8
.../IgniteCacheGetCustomCollectionsSelfTest.java | 12 ++--
...dsCacheConfigurationFileConsistencyCheckTest.java | 4 ++--
.../p2p/P2PClassLoadingFailureHandlingTest.java | 4 ++--
.../cache/IgniteCacheAbstractQuerySelfTest.java | 6 +++---
.../processors/query/stat/StatisticsViewsTest.java | 18 +-
13 files changed, 52 insertions(+), 52 deletions(-)
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/IgnitePlanner.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/IgnitePlanner.java
index 1af54fa9998..a66f2564ef7 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/IgnitePlanner.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/prepare/IgnitePlanner.java
@@ -455,10 +455,10 @@ public class IgnitePlanner implements Planner,
RelOptTable.ViewExpander {
// For now, don't trim if there are more than 3 joins. The projects
// near the leaves created by trim migrate past joins and seem to
// prevent join-reordering.
-final SqlToRelConverter.Config config = sqlToRelConverterCfg
+final SqlToRelConverter.Config cfg = sqlToRelConverterCfg
.withExpand(false)
.withTrimUnusedFields(RelOptUtil.countJoins(root.rel) < 2);
-SqlToRelConverter converter = sqlToRelConverter(validator(),
catalogReader, config);
+SqlToRelConverter converter = sqlToRelConverter(validator(),
catalogReader, cfg);
boolean ordered = !root.collation.getFieldCollations().isEmpty();
boolean dml = SqlKind.DML.contains(root.kind);
return root.withRel(converter.trimUnusedFields(dml || ordered,
root.rel));
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index 89da749de71..7f205713cce 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -11,7 +11,7 @@ buffer,buf
class,cls
command,cmd
commands,cmds
-#config,cfg
+config,cfg
#context,ctx
#count,cnt
#current,cur
diff --git
a/modules/compress/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCompressionBasicTest.java
b/modules/compress/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCompressionBasicTest.java
index 4ccdf4ca3c3..f1a04efb974 100644
---
a/modules/compress/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCompressionBasicTest.java
+++
b/modules/compress/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotCompressionBasicTest.java
@@ -121,12 +121,12 @@ public class SnapshotCompressionBasicTest extends
AbstractSnapshotSelfTest {
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String
igniteInstanceName) throws Exception {
-IgniteConfiguration config =
super.getConfiguration(igniteInstanceName);
+IgniteConfiguration cfg = super.getConfiguration(igniteInstanceName);
-config.getDataStorageConfiguration().setPageSize(PAGE_SIZE);
-config.setWorkDirectory(workingDirectory(config).toString());
+cfg.getDataStorageConfiguration().setPageSize(PAGE_SIZE);
+cfg.setWorkDirectory(workingDirectory(cfg).toString());
-return config;
+return cfg;
}
/** {@inheritDoc} */
@@ -300,9 +300,9 @@ public class SnapshotCompressionBasicTest extends
AbstractSnapshotSelfTest {
protected void createTestSnapshot() throws Exception {
CacheConfiguration[] caches = CACHES.entrySet().stream()
.map(cache -> {
-CacheConfiguration config = new
CacheConfiguration(cache.
(ignite) branch master updated: IGNITE-14823 Command abbrevation (#11093)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 99dfd02d5ee IGNITE-14823 Command abbrevation (#11093)
99dfd02d5ee is described below
commit 99dfd02d5eea9f3688be0d6edf30f454f3010869
Author: Nikolay
AuthorDate: Wed Dec 13 16:36:55 2023 +0300
IGNITE-14823 Command abbrevation (#11093)
---
.../checkstyle/src/main/resources/abbrevations.csv | 3 ++-
.../internal/client/rest/GridProbeCommandTest.java | 16
.../rest/JettyRestProcessorAbstractSelfTest.java | 20 ++--
.../compatibility/testframework/util/MavenUtils.java | 8
.../ignite/internal/commandline/CommandHandler.java | 18 +-
.../util/GridCommandHandlerFactoryAbstractTest.java | 6 +++---
.../apache/ignite/internal/util/GridJavaProcess.java | 16
.../rest/handlers/log/GridLogCommandHandlerTest.java | 12 ++--
.../handlers/query/GridQueryCommandHandlerTest.java | 18 +-
9 files changed, 59 insertions(+), 58 deletions(-)
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index e7d99cb554f..89da749de71 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -9,7 +9,8 @@ attribute,attr
attributes,attrs
buffer,buf
class,cls
-#command,cmd
+command,cmd
+commands,cmds
#config,cfg
#context,ctx
#count,cnt
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/client/rest/GridProbeCommandTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/client/rest/GridProbeCommandTest.java
index af09544db0d..5a0b83dc35e 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/client/rest/GridProbeCommandTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/client/rest/GridProbeCommandTest.java
@@ -146,21 +146,21 @@ public class GridProbeCommandTest extends
GridCommonAbstractTest {
}
}).start();
-Map probeRestCommandResponse;
+Map probeRestCmdResponse;
log.info("awaiting plugin handler latch");
triggerPluginStartLatch.await();
log.info("starting rest command url call");
try {
-probeRestCommandResponse = executeProbeRestRequest();
+probeRestCmdResponse = executeProbeRestRequest();
log.info("finished rest command url call");
}
finally {
triggerRestCmdLatch.countDown(); //make sure the grid shuts down
}
-assertTrue(probeRestCommandResponse.get("error").equals("grid has not
started"));
-assertEquals(GridRestResponse.SERVICE_UNAVAILABLE,
probeRestCommandResponse.get("successStatus"));
+assertTrue(probeRestCmdResponse.get("error").equals("grid has not
started"));
+assertEquals(GridRestResponse.SERVICE_UNAVAILABLE,
probeRestCmdResponse.get("successStatus"));
}
/**
@@ -172,12 +172,12 @@ public class GridProbeCommandTest extends
GridCommonAbstractTest {
public void testRestProbeCommandGridStarted() throws Exception {
startGrid("regular");
-Map probeRestCommandResponse;
+Map probeRestCmdResponse;
-probeRestCommandResponse = executeProbeRestRequest();
+probeRestCmdResponse = executeProbeRestRequest();
-assertTrue(probeRestCommandResponse.get("response").equals("grid has
started"));
-assertEquals(0, probeRestCommandResponse.get("successStatus"));
+assertTrue(probeRestCmdResponse.get("response").equals("grid has
started"));
+assertEquals(0, probeRestCmdResponse.get("successStatus"));
}
/**
diff --git
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
index f57688657e9..b291dff5725 100644
---
a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
@@ -2807,7 +2807,7 @@ public abstract class JettyRestProcessorAbstractSelfTest
extends JettyRestProces
public void testCacheCommandsWithoutCacheName() throws Exception {
final String ERROR_MSG = "Failed to find mandatory parameter in
request: cacheName";
-EnumSet cacheCommands =
EnumSet.of(GridRestCommand.DESTROY_CACHE,
(ignite) branch master updated: IGNITE-14823 Class abbrevation (#11092)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 1ed6d185b72 IGNITE-14823 Class abbrevation (#11092)
1ed6d185b72 is described below
commit 1ed6d185b726ce5a85fe420b16df74e46cbf5f9a
Author: Nikolay
AuthorDate: Wed Dec 13 15:08:24 2023 +0300
IGNITE-14823 Class abbrevation (#11092)
---
.../query/calcite/exec/exp/RexImpTable.java| 4 +-
.../query/calcite/exec/exp/RexToLixTranslator.java | 32 ++---
.../query/calcite/externalize/RelJson.java | 10 ++--
.../checkstyle/src/main/resources/abbrevations.csv | 2 +-
.../SystemViewRowAttributeWalkerGenerator.java | 6 +--
.../deployment/GridDeploymentClassLoader.java | 14 +++---
.../preloader/GridDhtPartitionsFullMessage.java| 6 +--
.../apache/ignite/ClassPathContentLoggingTest.java | 4 +-
.../internal/MarshallerContextLockingSelfTest.java | 6 +--
.../internal/binary/BinaryMarshallerSelfTest.java | 6 +--
.../internal/binary/BinaryObjectToStringTest.java | 56 +++---
.../IgniteCacheAbstractExecutionContextTest.java | 6 +--
.../ignite/internal/util/IgniteUtilsSelfTest.java | 4 +-
.../util/tostring/GridToStringBuilderSelfTest.java | 8 ++--
.../marshaller/MarshallerContextSelfTest.java | 12 ++---
.../p2p/DeploymentClassLoaderCallableTest.java | 12 ++---
.../testframework/junits/GridAbstractTest.java | 6 +--
.../classloadproblem/P2PClassLoadingProblems.java | 4 +-
.../cache/index/AbstractSchemaSelfTest.java| 4 +-
.../ignite/tools/javadoc/IgniteLinkTaglet.java | 8 ++--
20 files changed, 105 insertions(+), 105 deletions(-)
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
index f90c6c34425..0bf4221a58a 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
@@ -2025,12 +2025,12 @@ public class RexImpTable {
return argValueList;
}
assert (nullCount > 0) == type.isNullable();
-final Type javaClass =
+final Type javaCls =
translator.typeFactory.getJavaClass(type);
final List harmonizedArgValues = new ArrayList<>();
for (Expression argValue : argValueList) {
harmonizedArgValues.add(
-EnumUtils.convert(argValue, javaClass));
+EnumUtils.convert(argValue, javaCls));
}
return harmonizedArgValues;
}
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexToLixTranslator.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexToLixTranslator.java
index aeef8e8a4bb..8cba1b67875 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexToLixTranslator.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexToLixTranslator.java
@@ -683,16 +683,16 @@ public class RexToLixTranslator implements
RexVisitor
return RexImpTable.FALSE_EXPR;
}
}
-Type javaClass = typeFactory.getJavaClass(type);
+Type javaCls = typeFactory.getJavaClass(type);
final Object value2;
switch (literal.getType().getSqlTypeName()) {
case DECIMAL:
final BigDecimal bd = literal.getValueAs(BigDecimal.class);
-if (javaClass == float.class)
-return Expressions.constant(bd, javaClass);
-else if (javaClass == double.class)
-return Expressions.constant(bd, javaClass);
-assert javaClass == BigDecimal.class;
+if (javaCls == float.class)
+return Expressions.constant(bd, javaCls);
+else if (javaCls == double.class)
+return Expressions.constant(bd, javaCls);
+assert javaCls == BigDecimal.class;
return Expressions.call(
IgniteSqlFunctions.class,
"toBigDecimal",
@@ -711,7 +711,7 @@ public class RexToLixTranslator implements
RexVisitor
case INTERVAL_YEAR_MONTH:
case INTERVAL_MONTH:
value2 = literal.getValueAs(Integer.class);
-javaClass = int.class;
+javaCls = int.class;
break;
case TIMESTAMP
(ignite) branch master updated (b7c36c9252c -> 34b96165e6b)
This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/ignite.git from b7c36c9252c IGNITE-14823 Argument abbrevation (#11088) add 34b96165e6b IGNITE-14823 Buffer abbrevation (#11089) No new revisions were added by this update. Summary of changes: modules/checkstyle/src/main/resources/abbrevations.csv | 2 +- .../processors/compress/CompressionProcessorImpl.java | 12 ++-- .../cache/persistence/DataStorageMetricsImpl.java | 18 +- .../cache/persistence/wal/ByteBufferExpander.java | 6 ++ .../streamer/ClientDataStreamerStartRequest.java | 6 +++--- .../ignite/internal/util/io/GridFilenameUtils.java | 14 +++--- .../processors/cache/CacheMetricsCacheSizeTest.java| 4 ++-- .../persistence/pagemem/IgniteThrottlingUnitTest.java | 6 +++--- .../cache/persistence/pagemem/PageMemoryImplTest.java | 6 +++--- .../database/inlinecolumn/InlineIndexColumnTest.java | 14 +++--- .../deployment/uri/GridUriDeploymentJarVerifier.java | 4 ++-- 11 files changed, 45 insertions(+), 47 deletions(-)
(ignite) branch master updated: IGNITE-14823 Argument abbrevation (#11088)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new b7c36c9252c IGNITE-14823 Argument abbrevation (#11088)
b7c36c9252c is described below
commit b7c36c9252c5219b59082cb36c4d4fa1e8f9285c
Author: Nikolay
AuthorDate: Tue Dec 12 13:31:37 2023 +0300
IGNITE-14823 Argument abbrevation (#11088)
---
.../checkstyle/src/main/resources/abbrevations.csv | 4 ++--
.../ClusterNodeAttributeAffinityBackupFilter.java | 16 +++
.../cache/distribution/CacheDistributionTask.java | 4 ++--
.../distribution/CacheDistributionTaskResult.java | 12 +--
.../ignite/spi/metric/jmx/MetricRegistryMBean.java | 16 +++
.../spi/metric/jmx/ReadOnlyDynamicMBean.java | 8
...finityFunctionBackupFilterAbstractSelfTest.java | 24 +++---
.../org/apache/ignite/internal/GridMBeansTest.java | 4 ++--
.../ignite/internal/metric/LogExporterSpiTest.java | 8
.../cache/GridEvictionPolicyMBeansTest.java| 4 ++--
10 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index 2e21e16a960..aa696a7d166 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -5,8 +5,8 @@ affinity,aff
argument,arg
arguments,args
array,arr
-#attribute,attr
-#attributes,attrs
+attribute,attr
+attributes,attrs
#buffer,buf
#class,cls
#command,cmd
diff --git
a/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/ClusterNodeAttributeAffinityBackupFilter.java
b/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/ClusterNodeAttributeAffinityBackupFilter.java
index 7a94d7a579b..07103f35958 100644
---
a/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/ClusterNodeAttributeAffinityBackupFilter.java
+++
b/modules/core/src/main/java/org/apache/ignite/cache/affinity/rendezvous/ClusterNodeAttributeAffinityBackupFilter.java
@@ -83,15 +83,15 @@ public class ClusterNodeAttributeAffinityBackupFilter
implements IgniteBiPredica
private static final long serialVersionUID = 1L;
/** Attribute names. */
-private final String[] attributeNames;
+private final String[] attrNames;
/**
- * @param attributeNames The list of attribute names for the set of
attributes to compare. Must be at least one.
+ * @param attrNames The list of attribute names for the set of attributes
to compare. Must be at least one.
*/
-public ClusterNodeAttributeAffinityBackupFilter(String... attributeNames) {
-A.ensure(attributeNames.length > 0, "attributeNames.length > 0");
+public ClusterNodeAttributeAffinityBackupFilter(String... attrNames) {
+A.ensure(attrNames.length > 0, "attributeNames.length > 0");
-this.attributeNames = attributeNames.clone();
+this.attrNames = attrNames.clone();
}
/**
@@ -113,8 +113,8 @@ public class ClusterNodeAttributeAffinityBackupFilter
implements IgniteBiPredica
for (ClusterNode node : previouslySelected) {
boolean match = true;
-for (String attribute : attributeNames) {
-if (!Objects.equals(candidate.attribute(attribute),
node.attribute(attribute))) {
+for (String attr : attrNames) {
+if (!Objects.equals(candidate.attribute(attr),
node.attribute(attr))) {
match = false;
break;
@@ -134,6 +134,6 @@ public class ClusterNodeAttributeAffinityBackupFilter
implements IgniteBiPredica
* @return Attribute names.
*/
public String[] getAttributeNames() {
-return attributeNames.clone();
+return attrNames.clone();
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/distribution/CacheDistributionTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/distribution/CacheDistributionTask.java
index 21041faeb25..d98ad2a83d9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/distribution/CacheDistributionTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/commandline/cache/distribution/CacheDistributionTask.java
@@ -96,8 +96,8 @@ public class CacheDistributionTask extends
VisorMultiNodeTask());
-for (String userAttribute : arg.userAttributes())
-info.getUserAttributes().put(userAttribute,
(String)node.attributes().get(userAttribute));
+for (String userAttr : arg.userAttributes())
+info.getUserAttributes().put(userAttr,
(Strin
(ignite) branch ignite-2.16 updated: IGNITE-21056 Use thread local buffer for encrypted dump (#11086)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch ignite-2.16
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/ignite-2.16 by this push:
new 4d53fc3e0d7 IGNITE-21056 Use thread local buffer for encrypted dump
(#11086)
4d53fc3e0d7 is described below
commit 4d53fc3e0d7ab23c1577fc38bbaaf8f66083f4f2
Author: yurinaryshkin <135707807+yurinarysh...@users.noreply.github.com>
AuthorDate: Tue Dec 12 11:29:52 2023 +0300
IGNITE-21056 Use thread local buffer for encrypted dump (#11086)
(cherry picked from commit b3fe55e21c1d5436951b6484195b5201c65b657b)
---
.../processors/cache/persistence/snapshot/dump/DumpEntrySerializer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/DumpEntrySerializer.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/DumpEntrySerializer.java
index 70f8eebb33c..2642c5a08f5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/DumpEntrySerializer.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/DumpEntrySerializer.java
@@ -137,7 +137,7 @@ public class DumpEntrySerializer {
ByteBuffer encBuf = threadLocalBuffer(encThLocBufs);
if (encBuf.capacity() < encDataSz)
-encBuf = enlargeThreadLocalBuffer(thLocBufs, encDataSz);
+encBuf = enlargeThreadLocalBuffer(encThLocBufs, encDataSz);
else
encBuf.rewind().limit(encDataSz);
(ignite) branch master updated: IGNITE-21056 Use thread local buffer for encrypted dump (#11086)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new b3fe55e21c1 IGNITE-21056 Use thread local buffer for encrypted dump
(#11086)
b3fe55e21c1 is described below
commit b3fe55e21c1d5436951b6484195b5201c65b657b
Author: yurinaryshkin <135707807+yurinarysh...@users.noreply.github.com>
AuthorDate: Tue Dec 12 11:29:52 2023 +0300
IGNITE-21056 Use thread local buffer for encrypted dump (#11086)
---
.../processors/cache/persistence/snapshot/dump/DumpEntrySerializer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/DumpEntrySerializer.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/DumpEntrySerializer.java
index 70f8eebb33c..2642c5a08f5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/DumpEntrySerializer.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/DumpEntrySerializer.java
@@ -137,7 +137,7 @@ public class DumpEntrySerializer {
ByteBuffer encBuf = threadLocalBuffer(encThLocBufs);
if (encBuf.capacity() < encDataSz)
-encBuf = enlargeThreadLocalBuffer(thLocBufs, encDataSz);
+encBuf = enlargeThreadLocalBuffer(encThLocBufs, encDataSz);
else
encBuf.rewind().limit(encDataSz);
(ignite) branch master updated: IGNITE-14823 Argument abbrevation (#11085)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 6cffdef49ae IGNITE-14823 Argument abbrevation (#11085)
6cffdef49ae is described below
commit 6cffdef49aece80276649289359a4726d908f621
Author: Nikolay
AuthorDate: Mon Dec 11 15:31:04 2023 +0300
IGNITE-14823 Argument abbrevation (#11085)
---
.../processors/query/calcite/exec/exp/ConverterUtils.java | 14 +++---
.../processors/query/calcite/exec/exp/RexImpTable.java | 6 +++---
modules/checkstyle/src/main/resources/abbrevations.csv | 3 ++-
.../commandline/argument/parser/CLIArgumentParser.java | 4 ++--
.../ignite/internal/processors/task/GridTaskProcessor.java | 6 +++---
.../cache/persistence/MaintenancePersistenceTaskTest.java | 8
6 files changed, 21 insertions(+), 20 deletions(-)
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/ConverterUtils.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/ConverterUtils.java
index 6ddf9855a85..4f18bd6f5e2 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/ConverterUtils.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/ConverterUtils.java
@@ -436,19 +436,19 @@ public class ConverterUtils {
* Integer directly).
*
* @param targetTypes Formal operand types declared for the function
arguments
- * @param arguments Input expressions to the function
+ * @param args Input expressions to the function
* @return Input expressions with probable type conversion
*/
static List convertAssignableTypes(Class[] targetTypes,
-List arguments) {
+List args) {
final List list = new ArrayList<>();
-if (targetTypes.length == arguments.size()) {
-for (int i = 0; i < arguments.size(); i++)
-list.add(convertAssignableType(arguments.get(i),
targetTypes[i]));
+if (targetTypes.length == args.size()) {
+for (int i = 0; i < args.size(); i++)
+list.add(convertAssignableType(args.get(i), targetTypes[i]));
}
else {
int j = 0;
-for (Expression argument: arguments) {
+for (Expression arg: args) {
Class type;
if (!targetTypes[j].isArray()) {
type = targetTypes[j];
@@ -457,7 +457,7 @@ public class ConverterUtils {
else
type = targetTypes[j].getComponentType();
-list.add(convertAssignableType(argument, type));
+list.add(convertAssignableType(arg, type));
}
}
return list;
diff --git
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
index cd139b1cbbf..f90c6c34425 100644
---
a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
+++
b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/exec/exp/RexImpTable.java
@@ -2481,9 +2481,9 @@ public class RexImpTable {
return (translator, call, nullAs) -> {
final RexImpTable.RexCallImplementor rexCallImplementor
= createRexCallImplementor(implementor, nullPolicy, harmonize);
-final List arguments =
translator.getCallOperandResult(call);
-assert arguments != null;
-final RexToLixTranslator.Result result =
rexCallImplementor.implement(translator, call, arguments);
+final List args =
translator.getCallOperandResult(call);
+assert args != null;
+final RexToLixTranslator.Result result =
rexCallImplementor.implement(translator, call, args);
return nullAs.handle(result.valueVariable);
};
}
diff --git a/modules/checkstyle/src/main/resources/abbrevations.csv
b/modules/checkstyle/src/main/resources/abbrevations.csv
index 8d62828d912..2e21e16a960 100644
--- a/modules/checkstyle/src/main/resources/abbrevations.csv
+++ b/modules/checkstyle/src/main/resources/abbrevations.csv
@@ -2,7 +2,8 @@
address,addr
addresses,addrs
affinity,aff
-#argument,arg
+argument,arg
+arguments,args
array,arr
#attribute,attr
#attributes,attrs
diff --git
a/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/argument/parser/CLIArgumentParser.java
b/modules/control-utility/src/main/java/org/apache/ignite/internal/commandline/argument/parser/CLIArgumentParser.java
index bf58ed927de..0f6b1546e48 100644
---
a/
(ignite) branch master updated: IGNITE-14823 Affinity abbrevation (#11083)
This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ignite.git The following commit(s) were added to refs/heads/master by this push: new fd5b2441297 IGNITE-14823 Affinity abbrevation (#11083) fd5b2441297 is described below commit fd5b2441297a4d5440de51a1ed05e003053d21e1 Author: Nikolay AuthorDate: Mon Dec 11 15:05:31 2023 +0300 IGNITE-14823 Affinity abbrevation (#11083) --- .../calcite/metadata/AffinityServiceImpl.java | 4 +- .../query/calcite/trait/DistributionFunction.java | 8 ++-- .../checkstyle/src/main/resources/abbrevations.csv | 2 +- ...onAwarenessReconnectionAndFailoverSelfTest.java | 6 +-- .../thin/JdbcThinPartitionAwarenessSelfTest.java | 46 +++--- .../client/impl/GridClientAbstractProjection.java | 6 +-- .../internal/client/impl/GridClientDataImpl.java | 6 +-- .../internal/client/impl/GridClientImpl.java | 4 +- .../client/thin/ClientCacheAffinityMapping.java| 10 ++--- .../internal/client/thin/ClientIgniteSetImpl.java | 4 +- .../internal/jdbc/thin/JdbcThinConnection.java | 8 ++-- .../management/cache/CacheListCommand.java | 12 +++--- .../affinity/GridAffinityAssignmentCache.java | 10 ++--- .../affinity/IdealAffinityAssignment.java | 6 +-- .../cache/CacheAffinitySharedManager.java | 28 ++--- .../processors/cache/GridCacheProcessor.java | 4 +- .../internal/processors/cache/GridCacheUtils.java | 18 - .../preloader/GridDhtPartitionsExchangeFuture.java | 14 +++ .../processors/odbc/jdbc/JdbcResponse.java | 4 +- .../client/ClientAffinityTopologyVersion.java | 6 +-- .../cache/ClientCachePartitionAwarenessGroup.java | 4 +- .../client/cache/ClientCachePartitionsRequest.java | 8 ++-- .../RendezvousAffinityFunctionSimpleBenchmark.java | 4 +- .../internal/GridAffinityNoCacheSelfTest.java | 10 ++--- .../affinity/GridAffinityAssignmentV2Test.java | 28 ++--- .../cache/GridCacheAbstractFullApiSelfTest.java| 4 +- .../cache/GridCacheAtomicMessageCountSelfTest.java | 4 +- .../cache/GridCacheLifecycleAwareSelfTest.java | 6 +-- .../IgniteCacheConfigVariationsFullApiTest.java| 8 ++-- .../cache/IgniteCacheInvokeAbstractTest.java | 4 +- .../cache/IgniteCachePeekModesAbstractTest.java| 8 ++-- .../GridCacheClientModesAbstractSelfTest.java | 6 +-- .../IgniteCacheClientReconnectTest.java| 4 +- ...CacheAbstractTransformWriteThroughSelfTest.java | 8 ++-- ...GridCachePartitionedTopologyChangeSelfTest.java | 4 +- .../rebalancing/CacheNodeSafeAssertion.java| 6 +-- .../GridCacheRebalancingOrderingTest.java | 32 +++ ...dCacheRebalancingPartitionDistributionTest.java | 6 +-- .../eviction/EvictionPolicyFailureHandlerTest.java | 10 ++--- ...IgnitePdsCacheWalDisabledOnRebalancingTest.java | 12 +++--- ...PdsPageReplacementDuringPartitionClearTest.java | 4 +- .../db/wal/WalRebalanceRestartTest.java| 6 +-- .../snapshot/AbstractSnapshotSelfTest.java | 10 ++--- .../query/GridCacheQueryTransformerSelfTest.java | 4 +- .../AbstractTransactionIntergrityTest.java | 6 +-- .../TxOptimisticOnPartitionExchangeTest.java | 4 +- .../query/h2/affinity/PartitionExtractor.java | 12 +++--- .../IgniteCacheConfigVariationsQueryTest.java | 10 ++--- ...niteCacheDistributedPartitionQuerySelfTest.java | 8 ++-- .../query/IgniteSqlCreateTableTemplateTest.java| 4 +- .../processors/query/RunningQueriesTest.java | 10 ++--- .../load/IgniteCacheRandomOperationBenchmark.java | 10 ++--- 52 files changed, 235 insertions(+), 235 deletions(-) diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/AffinityServiceImpl.java b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/AffinityServiceImpl.java index 14719573b1d..cbe936dbff0 100644 --- a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/AffinityServiceImpl.java +++ b/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/metadata/AffinityServiceImpl.java @@ -56,8 +56,8 @@ public class AffinityServiceImpl extends AbstractService implements AffinityServ if (cacheId == CU.UNDEFINED_CACHE_ID) return k -> k == null ? 0 : U.safeAbs(k.hashCode()); -AffinityFunction affinity = cacheSharedContext.cacheContext(cacheId).group().affinityFunction(); +AffinityFunction aff = cacheSharedContext.cacheContext(cacheId).group().affinityFunction(); -return affinity::partition; +return aff::partition; } } diff --git a/modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/trait/DistributionFunction.java b/modules/calcite/
(ignite) branch master updated: IGNITE-14823 Abbrevation checkstyle rule (#9153)
This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ignite.git The following commit(s) were added to refs/heads/master by this push: new 6ccc32e2cbe IGNITE-14823 Abbrevation checkstyle rule (#9153) 6ccc32e2cbe is described below commit 6ccc32e2cbeda36026a8ebffa1fd4b04839bfb9e Author: Nikolay AuthorDate: Sat Dec 9 09:05:07 2023 +0300 IGNITE-14823 Abbrevation checkstyle rule (#9153) --- checkstyle/checkstyle.xml | 3 + modules/checkstyle/pom.xml | 16 ++ .../tools/checkstyle/IgniteAbbrevationsRule.java | 177 + .../src/main/resources/abbrevations-exclude.txt| 1 + .../checkstyle/src/main/resources/abbrevations.csv | 71 + .../checkstyle/IgniteAbbrevationRuleTest.java | 95 +++ .../apache/ignite/util/GridCommandHandlerTest.java | 8 +- .../maintenance/MaintenanceRebuildIndexUtils.java | 14 +- .../jdbc/thin/ConnectionPropertiesImpl.java| 14 +- .../management/baseline/BaselineTaskResult.java| 4 +- .../systemview/IgniteConfigurationIterable.java| 6 +- .../wal/filehandle/FileWriteHandleImpl.java| 6 +- .../apache/ignite/internal/util/IgniteUtils.java | 4 +- .../ignite/internal/util/io/GridFilenameUtils.java | 56 +++ .../sharedfs/TcpDiscoverySharedFsIpFinder.java | 4 +- .../tcp/ipfinder/vm/TcpDiscoveryVmIpFinder.java| 10 +- ...rNodeAttributeAffinityBackupFilterSelfTest.java | 6 +- .../internal/client/thin/ReliableChannelTest.java | 4 +- .../optimized/OptimizedObjectStreamSelfTest.java | 4 +- .../GridCacheBinaryObjectsAbstractSelfTest.java| 4 +- .../cache/persistence/file/FileDownloaderTest.java | 6 +- .../persistence/pagemem/PageMemoryImplTest.java| 8 +- .../ignite/internal/util/IgniteUtilsSelfTest.java | 16 +- .../apache/ignite/util/GridLongListSelfTest.java | 14 +- .../utils/IgniteWalConverterArguments.java | 4 +- .../persistence/db/wal/IgniteWalRecoveryTest.java | 10 +- .../query/WrongQueryEntityFieldTypeTest.java | 4 +- ...achePartitionedAtomicColumnConstraintsTest.java | 8 +- .../org/apache/ignite/sqltests/BaseSqlTest.java| 4 +- .../KubernetesServiceAddressResolver.java | 4 +- parent/pom.xml | 9 +- 31 files changed, 482 insertions(+), 112 deletions(-) diff --git a/checkstyle/checkstyle.xml b/checkstyle/checkstyle.xml index 513016577da..b64eba3540d 100644 --- a/checkstyle/checkstyle.xml +++ b/checkstyle/checkstyle.xml @@ -191,6 +191,9 @@ + + +
(ignite) 01/03: IGNITE-20614 Add rate limiter for dumps (#11076)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch ignite-2.16
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 0547e7fd688c49547e907224c2a9bfa2c1f0bda5
Author: Maksim Timonin
AuthorDate: Wed Dec 6 10:34:42 2023 +0300
IGNITE-20614 Add rate limiter for dumps (#11076)
Co-authored-by: nizhi...@apache.org
(cherry picked from commit 65aa55af1707e22db8fb702204016c1c08ae0bfa)
---
.../snapshot/IgniteSnapshotManager.java| 3 +-
.../snapshot/dump/CreateDumpFutureTask.java| 19
.../snapshot/dump/IgniteCacheDumpSelf2Test.java| 50 ++
3 files changed, 71 insertions(+), 1 deletion(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java
index 47e4e1c7f44..4890ab85b57 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java
@@ -2754,6 +2754,7 @@ public class IgniteSnapshotManager extends
GridCacheSharedManagerAdapter
snpName,
snapshotLocalDir(snpName, snpPath),
ioFactory,
+transferRateLimiter,
snpSndr,
parts,
compress
@@ -2816,7 +2817,7 @@ public class IgniteSnapshotManager extends
GridCacheSharedManagerAdapter
}
/** @return Current snapshot task. */
-> T currentSnapshotTask(Class
snpTaskCls) {
+public > T
currentSnapshotTask(Class snpTaskCls) {
SnapshotOperationRequest req = clusterSnpReq;
if (req == null)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/CreateDumpFutureTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/CreateDumpFutureTask.java
index 7e80a8dc64d..d57f755a8d4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/CreateDumpFutureTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/CreateDumpFutureTask.java
@@ -61,6 +61,7 @@ import
org.apache.ignite.internal.processors.cache.persistence.snapshot.Snapshot
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.SnapshotSender;
import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
import
org.apache.ignite.internal.processors.cache.version.GridCacheVersionManager;
+import org.apache.ignite.internal.util.BasicRateLimiter;
import org.apache.ignite.internal.util.GridConcurrentHashSet;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.internal.util.lang.GridCloseableIterator;
@@ -96,6 +97,12 @@ public class CreateDumpFutureTask extends
AbstractCreateSnapshotFutureTask imple
/** If {@code true} then compress partition files. */
private final boolean compress;
+/** Dump transfer rate limiter. */
+private final BasicRateLimiter rateLimiter;
+
+/** Processed dump size in bytes. */
+private final AtomicLong processedSize = new AtomicLong();
+
/**
* Dump contextes.
* Key is [group_id, partition_id] combined in single long value.
@@ -122,6 +129,7 @@ public class CreateDumpFutureTask extends
AbstractCreateSnapshotFutureTask imple
* @param dumpName Dump name.
* @param ioFactory IO factory.
* @param snpSndr Snapshot sender.
+ * @param rateLimiter Dump transfer rate limiter.
* @param parts Parts to dump.
* @param compress If {@code true} then compress partition files.
*/
@@ -132,6 +140,7 @@ public class CreateDumpFutureTask extends
AbstractCreateSnapshotFutureTask imple
String dumpName,
File dumpDir,
FileIOFactory ioFactory,
+BasicRateLimiter rateLimiter,
SnapshotSender snpSndr,
Map> parts,
boolean compress
@@ -148,6 +157,7 @@ public class CreateDumpFutureTask extends
AbstractCreateSnapshotFutureTask imple
this.dumpDir = dumpDir;
this.ioFactory = compress ? new WriteOnlyZipFileIOFactory() :
ioFactory;
this.compress = compress;
+this.rateLimiter = rateLimiter;
}
/** {@inheritDoc} */
@@ -343,6 +353,11 @@ public class CreateDumpFutureTask extends
AbstractCreateSnapshotFutureTask imple
return closeFut;
}
+/** @return Processed dump size in bytes. */
+public long processedSize() {
+return processedSize.get();
+}
+
/** */
private void clearDumpListener(CacheGroupContext gctx) {
for (GridCacheContext cctx : gc
(ignite) 03/03: [MINOR] Fix error message in test
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch ignite-2.16
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit d18d899ba2e4bf16ceebb9e2da3a50a19624718e
Author: Nikolay
AuthorDate: Fri Dec 8 14:28:45 2023 +0300
[MINOR] Fix error message in test
(cherry picked from commit 233c8bd2fb7176309f88ef2cdab658d6710c787e)
---
.../cache/persistence/snapshot/dump/IgniteCacheDumpSelf2Test.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/IgniteCacheDumpSelf2Test.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/IgniteCacheDumpSelf2Test.java
index 44b7927d73a..5ccaea42e3f 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/IgniteCacheDumpSelf2Test.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/IgniteCacheDumpSelf2Test.java
@@ -714,7 +714,7 @@ public class IgniteCacheDumpSelf2Test extends
GridCommonAbstractTest {
).run();
},
IgniteException.class,
-"Dump '" + DMP_NAME + "' has different master key digest. To
restore this snapshot, provide the same master key"
+"Dump '" + DMP_NAME + "' has different master key digest"
);
Map dumpEntries = new HashMap<>();
(ignite) branch ignite-2.16 updated (1fd546f754e -> d18d899ba2e)
This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a change to branch ignite-2.16 in repository https://gitbox.apache.org/repos/asf/ignite.git from 1fd546f754e IGNITE-19436 Fixed jvmdefaults.bat on JDK 17 (#10707) new 0547e7fd688 IGNITE-20614 Add rate limiter for dumps (#11076) new eae3bc33b9e IGNITE-21013 Support encryption of cache dumps (#11078) new d18d899ba2e [MINOR] Fix error message in test The 3 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: .../java/org/apache/ignite/dump/DumpReader.java| 19 +- .../ignite/dump/DumpReaderConfiguration.java | 19 +- .../snapshot/IgniteSnapshotManager.java| 53 +++-- .../persistence/snapshot/SnapshotMetadata.java | 14 +- .../snapshot/SnapshotOperationRequest.java | 13 +- .../snapshot/SnapshotPartitionsVerifyHandler.java | 5 +- .../snapshot/SnapshotRestoreProcess.java | 1 + .../snapshot/dump/CreateDumpFutureTask.java| 54 - .../cache/persistence/snapshot/dump/Dump.java | 43 +++- .../snapshot/dump/DumpEntrySerializer.java | 220 - .../snapshot/AbstractSnapshotSelfTest.java | 1 + .../snapshot/EncryptedSnapshotTest.java| 1 + .../snapshot/IgniteSnapshotManagerSelfTest.java| 1 + .../snapshot/dump/AbstractCacheDumpTest.java | 37 +++- .../snapshot/dump/IgniteCacheDumpSelf2Test.java| 187 +- .../dump/IgniteConcurrentCacheDumpTest.java| 13 +- 16 files changed, 587 insertions(+), 94 deletions(-)
(ignite) 02/03: IGNITE-21013 Support encryption of cache dumps (#11078)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch ignite-2.16
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit eae3bc33b9e0a4c7d90b9df7d3bfd631b520132e
Author: Nikolay
AuthorDate: Fri Dec 8 14:28:45 2023 +0300
IGNITE-21013 Support encryption of cache dumps (#11078)
(cherry picked from commit 668939affaeced34b59f0aa95bedd53f3a5bfe6a)
---
.../java/org/apache/ignite/dump/DumpReader.java| 19 +-
.../ignite/dump/DumpReaderConfiguration.java | 19 +-
.../snapshot/IgniteSnapshotManager.java| 50 -
.../persistence/snapshot/SnapshotMetadata.java | 14 +-
.../snapshot/SnapshotOperationRequest.java | 13 +-
.../snapshot/SnapshotPartitionsVerifyHandler.java | 5 +-
.../snapshot/SnapshotRestoreProcess.java | 1 +
.../snapshot/dump/CreateDumpFutureTask.java| 35 +++-
.../cache/persistence/snapshot/dump/Dump.java | 43 +++-
.../snapshot/dump/DumpEntrySerializer.java | 220 -
.../snapshot/AbstractSnapshotSelfTest.java | 1 +
.../snapshot/EncryptedSnapshotTest.java| 1 +
.../snapshot/IgniteSnapshotManagerSelfTest.java| 1 +
.../snapshot/dump/AbstractCacheDumpTest.java | 37 +++-
.../snapshot/dump/IgniteCacheDumpSelf2Test.java| 137 -
.../dump/IgniteConcurrentCacheDumpTest.java| 13 +-
16 files changed, 516 insertions(+), 93 deletions(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/dump/DumpReader.java
b/modules/core/src/main/java/org/apache/ignite/dump/DumpReader.java
index d2ed811ac3f..bb6f8cfb405 100644
--- a/modules/core/src/main/java/org/apache/ignite/dump/DumpReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/dump/DumpReader.java
@@ -41,6 +41,8 @@ import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteExperimental;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.encryption.EncryptionSpi;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static
org.apache.ignite.configuration.DataStorageConfiguration.DFLT_MARSHALLER_PATH;
@@ -75,7 +77,7 @@ public class DumpReader implements Runnable {
@Override public void run() {
ackAsciiLogo();
-try (Dump dump = new Dump(cfg.dumpRoot(), cfg.keepBinary(), false,
log)) {
+try (Dump dump = new Dump(cfg.dumpRoot(), null, cfg.keepBinary(),
false, encryptionSpi(), log)) {
DumpConsumer cnsmr = cfg.consumer();
cnsmr.start();
@@ -231,4 +233,19 @@ public class DumpReader implements Runnable {
"");
}
}
+
+/** */
+private EncryptionSpi encryptionSpi() {
+EncryptionSpi encSpi = cfg.encryptionSpi();
+
+if (encSpi == null)
+return null;
+
+if (encSpi instanceof IgniteSpiAdapter)
+((IgniteSpiAdapter)encSpi).onBeforeStart();
+
+encSpi.spiStart("dump-reader");
+
+return encSpi;
+}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/dump/DumpReaderConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/dump/DumpReaderConfiguration.java
index a7a80b8227f..619c532b1ff 100644
---
a/modules/core/src/main/java/org/apache/ignite/dump/DumpReaderConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/dump/DumpReaderConfiguration.java
@@ -22,6 +22,7 @@ import java.time.Duration;
import org.apache.ignite.internal.processors.cache.CacheObject;
import org.apache.ignite.internal.processors.cache.KeyCacheObject;
import org.apache.ignite.lang.IgniteExperimental;
+import org.apache.ignite.spi.encryption.EncryptionSpi;
/**
* Configuration class of {@link DumpReader}.
@@ -61,12 +62,15 @@ public class DumpReaderConfiguration {
/** Skip copies. */
private final boolean skipCopies;
+/** Encryption SPI. */
+private final EncryptionSpi encSpi;
+
/**
* @param dir Root dump directory.
* @param cnsmr Dump consumer.
*/
public DumpReaderConfiguration(File dir, DumpConsumer cnsmr) {
-this(dir, cnsmr, DFLT_THREAD_CNT, DFLT_TIMEOUT, true, true, null,
false);
+this(dir, cnsmr, DFLT_THREAD_CNT, DFLT_TIMEOUT, true, true, null,
false, null);
}
/**
@@ -78,15 +82,18 @@ public class DumpReaderConfiguration {
* @param keepBinary If {@code true} then don't deserialize {@link
KeyCacheObject} and {@link CacheObject}.
* @param cacheGroupNames Cache group names.
* @param skipCopies Skip copies.
+ * @param encSpi Encryption SPI.
*/
-public DumpReaderConfiguration(File dir,
+public DumpReaderConfiguration(
+File dir,
DumpConsumer cnsmr,
int thCnt,
Duration timeout,
boolean failFa
(ignite) branch master updated: [MINOR] Fix error message in test
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 233c8bd2fb7 [MINOR] Fix error message in test
233c8bd2fb7 is described below
commit 233c8bd2fb7176309f88ef2cdab658d6710c787e
Author: Nikolay
AuthorDate: Fri Dec 8 14:28:45 2023 +0300
[MINOR] Fix error message in test
---
.../cache/persistence/snapshot/dump/IgniteCacheDumpSelf2Test.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/IgniteCacheDumpSelf2Test.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/IgniteCacheDumpSelf2Test.java
index 44b7927d73a..5ccaea42e3f 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/IgniteCacheDumpSelf2Test.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/IgniteCacheDumpSelf2Test.java
@@ -714,7 +714,7 @@ public class IgniteCacheDumpSelf2Test extends
GridCommonAbstractTest {
).run();
},
IgniteException.class,
-"Dump '" + DMP_NAME + "' has different master key digest. To
restore this snapshot, provide the same master key"
+"Dump '" + DMP_NAME + "' has different master key digest"
);
Map dumpEntries = new HashMap<>();
(ignite) branch master updated: IGNITE-21013 Support encryption of cache dumps (#11078)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 668939affae IGNITE-21013 Support encryption of cache dumps (#11078)
668939affae is described below
commit 668939affaeced34b59f0aa95bedd53f3a5bfe6a
Author: Nikolay
AuthorDate: Fri Dec 8 14:28:45 2023 +0300
IGNITE-21013 Support encryption of cache dumps (#11078)
---
.../java/org/apache/ignite/dump/DumpReader.java| 19 +-
.../ignite/dump/DumpReaderConfiguration.java | 19 +-
.../snapshot/IgniteSnapshotManager.java| 50 -
.../persistence/snapshot/SnapshotMetadata.java | 14 +-
.../snapshot/SnapshotOperationRequest.java | 13 +-
.../snapshot/SnapshotPartitionsVerifyHandler.java | 5 +-
.../snapshot/SnapshotRestoreProcess.java | 1 +
.../snapshot/dump/CreateDumpFutureTask.java| 35 +++-
.../cache/persistence/snapshot/dump/Dump.java | 43 +++-
.../snapshot/dump/DumpEntrySerializer.java | 220 -
.../snapshot/AbstractSnapshotSelfTest.java | 1 +
.../snapshot/EncryptedSnapshotTest.java| 1 +
.../snapshot/IgniteSnapshotManagerSelfTest.java| 1 +
.../snapshot/dump/AbstractCacheDumpTest.java | 37 +++-
.../snapshot/dump/IgniteCacheDumpSelf2Test.java| 137 -
.../dump/IgniteConcurrentCacheDumpTest.java| 13 +-
16 files changed, 516 insertions(+), 93 deletions(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/dump/DumpReader.java
b/modules/core/src/main/java/org/apache/ignite/dump/DumpReader.java
index d2ed811ac3f..bb6f8cfb405 100644
--- a/modules/core/src/main/java/org/apache/ignite/dump/DumpReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/dump/DumpReader.java
@@ -41,6 +41,8 @@ import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteExperimental;
+import org.apache.ignite.spi.IgniteSpiAdapter;
+import org.apache.ignite.spi.encryption.EncryptionSpi;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static
org.apache.ignite.configuration.DataStorageConfiguration.DFLT_MARSHALLER_PATH;
@@ -75,7 +77,7 @@ public class DumpReader implements Runnable {
@Override public void run() {
ackAsciiLogo();
-try (Dump dump = new Dump(cfg.dumpRoot(), cfg.keepBinary(), false,
log)) {
+try (Dump dump = new Dump(cfg.dumpRoot(), null, cfg.keepBinary(),
false, encryptionSpi(), log)) {
DumpConsumer cnsmr = cfg.consumer();
cnsmr.start();
@@ -231,4 +233,19 @@ public class DumpReader implements Runnable {
"");
}
}
+
+/** */
+private EncryptionSpi encryptionSpi() {
+EncryptionSpi encSpi = cfg.encryptionSpi();
+
+if (encSpi == null)
+return null;
+
+if (encSpi instanceof IgniteSpiAdapter)
+((IgniteSpiAdapter)encSpi).onBeforeStart();
+
+encSpi.spiStart("dump-reader");
+
+return encSpi;
+}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/dump/DumpReaderConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/dump/DumpReaderConfiguration.java
index a7a80b8227f..619c532b1ff 100644
---
a/modules/core/src/main/java/org/apache/ignite/dump/DumpReaderConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/dump/DumpReaderConfiguration.java
@@ -22,6 +22,7 @@ import java.time.Duration;
import org.apache.ignite.internal.processors.cache.CacheObject;
import org.apache.ignite.internal.processors.cache.KeyCacheObject;
import org.apache.ignite.lang.IgniteExperimental;
+import org.apache.ignite.spi.encryption.EncryptionSpi;
/**
* Configuration class of {@link DumpReader}.
@@ -61,12 +62,15 @@ public class DumpReaderConfiguration {
/** Skip copies. */
private final boolean skipCopies;
+/** Encryption SPI. */
+private final EncryptionSpi encSpi;
+
/**
* @param dir Root dump directory.
* @param cnsmr Dump consumer.
*/
public DumpReaderConfiguration(File dir, DumpConsumer cnsmr) {
-this(dir, cnsmr, DFLT_THREAD_CNT, DFLT_TIMEOUT, true, true, null,
false);
+this(dir, cnsmr, DFLT_THREAD_CNT, DFLT_TIMEOUT, true, true, null,
false, null);
}
/**
@@ -78,15 +82,18 @@ public class DumpReaderConfiguration {
* @param keepBinary If {@code true} then don't deserialize {@link
KeyCacheObject} and {@link CacheObject}.
* @param cacheGroupNames Cache group names.
* @param skipCopies Skip copies.
+ * @param encSpi Encryption SPI.
*/
-public DumpReaderConfiguration(File dir,
+public DumpReaderConfiguration(
+File dir,
(ignite) 02/02: IGNITE-20917 Add entry version to DumpEntry (#11069)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch ignite-2.16
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 0a200d5006aa5069442028aa27737a4a5fd346ec
Author: Nikolay
AuthorDate: Mon Nov 27 14:29:50 2023 +0300
IGNITE-20917 Add entry version to DumpEntry (#11069)
(cherry picked from commit b7a8f021f8caf22ad51977be0323dc4085d095e3)
---
.../java/org/apache/ignite/dump/DumpEntry.java | 9 +-
.../snapshot/SnapshotPartitionsVerifyHandler.java | 2 +-
.../snapshot/dump/CreateDumpFutureTask.java| 11 +-
.../snapshot/dump/DumpEntrySerializer.java | 63 +++-
.../processors/cache/verify/IdleVerifyUtility.java | 4 +-
.../snapshot/dump/AbstractCacheDumpTest.java | 4 +
.../snapshot/dump/IgniteCacheDumpSelf2Test.java| 170 -
7 files changed, 247 insertions(+), 16 deletions(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/dump/DumpEntry.java
b/modules/core/src/main/java/org/apache/ignite/dump/DumpEntry.java
index ca34f3cbace..6fa8b3c58a0 100644
--- a/modules/core/src/main/java/org/apache/ignite/dump/DumpEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/dump/DumpEntry.java
@@ -17,7 +17,9 @@
package org.apache.ignite.dump;
+import java.util.Collection;
import java.util.Iterator;
+import org.apache.ignite.cache.CacheEntryVersion;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.Dump;
import org.apache.ignite.lang.IgniteExperimental;
@@ -26,7 +28,7 @@ import org.apache.ignite.lang.IgniteExperimental;
*
* @see Dump#iterator(String, int, int)
* @see DumpConsumer#onPartition(int, int, Iterator)
- * @see org.apache.ignite.IgniteSnapshot#createDump(String)
+ * @see org.apache.ignite.IgniteSnapshot#createDump(String, Collection)
*/
@IgniteExperimental
public interface DumpEntry {
@@ -36,6 +38,11 @@ public interface DumpEntry {
/** @return Expiration time. */
public long expireTime();
+/**
+ * @return Version of the entry.
+ */
+public CacheEntryVersion version();
+
/** @return Key. */
public Object key();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandler.java
index 3847b19b3a9..71cafd15828 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandler.java
@@ -409,7 +409,7 @@ public class SnapshotPartitionsVerifyHandler implements
SnapshotHandler
- * +-+---+--+-+-+---+
- * | 4 bytes | 4 bytes | 4 bytes | 8 bytes | | |
- * +-+---+--+-+-+---+
- * | CRC | Data size | cache ID | expiration time | key | value |
- * +-+---+--+-+-+---+
+ * +-+---+--+-+-+-+
+ * | 4 bytes | 4 bytes | 4 bytes | 8 bytes | | | |
+ * +-+---+--+-+-+-+
+ * | CRC | Data size | cache ID | expiration time | ver | key | value |
+ * +-+---+--+-+-+-+
*
*
* @param cache Cache id.
@@ -108,11 +111,22 @@ public class DumpEntrySerializer {
long expireTime,
KeyCacheObject key,
CacheObject val,
+GridCacheVersion ver,
CacheObjectContext coCtx
) throws IgniteCheckedException {
+int verSz = Integer.BYTES/*topVer*/ + Long.BYTES/*order*/ +
Integer.BYTES/*nodeOrderDrId*/;
+
+boolean hasConflictVer = ver.otherClusterVersion() != null;
+
+if (hasConflictVer)
+verSz *= 2 /*GridCacheVersion otherClusterVersion*/;
+
+assert ver.fieldsCount() == (hasConflictVer ? 4 : 3);
+
int keySz = key.valueBytesLength(coCtx);
int valSz = val.valueBytesLength(coCtx);
-int dataSz = /*cache ID*/Integer.BYTES + /*expire time*/Long.BYTES +
/*key*/keySz + /*value*/valSz;
+int dataSz = /*cache ID*/Integer.BYTES + /*expire time*/Long.BYTES
++ /* hasConflictVersion */1 + /*version*/verSz + /*key*/keySz +
/*value*/valSz;
int fullSz = dataSz + /*extra bytes for row size*/Integer.BYTES +
/*CRC*/Integer.BYTES;
@@ -128,6 +142,19 @@ public class DumpEntrySerializer {
buf.putInt(cache);
buf.putLong(expireTime);
+buf.put((byte)(hasConflictVer ? 1 : 0));
+buf.putInt(ver.topologyVersion());
+buf.putLong(ver.order
(ignite) branch ignite-2.16 updated (e0d23e465b9 -> 0a200d5006a)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a change to branch ignite-2.16
in repository https://gitbox.apache.org/repos/asf/ignite.git
from e0d23e465b9 IGNITE-20867 Fixed a typo in the cache directory name
check error message. (#11068)
new ef7fc63fb82 IGNITE-20836 Support zipping of dump files (#11040)
new 0a200d5006a IGNITE-20917 Add entry version to DumpEntry (#11069)
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:
.../java/org/apache/ignite/dump/DumpEntry.java | 9 +-
.../ignite/dump/DumpReaderConfiguration.java | 20 --
...sFileIOFactory.java => UnzipFileIOFactory.java} | 8 +-
.../snapshot/IgniteSnapshotManager.java| 43 +++-
.../persistence/snapshot/SnapshotMetadata.java | 17 ++
.../snapshot/SnapshotOperationRequest.java | 13 +-
.../snapshot/SnapshotPartitionsVerifyHandler.java | 7 +-
.../snapshot/SnapshotRestoreProcess.java | 1 +
.../snapshot/dump/CreateDumpFutureTask.java| 25 ++-
.../cache/persistence/snapshot/dump/Dump.java | 25 ++-
.../snapshot/dump/DumpEntrySerializer.java | 63 +-
.../dump/WriteOnlyZipFileIO.java} | 137 ++--
.../dump/WriteOnlyZipFileIOFactory.java} | 11 +-
.../processors/cache/verify/IdleVerifyUtility.java | 4 +-
.../snapshot/AbstractSnapshotSelfTest.java | 12 +-
.../snapshot/EncryptedSnapshotTest.java| 13 +-
.../snapshot/IgniteSnapshotManagerSelfTest.java| 1 +
.../snapshot/dump/AbstractCacheDumpTest.java | 26 ++-
.../snapshot/dump/IgniteCacheDumpSelf2Test.java| 236 -
.../snapshot/dump/IgniteCacheDumpSelfTest.java | 30 ++-
20 files changed, 550 insertions(+), 151 deletions(-)
copy
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/{RandomAccessFileIOFactory.java
=> UnzipFileIOFactory.java} (78%)
copy
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/{file/RandomAccessFileIO.java
=> snapshot/dump/WriteOnlyZipFileIO.java} (55%)
copy
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/{file/RandomAccessFileIOFactory.java
=> snapshot/dump/WriteOnlyZipFileIOFactory.java} (72%)
(ignite) 01/02: IGNITE-20836 Support zipping of dump files (#11040)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch ignite-2.16
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit ef7fc63fb8296f9b77569646eba789634a836569
Author: yurinaryshkin <135707807+yurinarysh...@users.noreply.github.com>
AuthorDate: Fri Nov 24 10:08:20 2023 +0300
IGNITE-20836 Support zipping of dump files (#11040)
(cherry picked from commit 36bd6ff35e8012616882a864c1e10aae115a00a3)
---
.../ignite/dump/DumpReaderConfiguration.java | 20 ---
.../cache/persistence/file/UnzipFileIOFactory.java | 35 +
.../snapshot/IgniteSnapshotManager.java| 43 --
.../persistence/snapshot/SnapshotMetadata.java | 17 +++
.../snapshot/SnapshotOperationRequest.java | 13 +-
.../snapshot/SnapshotPartitionsVerifyHandler.java | 5 +-
.../snapshot/SnapshotRestoreProcess.java | 1 +
.../snapshot/dump/CreateDumpFutureTask.java| 14 +-
.../cache/persistence/snapshot/dump/Dump.java | 25 +++-
.../snapshot/dump/WriteOnlyZipFileIO.java | 158 +
.../snapshot/dump/WriteOnlyZipFileIOFactory.java | 36 +
.../snapshot/AbstractSnapshotSelfTest.java | 12 +-
.../snapshot/EncryptedSnapshotTest.java| 13 +-
.../snapshot/IgniteSnapshotManagerSelfTest.java| 1 +
.../snapshot/dump/AbstractCacheDumpTest.java | 22 ++-
.../snapshot/dump/IgniteCacheDumpSelf2Test.java| 66 -
.../snapshot/dump/IgniteCacheDumpSelfTest.java | 30 +++-
17 files changed, 458 insertions(+), 53 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/dump/DumpReaderConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/dump/DumpReaderConfiguration.java
index 1b43554c3f0..a7a80b8227f 100644
---
a/modules/core/src/main/java/org/apache/ignite/dump/DumpReaderConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/dump/DumpReaderConfiguration.java
@@ -69,26 +69,6 @@ public class DumpReaderConfiguration {
this(dir, cnsmr, DFLT_THREAD_CNT, DFLT_TIMEOUT, true, true, null,
false);
}
-/**
- * @param dir Root dump directory.
- * @param cnsmr Dump consumer.
- * @param thCnt Count of threads to consume dumped partitions.
- * @param timeout Timeout of dump reader invocation.
- * @param failFast Stop processing partitions if consumer fail to process
one.
- * @param keepBinary If {@code true} then don't deserialize {@link
KeyCacheObject} and {@link CacheObject}.
- * @param cacheGroupNames Cache group names.
- */
-public DumpReaderConfiguration(File dir,
-DumpConsumer cnsmr,
-int thCnt,
-Duration timeout,
-boolean failFast,
-boolean keepBinary,
-String[] cacheGroupNames
-) {
-this(dir, cnsmr, thCnt, timeout, failFast, keepBinary,
cacheGroupNames, false);
-}
-
/**
* @param dir Root dump directory.
* @param cnsmr Dump consumer.
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/UnzipFileIOFactory.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/UnzipFileIOFactory.java
new file mode 100644
index 000..674ba291949
--- /dev/null
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/file/UnzipFileIOFactory.java
@@ -0,0 +1,35 @@
+/*
+ * 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.file;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.OpenOption;
+
+/**
+ * File I/O factory which provides {@link UnzipFileIO} implementation of
FileIO.
+ */
+public class UnzipFileIOFactory implements FileIOFactory {
+/** */
+private static final long serialVersionUID = 0L;
+
+/** {@inheritDoc} */
+@Override public UnzipFileIO create(File file, OpenOption... modes) throws
IOException {
+return new UnzipFileIO(file);
+}
+}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager
(ignite) branch master updated: IGNITE-20917 Add entry version to DumpEntry (#11069)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new b7a8f021f8c IGNITE-20917 Add entry version to DumpEntry (#11069)
b7a8f021f8c is described below
commit b7a8f021f8caf22ad51977be0323dc4085d095e3
Author: Nikolay
AuthorDate: Mon Nov 27 14:29:50 2023 +0300
IGNITE-20917 Add entry version to DumpEntry (#11069)
---
.../java/org/apache/ignite/dump/DumpEntry.java | 9 +-
.../snapshot/SnapshotPartitionsVerifyHandler.java | 2 +-
.../snapshot/dump/CreateDumpFutureTask.java| 11 +-
.../snapshot/dump/DumpEntrySerializer.java | 63 +++-
.../processors/cache/verify/IdleVerifyUtility.java | 4 +-
.../snapshot/dump/AbstractCacheDumpTest.java | 4 +
.../snapshot/dump/IgniteCacheDumpSelf2Test.java| 170 -
7 files changed, 247 insertions(+), 16 deletions(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/dump/DumpEntry.java
b/modules/core/src/main/java/org/apache/ignite/dump/DumpEntry.java
index ca34f3cbace..6fa8b3c58a0 100644
--- a/modules/core/src/main/java/org/apache/ignite/dump/DumpEntry.java
+++ b/modules/core/src/main/java/org/apache/ignite/dump/DumpEntry.java
@@ -17,7 +17,9 @@
package org.apache.ignite.dump;
+import java.util.Collection;
import java.util.Iterator;
+import org.apache.ignite.cache.CacheEntryVersion;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.Dump;
import org.apache.ignite.lang.IgniteExperimental;
@@ -26,7 +28,7 @@ import org.apache.ignite.lang.IgniteExperimental;
*
* @see Dump#iterator(String, int, int)
* @see DumpConsumer#onPartition(int, int, Iterator)
- * @see org.apache.ignite.IgniteSnapshot#createDump(String)
+ * @see org.apache.ignite.IgniteSnapshot#createDump(String, Collection)
*/
@IgniteExperimental
public interface DumpEntry {
@@ -36,6 +38,11 @@ public interface DumpEntry {
/** @return Expiration time. */
public long expireTime();
+/**
+ * @return Version of the entry.
+ */
+public CacheEntryVersion version();
+
/** @return Key. */
public Object key();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandler.java
index 3847b19b3a9..71cafd15828 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandler.java
@@ -409,7 +409,7 @@ public class SnapshotPartitionsVerifyHandler implements
SnapshotHandler
- * +-+---+--+-+-+---+
- * | 4 bytes | 4 bytes | 4 bytes | 8 bytes | | |
- * +-+---+--+-+-+---+
- * | CRC | Data size | cache ID | expiration time | key | value |
- * +-+---+--+-+-+---+
+ * +-+---+--+-+-+-+
+ * | 4 bytes | 4 bytes | 4 bytes | 8 bytes | | | |
+ * +-+---+--+-+-+-+
+ * | CRC | Data size | cache ID | expiration time | ver | key | value |
+ * +-+---+--+-+-+-+
*
*
* @param cache Cache id.
@@ -108,11 +111,22 @@ public class DumpEntrySerializer {
long expireTime,
KeyCacheObject key,
CacheObject val,
+GridCacheVersion ver,
CacheObjectContext coCtx
) throws IgniteCheckedException {
+int verSz = Integer.BYTES/*topVer*/ + Long.BYTES/*order*/ +
Integer.BYTES/*nodeOrderDrId*/;
+
+boolean hasConflictVer = ver.otherClusterVersion() != null;
+
+if (hasConflictVer)
+verSz *= 2 /*GridCacheVersion otherClusterVersion*/;
+
+assert ver.fieldsCount() == (hasConflictVer ? 4 : 3);
+
int keySz = key.valueBytesLength(coCtx);
int valSz = val.valueBytesLength(coCtx);
-int dataSz = /*cache ID*/Integer.BYTES + /*expire time*/Long.BYTES +
/*key*/keySz + /*value*/valSz;
+int dataSz = /*cache ID*/Integer.BYTES + /*expire time*/Long.BYTES
++ /* hasConflictVersion */1 + /*version*/verSz + /*key*/keySz +
/*value*/valSz;
int fullSz = dataSz + /*extra bytes for row size*/Integer.BYTES +
/*CRC*/Integer.BYTES;
@@ -128,6 +142,19 @@ public class DumpEntrySerializer {
buf.putInt(cache);
buf.putLong(expireTime);
+buf.put((byte
(ignite) branch master updated: IGNITE-20722 Support skipCopies for DumpReader (#11014)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 63f1a80d83d IGNITE-20722 Support skipCopies for DumpReader (#11014)
63f1a80d83d is described below
commit 63f1a80d83da4ae5e3122057826e92ff4b6e3178
Author: yurinaryshkin <135707807+yurinarysh...@users.noreply.github.com>
AuthorDate: Mon Oct 30 16:38:56 2023 +0300
IGNITE-20722 Support skipCopies for DumpReader (#11014)
---
.../java/org/apache/ignite/dump/DumpReader.java| 12 ++
.../ignite/dump/DumpReaderConfiguration.java | 40 +-
.../snapshot/dump/AbstractCacheDumpTest.java | 9 +++--
.../snapshot/dump/IgniteCacheDumpSelfTest.java | 47 --
4 files changed, 100 insertions(+), 8 deletions(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/dump/DumpReader.java
b/modules/core/src/main/java/org/apache/ignite/dump/DumpReader.java
index 34522d4809c..d2ed811ac3f 100644
--- a/modules/core/src/main/java/org/apache/ignite/dump/DumpReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/dump/DumpReader.java
@@ -21,6 +21,7 @@ import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -108,11 +109,22 @@ public class DumpReader implements Runnable {
AtomicBoolean skip = new AtomicBoolean(false);
+Map> groups = cfg.skipCopies() ? new
HashMap<>() : null;
+
+if (groups != null)
+grpToNodes.keySet().forEach(grpId -> groups.put(grpId, new
HashSet<>()));
+
for (Map.Entry> e :
grpToNodes.entrySet()) {
int grp = e.getKey();
for (String node : e.getValue()) {
for (int part : dump.partitions(node, grp)) {
+if (groups != null && !groups.get(grp).add(part)) {
+log.info("Skip copy partition [node=" + node +
", grp=" + grp + ", part=" + part + ']');
+
+continue;
+}
+
Runnable consumePart = () -> {
if (skip.get()) {
if (log.isDebugEnabled()) {
diff --git
a/modules/core/src/main/java/org/apache/ignite/dump/DumpReaderConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/dump/DumpReaderConfiguration.java
index 20da0ef0547..1b43554c3f0 100644
---
a/modules/core/src/main/java/org/apache/ignite/dump/DumpReaderConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/dump/DumpReaderConfiguration.java
@@ -58,12 +58,15 @@ public class DumpReaderConfiguration {
/** Cache group names. */
private String[] cacheGroupNames;
+/** Skip copies. */
+private final boolean skipCopies;
+
/**
* @param dir Root dump directory.
* @param cnsmr Dump consumer.
*/
public DumpReaderConfiguration(File dir, DumpConsumer cnsmr) {
-this(dir, cnsmr, DFLT_THREAD_CNT, DFLT_TIMEOUT, true, true, null);
+this(dir, cnsmr, DFLT_THREAD_CNT, DFLT_TIMEOUT, true, true, null,
false);
}
/**
@@ -75,8 +78,35 @@ public class DumpReaderConfiguration {
* @param keepBinary If {@code true} then don't deserialize {@link
KeyCacheObject} and {@link CacheObject}.
* @param cacheGroupNames Cache group names.
*/
-public DumpReaderConfiguration(File dir, DumpConsumer cnsmr, int thCnt,
Duration timeout, boolean failFast, boolean keepBinary,
+public DumpReaderConfiguration(File dir,
+DumpConsumer cnsmr,
+int thCnt,
+Duration timeout,
+boolean failFast,
+boolean keepBinary,
String[] cacheGroupNames
+) {
+this(dir, cnsmr, thCnt, timeout, failFast, keepBinary,
cacheGroupNames, false);
+}
+
+/**
+ * @param dir Root dump directory.
+ * @param cnsmr Dump consumer.
+ * @param thCnt Count of threads to consume dumped partitions.
+ * @param timeout Timeout of dump reader invocation.
+ * @param failFast Stop processing partitions if consumer fail to process
one.
+ * @param keepBinary If {@code true} then don't deserialize {@link
KeyCacheObject} and {@link CacheObject}.
+ * @param cacheGroupNames Cache group names.
+ * @param skipCopies Skip copies.
+ */
+public DumpReaderConfiguration(File dir,
+DumpConsumer cnsmr,
+int thCnt,
+Duration timeout,
+boolean failFast,
+boolean keepBinary,
+String[] cacheGroupNames,
+boolean skipCopies
) {
this.dir = dir;
this.cn
(ignite) branch master updated: IGNITE-20744 StandaloneContext should not load plugins from classpath (#11017)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 7c11d93729d IGNITE-20744 StandaloneContext should not load plugins
from classpath (#11017)
7c11d93729d is described below
commit 7c11d93729d97497dafe34ec66221fd77bacf05f
Author: Anton Vinogradov
AuthorDate: Fri Oct 27 19:31:00 2023 +0300
IGNITE-20744 StandaloneContext should not load plugins from classpath
(#11017)
---
.../src/main/java/org/apache/ignite/internal/IgniteKernal.java| 2 +-
.../persistence/wal/reader/StandaloneIgnitePluginProcessor.java | 2 +-
.../main/java/org/apache/ignite/internal/util/IgniteUtils.java| 8 ++--
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
index 0cafc69d0c4..fb227c583d7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java
@@ -918,7 +918,7 @@ public class IgniteKernal implements IgniteEx,
Externalizable {
throw new IgniteCheckedException("User attribute has illegal
name: '" + name + "'. Note that all names " +
"starting with '" + ATTR_PREFIX + "' are reserved for
internal use.");
-List plugins = U.allPluginProviders(cfg);
+List plugins = U.allPluginProviders(cfg, true);
// Spin out SPIs & managers.
try {
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneIgnitePluginProcessor.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneIgnitePluginProcessor.java
index 5ad46234811..ab142826ff9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneIgnitePluginProcessor.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneIgnitePluginProcessor.java
@@ -32,6 +32,6 @@ class StandaloneIgnitePluginProcessor extends
IgnitePluginProcessor {
* @param cfg Ignite configuration.
*/
StandaloneIgnitePluginProcessor(GridKernalContext ctx, IgniteConfiguration
cfg) throws IgniteCheckedException {
-super(ctx, cfg, U.allPluginProviders(cfg));
+super(ctx, cfg, U.allPluginProviders(cfg, false));
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 660a8924550..2f736091ed1 100755
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -1095,11 +1095,15 @@ public abstract class IgniteUtils {
* Gets all plugin providers.
*
* @param cfg Configuration.
+ * @param includeClsPath Include classpath plugins on empty config.
* @return Plugins.
*/
-public static List allPluginProviders(IgniteConfiguration
cfg) {
+public static List allPluginProviders(IgniteConfiguration
cfg, boolean includeClsPath) {
return cfg.getPluginProviders() != null &&
cfg.getPluginProviders().length > 0 ?
-Arrays.asList(cfg.getPluginProviders()) : U.allPluginProviders();
+Arrays.asList(cfg.getPluginProviders()) :
+includeClsPath ?
+U.allPluginProviders() :
+Collections.emptyList();
}
/**
[ignite] branch master updated: IGNITE-20708 Support cacheGroupNames for DumpReader (#11008)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 6ac26a0f18d IGNITE-20708 Support cacheGroupNames for DumpReader
(#11008)
6ac26a0f18d is described below
commit 6ac26a0f18d019dc84cf067067240a9efb2576af
Author: yurinaryshkin <135707807+yurinarysh...@users.noreply.github.com>
AuthorDate: Wed Oct 25 10:28:20 2023 +0300
IGNITE-20708 Support cacheGroupNames for DumpReader (#11008)
---
.../java/org/apache/ignite/dump/DumpReader.java| 14 -
.../ignite/dump/DumpReaderConfiguration.java | 16 +-
.../snapshot/dump/AbstractCacheDumpTest.java | 66 --
.../snapshot/dump/IgniteCacheDumpSelfTest.java | 44 +++
4 files changed, 106 insertions(+), 34 deletions(-)
diff --git a/modules/core/src/main/java/org/apache/ignite/dump/DumpReader.java
b/modules/core/src/main/java/org/apache/ignite/dump/DumpReader.java
index 07b9bf8035e..34522d4809c 100644
--- a/modules/core/src/main/java/org/apache/ignite/dump/DumpReader.java
+++ b/modules/core/src/main/java/org/apache/ignite/dump/DumpReader.java
@@ -19,12 +19,15 @@ package org.apache.ignite.dump;
import java.io.File;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
import org.apache.ignite.IgniteException;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.internal.GridLoggerProxy;
@@ -34,6 +37,7 @@ import
org.apache.ignite.internal.processors.cache.persistence.snapshot.Snapshot
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.Dump;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.Dump.DumpedPartitionIterator;
import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteExperimental;
@@ -85,9 +89,15 @@ public class DumpReader implements Runnable {
Map> grpToNodes = new HashMap<>();
+Set cacheGroupIds = cfg.cacheGroupNames() != null
+?
Arrays.stream(cfg.cacheGroupNames()).map(CU::cacheId).collect(Collectors.toSet())
+: null;
+
for (SnapshotMetadata meta : dump.metadata()) {
-for (Integer grp : meta.cacheGroupIds())
-grpToNodes.computeIfAbsent(grp, key -> new
ArrayList<>()).add(meta.folderName());
+for (Integer grp : meta.cacheGroupIds()) {
+if (cacheGroupIds == null ||
cacheGroupIds.contains(grp))
+grpToNodes.computeIfAbsent(grp, key -> new
ArrayList<>()).add(meta.folderName());
+}
}
cnsmr.onCacheConfigs(grpToNodes.entrySet().stream()
diff --git
a/modules/core/src/main/java/org/apache/ignite/dump/DumpReaderConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/dump/DumpReaderConfiguration.java
index c967136fe81..20da0ef0547 100644
---
a/modules/core/src/main/java/org/apache/ignite/dump/DumpReaderConfiguration.java
+++
b/modules/core/src/main/java/org/apache/ignite/dump/DumpReaderConfiguration.java
@@ -55,12 +55,15 @@ public class DumpReaderConfiguration {
/** If {@code true} then don't deserialize {@link KeyCacheObject} and
{@link CacheObject}. */
private final boolean keepBinary;
+/** Cache group names. */
+private String[] cacheGroupNames;
+
/**
* @param dir Root dump directory.
* @param cnsmr Dump consumer.
*/
public DumpReaderConfiguration(File dir, DumpConsumer cnsmr) {
-this(dir, cnsmr, DFLT_THREAD_CNT, DFLT_TIMEOUT, true, true);
+this(dir, cnsmr, DFLT_THREAD_CNT, DFLT_TIMEOUT, true, true, null);
}
/**
@@ -70,14 +73,18 @@ public class DumpReaderConfiguration {
* @param timeout Timeout of dump reader invocation.
* @param failFast Stop processing partitions if consumer fail to process
one.
* @param keepBinary If {@code true} then don't deserialize {@link
KeyCacheObject} and {@link CacheObject}.
+ * @param cacheGroupNames Cache group names.
*/
-public DumpReaderConfiguration(File dir, DumpConsumer cnsmr, int thCnt,
Duration timeout, boolean failFast, boolean keepBinary) {
+public DumpReaderConfiguration(File dir, DumpConsumer cnsmr, int thCnt,
Duration timeout, boolean failFast, boolean keepBinary,
+String[] cacheGroupNames
+) {
this.dir = dir;
this.c
[ignite] branch master updated: IGNITE-20528 Support cache objects transformation for StandaloneKernal (#11001)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 2aeba5cf2f4 IGNITE-20528 Support cache objects transformation for
StandaloneKernal (#11001)
2aeba5cf2f4 is described below
commit 2aeba5cf2f4325175692ef311dacad5061f0d8c3
Author: Anton Vinogradov
AuthorDate: Tue Oct 24 07:22:38 2023 +0300
IGNITE-20528 Support cache objects transformation for StandaloneKernal
(#11001)
---
.../AbstractCacheObjectCompressionTest.java| 2 +-
.../apache/ignite/internal/GridKernalContext.java | 8 ++
.../ignite/internal/GridKernalContextImpl.java | 12 +++
.../org/apache/ignite/internal/IgniteKernal.java | 12 ++-
...r.java => CacheObjectTransformerProcessor.java} | 4 +-
.../org/apache/ignite/internal/cdc/CdcMain.java| 1 +
.../cache/CacheObjectTransformerUtils.java | 29 --
.../processors/cache/GridCacheProcessor.java | 6 +-
.../processors/cache/GridCacheSharedContext.java | 24 +
.../snapshot/IgniteSnapshotManager.java| 2 +-
.../wal/reader/IgniteWalIteratorFactory.java | 33 ++-
.../wal/reader/StandaloneGridKernalContext.java| 45 +++--
.../reader/StandaloneIgnitePluginProcessor.java| 5 +-
.../apache/ignite/internal/util/IgniteUtils.java | 11 +++
.../apache/ignite/cdc/TransformedCdcSelfTest.java} | 34 +++
.../db/wal/IgniteWalIteratorSwitchSegmentTest.java | 2 -
.../pagemem/BPlusTreePageMemoryImplTest.java | 3 +-
.../BPlusTreeReuseListPageMemoryImplTest.java | 1 -
.../pagemem/IndexStoragePageMemoryImplTest.java| 3 +-
.../pagemem/PageMemoryImplNoLoadTest.java | 1 -
.../persistence/pagemem/PageMemoryImplTest.java| 1 -
.../AbstractCacheObjectTransformationTest.java | 2 +-
.../TestCacheObjectTransformerManagerAdapter.java | 63 -
.../TestCacheObjectTransformerPluginProvider.java | 8 +-
...TestCacheObjectTransformerProcessorAdapter.java | 103 +
.../loadtests/hashmap/GridCacheTestContext.java| 3 +-
.../ignite/testsuites/IgnitePdsTestSuite2.java | 2 +
...dexQueryCacheKeyValueTransformedFieldsTest.java | 4 +-
28 files changed, 268 insertions(+), 156 deletions(-)
diff --git
a/modules/compress/src/test/java/org/apache/ignite/internal/processors/cache/transform/AbstractCacheObjectCompressionTest.java
b/modules/compress/src/test/java/org/apache/ignite/internal/processors/cache/transform/AbstractCacheObjectCompressionTest.java
index a9451d88211..e1f0dead6a4 100644
---
a/modules/compress/src/test/java/org/apache/ignite/internal/processors/cache/transform/AbstractCacheObjectCompressionTest.java
+++
b/modules/compress/src/test/java/org/apache/ignite/internal/processors/cache/transform/AbstractCacheObjectCompressionTest.java
@@ -89,7 +89,7 @@ public abstract class AbstractCacheObjectCompressionTest
extends AbstractCacheOb
/**
*
*/
-protected static class CompressionTransformer extends
TestCacheObjectTransformerManagerAdapter {
+protected static class CompressionTransformer extends
TestCacheObjectTransformerProcessorAdapter {
/** Comptession type. */
protected static volatile CompressionType type =
CompressionType.defaultType();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
index 544b6b5d2eb..0de85f965f8 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
@@ -24,6 +24,7 @@ import java.util.concurrent.Executor;
import org.apache.ignite.IgniteLogger;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.cache.query.index.IndexProcessor;
+import
org.apache.ignite.internal.cache.transform.CacheObjectTransformerProcessor;
import org.apache.ignite.internal.managers.checkpoint.GridCheckpointManager;
import org.apache.ignite.internal.managers.collision.GridCollisionManager;
import org.apache.ignite.internal.managers.communication.GridIoManager;
@@ -207,6 +208,13 @@ public interface GridKernalContext extends
Iterable {
*/
public MaintenanceRegistry maintenanceRegistry();
+/**
+ * Gets transformation processor.
+ *
+ * @return Transformation processor.
+ */
+public CacheObjectTransformerProcessor transformer();
+
/**
* Gets system view manager.
*
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java
index 18e70f0326a..9bce003e3cc 100644
---
a/modules/core/src/main/java/org/apache/ignite/inter
[ignite-extensions] branch master updated: [MINOR] Fix compilation
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git
The following commit(s) were added to refs/heads/master by this push:
new f5f78e30 [MINOR] Fix compilation
f5f78e30 is described below
commit f5f78e303ca532a77d7d3a6430665ac89f35a57d
Author: nizhikov
AuthorDate: Fri Oct 20 14:26:46 2023 +0300
[MINOR] Fix compilation
---
.../java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java | 5 -
1 file changed, 5 deletions(-)
diff --git
a/modules/hibernate-ext/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java
b/modules/hibernate-ext/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java
index 1da411bf..3edbb03f 100644
---
a/modules/hibernate-ext/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java
+++
b/modules/hibernate-ext/hibernate/src/main/java/org/apache/ignite/cache/hibernate/HibernateCacheProxy.java
@@ -594,11 +594,6 @@ public class HibernateCacheProxy implements
IgniteInternalCache
return delegate.get().withNoRetries();
}
-/** {@inheritDoc} */
-@Override public IgniteInternalCache
withAllowAtomicOpsInTx() {
-return delegate.get().withAllowAtomicOpsInTx();
-}
-
/** {@inheritDoc} */
@Override public GridCacheContext context() {
return delegate.get().context();
[ignite] branch master updated: IGNITE-20470 [ducktests] Test for the cache dump (#10998)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 43c6432879f IGNITE-20470 [ducktests] Test for the cache dump (#10998)
43c6432879f is described below
commit 43c6432879f737055f4ac3bba674ce7fb6250626
Author: Sergey Korotkov
AuthorDate: Wed Oct 18 18:43:17 2023 +0700
IGNITE-20470 [ducktests] Test for the cache dump (#10998)
---
.../internal/ducktest/tests/dump/DumpUtility.java | 51 +
.../ignitetest/services/utils/control_utility.py | 15 ++-
.../ignitetest/services/utils/dump_utility.py | 48
.../ignitetest/services/utils/ignite_aware.py | 8 ++
.../ducktests/tests/ignitetest/tests/dump_test.py | 123 +
5 files changed, 243 insertions(+), 2 deletions(-)
diff --git
a/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/dump/DumpUtility.java
b/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/dump/DumpUtility.java
new file mode 100644
index 000..3c6983f7b1b
--- /dev/null
+++
b/modules/ducktests/src/main/java/org/apache/ignite/internal/ducktest/tests/dump/DumpUtility.java
@@ -0,0 +1,51 @@
+/*
+ * 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.ducktest.tests.dump;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import org.apache.ignite.internal.ducktest.utils.IgniteAwareApplication;
+
+/**
+ * Application to control the cache dump operations (just create for now).
+ */
+public class DumpUtility extends IgniteAwareApplication {
+/** {@inheritDoc} */
+@Override public void run(JsonNode jsonNode) {
+String cmd = jsonNode.get("cmd").asText();
+String dumpName = jsonNode.get("dumpName").asText();
+
+markInitialized();
+
+switch (cmd) {
+case "create":
+long startTime = System.nanoTime();
+
+ignite.snapshot().createDump(dumpName, null).get();
+
+long resultTime = System.nanoTime() - startTime;
+
+recordResult("DUMP_CREATE_TIME_MS", resultTime / 1_000_000);
+
+break;
+default:
+throw new RuntimeException("Wrong cmd parameter for the dump
control utility: '" + cmd + "'");
+}
+
+markFinished();
+}
+}
diff --git
a/modules/ducktests/tests/ignitetest/services/utils/control_utility.py
b/modules/ducktests/tests/ignitetest/services/utils/control_utility.py
index 1b1dd997cfd..d95f97b0a13 100644
--- a/modules/ducktests/tests/ignitetest/services/utils/control_utility.py
+++ b/modules/ducktests/tests/ignitetest/services/utils/control_utility.py
@@ -220,6 +220,17 @@ class ControlUtility:
raise TimeoutError(f'Failed to wait for the snapshot operation to
complete: '
f'snapshot_name={snapshot_name} in {timeout_sec}
seconds.')
+def snapshot_check(self, snapshot_name: str):
+"""
+Check snapshot.
+:param snapshot_name: Name of snapshot.
+"""
+res = self.__run(f"--snapshot check {snapshot_name}")
+
+assert "The check procedure has finished, no conflicts have been
found." in res
+
+return res
+
def start_performance_statistics(self):
"""
Start performance statistics collecting in the cluster.
@@ -425,10 +436,10 @@ class ControlUtility:
auth = f" --user {self.username} --password {self.password} "
return "%s %s" % \
- (envs_to_exports(self.__envs()),
+ (envs_to_exports(self.envs()),
self._cluster.script(f"{self.BASE_COMMAND} --host {node_ip}
{cmd} {ssl} {auth}"))
-def __envs(self):
+def envs(self):
"""
:return: environment set.
"""
diff --git a/modules/ducktests/tests/ignitetest/services/utils/dump_utility.py
b/module
[ignite] branch master updated: IGNITE-20601 Support custom location for cache dumps (#10990)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 8aed3c61ba2 IGNITE-20601 Support custom location for cache dumps
(#10990)
8aed3c61ba2 is described below
commit 8aed3c61ba2b61921463da6b35f1e5f936d7027b
Author: Nikolay
AuthorDate: Wed Oct 11 15:50:52 2023 +0300
IGNITE-20601 Support custom location for cache dumps (#10990)
---
.../snapshot/IgniteSnapshotManager.java| 7 +++-
.../snapshot/AbstractSnapshotSelfTest.java | 2 +-
.../snapshot/EncryptedSnapshotTest.java| 2 +-
.../snapshot/IgniteSnapshotManagerSelfTest.java| 1 +
.../snapshot/dump/AbstractCacheDumpTest.java | 7 +++-
.../snapshot/dump/IgniteCacheDumpSelf2Test.java| 46 ++
6 files changed, 60 insertions(+), 5 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java
index 80811f6fdd7..29560a7228d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java
@@ -1149,7 +1149,7 @@ public class IgniteSnapshotManager extends
GridCacheSharedManagerAdapter
Collection comprGrpIds,
boolean withMetaStorage
) {
-if (!isPersistenceEnabled(cctx.gridConfig()))
+if (!isPersistenceEnabled(cctx.gridConfig()) && req.snapshotPath() ==
null)
initLocalSnapshotDirectory(true);
Map> parts = new HashMap<>();
@@ -1185,6 +1185,7 @@ public class IgniteSnapshotManager extends
GridCacheSharedManagerAdapter
task0 = new GridFinishedFuture<>(Collections.emptySet());
else {
task0 = registerSnapshotTask(req.snapshotName(),
+req.snapshotPath(),
req.operationalNodeId(),
req.requestId(),
parts,
@@ -2719,6 +2720,7 @@ public class IgniteSnapshotManager extends
GridCacheSharedManagerAdapter
/**
* @param snpName Unique snapshot name.
+ * @param snpPath Snapshot path.
* @param srcNodeId Node id which cause snapshot operation.
* @param requestId Snapshot operation request ID.
* @param parts Collection of pairs group and appropriate cache partition
to be snapshot.
@@ -2729,6 +2731,7 @@ public class IgniteSnapshotManager extends
GridCacheSharedManagerAdapter
*/
AbstractSnapshotFutureTask registerSnapshotTask(
String snpName,
+@Nullable String snpPath,
UUID srcNodeId,
UUID requestId,
Map> parts,
@@ -2737,7 +2740,7 @@ public class IgniteSnapshotManager extends
GridCacheSharedManagerAdapter
SnapshotSender snpSndr
) {
AbstractSnapshotFutureTask task = registerTask(snpName, dump
-? new CreateDumpFutureTask(cctx, srcNodeId, requestId, snpName,
snapshotLocalDir(snpName, null), ioFactory, snpSndr, parts)
+? new CreateDumpFutureTask(cctx, srcNodeId, requestId, snpName,
snapshotLocalDir(snpName, snpPath), ioFactory, snpSndr, parts)
: new SnapshotFutureTask(cctx, srcNodeId, requestId, snpName,
tmpWorkDir, ioFactory, snpSndr, parts, withMetaStorage, locBuff));
if (!withMetaStorage) {
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractSnapshotSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractSnapshotSelfTest.java
index 7890402f2ec..65857a6d93b 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractSnapshotSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractSnapshotSelfTest.java
@@ -823,7 +823,7 @@ public abstract class AbstractSnapshotSelfTest extends
GridCommonAbstractTest {
boolean withMetaStorage,
SnapshotSender snpSndr
) throws IgniteCheckedException {
-AbstractSnapshotFutureTask task =
cctx.snapshotMgr().registerSnapshotTask(snpName, cctx.localNodeId(), null,
+AbstractSnapshotFutureTask task =
cctx.snapshotMgr().registerSnapshotTask(snpName, null, cctx.localNodeId(), null,
parts, withMetaStorage, false, snpSndr);
if (!(task instanceof SnapshotFutureTask))
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/EncryptedSnapshotTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/pr
[ignite] branch master updated (e3e3eded7a6 -> 56e61440af3)
This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/ignite.git from e3e3eded7a6 IGNITE-20589 Lazy creation of snapshot dir for in-memory cluster (#10981) add 56e61440af3 IGNITE-20597 Support cache group filter for dumps (#10986) No new revisions were added by this update. Summary of changes: .../java/org/apache/ignite/IgniteSnapshot.java | 3 +- .../snapshot/IgniteSnapshotManager.java| 26 ++-- .../snapshot/dump/AbstractCacheDumpTest.java | 8 ++- .../snapshot/dump/IgniteCacheDumpSelf2Test.java| 24 +-- .../snapshot/dump/IgniteCacheDumpSelfTest.java | 73 -- .../dump/IgniteConcurrentCacheDumpTest.java| 2 +- .../ignite/internal/dump/DumpCacheConfigTest.java | 2 +- 7 files changed, 117 insertions(+), 21 deletions(-)
[ignite] branch master updated (aa759048751 -> e3e3eded7a6)
This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/ignite.git from aa759048751 IGNITE-20586 .NET: Fix JNI string conversion causing node crash (#10985) add e3e3eded7a6 IGNITE-20589 Lazy creation of snapshot dir for in-memory cluster (#10981) No new revisions were added by this update. Summary of changes: .../snapshot/IgniteSnapshotManager.java| 72 -- .../apache/ignite/internal/util/IgniteUtils.java | 19 +- .../snapshot/dump/IgniteCacheDumpSelf2Test.java| 18 ++ 3 files changed, 89 insertions(+), 20 deletions(-)
[ignite] branch master updated: IGNITE-20595 Snapshot suite split in three (#10987)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new ceb22d20cab IGNITE-20595 Snapshot suite split in three (#10987)
ceb22d20cab is described below
commit ceb22d20cab407b038570c81be022d7233a6e12d
Author: Nikolay
AuthorDate: Tue Oct 10 11:28:43 2023 +0300
IGNITE-20595 Snapshot suite split in three (#10987)
---
.../ignite/testsuites/IgniteSnapshotTestSuite.java | 19 -
...estSuite.java => IgniteSnapshotTestSuite2.java} | 26 +---
.../testsuites/IgniteSnapshotTestSuite3.java | 48 ++
3 files changed, 49 insertions(+), 44 deletions(-)
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite.java
index ced347b5c00..4b4398fc1dd 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite.java
@@ -20,24 +20,15 @@ package org.apache.ignite.testsuites;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.EncryptedSnapshotTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotCheckTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotDeltaTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotHandlerTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotRestoreSelfTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotSelfTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotStreamerTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotWalRecordTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotConsistencyTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotMXBeanTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotManagerSelfTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotRemoteRequestTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotRestoreFromRemoteTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotWithMetastorageTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.PlainSnapshotTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.IgniteCacheDumpSelf2Test;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.IgniteCacheDumpSelfTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.IgniteConcurrentCacheDumpTest;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.DynamicSuite;
import org.junit.runner.RunWith;
@@ -65,15 +56,5 @@ public class IgniteSnapshotTestSuite {
GridTestUtils.addTestIfNeeded(suite,
IgniteClusterSnapshotRestoreSelfTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgniteClusterSnapshotHandlerTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgniteSnapshotRestoreFromRemoteTest.class, ignoredTests);
-GridTestUtils.addTestIfNeeded(suite, PlainSnapshotTest.class,
ignoredTests);
-GridTestUtils.addTestIfNeeded(suite, EncryptedSnapshotTest.class,
ignoredTests);
-GridTestUtils.addTestIfNeeded(suite,
IgniteClusterSnapshotWalRecordTest.class, ignoredTests);
-GridTestUtils.addTestIfNeeded(suite,
IgniteClusterSnapshotStreamerTest.class, ignoredTests);
-GridTestUtils.addTestIfNeeded(suite,
IgniteSnapshotConsistencyTest.class, ignoredTests);
-GridTestUtils.addTestIfNeeded(suite,
IgniteClusterSnapshotDeltaTest.class, ignoredTests);
-GridTestUtils.addTestIfNeeded(suite,
IncrementalSnapshotsTestSuite.class, ignoredTests);
-GridTestUtils.addTestIfNeeded(suite, IgniteCacheDumpSelfTest.class,
ignoredTests);
-GridTestUtils.addTestIfNeeded(suite, IgniteCacheDumpSelf2Test.class,
ignoredTests);
-GridTestUtils.addTestIfNeeded(suite,
IgniteConcurrentCacheDumpTest.class, ignoredTests);
}
}
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite2.java
similarity index 51%
copy from
modules/core/src/test/java/
[ignite] branch IGNITE-19950-snapshot-merge deleted (was b275a9803b9)
This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a change to branch IGNITE-19950-snapshot-merge in repository https://gitbox.apache.org/repos/asf/ignite.git was b275a9803b9 IGNITE-19950 Stub for dump creation process implemented The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[ignite] branch IGNITE-19753 deleted (was 8f803d81a42)
This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a change to branch IGNITE-19753 in repository https://gitbox.apache.org/repos/asf/ignite.git was 8f803d81a42 Merge branch 'master' into IGNITE-19753 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[ignite] branch cache_dumps deleted (was 0957e6aee21)
This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a change to branch cache_dumps in repository https://gitbox.apache.org/repos/asf/ignite.git was 0957e6aee21 IGNITE-20595 Snapshot suite split in three (#10987) This change permanently discards the following revisions: discard 0957e6aee21 IGNITE-20595 Snapshot suite split in three (#10987)
[ignite] branch cache_dumps updated: IGNITE-20595 Snapshot suite split in three (#10987)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch cache_dumps
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/cache_dumps by this push:
new 0957e6aee21 IGNITE-20595 Snapshot suite split in three (#10987)
0957e6aee21 is described below
commit 0957e6aee215246cb01dc50eef841f4a74225aa7
Author: Nikolay
AuthorDate: Tue Oct 10 11:28:43 2023 +0300
IGNITE-20595 Snapshot suite split in three (#10987)
---
modules/calcite/pom.xml| 7
modules/cassandra/store/pom.xml| 7 ++--
.../ignite/testsuites/IgniteSnapshotTestSuite.java | 19 -
...estSuite.java => IgniteSnapshotTestSuite2.java} | 26 +---
.../testsuites/IgniteSnapshotTestSuite3.java | 48 ++
modules/opencensus/pom.xml | 1 +
parent/pom.xml | 2 +-
7 files changed, 62 insertions(+), 48 deletions(-)
diff --git a/modules/calcite/pom.xml b/modules/calcite/pom.xml
index db1f38b42e6..3a39de70a8f 100644
--- a/modules/calcite/pom.xml
+++ b/modules/calcite/pom.xml
@@ -38,6 +38,7 @@
1.23.0
1.34.0
3.10.0
+1.0.1
2.8.2
3.1.8
2.4
@@ -81,6 +82,12 @@
${guava.version}
+
+com.google.guava
+failureaccess
+${failureaccess.version}
+
+
org.checkerframework
checker-qual
diff --git a/modules/cassandra/store/pom.xml b/modules/cassandra/store/pom.xml
index f447ff7daf4..d3a7f1254d0 100644
--- a/modules/cassandra/store/pom.xml
+++ b/modules/cassandra/store/pom.xml
@@ -39,6 +39,7 @@
3.2.0
3.11.3
3.0.2
+25.1-jre
@@ -116,9 +117,9 @@
-com.google.guava
-guava
-${guava.version}
+com.datastax.oss
+java-driver-shaded-guava
+${dataostaxguava.version}
diff --git
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite.java
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite.java
index ced347b5c00..4b4398fc1dd 100644
---
a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite.java
+++
b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteSnapshotTestSuite.java
@@ -20,24 +20,15 @@ package org.apache.ignite.testsuites;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.EncryptedSnapshotTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotCheckTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotDeltaTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotHandlerTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotRestoreSelfTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotSelfTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotStreamerTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteClusterSnapshotWalRecordTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotConsistencyTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotMXBeanTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotManagerSelfTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotRemoteRequestTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotRestoreFromRemoteTest;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.IgniteSnapshotWithMetastorageTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.PlainSnapshotTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.IgniteCacheDumpSelf2Test;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.IgniteCacheDumpSelfTest;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.IgniteConcurrentCacheDumpTest;
import org.apache.ignite.testframework.GridTestUtils;
import org.apache.ignite.testframework.junits.DynamicSuite;
import org.junit.runner.RunWith;
@@ -65,15 +56,5 @@ public class IgniteSnapshotTestSuite {
GridTestUtils.addTestIfNeeded(suite,
IgniteClusterSnapshotRestoreSelfTest.class, ignoredTests);
GridTestUtils.addTestIfNeeded(suite,
IgniteClusterSnapshotHandlerTest.class, ignoredTe
[ignite] branch cache_dumps updated (e40d2ebb48e -> a7fac8e2c19)
This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a change to branch cache_dumps in repository https://gitbox.apache.org/repos/asf/ignite.git from e40d2ebb48e Use constant lambda for init byte buffer. add a7fac8e2c19 Fix check when cache name contains "cache" word. No new revisions were added by this update. Summary of changes: .../internal/processors/cache/persistence/snapshot/dump/Dump.java | 4 ++-- .../cache/persistence/snapshot/dump/IgniteCacheDumpSelf2Test.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
[ignite] branch cache_dumps updated: Use constant lambda for init byte buffer.
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch cache_dumps
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/cache_dumps by this push:
new e40d2ebb48e Use constant lambda for init byte buffer.
e40d2ebb48e is described below
commit e40d2ebb48e6f813897a871089c1c8a4cad65d2b
Author: nizhikov
AuthorDate: Mon Oct 9 10:14:24 2023 +0300
Use constant lambda for init byte buffer.
---
.../cache/persistence/snapshot/dump/DumpEntrySerializer.java| 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/DumpEntrySerializer.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/DumpEntrySerializer.java
index b966aec607d..27146ec3644 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/DumpEntrySerializer.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/DumpEntrySerializer.java
@@ -20,6 +20,7 @@ package
org.apache.ignite.internal.processors.cache.persistence.snapshot.dump;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.concurrent.ConcurrentMap;
+import java.util.function.Function;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteException;
import org.apache.ignite.binary.BinaryObject;
@@ -40,6 +41,9 @@ public class DumpEntrySerializer {
/** sizeOf(CRC) + sizeOf(Data size) */
public static final int HEADER_SZ = Integer.BYTES + Integer.BYTES;
+/** Default buffer allocator. */
+private static final Function DFLT_BUF_ALLOC = k ->
ByteBuffer.allocate(100);
+
/** */
private final ConcurrentMap thLocBufs;
@@ -233,7 +237,7 @@ public class DumpEntrySerializer {
/** @return Thread local buffer. */
private ByteBuffer threadLocalBuffer() {
-return thLocBufs.computeIfAbsent(Thread.currentThread().getId(), id ->
ByteBuffer.allocate(100));
+return thLocBufs.computeIfAbsent(Thread.currentThread().getId(),
DFLT_BUF_ALLOC);
}
/** @return Thread local buffer. */
[ignite] branch cache_dumps updated (197ba3b8a32 -> de69539481d)
This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a change to branch cache_dumps in repository https://gitbox.apache.org/repos/asf/ignite.git from 197ba3b8a32 DumpReader marked as experimental add de69539481d Remove unnecessary init. No new revisions were added by this update. Summary of changes: .../processors/cache/persistence/snapshot/dump/DumpEntrySerializer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[ignite] branch cache_dumps updated (94628d583ab -> 197ba3b8a32)
This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a change to branch cache_dumps in repository https://gitbox.apache.org/repos/asf/ignite.git from 94628d583ab Code review changes add 197ba3b8a32 DumpReader marked as experimental No new revisions were added by this update. Summary of changes: modules/core/src/main/java/org/apache/ignite/dump/DumpReader.java | 2 ++ 1 file changed, 2 insertions(+)
[ignite] branch cache_dumps updated: Code review changes
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch cache_dumps
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/cache_dumps by this push:
new 94628d583ab Code review changes
94628d583ab is described below
commit 94628d583abb28102133fd078f4163f31ba83172
Author: nizhikov
AuthorDate: Mon Oct 9 08:12:58 2023 +0300
Code review changes
---
.../org/apache/ignite/internal/cdc/CdcMain.java| 9 +++--
.../snapshot/AbstractCreateSnapshotFutureTask.java | 4 +-
.../snapshot/SnapshotPartitionsVerifyHandler.java | 8 ++--
.../snapshot/dump/CreateDumpFutureTask.java| 43 +-
.../cache/persistence/snapshot/dump/Dump.java | 12 +++---
.../wal/reader/IgniteWalIteratorFactory.java | 8 ++--
.../wal/reader/StandaloneGridKernalContext.java| 4 +-
.../junits/GridTestKernalContext.java | 4 +-
8 files changed, 56 insertions(+), 36 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/cdc/CdcMain.java
b/modules/core/src/main/java/org/apache/ignite/internal/cdc/CdcMain.java
index da0e791a905..2e5914d58d2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/cdc/CdcMain.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/cdc/CdcMain.java
@@ -82,8 +82,8 @@ import static
org.apache.ignite.internal.pagemem.wal.record.WALRecord.RecordType
import static
org.apache.ignite.internal.pagemem.wal.record.WALRecord.RecordType.DATA_RECORD_V2;
import static
org.apache.ignite.internal.processors.cache.persistence.wal.FileWriteAheadLogManager.WAL_SEGMENT_FILE_FILTER;
import static
org.apache.ignite.internal.processors.cache.persistence.wal.FileWriteAheadLogManager.segmentIndex;
-import static
org.apache.ignite.internal.processors.cache.persistence.wal.reader.StandaloneGridKernalContext.closeAll;
-import static
org.apache.ignite.internal.processors.cache.persistence.wal.reader.StandaloneGridKernalContext.startAll;
+import static
org.apache.ignite.internal.processors.cache.persistence.wal.reader.StandaloneGridKernalContext.closeAllComponents;
+import static
org.apache.ignite.internal.processors.cache.persistence.wal.reader.StandaloneGridKernalContext.startAllComponents;
import static
org.apache.ignite.internal.processors.metric.impl.MetricUtils.metricName;
/**
@@ -330,7 +330,7 @@ public class CdcMain implements Runnable {
}
}
finally {
-closeAll(kctx);
+closeAllComponents(kctx);
if (log.isInfoEnabled())
log.info("Ignite Change Data Capture Application
stopped.");
@@ -371,7 +371,7 @@ public class CdcMain implements Runnable {
kctx.resource().setSpringContext(ctx);
-startAll(kctx);
+startAllComponents(kctx);
mreg = kctx.metric().registry("cdc");
@@ -853,6 +853,7 @@ public class CdcMain implements Runnable {
/**
* @param files Mapping files.
+ * @param filter Filter.
* @return Type mapping iterator.
*/
public static Iterator typeMappingIterator(File[] files,
Predicate filter) {
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractCreateSnapshotFutureTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractCreateSnapshotFutureTask.java
index 89ae911cf5d..a2de0d59e64 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractCreateSnapshotFutureTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/AbstractCreateSnapshotFutureTask.java
@@ -44,9 +44,7 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import static
org.apache.ignite.internal.pagemem.PageIdAllocator.INDEX_PARTITION;
-/**
- *
- */
+/** */
public abstract class AbstractCreateSnapshotFutureTask extends
AbstractSnapshotFutureTask {
/**
* Cache group and corresponding partitions collected under the PME lock.
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandler.java
index 3d14d937fc9..3ea6d4c1264 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandler.java
@@ -83,8 +83,8 @@ import static
org.apache.ignite.internal.processors.cache.persistence.file.
[ignite] branch cache_dumps updated: Minor: fix dump check. Read only local node data during check.
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch cache_dumps
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/cache_dumps by this push:
new aa1e0a57abb Minor: fix dump check. Read only local node data during
check.
aa1e0a57abb is described below
commit aa1e0a57abbad92d76efcfdb2c45d644d27f3e0f
Author: nizhikov
AuthorDate: Sun Oct 8 13:29:01 2023 +0300
Minor: fix dump check. Read only local node data during check.
---
.../snapshot/SnapshotPartitionsVerifyHandler.java | 29
.../snapshot/dump/CreateDumpFutureTask.java| 2 +-
.../cache/persistence/snapshot/dump/Dump.java | 31 ++
3 files changed, 45 insertions(+), 17 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandler.java
index c36917ee023..3d14d937fc9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandler.java
@@ -358,19 +358,26 @@ public class SnapshotPartitionsVerifyHandler implements
SnapshotHandler partFiles
) {
-try (Dump dump = new Dump(opCtx.snapshotDirectory(), true, true, log))
{
-Collection partitionHashRecordV2s =
U.doInParallel(
-cctx.snapshotMgr().snapshotExecutorService(),
-partFiles,
-part -> calculateDumpedPartitionHash(dump,
cacheGroupName(part.getParentFile()), partId(part.getName()))
-);
+try {
+String consistentId =
cctx.kernalContext().pdsFolderResolver().resolveFolders().consistentId().toString();
-return
partitionHashRecordV2s.stream().collect(Collectors.toMap(PartitionHashRecordV2::partitionKey,
r -> r));
-}
-catch (Throwable t) {
-log.error("Error executing handler: ", t);
+try (Dump dump = new Dump(opCtx.snapshotDirectory(), consistentId,
true, true, log)) {
+Collection partitionHashRecordV2s =
U.doInParallel(
+cctx.snapshotMgr().snapshotExecutorService(),
+partFiles,
+part -> calculateDumpedPartitionHash(dump,
cacheGroupName(part.getParentFile()), partId(part.getName()))
+);
+
+return
partitionHashRecordV2s.stream().collect(Collectors.toMap(PartitionHashRecordV2::partitionKey,
r -> r));
+}
+catch (Throwable t) {
+log.error("Error executing handler: ", t);
-throw new IgniteException(t);
+throw new IgniteException(t);
+}
+}
+catch (IgniteCheckedException e) {
+throw new IgniteException(e);
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/CreateDumpFutureTask.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/CreateDumpFutureTask.java
index c01f81f877a..de1009059b0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/CreateDumpFutureTask.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/CreateDumpFutureTask.java
@@ -306,7 +306,7 @@ public class CreateDumpFutureTask extends
AbstractCreateSnapshotFutureTask imple
}
/** {@inheritDoc} */
-@Override protected CompletableFuture closeAsync() {
+@Override protected synchronized CompletableFuture closeAsync() {
if (closeFut == null) {
dumpCtxs.values().forEach(PartitionDumpContext::close);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/Dump.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/Dump.java
index 38baf38356b..2496cd210c0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/Dump.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/Dump.java
@@ -59,6 +59,7 @@ import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.marshaller.MarshallerUtils;
import org.apache.ignite.marshaller.jdk.JdkMarshaller;
+import org.jetbrains.annotations.Nullable;
import static
org.apache.ignite.configuration.DataStorageConfiguration.DFLT_BINA
[ignite] branch cache_dumps updated (c326afe7535 -> 040d340fb8e)
This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a change to branch cache_dumps in repository https://gitbox.apache.org/repos/asf/ignite.git from c326afe7535 IGNITE-20472 Compilation fix after MVCC removal add 040d340fb8e IGNITE-20472 --only-primary mode fix No new revisions were added by this update. Summary of changes: .../cache/persistence/snapshot/dump/CreateDumpFutureTask.java | 4 ++-- .../cache/persistence/snapshot/dump/AbstractCacheDumpTest.java| 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
[ignite] branch cache_dumps updated (853ec9cc9b0 -> c326afe7535)
This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a change to branch cache_dumps in repository https://gitbox.apache.org/repos/asf/ignite.git from 853ec9cc9b0 Merge branch 'master' into cache_dumps add c326afe7535 IGNITE-20472 Compilation fix after MVCC removal No new revisions were added by this update. Summary of changes: .../cache/persistence/snapshot/dump/AbstractCacheDumpTest.java | 2 +- .../cache/persistence/snapshot/dump/IgniteConcurrentCacheDumpTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[ignite] branch cache_dumps updated (8018473c5f9 -> 853ec9cc9b0)
This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a change to branch cache_dumps in repository https://gitbox.apache.org/repos/asf/ignite.git from 8018473c5f9 IGNITE-20472 Dump API implemented (#10953) add 1c2020212fb IGNITE-20546 Fix transactions expiration set for reinsert (#10972) add a6751098758 IGNITE-20543 Wrap CacheStore creation to sandbox (#10971) add 6f5e27e2e89 IGNITE-20506 CacheAtomicityMode#TRANSACTIONAL_SNAPSHOT removal (#10964) add 0e978105b0d IGNITE-20507 Fixed StoredCacheData removing when a node filter is set (#10970) add aba71e1a151 IGNITE-20581 Updated Spring dependency to 5.2.25.RELEASE version (#10977) add 853ec9cc9b0 Merge branch 'master' into cache_dumps No new revisions were added by this update. Summary of changes: docs/_docs/SQL/sql-transactions.adoc | 87 - docs/_docs/code-snippets/dotnet/SqlTransactions.cs | 102 -- .../apache/ignite/snippets/SqlTransactions.java| 33 docs/_docs/code-snippets/xml/mvcc.xml | 46 - docs/_docs/configuring-caches/atomicity-modes.adoc | 8 - docs/_docs/sql-reference/ddl.adoc | 2 +- docs/_docs/sql-reference/transactions.adoc | 69 --- docs/_docs/transactions/mvcc.adoc | 193 --- .../GridCommandHandlerIndexForceRebuildTest.java | 8 - .../apache/ignite/cache/CacheAtomicityMode.java| 47 + .../cache/CacheAffinitySharedManager.java | 7 +- .../processors/cache/CacheGroupContext.java| 3 +- .../processors/cache/ClusterCachesInfo.java| 23 ++- .../processors/cache/GridCacheContext.java | 10 +- .../processors/cache/GridCacheMapEntry.java| 45 + .../processors/cache/GridCacheProcessor.java | 71 --- .../internal/processors/cache/GridCacheUtils.java | 30 --- .../processors/cache/GridLocalConfigManager.java | 11 -- .../cache/ValidationOnNodeJoinUtils.java | 59 -- .../distributed/dht/GridDhtTxPrepareFuture.java| 2 +- .../processors/cache/mvcc/MvccProcessor.java | 24 --- .../processors/cache/mvcc/MvccProcessorImpl.java | 75 +--- .../internal/processors/cache/mvcc/MvccUtils.java | 15 -- .../GridCacheDatabaseSharedManager.java| 12 +- .../cache/persistence/tree/util/PageHandler.java | 9 - .../ignite/cache/NodeWithFilterRestartTest.java| 210 ++--- .../internal/IgniteClientReconnectCacheTest.java | 2 +- .../cache/AbstractDataTypesCoverageTest.java | 2 +- .../cache/IgniteOutOfMemoryPropagationTest.java| 2 +- .../IgniteCacheMultiClientsStartTest.java | 2 +- .../distributed/IgniteCacheTxIteratorSelfTest.java | 2 +- .../CacheObjectTransformationEvolutionTest.java| 2 +- .../transform/CacheObjectTransformationTest.java | 2 +- .../security/sandbox/AbstractSandboxTest.java | 2 +- .../sandbox/CacheStoreFactorySandboxTest.java | 113 +++ .../ignite/testsuites/SecurityTestSuite.java | 2 + .../processors/query/h2/IgniteH2Indexing.java | 3 +- .../internal/processors/query/h2/QueryParser.java | 72 +-- .../query/h2/sql/GridSqlQueryParser.java | 2 +- .../cache/CacheQueryFilterExpiredTest.java | 106 +-- .../index/DynamicEnableIndexingBasicSelfTest.java | 2 +- .../DynamicEnableIndexingConcurrentSelfTest.java | 2 +- .../internal/processors/query/LazyOnDmlTest.java | 2 +- .../query/WrongQueryEntityFieldTypeTest.java | 2 +- .../Cache/Configuration/CacheAtomicityMode.cs | 33 +--- .../config/mvcc/benchmark-mvcc-messages.sh | 97 -- .../config/mvcc/benchmark-mvcc-processor.sh| 94 - .../mvcc/benchmark-mvcc-updates-contention.sh | 95 -- .../config/mvcc/benchmark-thin-native.properties | 123 .../benchmark-jdbc-thin-inmemory-mvcc.properties | 104 -- .../jdbc/mvcc/MvccUpdateContentionBenchmark.java | 12 -- parent/pom.xml | 2 +- 52 files changed, 485 insertions(+), 1598 deletions(-) delete mode 100644 docs/_docs/SQL/sql-transactions.adoc delete mode 100644 docs/_docs/code-snippets/dotnet/SqlTransactions.cs delete mode 100644 docs/_docs/code-snippets/java/src/main/java/org/apache/ignite/snippets/SqlTransactions.java delete mode 100644 docs/_docs/code-snippets/xml/mvcc.xml delete mode 100644 docs/_docs/sql-reference/transactions.adoc delete mode 100644 docs/_docs/transactions/mvcc.adoc create mode 100644 modules/core/src/test/java/org/apache/ignite/internal/processors/security/sandbox/CacheStoreFactorySandboxTest.java delete mode 100644 modules/yardstick/config/mvcc/benchmark-mvcc-messages.sh delete mode 100644 modules/yardstick/config/mvcc/benchmark-mvcc-processor.sh delete mode 100644 modules/yardstick/config/mvcc/benchmark-mvcc-updates-contention.sh
[ignite] branch cache_dumps updated: IGNITE-20472 Dump API implemented (#10953)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch cache_dumps
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/cache_dumps by this push:
new 8018473c5f9 IGNITE-20472 Dump API implemented (#10953)
8018473c5f9 is described below
commit 8018473c5f918c8a9e7865b655e182c5226544e8
Author: Nikolay
AuthorDate: Fri Oct 6 10:26:43 2023 +0300
IGNITE-20472 Dump API implemented (#10953)
---
.../java/org/apache/ignite/dump/DumpConsumer.java | 83 ++
.../persistence/snapshot => }/dump/DumpEntry.java | 16 +-
.../java/org/apache/ignite/dump/DumpReader.java| 210 ++
.../ignite/dump/DumpReaderConfiguration.java | 112
.../org/apache/ignite/internal/cdc/CdcMain.java| 57 ++--
.../org/apache/ignite/internal/cdc/CdcUtils.java | 60
.../pagemem/wal/record/UnwrapDataEntry.java| 48 ++--
.../snapshot/SnapshotPartitionsVerifyHandler.java | 40 +--
.../snapshot/dump/CreateDumpFutureTask.java| 57 ++--
.../cache/persistence/snapshot/dump/Dump.java | 119 ++--
.../snapshot/dump/DumpEntrySerializer.java | 27 +-
.../wal/reader/IgniteWalIteratorFactory.java | 13 +-
.../wal/reader/StandaloneGridKernalContext.java| 18 ++
.../snapshot/dump/AbstractCacheDumpTest.java | 306 +++--
.../snapshot/dump/IgniteCacheDumpSelfTest.java | 9 +-
.../dump/IgniteConcurrentCacheDumpTest.java| 4 +-
.../junits/GridTestKernalContext.java | 5 +-
.../ignite/internal/dump/DumpCacheConfigTest.java | 108 +---
18 files changed, 1031 insertions(+), 261 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/dump/DumpConsumer.java
b/modules/core/src/main/java/org/apache/ignite/dump/DumpConsumer.java
new file mode 100644
index 000..aec3a02c997
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/dump/DumpConsumer.java
@@ -0,0 +1,83 @@
+/*
+ * 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.dump;
+
+import java.util.Iterator;
+import org.apache.ignite.binary.BinaryType;
+import org.apache.ignite.cdc.TypeMapping;
+import org.apache.ignite.internal.processors.cache.StoredCacheData;
+import
org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.Dump;
+import org.apache.ignite.lang.IgniteExperimental;
+
+/**
+ * Consumer of {@link Dump}.
+ * This consumer will receive all {@link DumpEntry} stored in cache dump
during {@code IgniteDumpReader} application invocation.
+ * The lifecycle of the consumer is the following:
+ *
+ * Start of the consumer {@link #start()}.
+ * Stop of the consumer {@link #stop()}.
+ *
+ *
+ */
+@IgniteExperimental
+public interface DumpConsumer {
+/**
+ * Starts the consumer.
+ */
+void start();
+
+/**
+ * Handles type mappings.
+ * @param mappings Mappings iterator.
+ */
+void onMappings(Iterator mappings);
+
+/**
+ * Handles binary types.
+ * @param types Binary types iterator.
+ */
+void onTypes(Iterator types);
+
+/**
+ * Handles cache configs.
+ * Note, there can be several copies of cache config in the dump.
+ * This can happen if dump contains data from several nodes.
+ * @param caches Stored cache data.
+ */
+void onCacheConfigs(Iterator caches);
+
+/**
+ * Handles cache data.
+ * This method can be invoced by several threads concurrently.
+ * Note, there can be several copies of group partition in the dump.
+ * This can happen if dump contains data from several nodes.
+ * In this case callback will be invoked several time for the same pair of
[grp, part] values.
+ *
+ * @param grp Group id.
+ * @param part Partition.
+ * @param data Cache data iterator.
+ * @see DumpReaderConfiguration#threadCount()
+ */
+void onPartition(int grp, int part, Iterator data);
+
+/**
+ * Stops the consumer.
+ * This method can be invoked only after {@link #start()}.
+ */
+void stop();
+}
diff --git
a/modules/core/src/main/java/org/apache/ignite/in
[ignite] branch cache_dumps updated (b6b7d8704c9 -> 83177a05961)
This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a change to branch cache_dumps in repository https://gitbox.apache.org/repos/asf/ignite.git from b6b7d8704c9 Merge branch 'master' into cache_dumps add 97eb3179e3b IGNITE-20508 DeadlockDetectionManager removal (#10959) add d2af35b9320 IGNITE-20532 Fix JavaNioAccess handling in JDK 14 and later. (#10969) add 83177a05961 Merge branch 'master' into cache_dumps No new revisions were added by this update. Summary of changes: bin/include/jvmdefaults.bat| 16 +- bin/include/jvmdefaults.sh | 15 +- deliveries/docker/apache-ignite/run.sh | 1 + .../ignite/codegen/MessageCodeGenerator.java | 5 - .../configuration/TransactionConfiguration.java| 47 --- .../org/apache/ignite/internal/IgniteKernal.java | 4 +- .../ignite/internal/IgniteNodeAttributes.java | 2 +- .../client/thin/ClientClusterGroupImpl.java| 11 +- .../communication/GridIoMessageFactory.java| 4 - .../processors/cache/GridCacheProcessor.java | 4 - .../processors/cache/GridCacheSharedContext.java | 17 - .../cache/ValidationOnNodeJoinUtils.java | 52 +--- .../cache/mvcc/DeadlockDetectionManager.java | 343 - .../processors/cache/mvcc/DeadlockProbe.java | 201 .../processors/cache/mvcc/MvccProcessorImpl.java | 7 - .../internal/processors/cache/mvcc/ProbedTx.java | 239 -- .../snapshot/IgniteSnapshotManager.java| 2 +- .../wal/reader/IgniteWalIteratorFactory.java | 2 +- .../platform/utils/PlatformConfigurationUtils.java | 3 +- .../handlers/top/GridTopologyCommandHandler.java | 4 +- .../ignite/internal/util/FeatureChecker.java | 2 + .../apache/ignite/internal/util/GridUnsafe.java| 47 ++- .../db/wal/IgniteWalIteratorSwitchSegmentTest.java | 2 - .../pagemem/BPlusTreePageMemoryImplTest.java | 1 - .../BPlusTreeReuseListPageMemoryImplTest.java | 1 - .../pagemem/IndexStoragePageMemoryImplTest.java| 1 - .../pagemem/PageMemoryImplNoLoadTest.java | 1 - .../persistence/pagemem/PageMemoryImplTest.java| 1 - .../loadtests/hashmap/GridCacheTestContext.java| 1 - modules/platforms/cpp/core/src/ignition.cpp| 1 + .../Apache.Ignite.Core/IgniteConfiguration.cs | 2 - .../IgniteConfigurationSection.xsd | 7 - .../Apache.Ignite.Core/Impl/Unmanaged/Jni/Jvm.cs | 1 + .../Transactions/TransactionConfiguration.cs | 15 - parent/pom.xml | 3 +- 35 files changed, 101 insertions(+), 964 deletions(-) delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/DeadlockDetectionManager.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/DeadlockProbe.java delete mode 100644 modules/core/src/main/java/org/apache/ignite/internal/processors/cache/mvcc/ProbedTx.java
[ignite] branch cache_dumps updated (4d555e9f6a3 -> b6b7d8704c9)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a change to branch cache_dumps
in repository https://gitbox.apache.org/repos/asf/ignite.git
from 4d555e9f6a3 Merge branch 'master' into cache_dumps
add fc8a07e0f0e IGNITE-20418 Added the multiple nodes argument to the
'indexes_force_rebuild' command (#10941)
add d93a9f396bb IGNITE-20517 Jetty dependency version updated to 9.4.52
(#10962)
add eeb5535fe33 IGNITE-20515 Fix MappedFile.map for JDK 14 and newer.
(#10961)
add b6b7d8704c9 Merge branch 'master' into cache_dumps
No new revisions were added by this update.
Summary of changes:
docs/_docs/tools/control-script.adoc | 4 +-
.../internal/commandline/ArgumentParser.java | 11 +-
.../GridCommandHandlerIndexForceRebuildTest.java | 255 +++--
.../internal/management/api/ArgumentGroup.java | 3 +
...firmArgument.java => ArgumentGroupsHolder.java} | 11 +-
.../internal/management/api/CommandUtils.java | 126 +++---
.../cache/CacheIndexesForceRebuildCommand.java | 179 +--
.../cache/CacheIndexesForceRebuildCommandArg.java | 38 ++-
.../management/cache/IndexForceRebuildTask.java| 26 ++-
.../ignite/internal/mem/file/MappedFile.java | 186 +--
...mandHandlerClusterByClassTest_cache_help.output | 6 +-
...dlerClusterByClassWithSSLTest_cache_help.output | 6 +-
parent/pom.xml | 2 +-
13 files changed, 748 insertions(+), 105 deletions(-)
copy
modules/core/src/main/java/org/apache/ignite/internal/management/api/{CliConfirmArgument.java
=> ArgumentGroupsHolder.java} (80%)
[ignite] branch cache_dumps updated (7fe7e1627d5 -> 4d555e9f6a3)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a change to branch cache_dumps
in repository https://gitbox.apache.org/repos/asf/ignite.git
from 7fe7e1627d5 Merge branch 'master' into cache_dumps
add 9f70c2a048b IGNITE-20136 SQL Calcite: Add FORCE_INDEX/NO_INDEX hints -
Fixes #10902.
add 66bd852a89f IGNITE-19880 Fixed negative duration in the SQL query
system view (#10958)
add 4d555e9f6a3 Merge branch 'master' into cache_dumps
No new revisions were added by this update.
Summary of changes:
.../query/calcite/CalciteQueryProcessor.java | 12 +-
.../query/calcite/hint/HintDefinition.java | 86 ++
.../query/calcite/hint/HintOptionsChecker.java}| 17 +-
.../processors/query/calcite/hint/HintUtils.java | 175 +
.../processors/query/calcite/hint/HintsConfig.java | 85 ++
.../query/calcite/prepare/IgnitePlanner.java | 6 +-
.../query/calcite/prepare/PlannerHelper.java | 40 ++-
.../query/calcite/rel/AbstractIndexScan.java | 5 +-
.../query/calcite/rel/IgniteIndexScan.java | 3 +-
.../rel/logical/IgniteLogicalIndexScan.java| 3 +-
.../rel/logical/IgniteLogicalTableScan.java| 23 +-
.../calcite/rule/HashAggregateConverterRule.java | 2 +-
.../calcite/rule/SortAggregateConverterRule.java | 2 +-
.../calcite/rule/logical/ExposeIndexRule.java | 63 +
.../calcite/rule/logical/FilterScanMergeRule.java | 2 +-
.../calcite/rule/logical/LogicalOrToUnionRule.java | 1 +
.../calcite/rule/logical/ProjectScanMergeRule.java | 1 +
.../query/calcite/schema/CacheTableImpl.java | 3 +-
.../query/calcite/schema/SystemViewIndexImpl.java | 3 +-
.../query/calcite/schema/SystemViewTableImpl.java | 3 +-
.../processors/query/calcite/util/HintUtils.java | 60 -
.../integration/IndexScanlIntegrationTest.java | 78 ++
.../query/calcite/planner/AbstractPlannerTest.java | 6 +-
.../query/calcite/planner/TestTable.java | 3 +-
.../planner/hints/CommonHintsPlannerTest.java | 118 +
.../planner/hints/ForceIndexHintPlannerTest.java | 208 +++
.../calcite/planner/hints/HintsTestSuite.java} | 11 +-
.../planner/hints/NoIndexHintPlannerTest.java | 288 +
.../apache/ignite/testsuites/PlannerTestSuite.java | 3 +
.../query/running/QueryHistoryTracker.java | 3 +-
.../query/running/RunningQueryManager.java | 6 +-
.../processors/query/SqlSystemViewsSelfTest.java | 21 ++
32 files changed, 1222 insertions(+), 118 deletions(-)
create mode 100644
modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/hint/HintDefinition.java
copy
modules/{core/src/main/java/org/apache/ignite/internal/binary/BinaryWriteReplacer.java
=>
calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/hint/HintOptionsChecker.java}
(70%)
create mode 100644
modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/hint/HintUtils.java
create mode 100644
modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/hint/HintsConfig.java
delete mode 100644
modules/calcite/src/main/java/org/apache/ignite/internal/processors/query/calcite/util/HintUtils.java
create mode 100644
modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/planner/hints/CommonHintsPlannerTest.java
create mode 100644
modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/planner/hints/ForceIndexHintPlannerTest.java
copy
modules/{slf4j/src/test/java/org/apache/ignite/testsuites/IgniteSlf4jTestSuite.java
=>
calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/planner/hints/HintsTestSuite.java}
(80%)
create mode 100644
modules/calcite/src/test/java/org/apache/ignite/internal/processors/query/calcite/planner/hints/NoIndexHintPlannerTest.java
[ignite] branch cache_dumps updated (084580bdfd4 -> 7fe7e1627d5)
This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a change to branch cache_dumps in repository https://gitbox.apache.org/repos/asf/ignite.git from 084580bdfd4 IGNITE-20429 Eliminate context parameter. add 1ae2edc5d35 IGNITE-20490 Update the snappy dependency up to the latest 1.1.10.4 (#10957) add 158bd2c0d65 IGNITE-20462 Fix idle_verify hash conflicts for expiring entries - Fixes #10947. add 1185941f195 IGNITE-20464 Added node Consistent ID to the index validate command output. (#10946) new 7fe7e1627d5 Merge branch 'master' into cache_dumps 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: .../GridCommandHandlerIndexingCheckSizeTest.java | 8 +- .../apache/ignite/util/GridCommandHandlerTest.java | 36 .../internal/management/api/CommandUtils.java | 28 -- .../cache/CacheValidateIndexesCommand.java | 14 ++- .../management/cache/ValidateIndexesTask.java | 11 +-- .../cache/ValidateIndexesTaskResult.java | 100 + .../SnapshotPartitionsQuickVerifyHandler.java | 3 +- .../snapshot/SnapshotPartitionsVerifyHandler.java | 43 - .../processors/cache/verify/IdleVerifyUtility.java | 3 + .../cache/verify/PartitionHashRecordV2.java| 16 .../snapshot/IgniteClusterSnapshotCheckTest.java | 30 +++ .../db/LongDestroyDurableBackgroundTaskTest.java | 20 ++--- .../processors/query/h2/GridIndexRebuildTest.java | 4 +- parent/pom.xml | 2 +- 14 files changed, 267 insertions(+), 51 deletions(-)
[ignite] 01/01: Merge branch 'master' into cache_dumps
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch cache_dumps
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 7fe7e1627d5b7203461325fe894b103c598ea61a
Merge: 084580bdfd4 1185941f195
Author: nizhikov
AuthorDate: Wed Sep 27 12:59:14 2023 +0300
Merge branch 'master' into cache_dumps
.../GridCommandHandlerIndexingCheckSizeTest.java | 8 +-
.../apache/ignite/util/GridCommandHandlerTest.java | 36
.../internal/management/api/CommandUtils.java | 28 --
.../cache/CacheValidateIndexesCommand.java | 14 ++-
.../management/cache/ValidateIndexesTask.java | 11 +--
.../cache/ValidateIndexesTaskResult.java | 100 +
.../SnapshotPartitionsQuickVerifyHandler.java | 3 +-
.../snapshot/SnapshotPartitionsVerifyHandler.java | 43 -
.../processors/cache/verify/IdleVerifyUtility.java | 3 +
.../cache/verify/PartitionHashRecordV2.java| 16
.../snapshot/IgniteClusterSnapshotCheckTest.java | 30 +++
.../db/LongDestroyDurableBackgroundTaskTest.java | 20 ++---
.../processors/query/h2/GridIndexRebuildTest.java | 4 +-
parent/pom.xml | 2 +-
14 files changed, 267 insertions(+), 51 deletions(-)
diff --cc
modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandler.java
index 17e92b15c0f,e24a51c6b08..02be48a5620
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/SnapshotPartitionsVerifyHandler.java
@@@ -51,11 -52,10 +52,13 @@@ import org.apache.ignite.internal.proce
import
org.apache.ignite.internal.processors.cache.persistence.file.FilePageStore;
import
org.apache.ignite.internal.processors.cache.persistence.file.FilePageStoreManager;
import
org.apache.ignite.internal.processors.cache.persistence.metastorage.MetaStorage;
+import
org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.Dump;
+import
org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.DumpEntry;
+ import
org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusIO;
+ import
org.apache.ignite.internal.processors.cache.persistence.tree.io.BPlusMetaIO;
import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO;
import
org.apache.ignite.internal.processors.cache.persistence.tree.io.PagePartitionMetaIO;
+import
org.apache.ignite.internal.processors.cache.verify.IdleVerifyUtility.VerifyPartitionContext;
import
org.apache.ignite.internal.processors.cache.verify.PartitionHashRecordV2;
import org.apache.ignite.internal.processors.compress.CompressionProcessor;
import org.apache.ignite.internal.util.GridStringBuilder;
@@@ -311,88 -301,40 +318,122 @@@ public class SnapshotPartitionsVerifyHa
return res;
}
+ /** */
+ private boolean hasExpiringEntries(
+ GridKernalContext ctx,
+ PageStore pageStore,
+ ByteBuffer pageBuff,
+ long pendingTreeMetaId
+ ) throws IgniteCheckedException {
+ if (pendingTreeMetaId == 0)
+ return false;
+
+ long pageAddr = GridUnsafe.bufferAddress(pageBuff);
+
+ pageBuff.clear();
+ pageStore.read(pendingTreeMetaId, pageBuff, true);
+
+ if (PageIO.getCompressionType(pageBuff) !=
CompressionProcessor.UNCOMPRESSED_PAGE)
+ ctx.compress().decompressPage(pageBuff, pageStore.getPageSize());
+
+ BPlusMetaIO treeIO = BPlusMetaIO.VERSIONS.forPage(pageAddr);
+
+ int rootLvl = treeIO.getRootLevel(pageAddr);
+ long rootId = treeIO.getFirstPageId(pageAddr, rootLvl);
+
+ pageBuff.clear();
+ pageStore.read(rootId, pageBuff, true);
+
+ if (PageIO.getCompressionType(pageBuff) !=
CompressionProcessor.UNCOMPRESSED_PAGE)
+ ctx.compress().decompressPage(pageBuff, pageStore.getPageSize());
+
+ BPlusIO rootIO = PageIO.getPageIO(pageBuff);
+
+ return rootIO.getCount(pageAddr) != 0;
+ }
+
+/** */
+private Map checkDumpFiles(
+SnapshotHandlerContext opCtx,
+Set partFiles
+) throws IgniteCheckedException {
+GridKernalContext snpCtx =
cctx.snapshotMgr().createStandaloneKernalContext(
+cctx.kernalContext().compress(),
+opCtx.snapshotDirectory(),
+opCtx.metadata().folderName()
+);
+
+for (GridComponent comp : snpCtx)
+comp.start();
+
+try {
+Dump dump = new Dump(snpCtx, opCtx.snapshotDirectory());
+
+Collection partitionHashRecordV2s =
U.doInParallel(
+cctx.snapshotMgr().snapshotExecutorService(),
+partFiles
[ignite] branch cache_dumps updated (2b7e078e20b -> 084580bdfd4)
This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a change to branch cache_dumps in repository https://gitbox.apache.org/repos/asf/ignite.git from 2b7e078e20b IGNITE-20429 Dump check command implemented (#10949) add 29c4b6e0f2d IGNITE-19553 Add metrics for operations on secondary indexes - Fixes #10731. add ad02c96e062 IGNITE-20382 SQL Calcite: Add metrics for CalciteQueryExecutor thread pool - Fixes #10933. add c0c3db6df74 Merge branch 'master' into cache_dumps add 084580bdfd4 IGNITE-20429 Eliminate context parameter. No new revisions were added by this update. Summary of changes: docs/_docs/monitoring-metrics/new-metrics.adoc | 17 +- .../query/calcite/exec/QueryTaskExecutorImpl.java | 22 +- .../integration/SqlDiagnosticIntegrationTest.java | 20 ++ .../org/apache/ignite/IgniteSystemProperties.java | 6 + .../query/index/sorted/inline/InlineIndexImpl.java | 5 + .../query/index/sorted/inline/InlineIndexTree.java | 76 ++- .../snapshot/SnapshotPartitionsVerifyHandler.java | 2 +- .../cache/persistence/tree/BPlusTree.java | 46 +++-- .../processors/cache/verify/IdleVerifyUtility.java | 19 +- .../cache/index/BPlusTreeMetricsTest.java | 228 + .../IgniteBinaryCacheQueryTestSuite.java | 2 + 11 files changed, 399 insertions(+), 44 deletions(-) create mode 100644 modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/BPlusTreeMetricsTest.java
[ignite] branch cache_dumps updated (f5c7f733bbd -> 2b7e078e20b)
This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a change to branch cache_dumps in repository https://gitbox.apache.org/repos/asf/ignite.git from f5c7f733bbd Merge branch 'master' into cache_dumps add 2b7e078e20b IGNITE-20429 Dump check command implemented (#10949) No new revisions were added by this update. Summary of changes: .../IncrementalSnapshotVerificationTask.java | 14 +-- .../snapshot/SnapshotPartitionsVerifyHandler.java | 86 +- .../snapshot/dump/CreateDumpFutureTask.java| 70 ++-- .../cache/persistence/snapshot/dump/Dump.java | 18 ++- .../snapshot/dump/DumpEntrySerializer.java | 59 ++ .../processors/cache/verify/IdleVerifyUtility.java | 104 +++-- .../cache/verify/PartitionHashRecordV2.java| 27 ++--- .../snapshot/dump/AbstractCacheDumpTest.java | 31 +- .../snapshot/dump/IgniteCacheDumpSelf2Test.java| 116 +++ .../dump/IgniteConcurrentCacheDumpTest.java| 123 + .../ignite/testsuites/IgniteSnapshotTestSuite.java | 2 + 11 files changed, 528 insertions(+), 122 deletions(-) create mode 100644 modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/IgniteConcurrentCacheDumpTest.java
[ignite] branch cache_dumps updated (bd81eda1888 -> f5c7f733bbd)
This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a change to branch cache_dumps in repository https://gitbox.apache.org/repos/asf/ignite.git from bd81eda1888 IGNITE-19950 Creation of cache dump implemented (#10936) add bb91c57884a IGNITE-20426 Sync deprecated methods in the ClientCacheConfiguration (#10948) add a688b1d415b IGNITE-20465 *.mvccEnabled() removal (#10945) add f5c7f733bbd Merge branch 'master' into cache_dumps No new revisions were added by this update. Summary of changes: docs/_docs/code-snippets/dotnet/DataRebalancing.cs | 12 +- .../ignite/snippets/RebalancingConfiguration.java | 6 +- .../_docs/code-snippets/xml/rebalancing-config.xml | 23 +- docs/_docs/data-rebalancing.adoc | 16 +- .../jdbc/thin/JdbcThinConnectionSelfTest.java | 45 .../ignite/client/ClientCacheConfiguration.java| 26 ++- .../query/index/sorted/inline/InlineIndexTree.java | 2 +- .../processors/cache/CacheGroupContext.java| 7 - .../cache/IgniteCacheOffheapManager.java | 23 -- .../cache/IgniteCacheOffheapManagerImpl.java | 232 ++--- .../dht/preloader/GridDhtPartitionDemander.java| 9 +- .../dht/preloader/GridDhtPartitionSupplier.java| 41 +--- .../preloader/GridDhtPartitionsExchangeFuture.java | 9 +- .../dht/preloader/GridDhtPreloader.java| 4 - .../dht/topology/GridDhtPartitionTopologyImpl.java | 4 +- .../topology/GridDhtPartitionsStateValidator.java | 7 +- .../processors/cache/mvcc/MvccProcessor.java | 6 - .../processors/cache/mvcc/MvccProcessorImpl.java | 31 +-- .../internal/processors/cache/mvcc/MvccUtils.java | 8 - .../cache/persistence/GridCacheOffheapManager.java | 17 +- .../cache/transactions/IgniteTxHandler.java| 2 +- .../IgniteTxImplicitSingleStateImpl.java | 5 - .../cache/transactions/IgniteTxManager.java| 56 - .../transactions/IgniteTxRemoteStateAdapter.java | 5 - .../cache/transactions/IgniteTxStateImpl.java | 5 - .../processors/cache/tree/CacheDataTree.java | 46 +--- .../internal/processors/cache/tree/PendingRow.java | 3 +- .../processors/odbc/jdbc/JdbcRequestHandler.java | 24 +-- .../processors/odbc/odbc/OdbcRequestHandler.java | 25 +-- .../distributed/GridExchangeFreeSwitchTest.java| 17 +- .../wal/memtracker/PageMemoryTracker.java | 21 -- .../processors/query/h2/CommandProcessor.java | 110 -- .../processors/query/h2/GridCacheTwoStepQuery.java | 7 - .../processors/query/h2/IgniteH2Indexing.java | 43 +--- .../processors/query/h2/QueryParserResultDml.java | 7 - .../query/h2/QueryParserResultSelect.java | 7 - .../query/h2/twostep/GridReduceQueryExecutor.java | 14 -- .../index/SqlTransactionCommandsSelfTest.java | 70 --- .../IgniteBinaryCacheQueryTestSuite3.java | 3 - 39 files changed, 98 insertions(+), 900 deletions(-) delete mode 100644 modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SqlTransactionCommandsSelfTest.java
[ignite] branch cache_dumps created (now 11072da6cce)
This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a change to branch cache_dumps in repository https://gitbox.apache.org/repos/asf/ignite.git at 11072da6cce IGNITE-20466 Investigate and fix the issue with running this workflow on PRs from forks No new revisions were added by this update.
[ignite] branch master updated (de1b67e302b -> b6f49f80d57)
This is an automated email from the ASF dual-hosted git repository. nizhikov pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/ignite.git from de1b67e302b IGNITE-20274 github action must rely on environment variable to run agains the source code (#10908) add b6f49f80d57 IGNITE-20309 Snapshot creation must fail if check throws (#10913) No new revisions were added by this update. Summary of changes: .../SnapshotPartitionsQuickVerifyHandler.java | 5 .../snapshot/SnapshotPartitionsVerifyHandler.java | 14 -- .../snapshot/IgniteClusterSnapshotHandlerTest.java | 30 ++ 3 files changed, 47 insertions(+), 2 deletions(-)
[ignite-extensions] branch master updated: IGNITE-20297 Fix k2i NPE (#228)
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-extensions.git
The following commit(s) were added to refs/heads/master by this push:
new 79a88953 IGNITE-20297 Fix k2i NPE (#228)
79a88953 is described below
commit 79a88953ac5fddc232002b54439b4b7b1f0d3d85
Author: Nikolay
AuthorDate: Tue Aug 29 09:21:30 2023 +0300
IGNITE-20297 Fix k2i NPE (#228)
---
.../cdc/kafka/KafkaToIgniteMetadataUpdater.java | 9 -
.../ignite/cdc/kafka/CdcKafkaReplicationTest.java | 6 +-
.../cdc/kafka/KafkaToIgniteMetadataUpdaterTest.java | 21 -
3 files changed, 33 insertions(+), 3 deletions(-)
diff --git
a/modules/cdc-ext/src/main/java/org/apache/ignite/cdc/kafka/KafkaToIgniteMetadataUpdater.java
b/modules/cdc-ext/src/main/java/org/apache/ignite/cdc/kafka/KafkaToIgniteMetadataUpdater.java
index b8e8a9ad..6135b9db 100644
---
a/modules/cdc-ext/src/main/java/org/apache/ignite/cdc/kafka/KafkaToIgniteMetadataUpdater.java
+++
b/modules/cdc-ext/src/main/java/org/apache/ignite/cdc/kafka/KafkaToIgniteMetadataUpdater.java
@@ -20,6 +20,7 @@ package org.apache.ignite.cdc.kafka;
import java.time.Duration;
import java.util.Collections;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
@@ -38,6 +39,7 @@ import org.apache.kafka.clients.consumer.ConsumerRecords;
import org.apache.kafka.clients.consumer.KafkaConsumer;
import org.apache.kafka.clients.consumer.OffsetAndMetadata;
import org.apache.kafka.clients.consumer.OffsetCommitCallback;
+import org.apache.kafka.common.PartitionInfo;
import org.apache.kafka.common.TopicPartition;
import org.apache.kafka.common.serialization.ByteArrayDeserializer;
import org.apache.kafka.common.serialization.VoidDeserializer;
@@ -103,7 +105,12 @@ public class KafkaToIgniteMetadataUpdater implements
AutoCloseable, OffsetCommit
String metaTopic = streamerCfg.getMetadataTopic();
-parts = cnsmr.partitionsFor(metaTopic,
Duration.ofMillis(kafkaReqTimeout))
+List topicMeta = cnsmr.partitionsFor(metaTopic,
Duration.ofMillis(kafkaReqTimeout));
+
+if (topicMeta == null)
+throw new IgniteException("Unknown topic: " + metaTopic);
+
+parts = topicMeta
.stream()
.map(pInfo -> new TopicPartition(metaTopic, pInfo.partition()))
.collect(Collectors.toSet());
diff --git
a/modules/cdc-ext/src/test/java/org/apache/ignite/cdc/kafka/CdcKafkaReplicationTest.java
b/modules/cdc-ext/src/test/java/org/apache/ignite/cdc/kafka/CdcKafkaReplicationTest.java
index 403abdac..685c50b1 100644
---
a/modules/cdc-ext/src/test/java/org/apache/ignite/cdc/kafka/CdcKafkaReplicationTest.java
+++
b/modules/cdc-ext/src/test/java/org/apache/ignite/cdc/kafka/CdcKafkaReplicationTest.java
@@ -249,7 +249,11 @@ public class CdcKafkaReplicationTest extends
AbstractReplicationTest {
EmbeddedKafkaCluster kafka = curKafka;
if (kafka == null) {
-kafka = new EmbeddedKafkaCluster(1);
+Properties brokerProperties = new Properties();
+
+brokerProperties.put("auto.create.topics.enable", "false");
+
+kafka = new EmbeddedKafkaCluster(1, brokerProperties);
kafka.start();
}
diff --git
a/modules/cdc-ext/src/test/java/org/apache/ignite/cdc/kafka/KafkaToIgniteMetadataUpdaterTest.java
b/modules/cdc-ext/src/test/java/org/apache/ignite/cdc/kafka/KafkaToIgniteMetadataUpdaterTest.java
index fee428b9..6167503a 100644
---
a/modules/cdc-ext/src/test/java/org/apache/ignite/cdc/kafka/KafkaToIgniteMetadataUpdaterTest.java
+++
b/modules/cdc-ext/src/test/java/org/apache/ignite/cdc/kafka/KafkaToIgniteMetadataUpdaterTest.java
@@ -18,6 +18,7 @@
package org.apache.ignite.cdc.kafka;
import java.util.Collections;
+import org.apache.ignite.IgniteException;
import org.apache.ignite.cdc.CdcConsumer;
import org.apache.ignite.cdc.TypeMapping;
import org.apache.ignite.configuration.IgniteConfiguration;
@@ -41,6 +42,7 @@ import static
org.apache.ignite.cdc.kafka.CdcKafkaReplicationTest.initKafka;
import static
org.apache.ignite.cdc.kafka.CdcKafkaReplicationTest.kafkaProperties;
import static
org.apache.ignite.cdc.kafka.CdcKafkaReplicationTest.removeKafkaTopicsAndWait;
import static
org.apache.ignite.cdc.kafka.KafkaToIgniteCdcStreamerConfiguration.DFLT_KAFKA_REQ_TIMEOUT;
+import static org.apache.ignite.testframework.GridTestUtils.assertThrows;
import static org.apache.ignite.testframework.GridTestUtils.waitForCondition;
import static org.apache.logging.log4j.Level.DEBUG;
@@ -96,6 +98,18 @@ public class KafkaToIgniteMetadataUpdaterTest extends
GridCommonAbstractTest {
POLL_SKIP_LISTENER.reset();
}
+/** */
+@Test
+public void testThrowsForUnknownTopic() {
+KafkaToI
[ignite] 01/06: IGNITE-19950 WIP
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch IGNITE-19950-snapshot-merge
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit e698ed680093373bc913ded52fab4c6e5b197298
Author: nizhikov
AuthorDate: Thu Jul 27 14:04:24 2023 +0300
IGNITE-19950 WIP
---
.../IgniteDataTransferObjectSerDesGenerator.java | 696 +
.../java/org/apache/ignite/IgniteSnapshot.java | 7 +
.../org/apache/ignite/internal/IgniteKernal.java | 2 +-
.../internal/management/IgniteCommandRegistry.java | 4 +-
.../internal/management/dump/DumpCommand.java | 28 +
.../management/dump/DumpCreateCommand.java | 40 ++
.../management/dump/DumpCreateCommandArg.java | 71 +++
.../internal/management/dump/DumpCreateTask.java | 47 ++
.../snapshot/AbstractSnapshotFutureTask.java | 2 +-
.../snapshot/IgniteSnapshotManager.java| 321 --
.../snapshot/SnapshotOperationRequest.java | 13 +-
.../snapshot/SnapshotRestoreProcess.java | 3 +-
.../cache/persistence/snapshot/SnapshotSender.java | 2 +-
.../snapshot/dump/DumpCacheFutureTask.java | 120
.../persistence/snapshot/dump/DumpMetadata.java| 91 +++
.../internal/processors/pool/PoolProcessor.java| 22 +-
.../snapshot/IgniteCacheDumpSelfTest.java | 74 +++
.../junits/common/GridCommonAbstractTest.java | 6 +-
18 files changed, 1466 insertions(+), 83 deletions(-)
diff --git
a/modules/codegen/src/main/java/org/apache/ignite/codegen/IgniteDataTransferObjectSerDesGenerator.java
b/modules/codegen/src/main/java/org/apache/ignite/codegen/IgniteDataTransferObjectSerDesGenerator.java
new file mode 100644
index 000..da0870ed206
--- /dev/null
+++
b/modules/codegen/src/main/java/org/apache/ignite/codegen/IgniteDataTransferObjectSerDesGenerator.java
@@ -0,0 +1,696 @@
+/*
+ * 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.codegen;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.UUID;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import org.apache.ignite.internal.dto.IgniteDataTransferObject;
+import org.apache.ignite.internal.management.IgniteCommandRegistry;
+import org.apache.ignite.internal.management.api.Command;
+import org.apache.ignite.internal.management.api.CommandsRegistry;
+import org.apache.ignite.internal.management.api.ComputeCommand;
+import org.apache.ignite.internal.management.api.LocalCommand;
+import org.apache.ignite.internal.processors.cache.version.GridCacheVersion;
+import org.apache.ignite.internal.util.lang.GridTuple3;
+import org.apache.ignite.internal.util.typedef.F;
+import org.apache.ignite.internal.util.typedef.internal.U;
+import org.apache.ignite.lang.IgniteUuid;
+
+import static java.lang.reflect.Modifier.isStatic;
+import static java.lang.reflect.Modifier.isTransient;
+import static org.apache.ignite.codegen.MessageCodeGenerator.DFLT_SRC_DIR;
+import static org.apache.ignite.codegen.MessageCodeGenerator.TAB;
+
+/**
+ * This class can generate boilerplate code for classes extends {@link
IgniteDataTransferObject}.
+ * This class can generate {@code
IgniteDataTransferObject#writeExternalData(ObjectOutput)}
+ * and {@code IgniteDataTransferObject#readExternalData(byte, ObjectInput)}.
+ */
+public class IgniteDataTransferObjectSerDesGenerator {
+/** */
+public static final String METHOD_JAVADOC = TAB + "/** {@inheritDoc} */";
+
+/** */
+public static final String IMPORT_TOKEN = "import ";
+
+
[ignite] 03/06: IGNITE-19950 Save metadata implemented
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch IGNITE-19950-snapshot-merge
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 7300b472a518a665ed1021a7d636d65b8feaea06
Author: nizhikov
AuthorDate: Thu Jul 27 18:35:28 2023 +0300
IGNITE-19950 Save metadata implemented
---
.../processors/cache/GridLocalConfigManager.java | 8 ++-
.../cache/binary/BinaryMetadataFileStore.java | 19 +++
.../binary/CacheObjectBinaryProcessorImpl.java | 11 ++--
.../snapshot/IgniteSnapshotManager.java| 29 +--
.../snapshot/dump/DumpCacheFutureTask.java | 58 --
.../snapshot/IgniteCacheDumpSelfTest.java | 34 -
6 files changed, 122 insertions(+), 37 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridLocalConfigManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridLocalConfigManager.java
index 846d7128a99..4a6917e1a04 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridLocalConfigManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridLocalConfigManager.java
@@ -541,8 +541,12 @@ public class GridLocalConfigManager {
public File cacheConfigurationFile(CacheConfiguration ccfg) {
File cacheWorkDir = cacheWorkDir(ccfg);
-return ccfg.getGroupName() == null ? new File(cacheWorkDir,
CACHE_DATA_FILENAME) :
-new File(cacheWorkDir, ccfg.getName() + CACHE_DATA_FILENAME);
+return new File(cacheWorkDir, cachDataFilename(ccfg));
+}
+
+/** @return Name of cache data filename. */
+public static String cachDataFilename(CacheConfiguration ccfg) {
+return ccfg.getGroupName() == null ? CACHE_DATA_FILENAME :
(ccfg.getName() + CACHE_DATA_FILENAME);
}
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataFileStore.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataFileStore.java
index b994c4b7d06..fa20227d21b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataFileStore.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/BinaryMetadataFileStore.java
@@ -87,32 +87,33 @@ class BinaryMetadataFileStore {
final ConcurrentMap metadataLocCache,
final GridKernalContext ctx,
final IgniteLogger log,
-final File binaryMetadataFileStoreDir
+final File binaryMetadataFileStoreDir,
+final boolean forceEnabled
) throws IgniteCheckedException {
this.metadataLocCache = metadataLocCache;
this.ctx = ctx;
-enabled = CU.isPersistenceEnabled(ctx.config()) ||
CU.isCdcEnabled(ctx.config());
+enabled = forceEnabled || CU.isPersistenceEnabled(ctx.config()) ||
CU.isCdcEnabled(ctx.config());
this.log = log;
-if (!enabled)
-return;
-
-fileIOFactory =
ctx.config().getDataStorageConfiguration().getFileIOFactory();
+DataStorageConfiguration dsCfg =
ctx.config().getDataStorageConfiguration();
-final String nodeFolderName =
ctx.pdsFolderResolver().resolveFolders().folderName();
+fileIOFactory = dsCfg == null ? new
DataStorageConfiguration().getFileIOFactory() : dsCfg.getFileIOFactory();
if (binaryMetadataFileStoreDir != null)
metadataDir = binaryMetadataFileStoreDir;
-else
+else {
+final String nodeFolderName =
ctx.pdsFolderResolver().resolveFolders().folderName();
+
metadataDir = new File(U.resolveWorkDirectory(
ctx.config().getWorkDirectory(),
DataStorageConfiguration.DFLT_BINARY_METADATA_PATH,
false
), nodeFolderName);
-fixLegacyFolder(nodeFolderName);
+fixLegacyFolder(nodeFolderName);
+}
}
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
index db8bb33c8b4..7ca52e66449 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
@@ -261,7 +261,8 @@ public class CacheObjectBinaryProcessorImpl extends
GridProcessorAdapter impleme
CU.isPersistenceEnabled(ctx.config()) &&
binaryMetadataFileStoreDir == null ?
resolveBinaryWorkDir(ctx.config().getWorkDirectory(),
ctx.pdsFolderResolver().resolv
[ignite] 05/06: IGNITE-19950 Dump creation process implemented
This is an automated email from the ASF dual-hosted git repository.
nizhikov pushed a commit to branch IGNITE-19950-snapshot-merge
in repository https://gitbox.apache.org/repos/asf/ignite.git
commit be062a79f20e5304191d8661be6350e6a811b9a7
Author: nizhikov
AuthorDate: Fri Jul 28 18:47:26 2023 +0300
IGNITE-19950 Dump creation process implemented
---
.../snapshot/IgniteSnapshotManager.java| 46 +++
.../snapshot/dump/DumpCacheFutureTask.java | 32
.../persistence/snapshot/dump/DumpMetadata.java| 91 --
3 files changed, 48 insertions(+), 121 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java
index a8b80df7da2..9144f5d86ab 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java
@@ -142,7 +142,6 @@ import
org.apache.ignite.internal.processors.cache.persistence.metastorage.ReadO
import
org.apache.ignite.internal.processors.cache.persistence.metastorage.ReadWriteMetastorage;
import
org.apache.ignite.internal.processors.cache.persistence.partstate.GroupPartitionId;
import
org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.DumpCacheFutureTask;
-import
org.apache.ignite.internal.processors.cache.persistence.snapshot.dump.DumpMetadata;
import
org.apache.ignite.internal.processors.cache.persistence.tree.io.DataPageIO;
import
org.apache.ignite.internal.processors.cache.persistence.tree.io.DataPagePayload;
import org.apache.ignite.internal.processors.cache.persistence.tree.io.PageIO;
@@ -1233,17 +1232,17 @@ public class IgniteSnapshotManager extends
GridCacheSharedManagerAdapter
/**
* @param req Request.
- * @param grps0 Cache groups to dump.
+ * @param grps Cache groups to dump.
* @return Create dump future.
*/
-private IgniteInternalFuture
initLocalDump(SnapshotOperationRequest req, List grps0) {
+private IgniteInternalFuture
initLocalDump(SnapshotOperationRequest req, List grps) {
IgniteInternalFuture task0;
-List grps = grps0.stream().filter(grpId ->
cctx.cache().cacheGroup(grpId) != null).collect(Collectors.toList());
+List grpIds = grps.stream().filter(grpId ->
cctx.cache().cacheGroup(grpId) != null).collect(Collectors.toList());
File dumpDir = snapshotLocalDir(req.snapshotName(), null, locDumpDir);
-if (grps.isEmpty())
+if (grpIds.isEmpty())
task0 = new GridFinishedFuture<>(Collections.emptySet());
else {
dumpDir.mkdirs();
@@ -1257,7 +1256,7 @@ public class IgniteSnapshotManager extends
GridCacheSharedManagerAdapter
dumpDir,
tmpWorkDir,
ioFactory,
-grps
+grpIds
));
}
@@ -1269,23 +1268,39 @@ public class IgniteSnapshotManager extends
GridCacheSharedManagerAdapter
.map(n -> cctx.discovery().node(n).consistentId().toString())
.collect(Collectors.toSet());
-// Ignoring Void result fut.result().
+SnapshotFutureTaskResult res =
(SnapshotFutureTaskResult)fut.result();
-DumpMetadata meta = new DumpMetadata(
-req.requestId(),
-cctx.localNode().consistentId().toString(),
+SnapshotMetadata meta = new SnapshotMetadata(req.requestId(),
req.snapshotName(),
-grps,
-nodes
+cctx.localNode().consistentId().toString(),
+pdsSettings.folderName(),
+cctx.gridConfig().getDataStorageConfiguration().getPageSize(),
+grpIds,
+Collections.emptyList(),
+nodes,
+res.parts(),
+null,
+null,
+false
);
+SnapshotHandlerContext ctx = new SnapshotHandlerContext(meta,
req.groups(), cctx.localNode(), dumpDir,
+req.streamerWarning(), true);
+
+req.meta(meta);
+
File dmf = new File(dumpDir,
dumpMetaFileName(cctx.localNode().consistentId().toString()));
storeSnapshotMeta(meta, dmf);
log.info("Dump metafile has been created: " +
dmf.getAbsolutePath());
-return new SnapshotOperationResponse(null);
+try {
+return new
SnapshotOperationResponse(handlers.invokeAll(SnapshotHandlerType.CREATE, ctx));
+}
+catch (IgniteCheckedException e) {
+
