Skip to content

Commit fc6b136

Browse files
committed
Fix test
1 parent 4d1368c commit fc6b136

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

infra/rewrite/core/src/main/java/org/apache/shardingsphere/infra/rewrite/engine/RouteSQLRewriteEngine.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,11 @@ public RouteSQLRewriteResult rewrite(final SQLRewriteContext sqlRewriteContext,
8181

8282
private int getMaxUnionSizePerDataSource(final QueryContext queryContext) {
8383
ConfigurationProperties props = queryContext.getMetaData().getProps();
84-
if (null == props || null == props.getProps()) {
84+
if (null == props) {
8585
return Integer.parseInt(ConfigurationPropertyKey.MAX_UNION_SIZE_PER_DATASOURCE.getDefaultValue());
8686
}
87-
return props.<Integer>getValue(ConfigurationPropertyKey.MAX_UNION_SIZE_PER_DATASOURCE);
87+
Integer result = props.getValue(ConfigurationPropertyKey.MAX_UNION_SIZE_PER_DATASOURCE);
88+
return null == result ? Integer.parseInt(ConfigurationPropertyKey.MAX_UNION_SIZE_PER_DATASOURCE.getDefaultValue()) : result;
8889
}
8990

9091
private Map<RouteUnit, SQLRewriteUnit> createSQLRewriteUnits(final SQLRewriteContext sqlRewriteContext, final RouteContext routeContext, final int maxUnionSizePerDataSource) {

proxy/frontend/dialect/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/extended/bind/OpenGaussComBatchBindExecutorTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ private ContextManager mockContextManager() {
137137
when(result.getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.KERNEL_EXECUTOR_SIZE)).thenReturn(0);
138138
when(result.getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_CONNECTIONS_SIZE_PER_QUERY)).thenReturn(1);
139139
when(result.getMetaDataContexts().getMetaData().getProps().<Boolean>getValue(ConfigurationPropertyKey.SQL_SHOW)).thenReturn(false);
140+
when(result.getMetaDataContexts().getMetaData().getProps().<Integer>getValue(ConfigurationPropertyKey.MAX_UNION_SIZE_PER_DATASOURCE)).thenReturn(Integer.MAX_VALUE);
140141
when(result.getMetaDataContexts().getMetaData().getGlobalRuleMetaData()).thenReturn(new RuleMetaData(Collections.singleton(
141142
new SQLTranslatorRule(new DefaultSQLTranslatorRuleConfigurationBuilder().build()))));
142143
ShardingSphereDatabase database = mockDatabase();

0 commit comments

Comments
 (0)