You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2021/02/07 05:17:33 UTC
[shardingsphere] branch master updated: Remove useless log for
SchemaMetaDataLoader.loadAllTableNames() (#9366)
This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 2b3ae52 Remove useless log for SchemaMetaDataLoader.loadAllTableNames() (#9366)
2b3ae52 is described below
commit 2b3ae524f1e97a51de3632c1c121910abe5f5ec5
Author: Liang Zhang <te...@163.com>
AuthorDate: Sun Feb 7 13:17:10 2021 +0800
Remove useless log for SchemaMetaDataLoader.loadAllTableNames() (#9366)
* Remove useless log
* Remove useless log for SchemaMetaDataLoader.loadAllTableNames()
---
.../logging/base/advice/SchemaMetaDataLoaderAdvice.java | 9 +++++----
.../metadata/schema/builder/loader/SchemaMetaDataLoader.java | 11 +----------
2 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-logging/shardingsphere-agent-logging-base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/advice/SchemaMetaDataLoaderAdvice.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-logging/shardingsphere-agent-logging-base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/advice/SchemaMetaDataLoaderAdvice.java
index e686d07..9ac5175 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-logging/shardingsphere-agent-logging-base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/advice/SchemaMetaDataLoaderAdvice.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-logging/shardingsphere-agent-logging-base/src/main/java/org/apache/shardingsphere/agent/plugin/logging/base/advice/SchemaMetaDataLoaderAdvice.java
@@ -17,11 +17,12 @@
package org.apache.shardingsphere.agent.plugin.logging.base.advice;
-import java.lang.reflect.Method;
-import java.util.Collection;
import lombok.extern.slf4j.Slf4j;
-import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
import org.apache.shardingsphere.agent.api.advice.ClassStaticMethodAroundAdvice;
+import org.apache.shardingsphere.agent.api.result.MethodInvocationResult;
+
+import java.lang.reflect.Method;
+import java.util.Collection;
/**
* Schema meta data loader advice.
@@ -33,6 +34,6 @@ public final class SchemaMetaDataLoaderAdvice implements ClassStaticMethodAround
@SuppressWarnings("unchecked")
public void afterMethod(final Class<?> clazz, final Method method, final Object[] args, final MethodInvocationResult result) {
Collection<String> results = (Collection<String>) result.getResult();
- log.info("Loading {} tables' meta data for unconfigured tables.", results.size());
+ log.info("Loading {} tables.", results.size());
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/SchemaMetaDataLoader.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/SchemaMetaDataLoader.java
index 39764f0..95bca17 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/SchemaMetaDataLoader.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/schema/builder/loader/SchemaMetaDataLoader.java
@@ -19,7 +19,6 @@ package org.apache.shardingsphere.infra.metadata.schema.builder.loader;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.metadata.schema.builder.loader.adapter.MetaDataLoaderConnectionAdapter;
@@ -28,7 +27,6 @@ import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.Collection;
-import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
@@ -36,7 +34,6 @@ import java.util.List;
* Schema meta data loader.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-@Slf4j(topic = "ShardingSphere-metadata")
public final class SchemaMetaDataLoader {
private static final String TABLE_TYPE = "TABLE";
@@ -54,15 +51,9 @@ public final class SchemaMetaDataLoader {
* @throws SQLException SQL exception
*/
public static Collection<String> loadAllTableNames(final DataSource dataSource, final DatabaseType databaseType) throws SQLException {
- Collection<String> result;
try (MetaDataLoaderConnectionAdapter connectionAdapter = new MetaDataLoaderConnectionAdapter(databaseType, dataSource.getConnection())) {
- result = loadAllTableNames(connectionAdapter);
+ return loadAllTableNames(connectionAdapter);
}
- log.info("Loading {} tables' meta data for unconfigured tables.", result.size());
- if (result.isEmpty()) {
- return Collections.emptyList();
- }
- return result;
}
private static Collection<String> loadAllTableNames(final Connection connection) throws SQLException {