GitHub user erikdw opened a pull request:
https://github.com/apache/storm/pull/2550
STORM-2937: Overwrite latest storm-kafka-client 1.x-branch into 1.0.x-branch
Mimics @HeartSaVioR 's work in STORM-2936 and PR #2549, but applies back to
the more divergent 1.0.x-branch. Big thanks to @HeartSaVioR , @srdo, @hmcl for
guidance and @jessicalhartog & @srishtyagrawal for pairing to figure out all
the odds and ends here. And for the storm community's flexibility and
willingness to address this kind of issue!
* origin commit sha (1.x-branch): 74ca795
* That is the same as in STORM-2936 and PR #2549
* changed 2 things in external/storm-kafka-client/pom.xml:
* module version had to be synced with 1.0.x-branch current version
* storm-core dependency's scope changed from undefined
`${provided.scope}` to `provided`
* updated storm's base pom.xml with the same kafka client version as
1.x-branch: 0.10.1.0
* overwriting requires a few somewhat isolated changes to storm-core
* added InterfaceStability.java
* overwrote Time.java with that from 1.x-branch
* needed both for tests in storm-kafka-client, and for Time.nanoTime()
invocation
* backported changes to SlotTest.java to leverage Time.java changes
* needed since startSimulatingAutoAdvanceOnSleep() was ditched in the
Time.java changes.
* backport changes to Fields.java to allow equality comparisons in tests
* otherwise we received confusing test failures claiming 2 seemingly
identical items to be different
* backport changes to trident interface for partition handling, which
were needed for KafkaTridentSpoutEmitter
* also copied back the docs
NOTE: there were other minor-ish things I spotted in 1.x-branchthat I
intentionally didn't fix for now (typos, ^M characters, trailing whitespace,
etc.). I didn't want this to entail any more changes than necessary.
For quick reference, here are the files outside of storm-kafka-client that
have been modified or added:
```
% git diff origin/1.0.x-branch | grep '^diff' | awk '{print $3}' | grep -v
'^external/storm-kafka-client/'
docs/index.md
docs/storm-kafka-client.md
external/storm-eventhubs/src/main/java/org/apache/storm/eventhubs/trident/OpaqueTridentEventHubEmitter.java
external/storm-kafka/src/jvm/org/apache/storm/kafka/trident/TridentKafkaEmitter.java
pom.xml
storm-core/src/jvm/org/apache/storm/annotation/InterfaceStability.java
storm-core/src/jvm/org/apache/storm/trident/spout/IOpaquePartitionedTridentSpout.java
storm-core/src/jvm/org/apache/storm/trident/spout/OpaquePartitionedTridentSpoutExecutor.java
storm-core/src/jvm/org/apache/storm/trident/topology/state/TransactionalState.java
storm-core/src/jvm/org/apache/storm/tuple/Fields.java
storm-core/src/jvm/org/apache/storm/utils/Time.java
storm-core/test/jvm/org/apache/storm/daemon/supervisor/SlotTest.java
```
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/erikdw/storm STORM-2937
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/storm/pull/2550.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #2550
----
commit 533ef7ad2ba057bf746bc152ac84151516b744b1
Author: Erik Weathers <erikdw@...>
Date: 2018-02-07T00:10:36Z
copied external/storm-kafka-client from 1.x-branch at SHA 74ca795 (this
doesn't compile, intentionally)
commit e42ae4de8659c240609c7230a89e750a2e16df07
Author: Erik Weathers <erikdw@...>
Date: 2018-02-07T01:44:49Z
update storm-kafka-client pom.xml and base pom.xml as necessary for using
storm-kafka-client from 1.x-branch in 1.0.x-branch
Also added InterfaceStability.java which is another needed change.
commit f758123b57c8c60e2842a56b947416ca7cdf988e
Author: Hugo Louro <hmclouro@...>
Date: 2017-03-10T21:13:31Z
backport trident interface changes
commit 5d9ad1eaa6c6bca8edf5eceffb57e89e27975838
Author: Erik Weathers <erikdw@...>
Date: 2018-02-07T03:47:22Z
backport changes to Fields to allow it to be checked for equality in
storm-kafka-client unit tests
commit 0ddc411540f317e63f6a493eb668f49996bc45f3
Author: Erik Weathers <erikdw@...>
Date: 2018-02-07T04:02:43Z
copy Time.java from 1.x-branch to allow use of nanoTime() in
storm-kafka-client, and also update SlotTest to use try-with-resources since
new Time implementation ditched startSimulatingAutoAdvanceOnSleep() (this was a
selective cherry-pick of a03137ed, retaining only those changes needed)
commit ad736050727f0b38247a16948f6c880b4782e734
Author: Erik Weathers <erikdw@...>
Date: 2018-02-07T08:16:37Z
add storm-kafka-client doc from 1.x-branch, and link to it from index.md
----
---
