This is an automated email from the ASF dual-hosted git repository.
menghaoran 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 5d4f027 Refactor for code format (#9555)
5d4f027 is described below
commit 5d4f027916521db72120c87f169727fd1a82c70a
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Mar 1 21:20:38 2021 +0800
Refactor for code format (#9555)
* Remove useless log settings
* For code format
* For code format
* Remove useless log settings
---
.../src/test/resources/logback-test.xml | 31 ----------------------
.../shardingsphere-infra-optimize/pom.xml | 3 ++-
.../infra/optimize/context/CalciteContext.java | 4 +--
.../optimize/execute/CalciteJDBCExecutor.java | 2 +-
.../infra/optimize/schema/CalciteLogicSchema.java | 2 +-
.../execute/CalciteExecutionSQLGenerator.java | 2 +-
.../schema/CalciteLogicSchemaFactoryTest.java | 2 +-
7 files changed, 8 insertions(+), 38 deletions(-)
diff --git
a/shardingsphere-infra/shardingsphere-infra-binder/src/test/resources/logback-test.xml
b/shardingsphere-infra/shardingsphere-infra-binder/src/test/resources/logback-test.xml
deleted file mode 100644
index 617e7a3..0000000
---
a/shardingsphere-infra/shardingsphere-infra-binder/src/test/resources/logback-test.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!--
- ~ 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.
- -->
-
-<configuration>
- <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>[%-5level] %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread]
%logger{36} - %msg%n</pattern>
- </encoder>
- </appender>
- <logger name="ShardingSphere-metadata" level="warn" />
-
- <root>
- <level value="info" />
- <appender-ref ref="console" />
- </root>
-</configuration>
diff --git a/shardingsphere-infra/shardingsphere-infra-optimize/pom.xml
b/shardingsphere-infra/shardingsphere-infra-optimize/pom.xml
index 52c1e4e..9a6b5e8 100644
--- a/shardingsphere-infra/shardingsphere-infra-optimize/pom.xml
+++ b/shardingsphere-infra/shardingsphere-infra-optimize/pom.xml
@@ -27,7 +27,7 @@
</parent>
<artifactId>shardingsphere-infra-optimize</artifactId>
<name>${project.artifactId}</name>
-
+
<dependencies>
<dependency>
<groupId>org.apache.shardingsphere</groupId>
@@ -39,6 +39,7 @@
<artifactId>shardingsphere-infra-executor</artifactId>
<version>${project.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.calcite</groupId>
<artifactId>calcite-core</artifactId>
diff --git
a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/context/CalciteContext.java
b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/context/CalciteContext.java
index 8ee4298..1fa9969 100644
---
a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/context/CalciteContext.java
+++
b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/context/CalciteContext.java
@@ -29,10 +29,10 @@ import java.util.Properties;
/**
* Calcite context.
*/
-@Getter
@RequiredArgsConstructor
+@Getter
public final class CalciteContext {
-
+
private final Properties connectionProperties;
private final CalciteLogicSchema calciteLogicSchema;
diff --git
a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/execute/CalciteJDBCExecutor.java
b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/execute/CalciteJDBCExecutor.java
index 58787af..e11681c 100644
---
a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/execute/CalciteJDBCExecutor.java
+++
b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/execute/CalciteJDBCExecutor.java
@@ -56,7 +56,7 @@ public final class CalciteJDBCExecutor implements
CalciteExecutor {
throw new RuntimeException(ex);
}
}
-
+
public CalciteJDBCExecutor(final CalciteContext context) {
this.context = context;
PROPERTIES.setProperty(CalciteConnectionProperty.LEX.camelName(),
context.getConnectionProperties().getProperty(CalciteConnectionProperty.LEX.camelName()));
diff --git
a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/schema/CalciteLogicSchema.java
b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/schema/CalciteLogicSchema.java
index 0377b63..cdb4f30 100644
---
a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/schema/CalciteLogicSchema.java
+++
b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/schema/CalciteLogicSchema.java
@@ -35,7 +35,7 @@ public final class CalciteLogicSchema extends AbstractSchema {
private final String name;
private final Map<String, Table> tables = new LinkedMap<>();
-
+
public CalciteLogicSchema(final String name, final Map<String, Table>
tables) {
this.name = name;
this.tables.putAll(tables);
diff --git
a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/schema/table/execute/CalciteExecutionSQLGenerator.java
b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/schema/table/execute/CalciteExecutionSQLGenerator.java
index 07ae151..064e5be 100644
---
a/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/schema/table/execute/CalciteExecutionSQLGenerator.java
+++
b/shardingsphere-infra/shardingsphere-infra-optimize/src/main/java/org/apache/shardingsphere/infra/optimize/schema/table/execute/CalciteExecutionSQLGenerator.java
@@ -26,7 +26,7 @@ import java.util.List;
* Calcite execution sql generator.
*/
public final class CalciteExecutionSQLGenerator {
-
+
public CalciteExecutionSQLGenerator(final DataContext root, final
List<RexNode> filters, final int[] projects) {
// TODO
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-optimize/src/test/java/org/apache/shardingsphere/infra/optimize/schema/CalciteLogicSchemaFactoryTest.java
b/shardingsphere-infra/shardingsphere-infra-optimize/src/test/java/org/apache/shardingsphere/infra/optimize/schema/CalciteLogicSchemaFactoryTest.java
index 1370bd5..3f78996 100644
---
a/shardingsphere-infra/shardingsphere-infra-optimize/src/test/java/org/apache/shardingsphere/infra/optimize/schema/CalciteLogicSchemaFactoryTest.java
+++
b/shardingsphere-infra/shardingsphere-infra-optimize/src/test/java/org/apache/shardingsphere/infra/optimize/schema/CalciteLogicSchemaFactoryTest.java
@@ -32,7 +32,7 @@ import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.mock;
public final class CalciteLogicSchemaFactoryTest {
-
+
@Test
public void assertCreate() {
Map<String, ShardingSphereMetaData> metaDataMap = new LinkedMap<>();
