This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 22313c9651c Fixes #19714. (#21541)
22313c9651c is described below
commit 22313c9651c1d8fd44d2920676a47de15c462338
Author: Raigor <[email protected]>
AuthorDate: Thu Oct 13 12:01:34 2022 +0800
Fixes #19714. (#21541)
---
.../ral/updatable/RefreshTableMetadataHandler.java | 16 +++
.../updatable/RefreshTableMetadataHandlerTest.java | 127 +++++++++++++++++++++
2 files changed, 143 insertions(+)
diff --git
a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetadataHandler.java
b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetadataHandler.java
index 02f45edad45..94433978398 100644
---
a/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetadataHandler.java
+++
b/proxy/backend/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetadataHandler.java
@@ -22,10 +22,17 @@ import
org.apache.shardingsphere.dialect.exception.syntax.database.NoDatabaseSel
import
org.apache.shardingsphere.dialect.exception.syntax.database.UnknownDatabaseException;
import
org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshTableMetadataStatement;
import org.apache.shardingsphere.infra.database.type.DatabaseTypeEngine;
+import
org.apache.shardingsphere.infra.distsql.exception.resource.EmptyResourceException;
+import
org.apache.shardingsphere.infra.distsql.exception.resource.MissingRequiredResourcesException;
+import
org.apache.shardingsphere.infra.util.exception.ShardingSpherePreconditions;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
import
org.apache.shardingsphere.proxy.backend.handler.distsql.ral.UpdatableRALBackendHandler;
+import javax.sql.DataSource;
+import java.util.Collections;
+import java.util.Map;
+
/**
* Refresh table metadata handler.
*/
@@ -34,6 +41,7 @@ public final class RefreshTableMetadataHandler extends
UpdatableRALBackendHandle
@Override
protected void update(final ContextManager contextManager) {
String databaseName = getDatabaseName();
+ checkResources(databaseName,
contextManager.getDataSourceMap(databaseName));
String schemaName = getSchemaName(databaseName);
if (getSqlStatement().getResourceName().isPresent()) {
if (getSqlStatement().getTableName().isPresent()) {
@@ -50,6 +58,14 @@ public final class RefreshTableMetadataHandler extends
UpdatableRALBackendHandle
}
}
+ private void checkResources(final String databaseName, final Map<String,
DataSource> resources) {
+ ShardingSpherePreconditions.checkState(!resources.isEmpty(), () -> new
EmptyResourceException(databaseName));
+ if (getSqlStatement().getResourceName().isPresent()) {
+ String resourceName = getSqlStatement().getResourceName().get();
+
ShardingSpherePreconditions.checkState(resources.containsKey(resourceName), ()
-> new MissingRequiredResourcesException(databaseName,
Collections.singletonList(resourceName)));
+ }
+ }
+
private String getDatabaseName() {
String result = getConnectionSession().getDatabaseName();
if (Strings.isNullOrEmpty(result)) {
diff --git
a/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetadataHandlerTest.java
b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetadataHandlerTest.java
new file mode 100644
index 00000000000..2595a66cc02
--- /dev/null
+++
b/proxy/backend/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/RefreshTableMetadataHandlerTest.java
@@ -0,0 +1,127 @@
+/*
+ * 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.backend.handler.distsql.ral.updatable;
+
+import
org.apache.shardingsphere.dialect.exception.syntax.database.NoDatabaseSelectedException;
+import
org.apache.shardingsphere.dialect.exception.syntax.database.UnknownDatabaseException;
+import
org.apache.shardingsphere.distsql.parser.statement.ral.updatable.RefreshTableMetadataStatement;
+import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
+import org.apache.shardingsphere.infra.config.props.ConfigurationPropertyKey;
+import
org.apache.shardingsphere.infra.distsql.exception.resource.EmptyResourceException;
+import
org.apache.shardingsphere.infra.distsql.exception.resource.MissingRequiredResourcesException;
+import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
+import org.apache.shardingsphere.mode.manager.ContextManager;
+import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import
org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
+import org.apache.shardingsphere.proxy.backend.session.ConnectionSession;
+import org.apache.shardingsphere.proxy.backend.util.ProxyContextRestorer;
+import org.apache.shardingsphere.test.mock.MockedDataSource;
+import org.junit.Before;
+import org.junit.Test;
+
+import javax.sql.DataSource;
+import java.sql.SQLException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public final class RefreshTableMetadataHandlerTest extends
ProxyContextRestorer {
+
+ private ConnectionSession connectionSession;
+
+ private final ShardingSphereMetaData shardingSphereMetaData =
mock(ShardingSphereMetaData.class);
+
+ private final ContextManager contextManager = mock(ContextManager.class,
RETURNS_DEEP_STUBS);
+
+ @Before
+ public void setup() {
+ ProxyContext.init(contextManager);
+ ConfigurationProperties configurationProperties = new
ConfigurationProperties(createProperties());
+
when(contextManager.getMetaDataContexts().getMetaData()).thenReturn(shardingSphereMetaData);
+
when(shardingSphereMetaData.getProps()).thenReturn(configurationProperties);
+ connectionSession = mock(ConnectionSession.class, RETURNS_DEEP_STUBS);
+ }
+
+ @Test(expected = NoDatabaseSelectedException.class)
+ public void assertNoDatabaseSelected() throws SQLException {
+ RefreshTableMetadataHandler backendHandler = new
RefreshTableMetadataHandler();
+ backendHandler.init(new RefreshTableMetadataStatement(),
connectionSession);
+ backendHandler.execute();
+ }
+
+ @Test(expected = UnknownDatabaseException.class)
+ public void assertUnknownDatabaseException() throws SQLException {
+ when(connectionSession.getDatabaseName()).thenReturn("db");
+ RefreshTableMetadataHandler backendHandler = new
RefreshTableMetadataHandler();
+ backendHandler.init(new RefreshTableMetadataStatement(),
connectionSession);
+ backendHandler.execute();
+ }
+
+ @Test(expected = EmptyResourceException.class)
+ public void assertEmptyResource() throws SQLException {
+ when(connectionSession.getDatabaseName()).thenReturn("sharding_db");
+
when(shardingSphereMetaData.containsDatabase("sharding_db")).thenReturn(true);
+
when(contextManager.getDataSourceMap("sharding_db")).thenReturn(Collections.emptyMap());
+ RefreshTableMetadataHandler backendHandler = new
RefreshTableMetadataHandler();
+ backendHandler.init(new RefreshTableMetadataStatement(),
connectionSession);
+ backendHandler.execute();
+ }
+
+ @Test(expected = MissingRequiredResourcesException.class)
+ public void assertMissingRequiredResources() throws SQLException {
+ when(connectionSession.getDatabaseName()).thenReturn("sharding_db");
+
when(shardingSphereMetaData.containsDatabase("sharding_db")).thenReturn(true);
+ Map<String, DataSource> dataSources = createDataSources();
+
when(contextManager.getDataSourceMap("sharding_db")).thenReturn(dataSources);
+ RefreshTableMetadataHandler backendHandler = new
RefreshTableMetadataHandler();
+ backendHandler.init(new RefreshTableMetadataStatement("t_order",
"ds_1", null), connectionSession);
+ backendHandler.execute();
+ }
+
+ @Test
+ public void assertUpdate() throws SQLException {
+ when(connectionSession.getDatabaseName()).thenReturn("sharding_db");
+
when(shardingSphereMetaData.containsDatabase("sharding_db")).thenReturn(true);
+ Map<String, DataSource> dataSources = createDataSources();
+
when(contextManager.getDataSourceMap("sharding_db")).thenReturn(dataSources);
+ RefreshTableMetadataHandler backendHandler = new
RefreshTableMetadataHandler();
+ backendHandler.init(new RefreshTableMetadataStatement(),
connectionSession);
+ ResponseHeader actual = backendHandler.execute();
+ assertThat(actual, instanceOf(UpdateResponseHeader.class));
+ }
+
+ private Map<String, DataSource> createDataSources() {
+ Map<String, DataSource> result = new HashMap<>(1, 1);
+ result.put("ds_0", new MockedDataSource());
+ return result;
+ }
+
+ private Properties createProperties() {
+ Properties result = new Properties();
+
result.setProperty(ConfigurationPropertyKey.PROXY_BACKEND_DRIVER_TYPE.getKey(),
ConfigurationPropertyKey.PROXY_BACKEND_DRIVER_TYPE.getDefaultValue());
+ return result;
+ }
+}
