-
Notifications
You must be signed in to change notification settings - Fork 7.6k
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
Operators: And, Then, When #506
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
/** | ||
* Copyright 2013 Netflix, Inc. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package rx.joins; | ||
|
||
import java.util.HashMap; | ||
import java.util.Map; | ||
|
||
/** | ||
* Represents an activated plan. | ||
*/ | ||
public abstract class ActivePlan0 { | ||
protected final Map<JoinObserver, JoinObserver> joinObservers = new HashMap<JoinObserver, JoinObserver>(); | ||
|
||
public abstract void match(); | ||
|
||
protected void addJoinObserver(JoinObserver joinObserver) { | ||
joinObservers.put(joinObserver, joinObserver); | ||
} | ||
protected void dequeue() { | ||
for (JoinObserver jo : joinObservers.values()) { | ||
jo.dequeue(); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
/** | ||
* Copyright 2013 Netflix, Inc. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not | ||
* use this file except in compliance with the License. You may obtain a copy of | ||
* the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
* License for the specific language governing permissions and limitations under | ||
* the License. | ||
*/ | ||
package rx.joins; | ||
|
||
import rx.Notification; | ||
import rx.util.functions.Action0; | ||
import rx.util.functions.Action1; | ||
|
||
/** | ||
* Represents an active plan. | ||
*/ | ||
public class ActivePlan1<T1> extends ActivePlan0 { | ||
private final Action1<T1> onNext; | ||
private final Action0 onCompleted; | ||
private final JoinObserver1<T1> first; | ||
public ActivePlan1(JoinObserver1<T1> first, Action1<T1> onNext, Action0 onCompleted) { | ||
this.onNext = onNext; | ||
this.onCompleted = onCompleted; | ||
this.first = first; | ||
addJoinObserver(first); | ||
} | ||
|
||
@Override | ||
public void match() { | ||
if (!first.queue().isEmpty()) { | ||
Notification<T1> n1 = first.queue().peek(); | ||
if (n1.isOnCompleted()) { | ||
onCompleted.call(); | ||
} else { | ||
dequeue(); | ||
onNext.call(n1.getValue()); | ||
} | ||
} | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
/** | ||
* Copyright 2013 Netflix, Inc. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not | ||
* use this file except in compliance with the License. You may obtain a copy of | ||
* the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
* License for the specific language governing permissions and limitations under | ||
* the License. | ||
*/ | ||
package rx.joins; | ||
|
||
import rx.Notification; | ||
import rx.util.functions.Action0; | ||
import rx.util.functions.Action2; | ||
|
||
/** | ||
* Represents an active plan. | ||
*/ | ||
public class ActivePlan2<T1, T2> extends ActivePlan0 { | ||
private final Action2<T1, T2> onNext; | ||
private final Action0 onCompleted; | ||
private final JoinObserver1<T1> first; | ||
private final JoinObserver1<T2> second; | ||
public ActivePlan2(JoinObserver1<T1> first, JoinObserver1<T2> second, Action2<T1, T2> onNext, Action0 onCompleted) { | ||
this.onNext = onNext; | ||
this.onCompleted = onCompleted; | ||
this.first = first; | ||
this.second = second; | ||
addJoinObserver(first); | ||
addJoinObserver(second); | ||
} | ||
|
||
@Override | ||
public void match() { | ||
if (!first.queue().isEmpty() && !second.queue().isEmpty()) { | ||
Notification<T1> n1 = first.queue().peek(); | ||
Notification<T2> n2 = second.queue().peek(); | ||
|
||
if (n1.isOnCompleted() || n2.isOnCompleted()) { | ||
onCompleted.call(); | ||
} else { | ||
dequeue(); | ||
onNext.call(n1.getValue(), n2.getValue()); | ||
} | ||
} | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
/** | ||
* Copyright 2013 Netflix, Inc. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not | ||
* use this file except in compliance with the License. You may obtain a copy of | ||
* the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
* License for the specific language governing permissions and limitations under | ||
* the License. | ||
*/ | ||
package rx.joins; | ||
|
||
import rx.Notification; | ||
import rx.util.functions.Action0; | ||
import rx.util.functions.Action3; | ||
|
||
/** | ||
* Represents an active plan. | ||
*/ | ||
public class ActivePlan3<T1, T2, T3> extends ActivePlan0 { | ||
private final Action3<T1, T2, T3> onNext; | ||
private final Action0 onCompleted; | ||
private final JoinObserver1<T1> first; | ||
private final JoinObserver1<T2> second; | ||
private final JoinObserver1<T3> third; | ||
public ActivePlan3(JoinObserver1<T1> first, | ||
JoinObserver1<T2> second, | ||
JoinObserver1<T3> third, | ||
Action3<T1, T2, T3> onNext, | ||
Action0 onCompleted) { | ||
this.onNext = onNext; | ||
this.onCompleted = onCompleted; | ||
this.first = first; | ||
this.second = second; | ||
this.third = third; | ||
addJoinObserver(first); | ||
addJoinObserver(second); | ||
addJoinObserver(third); | ||
} | ||
|
||
@Override | ||
public void match() { | ||
if (!first.queue().isEmpty() | ||
&& !second.queue().isEmpty() | ||
&& !third.queue().isEmpty()) { | ||
Notification<T1> n1 = first.queue().peek(); | ||
Notification<T2> n2 = second.queue().peek(); | ||
Notification<T3> n3 = third.queue().peek(); | ||
|
||
if (n1.isOnCompleted() || n2.isOnCompleted() || n3.isOnCompleted()) { | ||
onCompleted.call(); | ||
} else { | ||
dequeue(); | ||
onNext.call(n1.getValue(), n2.getValue(), n3.getValue()); | ||
} | ||
} | ||
} | ||
|
||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is a
Plan
ever accessed in a multi-threaded environment?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've adapted the code from the latest Rx sources. Concurrency-related gate objects where present in the JoinObserver1 to protect a list of ActivePlan0 instances. The second place was in the when() to again build a list of ActivePlan0 instances. Since the Rx.NET source didn't contain any other locks, volatiles or concurrent instances, I assumed they are safe.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay, thanks for the validation.