From 9be85220b40215bfe88a97f77ca044033c5ab717 Mon Sep 17 00:00:00 2001 From: jiangML <1060319118@qq.com> Date: Thu, 26 Dec 2024 18:50:21 +0800 Subject: [PATCH 1/4] Optimize DatabaseExportMetaDataGenerator, null value properties are not exported --- .../util/DatabaseExportMetaDataGenerator.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/DatabaseExportMetaDataGenerator.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/DatabaseExportMetaDataGenerator.java index 570e9f9694416..c0eb39fc3bcf5 100644 --- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/DatabaseExportMetaDataGenerator.java +++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/util/DatabaseExportMetaDataGenerator.java @@ -71,12 +71,16 @@ private void appendDataSourceConfigurations(final ShardingSphereDatabase databas private void appendDataSourceConfiguration(final String dataSourceName, final DataSourcePoolProperties props, final StringBuilder stringBuilder) { stringBuilder.append(createIndentation(2)).append(dataSourceName).append(':').append(System.lineSeparator()); for (Entry entry : props.getConnectionPropertySynonyms().getStandardProperties().entrySet()) { - String value = null == entry.getValue() ? "" : entry.getValue().toString(); - stringBuilder.append(createIndentation(4)).append(entry.getKey()).append(": ").append(value).append(System.lineSeparator()); + if (null != entry.getValue()) { + String value = entry.getValue().toString(); + stringBuilder.append(createIndentation(4)).append(entry.getKey()).append(": ").append(value).append(System.lineSeparator()); + } } for (Entry entry : props.getPoolPropertySynonyms().getStandardProperties().entrySet()) { - String value = null == entry.getValue() ? "" : entry.getValue().toString(); - stringBuilder.append(createIndentation(4)).append(entry.getKey()).append(": ").append(value).append(System.lineSeparator()); + if (null != entry.getValue()) { + String value = entry.getValue().toString(); + stringBuilder.append(createIndentation(4)).append(entry.getKey()).append(": ").append(value).append(System.lineSeparator()); + } } } From 0f1683d73a4861c6a8237521cdd4df9a4a1cfdc6 Mon Sep 17 00:00:00 2001 From: jiangML <1060319118@qq.com> Date: Thu, 26 Dec 2024 19:18:03 +0800 Subject: [PATCH 2/4] Fix test error --- .../distsql/ral/queryable/ExportMetaDataExecutorTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutorTest.java index 6967b4e51f3c8..0ba2b850ca5b3 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutorTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutorTest.java @@ -180,7 +180,7 @@ private DataSource createDataSource(final String name) { MockedDataSource result = new MockedDataSource(); result.setUrl(String.format("jdbc:h2:mem:%s;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL", name)); result.setUsername("root"); - result.setPassword(""); + result.setPassword(null); result.setMaxPoolSize(50); result.setMinPoolSize(1); return result; From 851519a7daee27b03188d2c7ca5c6e030123b0d4 Mon Sep 17 00:00:00 2001 From: jiangML <1060319118@qq.com> Date: Thu, 26 Dec 2024 19:52:34 +0800 Subject: [PATCH 3/4] Fix test error --- .../ral/queryable/ExportDatabaseConfigurationExecutorTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationExecutorTest.java index c859983cb4cae..e99c7446c2f28 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationExecutorTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationExecutorTest.java @@ -73,6 +73,7 @@ void assertExecute() { Collection actual = executor.getRows(new ExportDatabaseConfigurationStatement(mock(DatabaseSegment.class), null), mock(ContextManager.class)); assertThat(actual.size(), is(1)); LocalDataQueryResultRow row = actual.iterator().next(); + System.out.println(row.getCell(1)); assertThat(row.getCell(1), is(loadExpectedRow())); } From ff94cb1e79e9a827eab00cb1d53c7c10795b9823 Mon Sep 17 00:00:00 2001 From: jiangML <1060319118@qq.com> Date: Thu, 26 Dec 2024 19:54:24 +0800 Subject: [PATCH 4/4] Fix test error --- .../ral/queryable/ExportDatabaseConfigurationExecutorTest.java | 1 - .../distsql/ral/queryable/ExportMetaDataExecutorTest.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationExecutorTest.java index e99c7446c2f28..c859983cb4cae 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationExecutorTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationExecutorTest.java @@ -73,7 +73,6 @@ void assertExecute() { Collection actual = executor.getRows(new ExportDatabaseConfigurationStatement(mock(DatabaseSegment.class), null), mock(ContextManager.class)); assertThat(actual.size(), is(1)); LocalDataQueryResultRow row = actual.iterator().next(); - System.out.println(row.getCell(1)); assertThat(row.getCell(1), is(loadExpectedRow())); } diff --git a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutorTest.java b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutorTest.java index 0ba2b850ca5b3..6967b4e51f3c8 100644 --- a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutorTest.java +++ b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutorTest.java @@ -180,7 +180,7 @@ private DataSource createDataSource(final String name) { MockedDataSource result = new MockedDataSource(); result.setUrl(String.format("jdbc:h2:mem:%s;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL", name)); result.setUsername("root"); - result.setPassword(null); + result.setPassword(""); result.setMaxPoolSize(50); result.setMinPoolSize(1); return result;