You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ni...@apache.org on 2023/12/14 08:33:30 UTC
(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 <ni...@apache.org>
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.getKey());
+ CacheConfiguration cfg = new CacheConfiguration(cache.getKey());
- config.setQueryEntities(Collections.singletonList(
+ cfg.setQueryEntities(Collections.singletonList(
new QueryEntity()
.setKeyType(Integer.class.getName())
.setValueType(Value.class.getName())
@@ -312,14 +312,14 @@ public class SnapshotCompressionBasicTest extends AbstractSnapshotSelfTest {
));
if (cache.getValue() != null)
- config.setGroupName(cache.getValue());
+ cfg.setGroupName(cache.getValue());
if (COMPRESSED_CACHES.contains(cache.getKey()))
- config.setDiskPageCompression(DISK_PAGE_COMPRESSION);
+ cfg.setDiskPageCompression(DISK_PAGE_COMPRESSION);
else
- config.setDiskPageCompression(DiskPageCompression.DISABLED);
+ cfg.setDiskPageCompression(DiskPageCompression.DISABLED);
- return config;
+ return cfg;
}).toArray(CacheConfiguration[]::new);
IgniteEx ignite = startGridsWithCache(DFLT_GRIDS_CNT, 1000, valueBuilder(), caches);
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
index 0689e12f91a..17f9851575d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/ClusterCachesInfo.java
@@ -2220,7 +2220,7 @@ public class ClusterCachesInfo {
boolean hasSchemaPatchConflict = false;
boolean active = ctx.state().clusterState().active();
- boolean isMergeConfigSupport = isMergeConfigSupports(null);
+ boolean isMergeCfgSupport = isMergeConfigSupports(null);
for (CacheJoinNodeDiscoveryData.CacheInfo cacheInfo : joinData.caches().values()) {
CacheConfiguration<?, ?> cfg = cacheInfo.cacheData().config();
@@ -2239,7 +2239,7 @@ public class ClusterCachesInfo {
registerNewCache(joinData, nodeId, cacheInfo);
}
- else if (!active && isMergeConfigSupport) {
+ else if (!active && isMergeCfgSupport) {
DynamicCacheDescriptor desc = registeredCaches.get(cfg.getName());
QuerySchemaPatch schemaPatch = desc.makeSchemaPatch(cacheInfo.cacheData());
diff --git a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoWriteBehindConnectionLeakTest.java b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoWriteBehindConnectionLeakTest.java
index cb255c7a4bf..044fe98459c 100644
--- a/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoWriteBehindConnectionLeakTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/cache/store/jdbc/CacheJdbcPojoWriteBehindConnectionLeakTest.java
@@ -54,7 +54,7 @@ public class CacheJdbcPojoWriteBehindConnectionLeakTest extends GridCommonAbstra
* @return Cache configuration.
*/
public CacheConfiguration<Integer, Person> cacheConfig() {
- CacheConfiguration<Integer, Person> cacheConfig = new CacheConfiguration<Integer, Person>()
+ CacheConfiguration<Integer, Person> cacheCfg = new CacheConfiguration<Integer, Person>()
.setName(DEFAULT_CACHE_NAME)
.setAtomicityMode(CacheAtomicityMode.TRANSACTIONAL)
.setReadThrough(true)
@@ -75,9 +75,9 @@ public class CacheJdbcPojoWriteBehindConnectionLeakTest extends GridCommonAbstra
.setValueFields(new JdbcTypeField(Types.VARCHAR, "name", String.class, "name"))
);
- cacheConfig.setCacheStoreFactory(cacheStoreFactory);
+ cacheCfg.setCacheStoreFactory(cacheStoreFactory);
- return cacheConfig;
+ return cacheCfg;
}
/** */
diff --git a/modules/core/src/test/java/org/apache/ignite/client/ReliabilityTest.java b/modules/core/src/test/java/org/apache/ignite/client/ReliabilityTest.java
index b7ea340f36c..acb72f6655f 100644
--- a/modules/core/src/test/java/org/apache/ignite/client/ReliabilityTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/client/ReliabilityTest.java
@@ -590,16 +590,16 @@ public class ReliabilityTest extends AbstractThinClientTest {
public void testServiceMethodInvocationAfterFailover() throws Exception {
PersonExternalizable person = new PersonExternalizable("Person 1");
- ServiceConfiguration testServiceConfig = new ServiceConfiguration();
- testServiceConfig.setName(SERVICE_NAME);
- testServiceConfig.setService(new TestService());
- testServiceConfig.setTotalCount(1);
+ ServiceConfiguration testServiceCfg = new ServiceConfiguration();
+ testServiceCfg.setName(SERVICE_NAME);
+ testServiceCfg.setService(new TestService());
+ testServiceCfg.setTotalCount(1);
Ignite ignite = null;
IgniteClient client = null;
try {
// Initialize cluster and client
- ignite = startGrid(getConfiguration().setServiceConfiguration(testServiceConfig));
+ ignite = startGrid(getConfiguration().setServiceConfiguration(testServiceCfg));
client = startClient(ignite);
TestServiceInterface svc = client.services().serviceProxy(SERVICE_NAME, TestServiceInterface.class);
@@ -621,7 +621,7 @@ public class ReliabilityTest extends AbstractThinClientTest {
GridTestUtils.assertThrowsWithCause(() -> svc.testMethod(person), ClientConnectionException.class);
// Restore the cluster and redeploy the service.
- ignite = startGrid(getConfiguration().setServiceConfiguration(testServiceConfig));
+ ignite = startGrid(getConfiguration().setServiceConfiguration(testServiceCfg));
// Invoke the service method with Externalizable parameter once again.
// This should restore the client connection and trigger registration of the
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
index 9686efd6759..c11d37f74d9 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/managers/discovery/GridDiscoveryManagerAttributesSelfTest.java
@@ -395,9 +395,9 @@ public abstract class GridDiscoveryManagerAttributesSelfTest extends GridCommonA
*/
protected void checkIsClientFlag(IgniteEx g) {
boolean isClientDiscovery = g.context().discovery().localNode().isClient();
- boolean isClientConfig = g.configuration().isClientMode() == null ? false : g.configuration().isClientMode();
+ boolean isClientCfg = g.configuration().isClientMode() == null ? false : g.configuration().isClientMode();
- assertEquals(isClientConfig, isClientDiscovery);
+ assertEquals(isClientCfg, isClientDiscovery);
}
/**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFastNodeLeftForTransactionTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFastNodeLeftForTransactionTest.java
index 7ffb5f09625..c394d4f59bd 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFastNodeLeftForTransactionTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheFastNodeLeftForTransactionTest.java
@@ -115,8 +115,8 @@ public class GridCacheFastNodeLeftForTransactionTest extends GridCommonAbstractT
IgniteEx crd = createCluster(nodes);
- for (CacheConfiguration cacheConfig : createCacheConfigs()) {
- String cacheName = cacheConfig.getName();
+ for (CacheConfiguration cacheCfg : createCacheConfigs()) {
+ String cacheName = cacheCfg.getName();
IgniteCache<Object, Object> cache = crd.cache(cacheName);
@@ -163,8 +163,8 @@ public class GridCacheFastNodeLeftForTransactionTest extends GridCommonAbstractT
IgniteEx crd = createCluster(nodes);
- for (CacheConfiguration cacheConfig : createCacheConfigs()) {
- String cacheName = cacheConfig.getName();
+ for (CacheConfiguration cacheCfg : createCacheConfigs()) {
+ String cacheName = cacheCfg.getName();
IgniteCache<Object, Object> cache = crd.cache(cacheName);
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGetCustomCollectionsSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGetCustomCollectionsSelfTest.java
index becc5e999dd..4f6d2120a81 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGetCustomCollectionsSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheGetCustomCollectionsSelfTest.java
@@ -41,14 +41,14 @@ public class IgniteCacheGetCustomCollectionsSelfTest extends GridCommonAbstractT
cfg.setMarshaller(null);
- final CacheConfiguration<String, MyMap> mapCacheConfig = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
+ final CacheConfiguration<String, MyMap> mapCacheCfg = new CacheConfiguration<>(DEFAULT_CACHE_NAME);
- mapCacheConfig.setCacheMode(CacheMode.PARTITIONED);
- mapCacheConfig.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
- mapCacheConfig.setBackups(1);
- mapCacheConfig.setName("cache");
+ mapCacheCfg.setCacheMode(CacheMode.PARTITIONED);
+ mapCacheCfg.setWriteSynchronizationMode(CacheWriteSynchronizationMode.FULL_SYNC);
+ mapCacheCfg.setBackups(1);
+ mapCacheCfg.setName("cache");
- cfg.setCacheConfiguration(mapCacheConfig);
+ cfg.setCacheConfiguration(mapCacheCfg);
return cfg;
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheConfigurationFileConsistencyCheckTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheConfigurationFileConsistencyCheckTest.java
index 8bd1ea1ccee..2b6bf346a0e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheConfigurationFileConsistencyCheckTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/IgnitePdsCacheConfigurationFileConsistencyCheckTest.java
@@ -248,9 +248,9 @@ public class IgnitePdsCacheConfigurationFileConsistencyCheckTest extends GridCom
data.config().setGroupName(ODD_GROUP_NAME);
- File config = new File(pageStore.cacheWorkDir(true, ODD_GROUP_NAME), data.config().getName() + CACHE_DATA_FILENAME);
+ File cfg = new File(pageStore.cacheWorkDir(true, ODD_GROUP_NAME), data.config().getName() + CACHE_DATA_FILENAME);
- try (DataOutputStream os = new DataOutputStream(new FileOutputStream(config))) {
+ try (DataOutputStream os = new DataOutputStream(new FileOutputStream(cfg))) {
os.writeLong(-1L);
}
diff --git a/modules/core/src/test/java/org/apache/ignite/p2p/P2PClassLoadingFailureHandlingTest.java b/modules/core/src/test/java/org/apache/ignite/p2p/P2PClassLoadingFailureHandlingTest.java
index 26e976d5fab..10ab975e950 100644
--- a/modules/core/src/test/java/org/apache/ignite/p2p/P2PClassLoadingFailureHandlingTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/p2p/P2PClassLoadingFailureHandlingTest.java
@@ -166,12 +166,12 @@ public class P2PClassLoadingFailureHandlingTest extends GridCommonAbstractTest {
Service svc = instantiateClassLoadedWithExternalClassLoader(
"org.apache.ignite.tests.p2p.classloadproblem.ServiceCausingP2PClassLoadProblem"
);
- ServiceConfiguration serviceConfig = new ServiceConfiguration()
+ ServiceConfiguration serviceCfg = new ServiceConfiguration()
.setName("p2p-classloading-failure")
.setTotalCount(1)
.setService(svc);
- assertThrows(log, () -> client.services().deploy(serviceConfig), IgniteException.class,
+ assertThrows(log, () -> client.services().deploy(serviceCfg), IgniteException.class,
"Failed to deploy some services");
assertThatFailureHandlerIsNotCalled();
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
index f317401f752..25e96c14c97 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheAbstractQuerySelfTest.java
@@ -956,11 +956,11 @@ public abstract class IgniteCacheAbstractQuerySelfTest extends GridCommonAbstrac
*/
@Test
public void testObjectQueryWithSwap() {
- CacheConfiguration<Integer, ObjectValue> config = new CacheConfiguration<Integer, ObjectValue>(cacheConfiguration());
+ CacheConfiguration<Integer, ObjectValue> cfg = new CacheConfiguration<Integer, ObjectValue>(cacheConfiguration());
- config.setOnheapCacheEnabled(true);
+ cfg.setOnheapCacheEnabled(true);
- IgniteCache<Integer, ObjectValue> cache = jcache(ignite(), config, Integer.class, ObjectValue.class);
+ IgniteCache<Integer, ObjectValue> cache = jcache(ignite(), cfg, Integer.class, ObjectValue.class);
boolean partitioned = cache.getConfiguration(CacheConfiguration.class).getCacheMode() == PARTITIONED;
diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/StatisticsViewsTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/StatisticsViewsTest.java
index 2981f06e05d..63b523816e4 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/StatisticsViewsTest.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/query/stat/StatisticsViewsTest.java
@@ -59,13 +59,13 @@ public abstract class StatisticsViewsTest extends StatisticsAbstractTest {
long bVer = smallStat.columnStatistics("B").version();
long cVer = smallStat.columnStatistics("C").version();
- List<List<Object>> config = Arrays.asList(
+ List<List<Object>> cfg = Arrays.asList(
Arrays.asList(SCHEMA, "TABLE", "SMALL", "A", (byte)15, null, null, null, null, aVer),
Arrays.asList(SCHEMA, "TABLE", "SMALL", "B", (byte)15, null, null, null, null, bVer),
Arrays.asList(SCHEMA, "TABLE", "SMALL", "C", (byte)15, null, null, null, null, cVer)
);
- checkSqlResult("select * from SYS.STATISTICS_CONFIGURATION where name = 'SMALL'", null, config::equals);
+ checkSqlResult("select * from SYS.STATISTICS_CONFIGURATION where name = 'SMALL'", null, cfg::equals);
}
/**
@@ -90,20 +90,20 @@ public abstract class StatisticsViewsTest extends StatisticsAbstractTest {
grid(0).cache(DEFAULT_CACHE_NAME).query(new SqlFieldsQuery("ANALYZE " + name)).getAll();
// 3) Check statistics configuration presence.
- List<List<Object>> config = new ArrayList<>();
- config.add(Arrays.asList(SCHEMA, "TABLE", name, "A", (byte)15, null, null, null, null, 1L));
- config.add(Arrays.asList(SCHEMA, "TABLE", name, "B", (byte)15, null, null, null, null, 1L));
- config.add(Arrays.asList(SCHEMA, "TABLE", name, "C", (byte)15, null, null, null, null, 1L));
+ List<List<Object>> cfg = new ArrayList<>();
+ cfg.add(Arrays.asList(SCHEMA, "TABLE", name, "A", (byte)15, null, null, null, null, 1L));
+ cfg.add(Arrays.asList(SCHEMA, "TABLE", name, "B", (byte)15, null, null, null, null, 1L));
+ cfg.add(Arrays.asList(SCHEMA, "TABLE", name, "C", (byte)15, null, null, null, null, 1L));
- checkSqlResult("select * from SYS.STATISTICS_CONFIGURATION where NAME = '" + name + "'", null, config::equals);
+ checkSqlResult("select * from SYS.STATISTICS_CONFIGURATION where NAME = '" + name + "'", null, cfg::equals);
// 4) Drop statistics for some column of new table.
grid(0).cache(DEFAULT_CACHE_NAME).query(new SqlFieldsQuery("DROP STATISTICS " + name + "(A);")).getAll();
// 5) Check statistics configuration without dropped column.
- List<Object> removed = config.remove(0);
+ List<Object> removed = cfg.remove(0);
checkSqlResult("select * from SYS.STATISTICS_CONFIGURATION where NAME = '" + name + "'", null,
- act -> testContains(config, act) == null && testContains(Arrays.asList(removed), act) != null);
+ act -> testContains(cfg, act) == null && testContains(Arrays.asList(removed), act) != null);
// 6) Drop statistics for new table.
grid(0).cache(DEFAULT_CACHE_NAME).query(new SqlFieldsQuery("DROP STATISTICS " + name)).getAll();