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 #1865

Closed
wants to merge 21 commits into from
Closed

Better License #1865

wants to merge 21 commits into from

Conversation

carryxyh
Copy link
Member

sth to supplement apache 2.0 license

增强线程池:在请求量阶段性出现高峰时使用
特性:cores线程全部使用的情况下,优先创建线程(总数不会超过max),当max个线程全都在忙的情况下,才将任务放入队列。请求量下降时,线程池会自动维持cores个线程,多余的线程退出。
增强线程池:在请求量阶段性出现高峰时使用
特性:cores线程全部使用的情况下,优先创建线程(总数不会超过max),当max个线程全都在忙的情况下,才将任务放入队列。请求量下降时,线程池会自动维持cores个线程,多余的线程退出。
long 初始化赋值时,小写l改为大写L防止误读
# 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
# 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
@codecov-io
Copy link

Codecov Report

Merging #1865 into master will decrease coverage by 0.02%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #1865      +/-   ##
============================================
- Coverage     40.75%   40.72%   -0.03%     
+ Complexity     4446     4445       -1     
============================================
  Files           629      629              
  Lines         30149    30149              
  Branches       5329     5329              
============================================
- Hits          12287    12278       -9     
- Misses        15926    15933       +7     
- Partials       1936     1938       +2
Impacted Files Coverage Δ Complexity Δ
...ibaba/dubbo/common/threadlocal/InternalThread.java 36.84% <ø> (ø) 4 <0> (ø) ⬇️
.../dubbo/common/threadlocal/InternalThreadLocal.java 70.58% <ø> (ø) 16 <0> (ø) ⬇️
...bbo/common/threadlocal/InternalThreadLocalMap.java 82.43% <ø> (ø) 21 <0> (ø) ⬇️
...a/dubbo/remoting/transport/netty/NettyChannel.java 57.5% <0%> (-8.75%) 19% <0%> (-2%)
...om/alibaba/dubbo/rpc/filter/ActiveLimitFilter.java 83.33% <0%> (-5.56%) 6% <0%> (ø)
.../com/alibaba/dubbo/monitor/dubbo/DubboMonitor.java 87.85% <0%> (-1.87%) 15% <0%> (ø)
...ba/dubbo/remoting/transport/netty/NettyServer.java 71.42% <0%> (+3.57%) 9% <0%> (+1%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 61727e1...ecb60e9. Read the comment docs.

@chickenlj
Copy link
Contributor

Hi @carryxyh ,
Would you please replace the apache header with the netty one?
https://github.com/apache/incubator-dubbo/pull/1865/files#diff-771d58b7b783f77d80a3e99eaa16f998R10

And also, Dubbo currently put all sub-module license in LICENSE, i think there's no need to add an extra LICENSE.netty.txt file, put it in LICENSE directly.
https://github.com/apache/incubator-dubbo/blob/master/LICENSE#L266

@chickenlj
Copy link
Contributor

Which files should add netty license? I can tell is:

  • InternalThreadLocal
  • InternalThreadLocalMap

@carryxyh
Copy link
Member Author

Oh, I will submit a new pr as soon as possible
Thx

@chickenlj
Copy link
Contributor

Resolved with #1866, close this one.

@chickenlj chickenlj closed this May 31, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants