Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Shardingsphere
提交
91c6676b
Shardingsphere
项目概览
apache
/
Shardingsphere
通知
56
Star
3
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Shardingsphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
91c6676b
编写于
9月 12, 2020
作者:
T
terrymanu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add ExpectedExceptions for proxy
上级
6c91b6eb
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
60 addition
and
9 deletion
+60
-9
shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecutorTask.java
...ingsphere/proxy/frontend/command/CommandExecutorTask.java
+2
-6
shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/exception/ExpectedExceptions.java
...ngsphere/proxy/frontend/exception/ExpectedExceptions.java
+55
-0
shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngine.java
...nd/postgresql/command/PostgreSQLCommandExecuteEngine.java
+3
-3
未找到文件。
shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecutorTask.java
浏览文件 @
91c6676b
...
...
@@ -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
);
...
...
shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/exception/ExpectedExceptions.java
0 → 100644
浏览文件 @
91c6676b
/*
* 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
);
}
}
shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/PostgreSQLCommandExecuteEngine.java
浏览文件 @
91c6676b
...
...
@@ -63,9 +63,9 @@ public final class PostgreSQLCommandExecuteEngine implements CommandExecuteEngin
@Override
public
DatabasePacket
<?>
getErrorPacket
(
final
Exception
cause
)
{
PostgreSQLErrorResponsePacket
errorResponsePacke
t
=
new
PostgreSQLErrorResponsePacket
();
errorResponsePacke
t
.
addField
(
PostgreSQLErrorResponsePacket
.
FIELD_TYPE_MESSAGE
,
cause
.
getMessage
());
return
errorResponsePacke
t
;
PostgreSQLErrorResponsePacket
resul
t
=
new
PostgreSQLErrorResponsePacket
();
resul
t
.
addField
(
PostgreSQLErrorResponsePacket
.
FIELD_TYPE_MESSAGE
,
cause
.
getMessage
());
return
resul
t
;
}
@Override
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录