This is an automated email from the ASF dual-hosted git repository.
panjuan 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 d487c1c fixes npe after drop current database (#10352)
d487c1c is described below
commit d487c1cb3c20e3bcdba9b6384665491dcdecc547
Author: Haoran Meng <[email protected]>
AuthorDate: Sat May 15 19:04:54 2021 +0800
fixes npe after drop current database (#10352)
Co-authored-by: menghaoranss <[email protected]>
---
.../text/distsql/rdl/RDLBackendHandlerFactory.java | 2 +-
.../rdl/impl/DropDatabaseBackendHandler.java | 16 +++-
.../rdl/impl/DropDatabaseBackendHandlerTest.java | 100 +++++++++++++++++++++
3 files changed, 115 insertions(+), 3 deletions(-)
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/RDLBackendHandlerFactory.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/RDLBackendHandlerFactory.java
index 8b38138..b90e686 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/RDLBackendHandlerFactory.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/RDLBackendHandlerFactory.java
@@ -131,7 +131,7 @@ public final class RDLBackendHandlerFactory {
return Optional.of(new
DropReadwriteSplittingRuleBackendHandler((DropReplicaQueryRuleStatement)
sqlStatement, backendConnection));
}
if (sqlStatement instanceof DropDatabaseStatement) {
- return Optional.of(new
DropDatabaseBackendHandler((DropDatabaseStatement) sqlStatement));
+ return Optional.of(new
DropDatabaseBackendHandler((DropDatabaseStatement) sqlStatement,
backendConnection));
}
if (sqlStatement instanceof DropShardingTableRuleStatement) {
return Optional.of(new
DropShardingTableRuleBackendHandler((DropShardingTableRuleStatement)
sqlStatement, backendConnection));
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropDatabaseBackendHandler.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropDatabaseBackendHandler.java
index fc231a8..3671bcc 100644
---
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropDatabaseBackendHandler.java
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropDatabaseBackendHandler.java
@@ -17,11 +17,13 @@
package org.apache.shardingsphere.proxy.backend.text.distsql.rdl.impl;
+import com.google.common.base.Strings;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.governance.core.registry.listener.event.metadata.MetaDataDroppedEvent;
import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
+import
org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
-import
org.apache.shardingsphere.proxy.backend.exception.DBCreateExistsException;
+import org.apache.shardingsphere.proxy.backend.exception.DBDropExistsException;
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.text.TextProtocolBackendHandler;
@@ -34,19 +36,29 @@ import
org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DropDatabas
public final class DropDatabaseBackendHandler implements
TextProtocolBackendHandler {
private final DropDatabaseStatement sqlStatement;
+
+ private final BackendConnection backendConnection;
@Override
public ResponseHeader execute() {
check(sqlStatement);
+ if (isDropCurrentDatabase(sqlStatement.getDatabaseName())) {
+ backendConnection.setCurrentSchema(null);
+ }
post(sqlStatement);
return new UpdateResponseHeader(sqlStatement);
}
private void check(final DropDatabaseStatement sqlStatement) {
if
(!ProxyContext.getInstance().getAllSchemaNames().contains(sqlStatement.getDatabaseName()))
{
- throw new DBCreateExistsException(sqlStatement.getDatabaseName());
+ throw new DBDropExistsException(sqlStatement.getDatabaseName());
}
}
+
+ private boolean isDropCurrentDatabase(final String databaseName) {
+ return !Strings.isNullOrEmpty(backendConnection.getSchemaName())
+ && backendConnection.getSchemaName().equals(databaseName);
+ }
private void post(final DropDatabaseStatement sqlStatement) {
// TODO Need to get the executed feedback from registry center for
returning.
diff --git
a/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropDatabaseBackendHandlerTest.java
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropDatabaseBackendHandlerTest.java
new file mode 100644
index 0000000..197a902
--- /dev/null
+++
b/shardingsphere-proxy/shardingsphere-proxy-backend/src/test/java/org/apache/shardingsphere/proxy/backend/text/distsql/rdl/impl/DropDatabaseBackendHandlerTest.java
@@ -0,0 +1,100 @@
+/*
+ * 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.text.distsql.rdl.impl;
+
+import org.apache.shardingsphere.infra.context.metadata.MetaDataContexts;
+import
org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
+import org.apache.shardingsphere.proxy.backend.context.ProxyContext;
+import org.apache.shardingsphere.proxy.backend.exception.DBDropExistsException;
+import org.apache.shardingsphere.proxy.backend.response.header.ResponseHeader;
+import
org.apache.shardingsphere.proxy.backend.response.header.update.UpdateResponseHeader;
+import
org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.DropDatabaseStatement;
+import org.apache.shardingsphere.transaction.context.TransactionContexts;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+import java.util.Arrays;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
+public final class DropDatabaseBackendHandlerTest {
+
+ @Mock
+ private BackendConnection backendConnection;
+
+ @Mock
+ private DropDatabaseStatement sqlStatement;
+
+ @Mock
+ private TransactionContexts transactionContexts;
+
+ @Mock
+ private MetaDataContexts metaDataContexts;
+
+ private DropDatabaseBackendHandler handler;
+
+ @Before
+ public void setUp() {
+ ProxyContext.getInstance().init(metaDataContexts, transactionContexts);
+ handler = new DropDatabaseBackendHandler(sqlStatement,
backendConnection);
+
when(metaDataContexts.getAllSchemaNames()).thenReturn(Arrays.asList("test_db",
"other_db"));
+ }
+
+ @Test(expected = DBDropExistsException.class)
+ public void assertExecuteDropNotExistDatabase() {
+ when(sqlStatement.getDatabaseName()).thenReturn("test_not_exist_db");
+ handler.execute();
+ }
+
+ @Test
+ public void assertExecuteDropWithoutCurrentDatabase() {
+ when(sqlStatement.getDatabaseName()).thenReturn("test_db");
+ ResponseHeader responseHeader = handler.execute();
+ verify(backendConnection, times(0)).setCurrentSchema(null);
+ assertNotNull(responseHeader);
+ assertTrue(responseHeader instanceof UpdateResponseHeader);
+ }
+
+ @Test
+ public void assertExecuteDropCurrentDatabase() {
+ when(backendConnection.getSchemaName()).thenReturn("test_db");
+ when(sqlStatement.getDatabaseName()).thenReturn("test_db");
+ ResponseHeader responseHeader = handler.execute();
+ verify(backendConnection).setCurrentSchema(null);
+ assertNotNull(responseHeader);
+ assertTrue(responseHeader instanceof UpdateResponseHeader);
+ }
+
+ @Test
+ public void assertExecuteDropOtherDatabase() {
+ when(backendConnection.getSchemaName()).thenReturn("test_db");
+ when(sqlStatement.getDatabaseName()).thenReturn("other_db");
+ ResponseHeader responseHeader = handler.execute();
+ verify(backendConnection, times(0)).setCurrentSchema(null);
+ assertNotNull(responseHeader);
+ assertTrue(responseHeader instanceof UpdateResponseHeader);
+ }
+}
