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.

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

Better License to comply with AL2 #1866

Merged
merged 22 commits into from
May 31, 2018
Merged

Better License to comply with AL2 #1866

merged 22 commits into from
May 31, 2018

Commits on Jan 10, 2018

  1. Configuration menu
    Copy the full SHA
    0807761 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    65438b4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7291963 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2018

  1. 当cores线程数全都使用的情况下,默认线程池会把任务放入到队列中。队列满则再创建线程(总数不会超过Max线程数)

    增强线程池:在请求量阶段性出现高峰时使用
    特性:cores线程全部使用的情况下,优先创建线程(总数不会超过max),当max个线程全都在忙的情况下,才将任务放入队列。请求量下降时,线程池会自动维持cores个线程,多余的线程退出。
    carryxyh committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    ed2ff0f View commit details
    Browse the repository at this point in the history
  2. 当cores线程数全都使用的情况下,默认线程池会把任务放入到队列中。队列满则再创建线程(总数不会超过Max线程数)

    增强线程池:在请求量阶段性出现高峰时使用
    特性:cores线程全部使用的情况下,优先创建线程(总数不会超过max),当max个线程全都在忙的情况下,才将任务放入队列。请求量下降时,线程池会自动维持cores个线程,多余的线程退出。
    carryxyh committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    f97db80 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2018

  1. Configuration menu
    Copy the full SHA
    a224bb0 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2018

  1. Configuration menu
    Copy the full SHA
    49aecfb View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2018

  1. Configuration menu
    Copy the full SHA
    561397f View commit details
    Browse the repository at this point in the history
  2. 错误命名

    carryxyh committed Feb 7, 2018
    Configuration menu
    Copy the full SHA
    60c2993 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2018

  1. Configuration menu
    Copy the full SHA
    af29757 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2018

  1. 增加@OverRide注解

    long 初始化赋值时,小写l改为大写L防止误读
    carryxyh committed Feb 27, 2018
    Configuration menu
    Copy the full SHA
    4be8d61 View commit details
    Browse the repository at this point in the history
  2. 修复单元测试

    carryxyh committed Feb 27, 2018
    Configuration menu
    Copy the full SHA
    5cfe610 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2018

  1. Merge remote-tracking branch 'upstream/master'

    # Conflicts:
    #	dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/dubbo/Builder.java
    #	dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/dubbo/GenericDataInput.java
    #	dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/dubbo/GenericDataOutput.java
    #	dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/dubbo/GenericObjectInput.java
    #	dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/dubbo/GenericObjectOutput.java
    #	dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/json/JsonObjectInput.java
    #	dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/json/JsonObjectOutput.java
    #	dubbo-common/src/main/java/com/alibaba/dubbo/common/serialize/support/json/JsonSerialization.java
    #	dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/AbstractCacheFactory.java
    #	dubbo-remoting/dubbo-remoting-grizzly/src/main/test/com/alibaba/dubbo/remoting/transport/grizzly/GrizzlyTransporterTest.java
    #	dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboInvoker.java
    #	dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/FutureAdapter.java
    #	dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/ReferenceCountExchangeClient.java
    #	dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java
    #	dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/filter/TraceFilter.java
    #	dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/status/ServerStatusChecker.java
    #	dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/status/ThreadPoolStatusChecker.java
    #	dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/ChangeTelnetHandler.java
    #	dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/CountTelnetHandler.java
    #	dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/CurrentTelnetHandler.java
    #	dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java
    #	dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/ListTelnetHandler.java
    #	dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/PortTelnetHandler.java
    #	dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/TraceTelnetHandler.java
    #	dubbo-serialization/dubbo-serialization-fastjson/src/main/java/com/alibaba/dubbo/common/serialize/fastjson/FastJsonObjectInput.java
    #	dubbo-serialization/dubbo-serialization-fastjson/src/main/java/com/alibaba/dubbo/common/serialize/fastjson/FastJsonObjectOutput.java
    #	dubbo-serialization/dubbo-serialization-fastjson/src/main/java/com/alibaba/dubbo/common/serialize/fastjson/FastJsonSerialization.java
    #	dubbo-serialization/dubbo-serialization-hessian2/src/main/java/com/alibaba/dubbo/common/serialize/hessian2/Hessian2Serialization.java
    #	dubbo-serialization/dubbo-serialization-jdk/src/main/java/com/alibaba/dubbo/common/serialize/java/CompactedJavaSerialization.java
    #	dubbo-serialization/dubbo-serialization-jdk/src/main/java/com/alibaba/dubbo/common/serialize/java/JavaSerialization.java
    carryxyh committed Apr 8, 2018
    Configuration menu
    Copy the full SHA
    7830079 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2018

  1. Merge remote-tracking branch 'upstream/master'

    # Conflicts:
    #	dubbo-common/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.threadpool.ThreadPool
    #	dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/ConfigUtilsTest.java
    carryxyh committed Apr 25, 2018
    Configuration menu
    Copy the full SHA
    a1a42c0 View commit details
    Browse the repository at this point in the history
  2. remove enhanced

    carryxyh committed Apr 25, 2018
    Configuration menu
    Copy the full SHA
    be1418f View commit details
    Browse the repository at this point in the history
  3. remove enhanced

    carryxyh committed Apr 25, 2018
    Configuration menu
    Copy the full SHA
    9653553 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2018

  1. Configuration menu
    Copy the full SHA
    e28aa17 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2018

  1. Configuration menu
    Copy the full SHA
    3896eaf View commit details
    Browse the repository at this point in the history

Commits on May 25, 2018

  1. Configuration menu
    Copy the full SHA
    570fbc1 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2018

  1. Configuration menu
    Copy the full SHA
    6c68c7a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6c7b65a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e70a40d View commit details
    Browse the repository at this point in the history