You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by me...@apache.org on 2021/08/27 06:22:56 UTC
[shardingsphere] branch master updated: Remove blank lines (#12045)
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 1c7f0a7 Remove blank lines (#12045)
1c7f0a7 is described below
commit 1c7f0a7b039cad09720989b9a6b9eac016150f03
Author: yx9o <ya...@163.com>
AuthorDate: Fri Aug 27 14:22:13 2021 +0800
Remove blank lines (#12045)
---
.../constant/OpenTelemetryConstants.java | 23 +++++++++++-----------
.../MySQLInformationSchemaExecutorFactory.java | 1 -
.../segment/ddl/function/FunctionSegment.java | 11 +++++------
.../sql/common/util/ExpressionExtractUtilTest.java | 1 -
.../segment/impl/function/ExpectedFunction.java | 3 +--
5 files changed, 17 insertions(+), 22 deletions(-)
diff --git a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/constant/OpenTelemetryConstants.java b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/constant/OpenTelemetryConstants.java
index cd9f2fb..c563507 100644
--- a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/constant/OpenTelemetryConstants.java
+++ b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-tracing/shardingsphere-agent-tracing-opentelemetry/src/main/java/org/apache/shardingsphere/agent/plugin/tracing/opentelemetry/constant/OpenTelemetryConstants.java
@@ -22,36 +22,35 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class OpenTelemetryConstants {
-
+
public static final String ROOT_SPAN = "opentelemetry_root_span";
-
+
public static final String COMPONENT = "component";
-
+
public static final String COMPONENT_NAME = "ShardingSphere";
-
+
public static final String DB_TYPE_VALUE = "shardingsphere-proxy";
-
+
/**
* The tag to record the bind variables of SQL.
*/
public static final String DB_TYPE = "db.type";
-
+
public static final String DB_STATEMENT = "db.statement";
-
+
public static final String DB_INSTANCE = "db.instance";
-
+
public static final String DB_BIND_VARIABLES = "db.bind_vars";
-
+
public static final String PEER_HOSTNAME = "peer.hostname";
-
+
/**
* PEER_PORT records the port number of the peer.
*/
public static final String PEER_PORT = "peer.port";
-
+
/**
* The tag to record the connection count.
*/
public static final String CONNECTION_COUNT = "connection.count";
-
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/MySQLInformationSchemaExecutorFactory.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/MySQLInformationSchemaExecutorFactory.java
index 44c9b8f..d785cd0 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/MySQLInformationSchemaExecutorFactory.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/admin/mysql/MySQLInformationSchemaExecutorFactory.java
@@ -43,5 +43,4 @@ public final class MySQLInformationSchemaExecutorFactory {
}
throw new UnsupportedOperationException(String.format("unsupported table : `%s`", tableName));
}
-
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/ddl/function/FunctionSegment.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/ddl/function/FunctionSegment.java
index d2e8d68..916dff1 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/ddl/function/FunctionSegment.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/common/segment/ddl/function/FunctionSegment.java
@@ -34,18 +34,17 @@ import java.util.Optional;
@Getter
@Setter
public final class FunctionSegment implements SQLSegment, OwnerAvailable {
-
+
private final int startIndex;
-
+
private final int stopIndex;
-
+
private final IdentifierValue identifier;
-
+
private OwnerSegment owner;
-
+
@Override
public Optional<OwnerSegment> getOwner() {
return Optional.ofNullable(owner);
}
}
-
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/common/util/ExpressionExtractUtilTest.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/common/util/ExpressionExtractUtilTest.java
index 9e1ddea..75367ac 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/common/util/ExpressionExtractUtilTest.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/test/java/org/apache/shardingsphere/sql/parser/sql/common/util/ExpressionExtractUtilTest.java
@@ -77,7 +77,6 @@ public final class ExpressionExtractUtilTest {
AndPredicate andPredicate2 = andPredicateIterator.next();
assertThat(andPredicate1.getPredicates().iterator().next(), is(expressionSegment1));
assertThat(andPredicate2.getPredicates().iterator().next(), is(expressionSegment2));
-
}
@Test
diff --git a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/function/ExpectedFunction.java b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/function/ExpectedFunction.java
index f94560f..b3f7b2f 100644
--- a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/function/ExpectedFunction.java
+++ b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/segment/impl/function/ExpectedFunction.java
@@ -30,8 +30,7 @@ import javax.xml.bind.annotation.XmlElement;
@Getter
@Setter
public final class ExpectedFunction extends AbstractExpectedIdentifierSQLSegment {
-
+
@XmlElement
private ExpectedOwner owner;
}
-