Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

merge async changes in 3.x to 2.7 #3997

Merged
merged 31 commits into from
May 23, 2019
Merged

merge async changes in 3.x to 2.7 #3997

merged 31 commits into from
May 23, 2019

Commits on May 8, 2019

  1. Async optimization (apache#3738) 

    * Result implement CF

* Result implement CF

* Result implement CF

* Add AsyncRpcResult

* Fix bugs and refactor Filter

* Try to add onSend onError for Filter

* invoke different filter method according to result status.

*  make generic work with async call, including add $invokeAsync

* refactor legacy Filter implementation to work with onResponse.

* demo changes

* Fixes apache#3620, provider attachment lose on consumer side, fix this by reverting RpcContext copy

* AsyncRpcResult should always holds an Invocation instance

* refactor filter signature

* reimplement embedded Filters

* use ProviderModel modification in 3.x

* Fix address notification processing workflow after merging 3.x branch

* Fix UT

* Fix UT

* Unit test of JValidator; Clean code of JValidator (apache#3723)

* Fixes apache#3625 (apache#3730)

use constant to replace magic number

* Fix conflict when merging master and 3.x

* Fix conflict when merging master and 3.x

* Result interface itself has Future status.

* Fix DefaultFuture UT

* Wrap all protocol Invoker with AsyncToSyncInvoker & Fix UT

* Add license

* fix UT

* Fix ut in MonitorFilterTest

* avoid duplicate async to sync wrapper

* return async result in CacheFilter.

* fix UT in CacheFilterTest

* Add generic condition check to GenericFilter callback.

* Fix UT

* Get generic from RpcContext if the value in Invocation is empty.

* Fix RSocketProtocol to meet AbstractProtocol adjustment

* rename RpcResult to AppResponse to help avoid confusion with AsyncRpcResult.

* RSocket module switch to AsyncRpcResult
    @chickenlj
    chickenlj committed May 8, 2019
    Configuration menu
    Copy the full SHA
    1f52668 View commit details
    Browse the repository at this point in the history

  2. resolve conflicts

    @chickenlj
    chickenlj committed May 8, 2019
    Configuration menu
    Copy the full SHA
    596b5d5 View commit details
    Browse the repository at this point in the history

  3. Rename some variables to avoid possible confusion between Result and … 

    …AppResponse. (apache#3889)

Clear that the `Result` of the call back is actually an `AppResponse`.
    @chickenlj
    chickenlj committed May 8, 2019
    Configuration menu
    Copy the full SHA
    8143d4e View commit details
    Browse the repository at this point in the history

  4. Result implements future and keep Filter backward compatibility. (apa… 

    …che#3916)
    @chickenlj
    chickenlj committed May 8, 2019
    Configuration menu
    Copy the full SHA
    64081c6 View commit details
    Browse the repository at this point in the history

  5. get CompletableFuture before thenApply

    @chickenlj
    chickenlj committed May 8, 2019
    Configuration menu
    Copy the full SHA
    670690e View commit details
    Browse the repository at this point in the history

  6. rename property to avoid possible confusion

    @chickenlj
    chickenlj committed May 8, 2019
    Configuration menu
    Copy the full SHA
    0d0c991 View commit details
    Browse the repository at this point in the history

  7. add comment

    @chickenlj
    chickenlj committed May 8, 2019
    Configuration menu
    Copy the full SHA
    db962a1 View commit details
    Browse the repository at this point in the history

  8. add comment

    @chickenlj
    chickenlj committed May 8, 2019
    Configuration menu
    Copy the full SHA
    5971410 View commit details
    Browse the repository at this point in the history

  9. add comment

    @ralf0131 @chickenlj
    ralf0131 authored and chickenlj committed May 8, 2019
    Configuration menu
    Copy the full SHA
    d9676b8 View commit details
    Browse the repository at this point in the history

  10. add comment

    @chickenlj
    chickenlj committed May 8, 2019
    Configuration menu
    Copy the full SHA
    5c90c8f View commit details
    Browse the repository at this point in the history

  11. Merge branch 'master' into consumer-thread-isolation 

    # Conflicts:
#	dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericFilter.java
    @chickenlj
    chickenlj committed May 8, 2019
    Configuration menu
    Copy the full SHA
    76862a6 View commit details
    Browse the repository at this point in the history

  12. resolve conflicts when merging async from 3.x

    @chickenlj
    chickenlj committed May 8, 2019
    Configuration menu
    Copy the full SHA
    93688fd View commit details
    Browse the repository at this point in the history

  13. keep dubbo-demo unchanged

    @chickenlj
    chickenlj committed May 8, 2019
    Configuration menu
    Copy the full SHA
    82ffe21 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2019

  1. delete PropertiesConfigurationTest, does not exit in master branch be… 

    …fore.
    @chickenlj
    chickenlj committed May 13, 2019
    Configuration menu
    Copy the full SHA
    2e9e367 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into consumer-thread-isolation 

    # Conflicts:
#	dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/MergeableClusterInvoker.java
#	dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java
#	dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/filter/CacheFilter.java
#	dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/support/MonitorFilter.java
#	dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/DefaultFuture.java
#	dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/header/HeaderExchangeChannel.java
#	dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ActiveLimitFilter.java
#	dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/CompatibleFilter.java
#	dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ConsumerContextFilter.java
#	dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ContextFilter.java
#	dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/EchoFilter.java
#	dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ExceptionFilter.java
#	dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ExecuteLimitFilter.java
#	dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericFilter.java
#	dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericImplFilter.java
#	dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/TimeoutFilter.java
#	dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AbstractInvoker.java
#	dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/InvokerInvocationHandler.java
#	dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/RpcUtils.java
#	dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/ChannelWrappedInvoker.java
#	dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboCountCodec.java
#	dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java
#	dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvokerAvilableTest.java
#	dubbo-rpc/dubbo-rpc-hessian/src/main/java/org/apache/dubbo/rpc/protocol/hessian/HessianProtocol.java
#	dubbo-rpc/dubbo-rpc-http/src/main/java/org/apache/dubbo/rpc/protocol/http/HttpProtocol.java
#	dubbo-rpc/dubbo-rpc-memcached/src/main/java/org/apache/dubbo/rpc/protocol/memcached/MemcachedProtocol.java
#	dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftProtocol.java
    @chickenlj
    chickenlj committed May 13, 2019
    Configuration menu
    Copy the full SHA
    e02d099 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2019

  1. merge master to resolve conflicts

    @chickenlj
    chickenlj committed May 14, 2019
    Configuration menu
    Copy the full SHA
    de320ba View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into consumer-thread-isolation 

    # Conflicts:
#	dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/support/MonitorFilter.java
    @chickenlj
    chickenlj committed May 14, 2019
    Configuration menu
    Copy the full SHA
    7381887 View commit details
    Browse the repository at this point in the history

  3. merge master to resolve conflicts

    @chickenlj
    chickenlj committed May 14, 2019
    Configuration menu
    Copy the full SHA
    09f2047 View commit details
    Browse the repository at this point in the history

  4. remove unused imports

    @chickenlj
    chickenlj committed May 14, 2019
    Configuration menu
    Copy the full SHA
    3194ef7 View commit details
    Browse the repository at this point in the history

  5. remove unused imports

    @chickenlj
    chickenlj committed May 14, 2019
    Configuration menu
    Copy the full SHA
    2634859 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2019

  1. remove unused imports

    @chickenlj
    chickenlj committed May 15, 2019
    Configuration menu
    Copy the full SHA
    2869f6d View commit details
    Browse the repository at this point in the history

Commits on May 16, 2019

  1. Merge branch 'master' into consumer-thread-isolation 

    # Conflicts:
#	dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ContextFilter.java
#	dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboProtocol.java
    @chickenlj
    chickenlj committed May 16, 2019
    Configuration menu
    Copy the full SHA
    5738a75 View commit details
    Browse the repository at this point in the history

  2. remove unused imports

    @chickenlj
    chickenlj committed May 16, 2019
    Configuration menu
    Copy the full SHA
    b57d818 View commit details
    Browse the repository at this point in the history

  3. remove unused imports

    @chickenlj
    chickenlj committed May 16, 2019
    Configuration menu
    Copy the full SHA
    32a3d07 View commit details
    Browse the repository at this point in the history

  4. Fix but, replace AppResponse with AsyncRpcResult

    @chickenlj
    chickenlj committed May 16, 2019
    Configuration menu
    Copy the full SHA
    2b8ce01 View commit details
    Browse the repository at this point in the history

  5. refactor doRefer in XmlRpcProtocol extension to getFrameProxy

    @chickenlj
    chickenlj committed May 16, 2019
    Configuration menu
    Copy the full SHA
    56953eb View commit details
    Browse the repository at this point in the history

  6. reuse doRefer to reduce backward influences

    @chickenlj
    chickenlj committed May 16, 2019
    Configuration menu
    Copy the full SHA
    00aa992 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2019

  1. Merge branch 'master' into consumer-thread-isolation 

    # Conflicts:
#	dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/MergeableClusterInvoker.java
#	dubbo-common/src/main/java/org/apache/dubbo/common/constants/RpcConstants.java
#	dubbo-compatible/src/main/java/com/alibaba/dubbo/rpc/Invocation.java
#	dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/MetricsFilter.java
#	dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/DefaultFuture.java
#	dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/CompatibleFilter.java
#	dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericFilter.java
#	dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericImplFilter.java
#	dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AbstractInvoker.java
#	dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/InvokerInvocationHandler.java
#	dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/RpcUtils.java
#	dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/ChannelWrappedInvoker.java
#	dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvokerAvilableTest.java
#	dubbo-rpc/dubbo-rpc-hessian/src/main/java/org/apache/dubbo/rpc/protocol/hessian/HessianProtocol.java
#	dubbo-rpc/dubbo-rpc-http/src/main/java/org/apache/dubbo/rpc/protocol/http/HttpProtocol.java
#	dubbo-rpc/dubbo-rpc-redis/src/main/java/org/apache/dubbo/rpc/protocol/redis/RedisProtocol.java
#	dubbo-rpc/dubbo-rpc-rmi/src/main/java/org/apache/dubbo/rpc/protocol/rmi/RmiProtocol.java
#	dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftProtocol.java
    @chickenlj
    chickenlj committed May 17, 2019
    Configuration menu
    Copy the full SHA
    3615281 View commit details
    Browse the repository at this point in the history

  2. remove unused imports after merge master

    @chickenlj
    chickenlj committed May 17, 2019
    Configuration menu
    Copy the full SHA
    fc797e2 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2019

  1. Fix issues find during review.

    @chickenlj
    chickenlj committed May 22, 2019
    Configuration menu
    Copy the full SHA
    fa1c373 View commit details
    Browse the repository at this point in the history

  2. add UT

    @chickenlj
    chickenlj committed May 22, 2019
    Configuration menu
    Copy the full SHA
    b155d93 View commit details
    Browse the repository at this point in the history