You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2021/04/01 14:00:48 UTC
[shardingsphere] branch master updated: Add SQLStatementEvent
(#9907)
This is an automated email from the ASF dual-hosted git repository.
duanzhengqiang 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 07117ab Add SQLStatementEvent (#9907)
07117ab is described below
commit 07117ab3ff6436541d8cda5a34a0f44c9b9c1ab1
Author: Liang Zhang <te...@163.com>
AuthorDate: Thu Apr 1 22:00:24 2021 +0800
Add SQLStatementEvent (#9907)
* Refactor CreateUserStatementAuthRefresher
* Refactor GrantStatementAuthRefresher
* Refactor AuthenticationRefresher
* Refactor MetadataRefreshEngine
* Add SQLStatementEvent
* Rename SQLStatementEventMapper
* Add DCLStatementEvent
* Move DCLStatementEvent
* Rename package
* Add extends for DCLStatementEvent
---
.../governance/core/registry/RegistryCenter.java | 16 +++----
.../SQLStatementEventMapper.java} | 19 ++++----
.../mapper/SQLStatementEventMapperFactory.java | 55 ++++++++++++++++++++++
.../event/SQLStatementEvent.java} | 14 ++----
.../event/dcl/DCLStatementEvent.java} | 14 ++----
.../event/dcl/impl/CreateUserStatementEvent.java} | 7 +--
.../event/dcl/impl/GrantStatementEvent.java} | 7 +--
.../type/CreateUserStatementEventMapper.java | 45 ++++++++++++++++++
.../type/GrantStatementEventMapper.java} | 27 ++++++-----
.../type/CreateUserStatementAuthRefresher.java | 52 --------------------
.../metadata/engine/MetadataRefreshEngine.java | 29 ++++--------
.../metadata/engine/MetadataRefresherFactory.java | 6 ---
.../driver/executor/JDBCLockEngine.java | 4 +-
.../communication/DatabaseCommunicationEngine.java | 4 +-
14 files changed, 155 insertions(+), 144 deletions(-)
diff --git a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/RegistryCenter.java b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/RegistryCenter.java
index f6c2ea5..d97ae58 100644
--- a/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/RegistryCenter.java
+++ b/shardingsphere-governance/shardingsphere-governance-core/src/main/java/org/apache/shardingsphere/governance/core/registry/RegistryCenter.java
@@ -44,8 +44,8 @@ import org.apache.shardingsphere.infra.config.datasource.DataSourceConfiguration
import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
import org.apache.shardingsphere.infra.metadata.auth.builtin.yaml.swapper.UserRuleYamlSwapper;
import org.apache.shardingsphere.infra.metadata.auth.model.user.ShardingSphereUser;
-import org.apache.shardingsphere.infra.metadata.auth.refresher.event.CreateUserEvent;
-import org.apache.shardingsphere.infra.metadata.auth.refresher.event.GrantEvent;
+import org.apache.shardingsphere.infra.metadata.auth.mapper.event.dcl.impl.CreateUserStatementEvent;
+import org.apache.shardingsphere.infra.metadata.auth.mapper.event.dcl.impl.GrantStatementEvent;
import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
import org.apache.shardingsphere.infra.metadata.schema.refresher.event.SchemaAlteredEvent;
import org.apache.shardingsphere.infra.rule.event.impl.DataSourceDisabledEvent;
@@ -227,7 +227,7 @@ public final class RegistryCenter {
newArrayList.add(schemaName);
repository.persist(node.getMetadataNodePath(), Joiner.on(",").join(newArrayList));
}
-
+
/**
* Load data source configurations.
*
@@ -235,8 +235,7 @@ public final class RegistryCenter {
* @return data source configurations
*/
public Map<String, DataSourceConfiguration> loadDataSourceConfigurations(final String schemaName) {
- return hasDataSourceConfiguration(schemaName)
- ? YamlConfigurationConverter.convertDataSourceConfigurations(repository.get(node.getMetadataDataSourcePath(schemaName))) : new LinkedHashMap<>();
+ return hasDataSourceConfiguration(schemaName) ? YamlConfigurationConverter.convertDataSourceConfigurations(repository.get(node.getMetadataDataSourcePath(schemaName))) : new LinkedHashMap<>();
}
/**
@@ -267,8 +266,7 @@ public final class RegistryCenter {
* @return properties
*/
public Properties loadProperties() {
- return Strings.isNullOrEmpty(repository.get(node.getPropsPath())) ? new Properties()
- : YamlConfigurationConverter.convertProperties(repository.get(node.getPropsPath()));
+ return Strings.isNullOrEmpty(repository.get(node.getPropsPath())) ? new Properties() : YamlConfigurationConverter.convertProperties(repository.get(node.getPropsPath()));
}
/**
@@ -461,7 +459,7 @@ public final class RegistryCenter {
* @param event user configuration cached event
*/
@Subscribe
- public synchronized void renew(final CreateUserEvent event) {
+ public synchronized void renew(final CreateUserStatementEvent event) {
persistAuthentication(event.getUsers(), true);
}
@@ -471,7 +469,7 @@ public final class RegistryCenter {
* @param event grant event
*/
@Subscribe
- public synchronized void renew(final GrantEvent event) {
+ public synchronized void renew(final GrantStatementEvent event) {
persistChangedPrivilege(event.getUsers());
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/refresher/AuthenticationRefresher.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/mapper/SQLStatementEventMapper.java
similarity index 59%
rename from shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/refresher/AuthenticationRefresher.java
rename to shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/mapper/SQLStatementEventMapper.java
index 5b09423..32749aa 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/refresher/AuthenticationRefresher.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/mapper/SQLStatementEventMapper.java
@@ -15,24 +15,21 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.metadata.auth.refresher;
+package org.apache.shardingsphere.infra.metadata.auth.mapper;
-import org.apache.shardingsphere.infra.metadata.auth.Authentication;
-import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
-import org.apache.shardingsphere.infra.metadata.engine.MetadataRefresher;
+import org.apache.shardingsphere.infra.metadata.auth.mapper.event.SQLStatementEvent;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
/**
- * Authentication refresher.
+ * SQL statement event mapper.
*/
-public interface AuthenticationRefresher extends MetadataRefresher {
+public interface SQLStatementEventMapper {
/**
- * Refresh.
+ * Map SQL statement to SQL statement event.
*
- * @param authentication authentication
- * @param sqlStatement sql statement
- * @param metaData metaData
+ * @param sqlStatement SQL statement
+ * @return SQL statement event
*/
- void refresh(Authentication authentication, SQLStatement sqlStatement, ShardingSphereMetaData metaData);
+ SQLStatementEvent map(SQLStatement sqlStatement);
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/mapper/SQLStatementEventMapperFactory.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/mapper/SQLStatementEventMapperFactory.java
new file mode 100644
index 0000000..63ebf3c
--- /dev/null
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/mapper/SQLStatementEventMapperFactory.java
@@ -0,0 +1,55 @@
+/*
+ * 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.infra.metadata.auth.mapper;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.apache.shardingsphere.infra.metadata.auth.mapper.type.CreateUserStatementEventMapper;
+import org.apache.shardingsphere.infra.metadata.auth.mapper.type.GrantStatementEventMapper;
+import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
+import org.apache.shardingsphere.sql.parser.sql.common.statement.dcl.CreateUserStatement;
+import org.apache.shardingsphere.sql.parser.sql.common.statement.dcl.GrantStatement;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+
+/**
+ * SQL statement event mapper factory.
+ */
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class SQLStatementEventMapperFactory {
+
+ private static final Map<Class<?>, SQLStatementEventMapper> REGISTRY = new HashMap<>();
+
+ static {
+ REGISTRY.put(GrantStatement.class, new GrantStatementEventMapper());
+ REGISTRY.put(CreateUserStatement.class, new CreateUserStatementEventMapper());
+ }
+
+ /**
+ * Create new instance of SQL statement event mapper.
+ *
+ * @param sqlStatement SQL statement
+ * @return instance of SQL statement event mapper
+ */
+ public static Optional<SQLStatementEventMapper> newInstance(final SQLStatement sqlStatement) {
+ return REGISTRY.entrySet().stream().filter(entry -> entry.getKey().isAssignableFrom(sqlStatement.getClass())).findFirst().map(Entry::getValue);
+ }
+}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/refresher/event/AuthenticationAlteredEvent.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/mapper/event/SQLStatementEvent.java
similarity index 68%
copy from shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/refresher/event/AuthenticationAlteredEvent.java
copy to shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/mapper/event/SQLStatementEvent.java
index b794add..13fcbbe 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/refresher/event/AuthenticationAlteredEvent.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/mapper/event/SQLStatementEvent.java
@@ -15,18 +15,10 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.metadata.auth.refresher.event;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.infra.metadata.auth.Authentication;
+package org.apache.shardingsphere.infra.metadata.auth.mapper.event;
/**
- * Authentication altered event.
+ * SQL statement event.
*/
-@RequiredArgsConstructor
-@Getter
-public final class AuthenticationAlteredEvent {
-
- private final Authentication authentication;
+public interface SQLStatementEvent {
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/refresher/event/AuthenticationAlteredEvent.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/mapper/event/dcl/DCLStatementEvent.java
similarity index 68%
rename from shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/refresher/event/AuthenticationAlteredEvent.java
rename to shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/mapper/event/dcl/DCLStatementEvent.java
index b794add..c17d731 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/refresher/event/AuthenticationAlteredEvent.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/mapper/event/dcl/DCLStatementEvent.java
@@ -15,18 +15,12 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.metadata.auth.refresher.event;
+package org.apache.shardingsphere.infra.metadata.auth.mapper.event.dcl;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import org.apache.shardingsphere.infra.metadata.auth.Authentication;
+import org.apache.shardingsphere.infra.metadata.auth.mapper.event.SQLStatementEvent;
/**
- * Authentication altered event.
+ * DCL statement event.
*/
-@RequiredArgsConstructor
-@Getter
-public final class AuthenticationAlteredEvent {
-
- private final Authentication authentication;
+public interface DCLStatementEvent extends SQLStatementEvent {
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/refresher/event/CreateUserEvent.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/mapper/event/dcl/impl/CreateUserStatementEvent.java
similarity index 79%
rename from shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/refresher/event/CreateUserEvent.java
rename to shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/mapper/event/dcl/impl/CreateUserStatementEvent.java
index 8554710..2d45300 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/refresher/event/CreateUserEvent.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/mapper/event/dcl/impl/CreateUserStatementEvent.java
@@ -15,20 +15,21 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.metadata.auth.refresher.event;
+package org.apache.shardingsphere.infra.metadata.auth.mapper.event.dcl.impl;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.metadata.auth.model.user.ShardingSphereUser;
+import org.apache.shardingsphere.infra.metadata.auth.mapper.event.dcl.DCLStatementEvent;
import java.util.Collection;
/**
- * Create user event.
+ * Create user statement event.
*/
@RequiredArgsConstructor
@Getter
-public final class CreateUserEvent {
+public final class CreateUserStatementEvent implements DCLStatementEvent {
private final Collection<ShardingSphereUser> users;
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/refresher/event/GrantEvent.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/mapper/event/dcl/impl/GrantStatementEvent.java
similarity index 80%
rename from shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/refresher/event/GrantEvent.java
rename to shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/mapper/event/dcl/impl/GrantStatementEvent.java
index 034a058..9e711f8 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/refresher/event/GrantEvent.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/mapper/event/dcl/impl/GrantStatementEvent.java
@@ -15,20 +15,21 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.metadata.auth.refresher.event;
+package org.apache.shardingsphere.infra.metadata.auth.mapper.event.dcl.impl;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.metadata.auth.model.user.ShardingSphereUser;
+import org.apache.shardingsphere.infra.metadata.auth.mapper.event.dcl.DCLStatementEvent;
import java.util.Collection;
/**
- * Grant event.
+ * Grant statement event.
*/
@RequiredArgsConstructor
@Getter
-public final class GrantEvent {
+public final class GrantStatementEvent implements DCLStatementEvent {
private final Collection<ShardingSphereUser> users;
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/mapper/type/CreateUserStatementEventMapper.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/mapper/type/CreateUserStatementEventMapper.java
new file mode 100644
index 0000000..d7ac7fc
--- /dev/null
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/mapper/type/CreateUserStatementEventMapper.java
@@ -0,0 +1,45 @@
+/*
+ * 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.infra.metadata.auth.mapper.type;
+
+import org.apache.shardingsphere.infra.metadata.auth.AuthenticationContext;
+import org.apache.shardingsphere.infra.metadata.auth.model.user.ShardingSphereUser;
+import org.apache.shardingsphere.infra.metadata.auth.mapper.SQLStatementEventMapper;
+import org.apache.shardingsphere.infra.metadata.auth.mapper.event.dcl.impl.CreateUserStatementEvent;
+import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
+import org.apache.shardingsphere.sql.parser.sql.common.statement.dcl.CreateUserStatement;
+
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+/**
+ * Create user statement event.
+ */
+public final class CreateUserStatementEventMapper implements SQLStatementEventMapper {
+
+ @Override
+ public CreateUserStatementEvent map(final SQLStatement sqlStatement) {
+ Collection<ShardingSphereUser> users = getUsers((CreateUserStatement) sqlStatement);
+ users.addAll(AuthenticationContext.getInstance().getAuthentication().getAllUsers());
+ return new CreateUserStatementEvent(users);
+ }
+
+ private Collection<ShardingSphereUser> getUsers(final CreateUserStatement sqlStatement) {
+ return sqlStatement.getUsers().stream().map(each -> new ShardingSphereUser(each.getUser(), each.getAuth(), null != each.getHost() ? each.getHost() : "%")).collect(Collectors.toList());
+ }
+}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/refresher/type/GrantStatementAuthRefresher.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/mapper/type/GrantStatementEventMapper.java
similarity index 53%
rename from shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/refresher/type/GrantStatementAuthRefresher.java
rename to shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/mapper/type/GrantStatementEventMapper.java
index 627cecb..b8db0c5 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/refresher/type/GrantStatementAuthRefresher.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/mapper/type/GrantStatementEventMapper.java
@@ -15,32 +15,33 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.infra.metadata.auth.refresher.type;
+package org.apache.shardingsphere.infra.metadata.auth.mapper.type;
-import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
-import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
-import org.apache.shardingsphere.infra.metadata.auth.Authentication;
import org.apache.shardingsphere.infra.metadata.auth.model.user.ShardingSphereUser;
-import org.apache.shardingsphere.infra.metadata.auth.refresher.AuthenticationRefresher;
-import org.apache.shardingsphere.infra.metadata.auth.refresher.event.GrantEvent;
+import org.apache.shardingsphere.infra.metadata.auth.mapper.SQLStatementEventMapper;
+import org.apache.shardingsphere.infra.metadata.auth.mapper.event.dcl.impl.GrantStatementEvent;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.dcl.MySQLGrantStatement;
import java.util.Collection;
+import java.util.Collections;
import java.util.stream.Collectors;
/**
- * Grant statement auth refresher.
+ * Grant statement event mapper.
*/
-public final class GrantStatementAuthRefresher implements AuthenticationRefresher {
+public final class GrantStatementEventMapper implements SQLStatementEventMapper {
@Override
- public void refresh(final Authentication authentication, final SQLStatement sqlStatement, final ShardingSphereMetaData metaData) {
+ public GrantStatementEvent map(final SQLStatement sqlStatement) {
if (sqlStatement instanceof MySQLGrantStatement) {
- Collection<ShardingSphereUser> users = ((MySQLGrantStatement) sqlStatement).getUsers().stream()
- .map(each -> new ShardingSphereUser(each.getUser(), each.getAuth(), each.getHost())).collect(Collectors.toList());
- ShardingSphereEventBus.getInstance().post(new GrantEvent(users));
+ return new GrantStatementEvent(getUsers((MySQLGrantStatement) sqlStatement));
}
- // TODO support other db
+ // TODO support other database dialects
+ return new GrantStatementEvent(Collections.emptyList());
+ }
+
+ private Collection<ShardingSphereUser> getUsers(final MySQLGrantStatement sqlStatement) {
+ return sqlStatement.getUsers().stream().map(each -> new ShardingSphereUser(each.getUser(), each.getAuth(), each.getHost())).collect(Collectors.toList());
}
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/refresher/type/CreateUserStatementAuthRefresher.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/refresher/type/CreateUserStatementAuthRefresher.java
deleted file mode 100644
index 97929a0..0000000
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/auth/refresher/type/CreateUserStatementAuthRefresher.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.infra.metadata.auth.refresher.type;
-
-import org.apache.shardingsphere.infra.eventbus.ShardingSphereEventBus;
-import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
-import org.apache.shardingsphere.infra.metadata.auth.Authentication;
-import org.apache.shardingsphere.infra.metadata.auth.model.user.ShardingSphereUser;
-import org.apache.shardingsphere.infra.metadata.auth.refresher.AuthenticationRefresher;
-import org.apache.shardingsphere.infra.metadata.auth.refresher.event.CreateUserEvent;
-import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
-import org.apache.shardingsphere.sql.parser.sql.common.statement.dcl.CreateUserStatement;
-import org.apache.shardingsphere.sql.parser.sql.dialect.statement.mysql.segment.UserSegment;
-
-import java.util.Collection;
-import java.util.LinkedList;
-
-/**
- * Create user statement auth refresher.
- */
-public final class CreateUserStatementAuthRefresher implements AuthenticationRefresher {
-
- @Override
- public void refresh(final Authentication authentication, final SQLStatement sqlStatement, final ShardingSphereMetaData metaData) {
- Collection<ShardingSphereUser> users = generateUsers((CreateUserStatement) sqlStatement);
- users.addAll(authentication.getAllUsers());
- ShardingSphereEventBus.getInstance().post(new CreateUserEvent(users));
- }
-
- private Collection<ShardingSphereUser> generateUsers(final CreateUserStatement statement) {
- Collection<ShardingSphereUser> result = new LinkedList<>();
- for (UserSegment each : statement.getUsers()) {
- result.add(new ShardingSphereUser(each.getUser(), each.getAuth(), null != each.getHost() ? each.getHost() : "%"));
- }
- return result;
- }
-}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/engine/MetadataRefreshEngine.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/engine/MetadataRefreshEngine.java
index 6ce043f..70513a2 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/engine/MetadataRefreshEngine.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/engine/MetadataRefreshEngine.java
@@ -23,9 +23,8 @@ import org.apache.shardingsphere.infra.exception.ShardingSphereException;
import org.apache.shardingsphere.infra.lock.LockNameUtil;
import org.apache.shardingsphere.infra.lock.ShardingSphereLock;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
-import org.apache.shardingsphere.infra.metadata.auth.Authentication;
-import org.apache.shardingsphere.infra.metadata.auth.refresher.AuthenticationRefresher;
-import org.apache.shardingsphere.infra.metadata.auth.refresher.event.AuthenticationAlteredEvent;
+import org.apache.shardingsphere.infra.metadata.auth.mapper.SQLStatementEventMapper;
+import org.apache.shardingsphere.infra.metadata.auth.mapper.SQLStatementEventMapperFactory;
import org.apache.shardingsphere.infra.metadata.schema.builder.SchemaBuilderMaterials;
import org.apache.shardingsphere.infra.metadata.schema.refresher.SchemaRefresher;
import org.apache.shardingsphere.infra.metadata.schema.refresher.event.SchemaAlteredEvent;
@@ -42,16 +41,12 @@ public final class MetadataRefreshEngine {
private final ShardingSphereMetaData metaData;
- private final Authentication authentication;
-
private final SchemaBuilderMaterials materials;
private final Optional<ShardingSphereLock> lockOptional;
- public MetadataRefreshEngine(final ShardingSphereMetaData metaData, final Authentication authentication,
- final ConfigurationProperties properties, final Optional<ShardingSphereLock> lockOptional) {
+ public MetadataRefreshEngine(final ShardingSphereMetaData metaData, final ConfigurationProperties properties, final Optional<ShardingSphereLock> lockOptional) {
this.metaData = metaData;
- this.authentication = authentication;
this.lockOptional = lockOptional;
materials = new SchemaBuilderMaterials(metaData.getResource().getDatabaseType(), metaData.getResource().getDataSources(), metaData.getRuleMetaData().getRules(), properties);
}
@@ -66,12 +61,12 @@ public final class MetadataRefreshEngine {
public void refresh(final SQLStatement sqlStatement, final Collection<String> routeDataSourceNames) throws SQLException {
Optional<MetadataRefresher> metadataRefresher = MetadataRefresherFactory.newInstance(sqlStatement);
if (metadataRefresher.isPresent()) {
- if (metadataRefresher.get() instanceof SchemaRefresher) {
- refreshSchema(sqlStatement, routeDataSourceNames, (SchemaRefresher) metadataRefresher.get());
- }
- if (metadataRefresher.get() instanceof AuthenticationRefresher) {
- refreshAuthentication(sqlStatement, (AuthenticationRefresher) metadataRefresher.get());
- }
+ refreshSchema(sqlStatement, routeDataSourceNames, (SchemaRefresher) metadataRefresher.get());
+ }
+ Optional<SQLStatementEventMapper> sqlStatementEventMapper = SQLStatementEventMapperFactory.newInstance(sqlStatement);
+ if (sqlStatementEventMapper.isPresent()) {
+ ShardingSphereEventBus.getInstance().post(sqlStatementEventMapper.get().map(sqlStatement));
+ // TODO Subscribe and handle DCLStatementEvent
}
}
@@ -103,10 +98,4 @@ public final class MetadataRefreshEngine {
refresher.refresh(metaData.getSchema(), routeDataSourceNames, sqlStatement, materials);
ShardingSphereEventBus.getInstance().post(new SchemaAlteredEvent(metaData.getName(), metaData.getSchema()));
}
-
- private void refreshAuthentication(final SQLStatement sqlStatement, final AuthenticationRefresher refresher) {
- refresher.refresh(authentication, sqlStatement, metaData);
- // TODO :Subscribe and handle this event
- ShardingSphereEventBus.getInstance().post(new AuthenticationAlteredEvent(authentication));
- }
}
diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/engine/MetadataRefresherFactory.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/engine/MetadataRefresherFactory.java
index 040de01..2395173 100644
--- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/engine/MetadataRefresherFactory.java
+++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/engine/MetadataRefresherFactory.java
@@ -19,8 +19,6 @@ package org.apache.shardingsphere.infra.metadata.engine;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import org.apache.shardingsphere.infra.metadata.auth.refresher.type.CreateUserStatementAuthRefresher;
-import org.apache.shardingsphere.infra.metadata.auth.refresher.type.GrantStatementAuthRefresher;
import org.apache.shardingsphere.infra.metadata.schema.refresher.type.AlterTableStatementSchemaRefresher;
import org.apache.shardingsphere.infra.metadata.schema.refresher.type.CreateIndexStatementSchemaRefresher;
import org.apache.shardingsphere.infra.metadata.schema.refresher.type.CreateTableStatementSchemaRefresher;
@@ -29,8 +27,6 @@ import org.apache.shardingsphere.infra.metadata.schema.refresher.type.DropIndexS
import org.apache.shardingsphere.infra.metadata.schema.refresher.type.DropTableStatementSchemaRefresher;
import org.apache.shardingsphere.infra.metadata.schema.refresher.type.DropViewStatementSchemaRefresher;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
-import org.apache.shardingsphere.sql.parser.sql.common.statement.dcl.CreateUserStatement;
-import org.apache.shardingsphere.sql.parser.sql.common.statement.dcl.GrantStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.AlterTableStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.CreateIndexStatement;
import org.apache.shardingsphere.sql.parser.sql.common.statement.ddl.CreateTableStatement;
@@ -60,8 +56,6 @@ public final class MetadataRefresherFactory {
REGISTRY.put(DropIndexStatement.class, new DropIndexStatementSchemaRefresher());
REGISTRY.put(CreateViewStatement.class, new CreateViewStatementSchemaRefresher());
REGISTRY.put(DropViewStatement.class, new DropViewStatementSchemaRefresher());
- REGISTRY.put(GrantStatement.class, new GrantStatementAuthRefresher());
- REGISTRY.put(CreateUserStatement.class, new CreateUserStatementAuthRefresher());
}
/**
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/JDBCLockEngine.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/JDBCLockEngine.java
index 1599180..2a05af7 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/JDBCLockEngine.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/executor/JDBCLockEngine.java
@@ -26,7 +26,6 @@ import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.J
import org.apache.shardingsphere.infra.executor.sql.execute.engine.driver.jdbc.JDBCExecutorCallback;
import org.apache.shardingsphere.infra.lock.LockNameUtil;
import org.apache.shardingsphere.infra.lock.ShardingSphereLock;
-import org.apache.shardingsphere.infra.metadata.auth.AuthenticationContext;
import org.apache.shardingsphere.infra.metadata.engine.MetadataRefreshEngine;
import org.apache.shardingsphere.infra.route.context.RouteUnit;
import org.apache.shardingsphere.sql.parser.sql.common.statement.SQLStatement;
@@ -56,8 +55,7 @@ public final class JDBCLockEngine {
public JDBCLockEngine(final MetaDataContexts metaDataContexts, final JDBCExecutor jdbcExecutor) {
this.metaDataContexts = metaDataContexts;
this.jdbcExecutor = jdbcExecutor;
- metadataRefreshEngine = new MetadataRefreshEngine(
- metaDataContexts.getDefaultMetaData(), AuthenticationContext.getInstance().getAuthentication(), metaDataContexts.getProps(), metaDataContexts.getLock());
+ metadataRefreshEngine = new MetadataRefreshEngine(metaDataContexts.getDefaultMetaData(), metaDataContexts.getProps(), metaDataContexts.getLock());
}
/**
diff --git a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java
index 7ac2659..be27b6d 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-backend/src/main/java/org/apache/shardingsphere/proxy/backend/communication/DatabaseCommunicationEngine.java
@@ -30,7 +30,6 @@ import org.apache.shardingsphere.infra.executor.sql.prepare.driver.jdbc.JDBCDriv
import org.apache.shardingsphere.infra.merge.MergeEngine;
import org.apache.shardingsphere.infra.merge.result.MergedResult;
import org.apache.shardingsphere.infra.metadata.ShardingSphereMetaData;
-import org.apache.shardingsphere.infra.metadata.auth.AuthenticationContext;
import org.apache.shardingsphere.infra.metadata.engine.MetadataRefreshEngine;
import org.apache.shardingsphere.infra.rule.type.DataNodeContainedRule;
import org.apache.shardingsphere.proxy.backend.communication.jdbc.connection.BackendConnection;
@@ -82,8 +81,7 @@ public final class DatabaseCommunicationEngine {
this.logicSQL = logicSQL;
proxySQLExecutor = new ProxySQLExecutor(driverType, backendConnection);
kernelProcessor = new KernelProcessor();
- engine = new MetadataRefreshEngine(metaData,
- AuthenticationContext.getInstance().getAuthentication(), ProxyContext.getInstance().getMetaDataContexts().getProps(), ProxyContext.getInstance().getLock());
+ engine = new MetadataRefreshEngine(metaData, ProxyContext.getInstance().getMetaDataContexts().getProps(), ProxyContext.getInstance().getLock());
proxyLockEngine = new ProxyLockEngine(proxySQLExecutor, engine, backendConnection.getSchemaName());
}