[Dubbo 2926] standardize semantics of all mergers,enhance mergeFactory and testcases #2936

luchy0120 · 2018-12-11T02:21:49Z

What is the purpose of the change

This patch can standardize semantics of all mergers : merge arguments can be null , and all the others should have same type .

For ArrayMerger , as its argument type is Object[]... items , so we can avoid checking whether item[i] is
an Array . Also , in order to avoid problems like

        class Person{};
        class Teacher extends Person{};
        Person[] a= {new Person()};
        Teacher[] b= {new Teacher()};
        Object[] result = ArrayMerger.INSTANCE.merge(a,b);

we can require all elements to have the same type , al least the user should pass in the same type

For MergerFactory , if the required class is not in cache , we can throw an user friendly Exception

For test case , I add some exception case , and fix an ArrayMerger case , also add some null argument
test case .

Brief changelog

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/*
dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/merger/ResultMergerTest

Verifying this change

mvn clean install -DskipTests

codecov-io · 2018-12-11T02:38:19Z

Codecov Report

Merging #2936 into master will increase coverage by 0.03%.
The diff coverage is 100%.

@@            Coverage Diff             @@
##           master    #2936      +/-   ##
==========================================
+ Coverage   63.92%   63.96%   +0.03%     
==========================================
  Files         584      584              
  Lines       26005    26051      +46     
  Branches     4543     4564      +21     
==========================================
+ Hits        16624    16663      +39     
- Misses       7195     7213      +18     
+ Partials     2186     2175      -11

Impacted Files	Coverage Δ
...rg/apache/dubbo/rpc/cluster/merger/ListMerger.java	`100% <100%> (+16.66%)`	⬆️
...che/dubbo/rpc/cluster/merger/ShortArrayMerger.java	`100% <100%> (ø)`	⬆️
...g/apache/dubbo/rpc/cluster/merger/ArrayMerger.java	`100% <100%> (+31.57%)`	⬆️
...ache/dubbo/rpc/cluster/merger/LongArrayMerger.java	`100% <100%> (ø)`	⬆️
...ache/dubbo/rpc/cluster/merger/ByteArrayMerger.java	`100% <100%> (ø)`	⬆️
...org/apache/dubbo/rpc/cluster/merger/SetMerger.java	`100% <100%> (+16.66%)`	⬆️
...he/dubbo/rpc/cluster/merger/DoubleArrayMerger.java	`100% <100%> (ø)`	⬆️
...che/dubbo/rpc/cluster/merger/FloatArrayMerger.java	`100% <100%> (ø)`	⬆️
...pache/dubbo/rpc/cluster/merger/IntArrayMerger.java	`100% <100%> (ø)`	⬆️
...e/dubbo/rpc/cluster/merger/BooleanArrayMerger.java	`100% <100%> (ø)`	⬆️
... and 15 more

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 9d4b6cb...9761fbc. Read the comment docs.

luchy0120 · 2018-12-11T05:24:43Z

#2926

beiwei30 · 2018-12-11T09:35:54Z

nice suggestion, I will take a look.

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/MergerFactory.java

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/MapMerger.java

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/ListMerger.java

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/SetMerger.java

beiwei30

I leave comments for some trivial enhancement, pls. take a look.

beiwei30 · 2018-12-11T09:50:17Z

@luchy0120 could you pls. take a look?

kimmking · 2018-12-11T10:16:28Z

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/ArrayMerger.java

+        for (Object[] array : items) {
+            if (array != null) {
+                for (int j = 0; j < array.length; j++) {
+                    Array.set(result, index++, array[j]);


array[index++] =result?

This is not wrong . It means "result[index++] = array[j]"

kimmking · 2018-12-11T10:20:15Z

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/ArrayMerger.java

        }
+
+        int i = 0;


why check this?

Because if the user pass in ( null ,null , new String[]{"abs","edf"} , null ) , we need to find out the String.class , so we need to skip the null objects .

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/ArrayMerger.java

luchy0120 · 2018-12-12T04:37:17Z

@beiwei30, @kimmking, I've updated code accroding to your review . I add some comments for mergeFactory and remove the unnecessary check

beiwei30 · 2018-12-12T06:07:57Z

I think it's ready to go.

apache#2936)

@beiwei30

* added dubbo-rpc-api filter documentation for issue no #2935 * wrong @see java.io.File was added, removed this version of checkins * Close all ports after tests finish (#2906) * fix testCustomExecutor (#2904) * Graceful shutdown enhancement in Spring (#2901) * Simplify the code logic of the method AbstractClusterInvoker#reselect. (#2826) * Simplify the code logic of the method AbstractClusterInvoker#reselect. * Minor modification for code style. * create AbstractRouter (#2909) * create AbstractRouter * router default method * router default method * router default method * mockinvoker * Added javadoc for dubbo-filter module dubbo github issue 2884 (#2921) * Enhance unit test (#2920) * Change Readme dubbo-sample hyperlink (#2927) * Simply TagRouter (#2924) * make telnet config work again (#2925) * Remove the log to putRandomPort when one protocol use random port (#2931) * optimize findConfigedPorts method of ServiceConfig to log only one time when userandom port * move the log to method putRandomPort * Fix DubboShutdownHook Memory Leak (#2922) * Improve UT grammar and remove unnecessary braces. (#2930) * Improve UT grammer, fix compiler warnings. * Remove unnecessary braces. * re-enable testCustomExecutor (#2917) * fix testCustomExecutor * fix ci * Fixing test-order dependency for FstObjectInputTest (#2815) * re-enable testCustomExecutor (#2913) * Resetting ExtensionLoader to remove test order dependencies in StickyTest (#2807) * optimize the RondRobinLoadBalance and MockClusterInvoker (#2932) delete unused logic and take the logger out. * [Dubbo-2864] Fix build failed with -Prelease (#2923) fixes #2864 * Fix telnet can not find method with enum type (#2803) * [dubbo-2766] fix the bug of isMatch method of InvokeTelnetHandler (#2787) * enhance org.apache.dubbo.rpc.protocol.dubbo.telnet.InvokeTelnetHandler#isMatch (#2941) * enhance isMatch * remove useless imports * [Dubbo-2766]Fix 2766 and enhance the invoke command (#2801) * add getter and setter for ServiceConfig's interfaceName property#2353 * add interfaceName to ignoreAttributeNames and change the unit test * delete the demo source code and update the unit test * unchange ServiceConfig * update unit test * update unit test * fix #2798 and enhance invoke command * Delete useless assignments (#2939) * Replace anonymous class with method reference (#2929) * Replace anonymous class with method reference * Revert changes as per @beiwei30 code review * Optimize retry for FailbackRegistry. (#2763) * Abstract retry task * Task for retry. * Fix sth. * Finish Optimize. fix ci failed. * Optimize retry for FailbackRegistry. The retry operation splits into specific operations, such as subscriptions and registrations. This approach allows for very precise retry control. * Optimize retry for FailbackRegistry. The retry operation splits into specific operations, such as subscriptions and registrations. This approach allows for very precise retry control. * Optimize logger warn's msg. * Optimize FailedNotifiedTask's run method. Optimize addXXXTask, directly return if we already have a retry task. * Optimize notify logic, just notify when the urls is not empty. * Optimize notify logic, just notify when the urls is not empty. * Optimize timer that use daemon thread. * standardize semantics of all mergers,enhance mergeFactory and testcase (#2936) * Modified to lower camel case (#2945) * Improve several map iteration (#2938) * added dubbo-rpc-api filter documentation for issue no #2935 * wrong @see java.io.File was added, removed this version of checkins

luchy0120 changed the title ~~standardize semantics of all mergers,enhance mergeFactory and testcases~~ [Dubbo 2926] standardize semantics of all mergers,enhance mergeFactory and testcases Dec 11, 2018

luchy0120 force-pushed the patch branch from 3612123 to de12c48 Compare December 11, 2018 03:26

beiwei30 reviewed Dec 11, 2018

View reviewed changes

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/MergerFactory.java Outdated Show resolved Hide resolved

beiwei30 reviewed Dec 11, 2018

View reviewed changes

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/MapMerger.java Outdated Show resolved Hide resolved

beiwei30 reviewed Dec 11, 2018

View reviewed changes

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/ListMerger.java Outdated Show resolved Hide resolved

beiwei30 reviewed Dec 11, 2018

View reviewed changes

dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/SetMerger.java Outdated Show resolved Hide resolved

beiwei30 requested changes Dec 11, 2018

View reviewed changes

kimmking reviewed Dec 11, 2018

View reviewed changes

luchy0120 force-pushed the patch branch 4 times, most recently from 91f064a to 78215d7 Compare December 12, 2018 03:21

standardize semantics of all mergers,enhance mergeFactory and testcase

9761fbc

luchy0120 force-pushed the patch branch from 78215d7 to 9761fbc Compare December 12, 2018 04:52

beiwei30 approved these changes Dec 12, 2018

View reviewed changes

beiwei30 merged commit 61eff59 into apache:master Dec 12, 2018

luchy0120 deleted the patch branch December 13, 2018 07:46

khanimteyaz pushed a commit to khanimteyaz/incubator-dubbo that referenced this pull request Dec 17, 2018

standardize semantics of all mergers,enhance mergeFactory and testcase (

9a2f958

apache#2936)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Dubbo 2926] standardize semantics of all mergers,enhance mergeFactory and testcases #2936

[Dubbo 2926] standardize semantics of all mergers,enhance mergeFactory and testcases #2936

luchy0120 commented Dec 11, 2018 •

edited

Loading

codecov-io commented Dec 11, 2018 •

edited

Loading

luchy0120 commented Dec 11, 2018

beiwei30 commented Dec 11, 2018

beiwei30 left a comment

beiwei30 commented Dec 11, 2018

kimmking Dec 11, 2018

luchy0120 Dec 11, 2018

kimmking Dec 11, 2018

luchy0120 Dec 11, 2018

luchy0120 commented Dec 12, 2018

beiwei30 commented Dec 12, 2018

[Dubbo 2926] standardize semantics of all mergers,enhance mergeFactory and testcases #2936

[Dubbo 2926] standardize semantics of all mergers,enhance mergeFactory and testcases #2936

Conversation

luchy0120 commented Dec 11, 2018 • edited Loading

What is the purpose of the change

Brief changelog

Verifying this change

codecov-io commented Dec 11, 2018 • edited Loading

Codecov Report

luchy0120 commented Dec 11, 2018

beiwei30 commented Dec 11, 2018

beiwei30 left a comment

Choose a reason for hiding this comment

beiwei30 commented Dec 11, 2018

kimmking Dec 11, 2018

Choose a reason for hiding this comment

luchy0120 Dec 11, 2018

Choose a reason for hiding this comment

kimmking Dec 11, 2018

Choose a reason for hiding this comment

luchy0120 Dec 11, 2018

Choose a reason for hiding this comment

luchy0120 commented Dec 12, 2018

beiwei30 commented Dec 12, 2018

luchy0120 commented Dec 11, 2018 •

edited

Loading

codecov-io commented Dec 11, 2018 •

edited

Loading