You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by GitBox <gi...@apache.org> on 2021/03/18 10:04:18 UTC
[GitHub] [shardingsphere] juaby opened a new pull request #9731: Refactor eventbus and distsql handler
juaby opened a new pull request #9731:
URL: https://github.com/apache/shardingsphere/pull/9731
Fixes #ISSUSE_ID.
Changes proposed in this pull request:
- RT
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shardingsphere] tristaZero commented on a change in pull request #9731: Refactor eventbus and distsql handler
Posted by GitBox <gi...@apache.org>.
tristaZero commented on a change in pull request #9731:
URL: https://github.com/apache/shardingsphere/pull/9731#discussion_r598055825
##########
File path: shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/eventbus/CompletableEventService.java
##########
@@ -0,0 +1,65 @@
+/*
+ * 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.eventbus;
+
+import com.google.common.eventbus.Subscribe;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * Completable event service.
+ */
+public final class CompletableEventService<T> {
+
+ private final T target;
+
+ private final Map<Class<?>, Method> targetMethods;
+
+ public CompletableEventService(final T target) {
+ this.target = target;
+ this.targetMethods = Arrays.stream(target.getClass().getDeclaredMethods()).filter(method -> {
+ Class<?>[] parameterTypes = method.getParameterTypes();
+ return parameterTypes.length == 1 && null != method.getDeclaredAnnotation(Subscribe.class);
+ }).collect(Collectors.toMap(method -> {
+ Class<?>[] parameterTypes = method.getParameterTypes();
+ return parameterTypes[0];
+ }, method -> method));
+ }
+
+ /**
+ * Handle event.
+ *
+ * @param completableEvent completable event
+ */
+ @Subscribe
+ public void handle(final CompletableEvent completableEvent) {
+ try {
+ Method handler = targetMethods.get(completableEvent.getTarget().getClass());
+ if (null != handler) {
+ handler.invoke(target, completableEvent.getTarget());
+ }
+ completableEvent.getCompletableFuture().complete(true);
+ } catch (IllegalAccessException | InvocationTargetException e) {
Review comment:
final one?
##########
File path: shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/eventbus/ShardingSphereEventBus.java
##########
@@ -20,23 +20,75 @@
import com.google.common.eventbus.EventBus;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
+import org.apache.shardingsphere.infra.exception.ShardingSphereException;
+
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
/**
* ShardingSphere event bus.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class ShardingSphereEventBus {
+ private EventBus eventBus;
+
+ private ShardingSphereEventBus(final EventBus eventBus, final DummyEventService dummyEventService) {
+ this.eventBus = eventBus;
+ this.eventBus.register(dummyEventService);
+ }
+
/**
* Get instance of ShardingSphere event bus.
*
* @return instance of ShardingSphere event bus
*/
- public static EventBus getInstance() {
+ public static ShardingSphereEventBus getInstance() {
return ShardingSphereEventBusHolder.INSTANCE;
}
+ /**
+ * Registers all subscriber methods on {@code object} to receive events.
+ *
+ * @param target whose subscriber methods should be registered.
+ * @param <T> subscriber type.
+ */
+ public <T> void register(final T target) {
Review comment:
Where is this function called?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shardingsphere] tristaZero commented on a change in pull request #9731: Refactor eventbus and distsql handler
Posted by GitBox <gi...@apache.org>.
tristaZero commented on a change in pull request #9731:
URL: https://github.com/apache/shardingsphere/pull/9731#discussion_r598058218
##########
File path: shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/eventbus/CompletableEventService.java
##########
@@ -0,0 +1,65 @@
+/*
+ * 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.eventbus;
+
+import com.google.common.eventbus.Subscribe;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * Completable event service.
+ */
+public final class CompletableEventService<T> {
+
+ private final T target;
+
+ private final Map<Class<?>, Method> targetMethods;
+
+ public CompletableEventService(final T target) {
+ this.target = target;
+ this.targetMethods = Arrays.stream(target.getClass().getDeclaredMethods()).filter(method -> {
+ Class<?>[] parameterTypes = method.getParameterTypes();
+ return parameterTypes.length == 1 && null != method.getDeclaredAnnotation(Subscribe.class);
+ }).collect(Collectors.toMap(method -> {
+ Class<?>[] parameterTypes = method.getParameterTypes();
Review comment:
Is it supposed to remove all `@Subscribe` annotation from `renew()` of target classes?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shardingsphere] tristaZero commented on a change in pull request #9731: Refactor eventbus and distsql handler
Posted by GitBox <gi...@apache.org>.
tristaZero commented on a change in pull request #9731:
URL: https://github.com/apache/shardingsphere/pull/9731#discussion_r598514974
##########
File path: shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/eventbus/CompletableEvent.java
##########
@@ -0,0 +1,35 @@
+/*
+ * 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.eventbus;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * Completable event.
+ */
+@Getter
+@RequiredArgsConstructor
+public class CompletableEvent<E> {
Review comment:
final one?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shardingsphere] juaby commented on a change in pull request #9731: Refactor eventbus and distsql handler
Posted by GitBox <gi...@apache.org>.
juaby commented on a change in pull request #9731:
URL: https://github.com/apache/shardingsphere/pull/9731#discussion_r599303972
##########
File path: shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/eventbus/CompletableEvent.java
##########
@@ -0,0 +1,35 @@
+/*
+ * 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.eventbus;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import java.util.concurrent.CompletableFuture;
+
+/**
+ * Completable event.
+ */
+@Getter
+@RequiredArgsConstructor
+public class CompletableEvent<E> {
Review comment:
Fixed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shardingsphere] codecov-io commented on pull request #9731: Refactor eventbus and distsql handler
Posted by GitBox <gi...@apache.org>.
codecov-io commented on pull request #9731:
URL: https://github.com/apache/shardingsphere/pull/9731#issuecomment-802517073
# [Codecov](https://codecov.io/gh/apache/shardingsphere/pull/9731?src=pr&el=h1) Report
> Merging [#9731](https://codecov.io/gh/apache/shardingsphere/pull/9731?src=pr&el=desc) (59abd93) into [master](https://codecov.io/gh/apache/shardingsphere/commit/8233df336885756b5e1c5a76307ef0b306b1c607?el=desc) (8233df3) will **increase** coverage by `0.27%`.
> The diff coverage is `43.75%`.
[](https://codecov.io/gh/apache/shardingsphere/pull/9731?src=pr&el=tree)
```diff
@@ Coverage Diff @@
## master #9731 +/- ##
============================================
+ Coverage 67.43% 67.70% +0.27%
- Complexity 685 688 +3
============================================
Files 1661 1665 +4
Lines 27735 27683 -52
Branches 4923 4882 -41
============================================
+ Hits 18702 18744 +42
+ Misses 7657 7562 -95
- Partials 1376 1377 +1
```
| [Impacted Files](https://codecov.io/gh/apache/shardingsphere/pull/9731?src=pr&el=tree) | Coverage Δ | Complexity Δ | |
|---|---|---|---|
| [...istsql/ral/impl/CheckScalingJobBackendHandler.java](https://codecov.io/gh/apache/shardingsphere/pull/9731/diff?src=pr&el=tree#diff-c2hhcmRpbmdzcGhlcmUtcHJveHkvc2hhcmRpbmdzcGhlcmUtcHJveHktYmFja2VuZC9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2hhcmRpbmdzcGhlcmUvcHJveHkvYmFja2VuZC90ZXh0L2Rpc3RzcWwvcmFsL2ltcGwvQ2hlY2tTY2FsaW5nSm9iQmFja2VuZEhhbmRsZXIuamF2YQ==) | `0.00% <0.00%> (ø)` | `0.00 <0.00> (ø)` | |
| [...distsql/ral/impl/DropScalingJobBackendHandler.java](https://codecov.io/gh/apache/shardingsphere/pull/9731/diff?src=pr&el=tree#diff-c2hhcmRpbmdzcGhlcmUtcHJveHkvc2hhcmRpbmdzcGhlcmUtcHJveHktYmFja2VuZC9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2hhcmRpbmdzcGhlcmUvcHJveHkvYmFja2VuZC90ZXh0L2Rpc3RzcWwvcmFsL2ltcGwvRHJvcFNjYWxpbmdKb2JCYWNrZW5kSGFuZGxlci5qYXZh) | `0.00% <0.00%> (ø)` | `0.00 <0.00> (ø)` | |
| [...istsql/ral/impl/ResetScalingJobBackendHandler.java](https://codecov.io/gh/apache/shardingsphere/pull/9731/diff?src=pr&el=tree#diff-c2hhcmRpbmdzcGhlcmUtcHJveHkvc2hhcmRpbmdzcGhlcmUtcHJveHktYmFja2VuZC9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2hhcmRpbmdzcGhlcmUvcHJveHkvYmFja2VuZC90ZXh0L2Rpc3RzcWwvcmFsL2ltcGwvUmVzZXRTY2FsaW5nSm9iQmFja2VuZEhhbmRsZXIuamF2YQ==) | `0.00% <0.00%> (ø)` | `0.00 <0.00> (ø)` | |
| [...sql/ral/impl/ShowScalingJobListBackendHandler.java](https://codecov.io/gh/apache/shardingsphere/pull/9731/diff?src=pr&el=tree#diff-c2hhcmRpbmdzcGhlcmUtcHJveHkvc2hhcmRpbmdzcGhlcmUtcHJveHktYmFja2VuZC9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2hhcmRpbmdzcGhlcmUvcHJveHkvYmFja2VuZC90ZXh0L2Rpc3RzcWwvcmFsL2ltcGwvU2hvd1NjYWxpbmdKb2JMaXN0QmFja2VuZEhhbmRsZXIuamF2YQ==) | `0.00% <0.00%> (ø)` | `0.00 <0.00> (ø)` | |
| [...l/ral/impl/ShowScalingJobStatusBackendHandler.java](https://codecov.io/gh/apache/shardingsphere/pull/9731/diff?src=pr&el=tree#diff-c2hhcmRpbmdzcGhlcmUtcHJveHkvc2hhcmRpbmdzcGhlcmUtcHJveHktYmFja2VuZC9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2hhcmRpbmdzcGhlcmUvcHJveHkvYmFja2VuZC90ZXh0L2Rpc3RzcWwvcmFsL2ltcGwvU2hvd1NjYWxpbmdKb2JTdGF0dXNCYWNrZW5kSGFuZGxlci5qYXZh) | `0.00% <0.00%> (ø)` | `0.00 <0.00> (ø)` | |
| [...istsql/ral/impl/StartScalingJobBackendHandler.java](https://codecov.io/gh/apache/shardingsphere/pull/9731/diff?src=pr&el=tree#diff-c2hhcmRpbmdzcGhlcmUtcHJveHkvc2hhcmRpbmdzcGhlcmUtcHJveHktYmFja2VuZC9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2hhcmRpbmdzcGhlcmUvcHJveHkvYmFja2VuZC90ZXh0L2Rpc3RzcWwvcmFsL2ltcGwvU3RhcnRTY2FsaW5nSm9iQmFja2VuZEhhbmRsZXIuamF2YQ==) | `0.00% <0.00%> (ø)` | `0.00 <0.00> (ø)` | |
| [...distsql/ral/impl/StopScalingJobBackendHandler.java](https://codecov.io/gh/apache/shardingsphere/pull/9731/diff?src=pr&el=tree#diff-c2hhcmRpbmdzcGhlcmUtcHJveHkvc2hhcmRpbmdzcGhlcmUtcHJveHktYmFja2VuZC9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2hhcmRpbmdzcGhlcmUvcHJveHkvYmFja2VuZC90ZXh0L2Rpc3RzcWwvcmFsL2ltcGwvU3RvcFNjYWxpbmdKb2JCYWNrZW5kSGFuZGxlci5qYXZh) | `0.00% <0.00%> (ø)` | `0.00 <0.00> (ø)` | |
| [...t/distsql/rdl/AlterShardingRuleBackendHandler.java](https://codecov.io/gh/apache/shardingsphere/pull/9731/diff?src=pr&el=tree#diff-c2hhcmRpbmdzcGhlcmUtcHJveHkvc2hhcmRpbmdzcGhlcmUtcHJveHktYmFja2VuZC9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2hhcmRpbmdzcGhlcmUvcHJveHkvYmFja2VuZC90ZXh0L2Rpc3RzcWwvcmRsL0FsdGVyU2hhcmRpbmdSdWxlQmFja2VuZEhhbmRsZXIuamF2YQ==) | `0.00% <0.00%> (ø)` | `0.00 <0.00> (ø)` | |
| [...stsql/rdl/impl/DropShardingRuleBackendHandler.java](https://codecov.io/gh/apache/shardingsphere/pull/9731/diff?src=pr&el=tree#diff-c2hhcmRpbmdzcGhlcmUtcHJveHkvc2hhcmRpbmdzcGhlcmUtcHJveHktYmFja2VuZC9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2hhcmRpbmdzcGhlcmUvcHJveHkvYmFja2VuZC90ZXh0L2Rpc3RzcWwvcmRsL2ltcGwvRHJvcFNoYXJkaW5nUnVsZUJhY2tlbmRIYW5kbGVyLmphdmE=) | `0.00% <0.00%> (ø)` | `0.00 <0.00> (ø)` | |
| [...mpl/ReadWriteSplittingRuleQueryBackendHandler.java](https://codecov.io/gh/apache/shardingsphere/pull/9731/diff?src=pr&el=tree#diff-c2hhcmRpbmdzcGhlcmUtcHJveHkvc2hhcmRpbmdzcGhlcmUtcHJveHktYmFja2VuZC9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2hhcmRpbmdzcGhlcmUvcHJveHkvYmFja2VuZC90ZXh0L2Rpc3RzcWwvcnFsL2ltcGwvUmVhZFdyaXRlU3BsaXR0aW5nUnVsZVF1ZXJ5QmFja2VuZEhhbmRsZXIuamF2YQ==) | `0.00% <0.00%> (ø)` | `0.00 <0.00> (ø)` | |
| ... and [36 more](https://codecov.io/gh/apache/shardingsphere/pull/9731/diff?src=pr&el=tree-more) | |
------
[Continue to review full report at Codecov](https://codecov.io/gh/apache/shardingsphere/pull/9731?src=pr&el=continue).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/apache/shardingsphere/pull/9731?src=pr&el=footer). Last update [8233df3...59abd93](https://codecov.io/gh/apache/shardingsphere/pull/9731?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shardingsphere] juaby closed pull request #9731: Refactor eventbus and distsql handler
Posted by GitBox <gi...@apache.org>.
juaby closed pull request #9731:
URL: https://github.com/apache/shardingsphere/pull/9731
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [shardingsphere] juaby commented on a change in pull request #9731: Refactor eventbus and distsql handler
Posted by GitBox <gi...@apache.org>.
juaby commented on a change in pull request #9731:
URL: https://github.com/apache/shardingsphere/pull/9731#discussion_r598488569
##########
File path: shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/eventbus/CompletableEventService.java
##########
@@ -0,0 +1,65 @@
+/*
+ * 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.eventbus;
+
+import com.google.common.eventbus.Subscribe;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * Completable event service.
+ */
+public final class CompletableEventService<T> {
+
+ private final T target;
+
+ private final Map<Class<?>, Method> targetMethods;
+
+ public CompletableEventService(final T target) {
+ this.target = target;
+ this.targetMethods = Arrays.stream(target.getClass().getDeclaredMethods()).filter(method -> {
+ Class<?>[] parameterTypes = method.getParameterTypes();
+ return parameterTypes.length == 1 && null != method.getDeclaredAnnotation(Subscribe.class);
+ }).collect(Collectors.toMap(method -> {
+ Class<?>[] parameterTypes = method.getParameterTypes();
+ return parameterTypes[0];
+ }, method -> method));
+ }
+
+ /**
+ * Handle event.
+ *
+ * @param completableEvent completable event
+ */
+ @Subscribe
+ public void handle(final CompletableEvent completableEvent) {
+ try {
+ Method handler = targetMethods.get(completableEvent.getTarget().getClass());
+ if (null != handler) {
+ handler.invoke(target, completableEvent.getTarget());
+ }
+ completableEvent.getCompletableFuture().complete(true);
+ } catch (IllegalAccessException | InvocationTargetException e) {
Review comment:
Fixed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org