未验证 提交 f86bdb97 编写于 作者: kimmking's avatar kimmking 提交者: GitHub

Rename MetricsUtils methods (#7059)

上级 02b8b170
...@@ -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.buriedTransactionMetric("begin"); MetricsUtils.collectTransactionMetric("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.buriedTransactionMetric("commit"); MetricsUtils.collectTransactionMetric("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.buriedTransactionMetric("rollback"); MetricsUtils.collectTransactionMetric("rollback");
} finally { } finally {
connection.getStateHandler().setStatus(ConnectionStatus.TERMINATED); connection.getStateHandler().setStatus(ConnectionStatus.TERMINATED);
} }
......
...@@ -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);
}
} }
...@@ -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.buriedShardingMetrics(routeContext.getRouteResult().getRouteUnits()); MetricsUtils.collectRouteUnitMetrics(routeContext.getRouteResult().getRouteUnits());
MetricsUtils.buriedShardingRuleMetrics(routeContext, rules); MetricsUtils.collectShardingRuleMetrics(routeContext, rules);
} }
@Override @Override
......
...@@ -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 buriedShardingMetrics(final Collection<RouteUnit> routeUnits) { public static void collectRouteUnitMetrics(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 buriedTransactionMetric(final String labelValue) { public static void collectTransactionMetric(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 buriedShardingRuleMetrics(final RouteContext routeContext, final Collection<ShardingSphereRule> rules) { public static void collectShardingRuleMetrics(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()));
......
...@@ -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.buriedShardingMetrics(Collections.singleton(unit)); MetricsUtils.collectRouteUnitMetrics(Collections.singleton(unit));
} }
@Test @Test
public void testBuriedTransactionMetric() { public void testBuriedTransactionMetric() {
MetricsUtils.buriedTransactionMetric("begin"); MetricsUtils.collectTransactionMetric("begin");
MetricsUtils.buriedTransactionMetric("commit"); MetricsUtils.collectTransactionMetric("commit");
MetricsUtils.buriedTransactionMetric("rollback"); MetricsUtils.collectTransactionMetric("rollback");
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册