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

Merge dubbo-serialization-avro into incubator-dubbo #3708 #3717

Merged
merged 17 commits into from
Apr 9, 2019

Conversation

CrazyHZM
Copy link
Member

What is the purpose of the change

Merge dubbo-serialization-avro into incubator-dubbo #3708

Brief changelog

XXXXX

Verifying this change

XXXXX

Follow this checklist to help us incorporate your contribution quickly and easily:

  • Make sure there is a GITHUB_issue field for the change (usually before you start working on it). Trivial changes like typos do not require a GITHUB issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
  • Format the pull request title like [Dubbo-XXX] Fix UnknownException when host config not exist #XXX. Each commit in the pull request should have a meaningful subject line and body.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
  • Run mvn clean install -DskipTests=false & mvn clean test-compile failsafe:integration-test to make sure unit-test and integration-test pass.
  • If this contribution is large, please follow the Software Donation Guide.

@CrazyHZM
Copy link
Member Author

@ralf0131
Can you help me see where the license is wrong?

@tswstarplanet
Copy link
Contributor

tswstarplanet commented Mar 22, 2019

You can delete the line "xml version="1.0" encoding="UTF-8""

@CrazyHZM
Copy link
Member Author

You can delete the line "xml version="1.0" encoding="UTF-8""

I tried to do this, but I can't solve it.

@ralf0131
Copy link
Contributor

You can run the UT locally and check the output to see what is the problem. For example: /home/travis/build/apache/incubator-dubbo/dubbo-serialization/dubbo-serialization-avro/target/rat.txt

@codecov-io
Copy link

codecov-io commented Mar 24, 2019

Codecov Report

Merging #3717 into master will increase coverage by 0.01%.
The diff coverage is 84.37%.

Impacted file tree graph

@@             Coverage Diff              @@
##             master    #3717      +/-   ##
============================================
+ Coverage     63.62%   63.63%   +0.01%     
  Complexity       71       71              
============================================
  Files           704      707       +3     
  Lines         31065    31129      +64     
  Branches       5037     5037              
============================================
+ Hits          19764    19808      +44     
- Misses         9032     9045      +13     
- Partials       2269     2276       +7
Impacted Files Coverage Δ Complexity Δ
...dubbo/common/serialize/avro/AvroSerialization.java 100% <100%> (ø) 0 <0> (?)
.../dubbo/common/serialize/avro/AvroObjectOutput.java 81.81% <81.81%> (ø) 0 <0> (?)
...e/dubbo/common/serialize/avro/AvroObjectInput.java 84.61% <84.61%> (ø) 0 <0> (?)
.../apache/dubbo/remoting/transport/AbstractPeer.java 63.04% <0%> (-10.87%) 0% <0%> (ø)
...ng/transport/dispatcher/all/AllChannelHandler.java 51.42% <0%> (-5.72%) 0% <0%> (ø)
.../org/apache/dubbo/remoting/ExecutionException.java 15.78% <0%> (-5.27%) 0% <0%> (ø)
...dubbo/remoting/exchange/support/DefaultFuture.java 73.46% <0%> (-2.73%) 0% <0%> (ø)
...exchange/support/header/HeaderExchangeHandler.java 59.84% <0%> (-2.37%) 0% <0%> (ø)
...pache/dubbo/remoting/transport/AbstractServer.java 46.87% <0%> (-1.05%) 0% <0%> (ø)
.../exchange/support/header/HeaderExchangeServer.java 66.98% <0%> (-0.95%) 0% <0%> (ø)
... and 6 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 fb5d96d...371fc6c. Read the comment docs.

@ralf0131
Copy link
Contributor

Hi,

While I am reviewing this pull request, I feel more people should come in and take a look. Please request @beiwei30 to review as well.

Copy link
Contributor

@ralf0131 ralf0131 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you please rebase it with master? I guess some of the change has been made to master. For example, the license issues should be fixed already.

dubbo-serialization/dubbo-serialization-api/pom.xml Outdated Show resolved Hide resolved
dubbo-common/pom.xml Outdated Show resolved Hide resolved
# Conflicts:
#	dubbo-bom/pom.xml
#	dubbo-serialization/dubbo-serialization-api/pom.xml
Copy link
Contributor

@ralf0131 ralf0131 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks for the pull request.

vio-lin pushed a commit to vio-lin/incubator-dubbo that referenced this pull request Apr 29, 2019
@CrazyHZM CrazyHZM deleted the mergeAvro branch May 14, 2019 09:25
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.

5 participants