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

STORM-1016: Generate trident bolt ids with sorted group names #706

Merged
merged 4 commits into from
Nov 17, 2015
Merged

STORM-1016: Generate trident bolt ids with sorted group names #706

merged 4 commits into from
Nov 17, 2015

Conversation

jiasheng55
Copy link
Contributor

PR for STORM-1016

@revans2
Copy link
Contributor

revans2 commented Nov 6, 2015

@Victor-Wong these changes look good, but would it be cleaner to just use a TreeMap instead of a HashMap?

@revans2
Copy link
Contributor

revans2 commented Nov 11, 2015

@Victor-Wong any update on this?

@jiasheng55
Copy link
Contributor Author

@revans2 sorry for replying so late, I just made some changes and it worked OK. Is that what you mean?

@revans2
Copy link
Contributor

revans2 commented Nov 13, 2015

@Victor-Wong yes that is exactly what I was thinking, makes the code a lot smaller. I am +1 on this change, but it looks like there is a code conflict. Could you upmerge your changes?

And don't worry about it taking a while.

Conflicts:
	storm-core/src/jvm/storm/trident/TridentTopology.java
	storm-core/src/jvm/storm/trident/graph/GraphGrouper.java
@jiasheng55
Copy link
Contributor Author

@revans2 changes upmerged. Is that right?

@revans2
Copy link
Contributor

revans2 commented Nov 16, 2015

The build is complaining that storm-core/test/jvm/storm/trident/TestTridentTopology.java does not have an apache license header.

@@ -34,8 +31,8 @@

public GraphGrouper(DirectedGraph<Node, IndexedEdge> graph, Collection<Group> initialGroups) {
this.graph = graph;
this.currGroups = new HashSet<>(initialGroups);
reindex();
this.currGroups = new LinkedHashSet(initialGroups);
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you put the <> characters back at the end of the LinkedHashSet?

@revans2
Copy link
Contributor

revans2 commented Nov 16, 2015

Two very minor things, and I am +1

@jiasheng55
Copy link
Contributor Author

done :)

@revans2
Copy link
Contributor

revans2 commented Nov 17, 2015

+1

@asfgit asfgit merged commit 532a594 into apache:master Nov 17, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants