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 91c6676 Add ExpectedExceptions for proxy
new 74219f3 Merge pull request #7417 from terrymanu/dev
91c6676 is described below
commit 91c6676bb38c71a633613453227ff9f7f2bcda9a
Author: terrymanu <[email protected]>
AuthorDate: Sat Sep 12 11:50:58 2020 +0800
Add ExpectedExceptions for proxy
---
.../frontend/command/CommandExecutorTask.java | 8 +---
.../frontend/exception/ExpectedExceptions.java | 55 ++++++++++++++++++++++
.../command/PostgreSQLCommandExecuteEngine.java | 6 +--
3 files changed, 60 insertions(+), 9 deletions(-)
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecutorTask.java
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecutorTask.java
index 10724d5..f924da9 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecutorTask.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecutorTask.java
@@ -31,6 +31,7 @@ import
org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.Bac
import
org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.ConnectionStatusHandler;
import
org.apache.shardingsphere.proxy.frontend.command.executor.CommandExecutor;
import
org.apache.shardingsphere.proxy.frontend.command.executor.QueryCommandExecutor;
+import org.apache.shardingsphere.proxy.frontend.exception.ExpectedExceptions;
import
org.apache.shardingsphere.proxy.frontend.spi.DatabaseProtocolFrontendEngine;
import java.sql.SQLException;
@@ -77,7 +78,7 @@ public final class CommandExecutorTask implements Runnable {
context.writeAndFlush(databaseProtocolFrontendEngine.getCommandExecuteEngine().getErrorPacket(ex));
Optional<DatabasePacket<?>> databasePacket =
databaseProtocolFrontendEngine.getCommandExecuteEngine().getOtherPacket();
databasePacket.ifPresent(context::writeAndFlush);
- if (!isExpectedException(ex)) {
+ if (!ExpectedExceptions.isExpected(ex.getClass())) {
log.error("Exception occur: ", ex);
}
} finally {
@@ -88,11 +89,6 @@ public final class CommandExecutorTask implements Runnable {
}
}
- // TODO finish expected exception
- private boolean isExpectedException(final Exception ex) {
- return ex instanceof RuntimeException;
- }
-
private boolean executeCommand(final ChannelHandlerContext context, final
PacketPayload payload, final BackendConnection backendConnection) throws
SQLException {
CommandExecuteEngine commandExecuteEngine =
databaseProtocolFrontendEngine.getCommandExecuteEngine();
CommandPacketType type =
commandExecuteEngine.getCommandPacketType(payload);
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/exception/ExpectedExceptions.java
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/exception/ExpectedExceptions.java
new file mode 100644
index 0000000..434e7e8
--- /dev/null
+++
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/exception/ExpectedExceptions.java
@@ -0,0 +1,55 @@
+/*
+ * 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.
+ */
+
+package org.apache.shardingsphere.proxy.frontend.exception;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import
org.apache.shardingsphere.infra.config.exception.ShardingSphereConfigurationException;
+import org.apache.shardingsphere.infra.exception.ShardingSphereException;
+import org.apache.shardingsphere.proxy.backend.exception.BackendException;
+import
org.apache.shardingsphere.proxy.backend.text.sctl.exception.ShardingCTLException;
+import org.apache.shardingsphere.sql.parser.exception.SQLParsingException;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+/**
+ * Expected exceptions.
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class ExpectedExceptions {
+
+ private static final Collection<Class<? extends Exception>> EXCEPTIONS =
new HashSet<>();
+
+ static {
+ EXCEPTIONS.add(ShardingSphereException.class);
+ EXCEPTIONS.add(ShardingSphereConfigurationException.class);
+ EXCEPTIONS.add(SQLParsingException.class);
+ EXCEPTIONS.add(ShardingCTLException.class);
+ EXCEPTIONS.add(BackendException.class);
+ }
+
+ /**
+ * Judge whether expected exception.
+ * @param exceptionClass exception class
+ * @return is expected exception or not
+ */
+ public static boolean isExpected(final Class<?> exceptionClass) {
+ return EXCEPTIONS.contains(exceptionClass);
+ }
+}
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngine.java
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngine.java
index 26be0c0..7a86af6 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngine.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngine.java
@@ -63,9 +63,9 @@ public final class PostgreSQLCommandExecuteEngine implements
CommandExecuteEngin
@Override
public DatabasePacket<?> getErrorPacket(final Exception cause) {
- PostgreSQLErrorResponsePacket errorResponsePacket = new
PostgreSQLErrorResponsePacket();
-
errorResponsePacket.addField(PostgreSQLErrorResponsePacket.FIELD_TYPE_MESSAGE,
cause.getMessage());
- return errorResponsePacket;
+ PostgreSQLErrorResponsePacket result = new
PostgreSQLErrorResponsePacket();
+ result.addField(PostgreSQLErrorResponsePacket.FIELD_TYPE_MESSAGE,
cause.getMessage());
+ return result;
}
@Override
