Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
BUG-3128: Update RPC router concepts
[controller.git]
/
opendaylight
/
md-sal
/
sal-dom-broker
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
md
/
sal
/
dom
/
broker
/
impl
/
AbstractDOMRpcRoutingTableEntry.java
diff --git
a/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMRpcRoutingTableEntry.java
b/opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMRpcRoutingTableEntry.java
index 08c43845fc57bfdf7d72ad795f7c1054ecd45956..0cce2f1d80bbc5389306f5f956353c3197efd35c 100644
(file)
--- a/
opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMRpcRoutingTableEntry.java
+++ b/
opendaylight/md-sal/sal-dom-broker/src/main/java/org/opendaylight/controller/md/sal/dom/broker/impl/AbstractDOMRpcRoutingTableEntry.java
@@
-10,12
+10,14
@@
package org.opendaylight.controller.md.sal.dom.broker.impl;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMap.Builder;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMap.Builder;
+import com.google.common.collect.Maps;
import com.google.common.util.concurrent.CheckedFuture;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import com.google.common.util.concurrent.CheckedFuture;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
+import org.opendaylight.controller.md.sal.dom.api.DOMRpcAvailabilityListener;
import org.opendaylight.controller.md.sal.dom.api.DOMRpcException;
import org.opendaylight.controller.md.sal.dom.api.DOMRpcImplementation;
import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult;
import org.opendaylight.controller.md.sal.dom.api.DOMRpcException;
import org.opendaylight.controller.md.sal.dom.api.DOMRpcImplementation;
import org.opendaylight.controller.md.sal.dom.api.DOMRpcResult;
@@
-27,16
+29,17
@@
abstract class AbstractDOMRpcRoutingTableEntry {
private final Map<YangInstanceIdentifier, List<DOMRpcImplementation>> impls;
private final SchemaPath schemaPath;
private final Map<YangInstanceIdentifier, List<DOMRpcImplementation>> impls;
private final SchemaPath schemaPath;
- protected AbstractDOMRpcRoutingTableEntry(final SchemaPath schemaPath, final Map<YangInstanceIdentifier, List<DOMRpcImplementation>> impls) {
+ AbstractDOMRpcRoutingTableEntry(final SchemaPath schemaPath,
+ final Map<YangInstanceIdentifier, List<DOMRpcImplementation>> impls) {
this.schemaPath = Preconditions.checkNotNull(schemaPath);
this.impls = Preconditions.checkNotNull(impls);
}
this.schemaPath = Preconditions.checkNotNull(schemaPath);
this.impls = Preconditions.checkNotNull(impls);
}
-
protected
final SchemaPath getSchemaPath() {
+ final SchemaPath getSchemaPath() {
return schemaPath;
}
return schemaPath;
}
-
protected
final List<DOMRpcImplementation> getImplementations(final YangInstanceIdentifier context) {
+ final List<DOMRpcImplementation> getImplementations(final YangInstanceIdentifier context) {
return impls.get(context);
}
return impls.get(context);
}
@@
-44,12
+47,12
@@
abstract class AbstractDOMRpcRoutingTableEntry {
return impls;
}
return impls;
}
-
public
boolean containsContext(final YangInstanceIdentifier contextReference) {
+
final
boolean containsContext(final YangInstanceIdentifier contextReference) {
return impls.containsKey(contextReference);
}
return impls.containsKey(contextReference);
}
- final Set<YangInstanceIdentifier> registeredIdentifiers() {
- return
impls
.keySet();
+ final Set<YangInstanceIdentifier> registeredIdentifiers(
final DOMRpcAvailabilityListener l
) {
+ return
Maps.filterValues(impls, list -> list.stream().anyMatch(l::acceptsImplementation))
.keySet();
}
/**
}
/**
@@
-58,32
+61,38
@@
abstract class AbstractDOMRpcRoutingTableEntry {
* @param newRpcs List of new RPCs, must be mutable
* @return
*/
* @param newRpcs List of new RPCs, must be mutable
* @return
*/
- final AbstractDOMRpcRoutingTableEntry add(final DOMRpcImplementation implementation, final List<YangInstanceIdentifier> newRpcs) {
+ final AbstractDOMRpcRoutingTableEntry add(final DOMRpcImplementation implementation,
+ final List<YangInstanceIdentifier> newRpcs) {
final Builder<YangInstanceIdentifier, List<DOMRpcImplementation>> vb = ImmutableMap.builder();
for (final Entry<YangInstanceIdentifier, List<DOMRpcImplementation>> ve : impls.entrySet()) {
if (newRpcs.remove(ve.getKey())) {
final Builder<YangInstanceIdentifier, List<DOMRpcImplementation>> vb = ImmutableMap.builder();
for (final Entry<YangInstanceIdentifier, List<DOMRpcImplementation>> ve : impls.entrySet()) {
if (newRpcs.remove(ve.getKey())) {
- final
Array
List<DOMRpcImplementation> i = new ArrayList<>(ve.getValue().size() + 1);
+ final List<DOMRpcImplementation> i = new ArrayList<>(ve.getValue().size() + 1);
i.addAll(ve.getValue());
i.add(implementation);
i.addAll(ve.getValue());
i.add(implementation);
+
+ // New implementation is at the end, this will move it to be the last among implementations
+ // with equal cost -- relying on sort() being stable.
+ i.sort((a, b) -> Long.compare(a.invocationCost(), b.invocationCost()));
vb.put(ve.getKey(), i);
} else {
vb.put(ve);
}
}
for(final YangInstanceIdentifier ii : newRpcs) {
vb.put(ve.getKey(), i);
} else {
vb.put(ve);
}
}
for(final YangInstanceIdentifier ii : newRpcs) {
- final
Array
List<DOMRpcImplementation> impl = new ArrayList<>(1);
+ final List<DOMRpcImplementation> impl = new ArrayList<>(1);
impl.add(implementation);
impl.add(implementation);
- vb.put(ii,impl);
+ vb.put(ii,
impl);
}
return newInstance(vb.build());
}
}
return newInstance(vb.build());
}
- final AbstractDOMRpcRoutingTableEntry remove(final DOMRpcImplementation implementation, final List<YangInstanceIdentifier> removed) {
+ final AbstractDOMRpcRoutingTableEntry remove(final DOMRpcImplementation implementation,
+ final List<YangInstanceIdentifier> removed) {
final Builder<YangInstanceIdentifier, List<DOMRpcImplementation>> vb = ImmutableMap.builder();
for (final Entry<YangInstanceIdentifier, List<DOMRpcImplementation>> ve : impls.entrySet()) {
if (removed.remove(ve.getKey())) {
final Builder<YangInstanceIdentifier, List<DOMRpcImplementation>> vb = ImmutableMap.builder();
for (final Entry<YangInstanceIdentifier, List<DOMRpcImplementation>> ve : impls.entrySet()) {
if (removed.remove(ve.getKey())) {
- final
Array
List<DOMRpcImplementation> i = new ArrayList<>(ve.getValue());
+ final List<DOMRpcImplementation> i = new ArrayList<>(ve.getValue());
i.remove(implementation);
// We could trimToSize(), but that may perform another copy just to get rid
// of a single element. That is probably not worth the trouble.
i.remove(implementation);
// We could trimToSize(), but that may perform another copy just to get rid
// of a single element. That is probably not worth the trouble.