Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Shardingsphere
提交
f86bdb97
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,发现更多精彩内容 >>
未验证
提交
f86bdb97
编写于
8月 25, 2020
作者:
kimmking
提交者:
GitHub
8月 25, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename MetricsUtils methods (#7059)
上级
02b8b170
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
21 addition
and
21 deletion
+21
-21
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/BackendTransactionManager.java
...munication/jdbc/connection/BackendTransactionManager.java
+3
-3
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/wrapper/PreparedStatementExecutorWrapper.java
...cation/jdbc/wrapper/PreparedStatementExecutorWrapper.java
+6
-6
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/wrapper/StatementExecutorWrapper.java
.../communication/jdbc/wrapper/StatementExecutorWrapper.java
+2
-2
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/metrics/MetricsUtils.java
...he/shardingsphere/proxy/backend/metrics/MetricsUtils.java
+6
-6
shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/metrics/MetricsUtilsTest.java
...hardingsphere/proxy/backend/metrics/MetricsUtilsTest.java
+4
-4
未找到文件。
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/connection/BackendTransactionManager.java
浏览文件 @
f86bdb97
...
@@ -58,7 +58,7 @@ public final class BackendTransactionManager implements TransactionManager {
...
@@ -58,7 +58,7 @@ public final class BackendTransactionManager implements TransactionManager {
}
else
{
}
else
{
shardingTransactionManager
.
begin
();
shardingTransactionManager
.
begin
();
}
}
MetricsUtils
.
buried
TransactionMetric
(
"begin"
);
MetricsUtils
.
collect
TransactionMetric
(
"begin"
);
}
}
@Override
@Override
...
@@ -70,7 +70,7 @@ public final class BackendTransactionManager implements TransactionManager {
...
@@ -70,7 +70,7 @@ public final class BackendTransactionManager implements TransactionManager {
}
else
{
}
else
{
shardingTransactionManager
.
commit
();
shardingTransactionManager
.
commit
();
}
}
MetricsUtils
.
buried
TransactionMetric
(
"commit"
);
MetricsUtils
.
collect
TransactionMetric
(
"commit"
);
}
finally
{
}
finally
{
connection
.
getStateHandler
().
setStatus
(
ConnectionStatus
.
TERMINATED
);
connection
.
getStateHandler
().
setStatus
(
ConnectionStatus
.
TERMINATED
);
}
}
...
@@ -86,7 +86,7 @@ public final class BackendTransactionManager implements TransactionManager {
...
@@ -86,7 +86,7 @@ public final class BackendTransactionManager implements TransactionManager {
}
else
{
}
else
{
shardingTransactionManager
.
rollback
();
shardingTransactionManager
.
rollback
();
}
}
MetricsUtils
.
buried
TransactionMetric
(
"rollback"
);
MetricsUtils
.
collect
TransactionMetric
(
"rollback"
);
}
finally
{
}
finally
{
connection
.
getStateHandler
().
setStatus
(
ConnectionStatus
.
TERMINATED
);
connection
.
getStateHandler
().
setStatus
(
ConnectionStatus
.
TERMINATED
);
}
}
...
...
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/wrapper/PreparedStatementExecutorWrapper.java
浏览文件 @
f86bdb97
...
@@ -68,7 +68,7 @@ public final class PreparedStatementExecutorWrapper implements JDBCExecutorWrapp
...
@@ -68,7 +68,7 @@ public final class PreparedStatementExecutorWrapper implements JDBCExecutorWrapp
new
CommonSQLStatementContext
(
sqlStatement
),
new
ExecutionUnit
(
schema
.
getSchema
().
getDataSources
().
keySet
().
iterator
().
next
(),
new
SQLUnit
(
sql
,
parameters
)));
new
CommonSQLStatementContext
(
sqlStatement
),
new
ExecutionUnit
(
schema
.
getSchema
().
getDataSources
().
keySet
().
iterator
().
next
(),
new
SQLUnit
(
sql
,
parameters
)));
}
}
RouteContext
routeContext
=
new
DataNodeRouter
(
schema
.
getSchema
().
getMetaData
(),
PROXY_SCHEMA_CONTEXTS
.
getSchemaContexts
().
getProps
(),
rules
).
route
(
sqlStatement
,
sql
,
parameters
);
RouteContext
routeContext
=
new
DataNodeRouter
(
schema
.
getSchema
().
getMetaData
(),
PROXY_SCHEMA_CONTEXTS
.
getSchemaContexts
().
getProps
(),
rules
).
route
(
sqlStatement
,
sql
,
parameters
);
routeMetricsCollect
(
routeContext
,
rules
);
collectRouteMetrics
(
routeContext
,
rules
);
SQLRewriteEntry
sqlRewriteEntry
=
new
SQLRewriteEntry
(
schema
.
getSchema
().
getMetaData
().
getSchema
().
getConfiguredSchemaMetaData
(),
PROXY_SCHEMA_CONTEXTS
.
getSchemaContexts
().
getProps
(),
rules
);
SQLRewriteEntry
sqlRewriteEntry
=
new
SQLRewriteEntry
(
schema
.
getSchema
().
getMetaData
().
getSchema
().
getConfiguredSchemaMetaData
(),
PROXY_SCHEMA_CONTEXTS
.
getSchemaContexts
().
getProps
(),
rules
);
SQLRewriteResult
sqlRewriteResult
=
sqlRewriteEntry
.
rewrite
(
sql
,
new
ArrayList
<>(
parameters
),
routeContext
);
SQLRewriteResult
sqlRewriteResult
=
sqlRewriteEntry
.
rewrite
(
sql
,
new
ArrayList
<>(
parameters
),
routeContext
);
return
new
ExecutionContext
(
routeContext
.
getSqlStatementContext
(),
ExecutionContextBuilder
.
build
(
schema
.
getSchema
().
getMetaData
(),
sqlRewriteResult
));
return
new
ExecutionContext
(
routeContext
.
getSqlStatementContext
(),
ExecutionContextBuilder
.
build
(
schema
.
getSchema
().
getMetaData
(),
sqlRewriteResult
));
...
@@ -79,14 +79,14 @@ public final class PreparedStatementExecutorWrapper implements JDBCExecutorWrapp
...
@@ -79,14 +79,14 @@ public final class PreparedStatementExecutorWrapper implements JDBCExecutorWrapp
return
((
PreparedStatement
)
statement
).
execute
();
return
((
PreparedStatement
)
statement
).
execute
();
}
}
private
void
routeMetricsCollect
(
final
RouteContext
routeContext
,
final
Collection
<
ShardingSphereRule
>
rules
)
{
MetricsUtils
.
buriedShardingMetrics
(
routeContext
.
getRouteResult
().
getRouteUnits
());
MetricsUtils
.
buriedShardingRuleMetrics
(
routeContext
,
rules
);
}
@Override
@Override
public
ExecuteGroupEngine
<?>
getExecuteGroupEngine
(
final
BackendConnection
backendConnection
,
final
StatementOption
option
)
{
public
ExecuteGroupEngine
<?>
getExecuteGroupEngine
(
final
BackendConnection
backendConnection
,
final
StatementOption
option
)
{
int
maxConnectionsSizePerQuery
=
PROXY_SCHEMA_CONTEXTS
.
getSchemaContexts
().
getProps
().<
Integer
>
getValue
(
ConfigurationPropertyKey
.
MAX_CONNECTIONS_SIZE_PER_QUERY
);
int
maxConnectionsSizePerQuery
=
PROXY_SCHEMA_CONTEXTS
.
getSchemaContexts
().
getProps
().<
Integer
>
getValue
(
ConfigurationPropertyKey
.
MAX_CONNECTIONS_SIZE_PER_QUERY
);
return
new
PreparedStatementExecuteGroupEngine
(
maxConnectionsSizePerQuery
,
backendConnection
,
option
,
schema
.
getSchema
().
getRules
());
return
new
PreparedStatementExecuteGroupEngine
(
maxConnectionsSizePerQuery
,
backendConnection
,
option
,
schema
.
getSchema
().
getRules
());
}
}
private
void
collectRouteMetrics
(
final
RouteContext
routeContext
,
final
Collection
<
ShardingSphereRule
>
rules
)
{
MetricsUtils
.
collectRouteUnitMetrics
(
routeContext
.
getRouteResult
().
getRouteUnits
());
MetricsUtils
.
collectShardingRuleMetrics
(
routeContext
,
rules
);
}
}
}
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/jdbc/wrapper/StatementExecutorWrapper.java
浏览文件 @
f86bdb97
...
@@ -81,8 +81,8 @@ public final class StatementExecutorWrapper implements JDBCExecutorWrapper {
...
@@ -81,8 +81,8 @@ public final class StatementExecutorWrapper implements JDBCExecutorWrapper {
}
}
private
void
routeMetricsCollect
(
final
RouteContext
routeContext
,
final
Collection
<
ShardingSphereRule
>
rules
)
{
private
void
routeMetricsCollect
(
final
RouteContext
routeContext
,
final
Collection
<
ShardingSphereRule
>
rules
)
{
MetricsUtils
.
buriedSharding
Metrics
(
routeContext
.
getRouteResult
().
getRouteUnits
());
MetricsUtils
.
collectRouteUnit
Metrics
(
routeContext
.
getRouteResult
().
getRouteUnits
());
MetricsUtils
.
buried
ShardingRuleMetrics
(
routeContext
,
rules
);
MetricsUtils
.
collect
ShardingRuleMetrics
(
routeContext
,
rules
);
}
}
@Override
@Override
...
...
shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/metrics/MetricsUtils.java
浏览文件 @
f86bdb97
...
@@ -36,11 +36,11 @@ import java.util.Collection;
...
@@ -36,11 +36,11 @@ import java.util.Collection;
public
final
class
MetricsUtils
{
public
final
class
MetricsUtils
{
/**
/**
*
Buried
sharding metrics.
*
Collect
sharding metrics.
*
*
* @param routeUnits route units
* @param routeUnits route units
*/
*/
public
static
void
buriedSharding
Metrics
(
final
Collection
<
RouteUnit
>
routeUnits
)
{
public
static
void
collectRouteUnit
Metrics
(
final
Collection
<
RouteUnit
>
routeUnits
)
{
if
(!
routeUnits
.
isEmpty
())
{
if
(!
routeUnits
.
isEmpty
())
{
for
(
RouteUnit
each
:
routeUnits
)
{
for
(
RouteUnit
each
:
routeUnits
)
{
Collection
<
RouteMapper
>
tableMappers
=
each
.
getTableMappers
();
Collection
<
RouteMapper
>
tableMappers
=
each
.
getTableMappers
();
...
@@ -55,21 +55,21 @@ public final class MetricsUtils {
...
@@ -55,21 +55,21 @@ public final class MetricsUtils {
}
}
/**
/**
*
Buried
transaction metric.
*
Collect
transaction metric.
*
*
* @param labelValue label value
* @param labelValue label value
*/
*/
public
static
void
buried
TransactionMetric
(
final
String
labelValue
)
{
public
static
void
collect
TransactionMetric
(
final
String
labelValue
)
{
SingletonFacadeEngine
.
buildMetrics
().
ifPresent
(
metricsHandlerFacade
->
metricsHandlerFacade
.
counterIncrement
(
MetricsLabelEnum
.
TRANSACTION
.
getName
(),
labelValue
));
SingletonFacadeEngine
.
buildMetrics
().
ifPresent
(
metricsHandlerFacade
->
metricsHandlerFacade
.
counterIncrement
(
MetricsLabelEnum
.
TRANSACTION
.
getName
(),
labelValue
));
}
}
/**
/**
*
Buried
sharding rule metrics.
*
Collect
sharding rule metrics.
*
*
* @param routeContext route context
* @param routeContext route context
* @param rules rules
* @param rules rules
*/
*/
public
static
void
buried
ShardingRuleMetrics
(
final
RouteContext
routeContext
,
final
Collection
<
ShardingSphereRule
>
rules
)
{
public
static
void
collect
ShardingRuleMetrics
(
final
RouteContext
routeContext
,
final
Collection
<
ShardingSphereRule
>
rules
)
{
routeContext
.
getRouteResult
().
getActualDataSourceNames
().
forEach
(
dataSourceName
->
rules
.
forEach
(
each
->
{
routeContext
.
getRouteResult
().
getActualDataSourceNames
().
forEach
(
dataSourceName
->
rules
.
forEach
(
each
->
{
if
(
each
instanceof
ShadowRule
&&
((
ShadowRule
)
each
).
getShadowMappings
().
containsValue
(
dataSourceName
))
{
if
(
each
instanceof
ShadowRule
&&
((
ShadowRule
)
each
).
getShadowMappings
().
containsValue
(
dataSourceName
))
{
SingletonFacadeEngine
.
buildMetrics
().
ifPresent
(
metricsHandlerFacade
->
metricsHandlerFacade
.
counterIncrement
(
MetricsLabelEnum
.
SHADOW_HIT_TOTAL
.
getName
()));
SingletonFacadeEngine
.
buildMetrics
().
ifPresent
(
metricsHandlerFacade
->
metricsHandlerFacade
.
counterIncrement
(
MetricsLabelEnum
.
SHADOW_HIT_TOTAL
.
getName
()));
...
...
shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/metrics/MetricsUtilsTest.java
浏览文件 @
f86bdb97
...
@@ -33,14 +33,14 @@ public final class MetricsUtilsTest {
...
@@ -33,14 +33,14 @@ public final class MetricsUtilsTest {
RouteMapper
dataSourceMapper
=
new
RouteMapper
(
"ds"
,
"ds_0"
);
RouteMapper
dataSourceMapper
=
new
RouteMapper
(
"ds"
,
"ds_0"
);
RouteMapper
tableMapper
=
new
RouteMapper
(
"t_order"
,
"t_order_0"
);
RouteMapper
tableMapper
=
new
RouteMapper
(
"t_order"
,
"t_order_0"
);
RouteUnit
unit
=
new
RouteUnit
(
dataSourceMapper
,
Collections
.
singletonList
(
tableMapper
));
RouteUnit
unit
=
new
RouteUnit
(
dataSourceMapper
,
Collections
.
singletonList
(
tableMapper
));
MetricsUtils
.
buriedSharding
Metrics
(
Collections
.
singleton
(
unit
));
MetricsUtils
.
collectRouteUnit
Metrics
(
Collections
.
singleton
(
unit
));
}
}
@Test
@Test
public
void
testBuriedTransactionMetric
()
{
public
void
testBuriedTransactionMetric
()
{
MetricsUtils
.
buried
TransactionMetric
(
"begin"
);
MetricsUtils
.
collect
TransactionMetric
(
"begin"
);
MetricsUtils
.
buried
TransactionMetric
(
"commit"
);
MetricsUtils
.
collect
TransactionMetric
(
"commit"
);
MetricsUtils
.
buried
TransactionMetric
(
"rollback"
);
MetricsUtils
.
collect
TransactionMetric
(
"rollback"
);
}
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录