X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=benchmark%2Fdsbenchmark%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fdsbenchmark%2Ftxchain%2FTxchainBaRead.java;h=101ae39b968ae0858c23f8d91aa9067d24c0097d;hp=2a53deaa560de19c72fe32122577eb1302c922ba;hb=842ae4586043f7a230ab701696e4e4f0b7ff49f4;hpb=29bb6776c62775c5dc73789e4a63d1dc12cc8a64 diff --git a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaRead.java b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaRead.java index 2a53deaa56..101ae39b96 100644 --- a/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaRead.java +++ b/benchmark/dsbenchmark/src/main/java/org/opendaylight/dsbenchmark/txchain/TxchainBaRead.java @@ -5,17 +5,18 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ - package org.opendaylight.dsbenchmark.txchain; -import com.google.common.base.Optional; -import com.google.common.util.concurrent.CheckedFuture; - -import org.opendaylight.controller.md.sal.binding.api.BindingTransactionChain; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.ReadTransaction; -import org.opendaylight.controller.md.sal.common.api.data.*; +import com.google.common.util.concurrent.FluentFuture; +import java.util.Optional; +import java.util.concurrent.ExecutionException; import org.opendaylight.dsbenchmark.DatastoreAbstractWriter; +import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.ReadTransaction; +import org.opendaylight.mdsal.binding.api.Transaction; +import org.opendaylight.mdsal.binding.api.TransactionChain; +import org.opendaylight.mdsal.binding.api.TransactionChainListener; +import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.StartTestInput.DataStore; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dsbenchmark.rev150105.TestExec; @@ -26,96 +27,80 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class TxchainBaRead extends DatastoreAbstractWriter implements TransactionChainListener{ - private static final Logger LOG = (Logger) LoggerFactory.getLogger(TxchainBaRead.class); - private DataBroker bindingDataBroker; +public class TxchainBaRead extends DatastoreAbstractWriter implements TransactionChainListener { + private static final Logger LOG = LoggerFactory.getLogger(TxchainBaRead.class); + private final DataBroker bindingDataBroker; - public TxchainBaRead(DataBroker bindingDataBroker, int outerListElem, int innerListElem, long writesPerTx, DataStore dataStore) { + public TxchainBaRead(final DataBroker bindingDataBroker, final int outerListElem, final int innerListElem, + final long writesPerTx, final DataStore dataStore) { super(StartTestInput.Operation.DELETE, outerListElem, innerListElem, writesPerTx, dataStore); this.bindingDataBroker = bindingDataBroker; - LOG.info("Created TxchainBaRead"); + LOG.debug("Created TxchainBaRead"); } @Override public void createList() { - LOG.info("TxchainBaRead: reading data in the data store"); + LOG.debug("TxchainBaRead: reading data in the data store"); // Dump the whole list into the data store in a single transaction // with PUTs on the transaction - TxchainBaWrite dd = new TxchainBaWrite(bindingDataBroker, - StartTestInput.Operation.PUT, - outerListElem, - innerListElem, - outerListElem, - dataStore); + TxchainBaWrite dd = new TxchainBaWrite(bindingDataBroker, StartTestInput.Operation.PUT, outerListElem, + innerListElem, outerListElem, dataStore); dd.createList(); dd.executeList(); } @Override public void executeList() { - - BindingTransactionChain chain = bindingDataBroker.createTransactionChain(this); - ReadTransaction tx = bindingDataBroker.newReadOnlyTransaction(); - - for (long l = 0; l < outerListElem; l++) { - - OuterList outerList; - InstanceIdentifier iid = InstanceIdentifier.create(TestExec.class) - .child(OuterList.class, new OuterListKey((int) l)); - Optional optionalDataObject; - CheckedFuture, ReadFailedException> submitFuture = tx.read(LogicalDatastoreType.CONFIGURATION, iid); - - try { - optionalDataObject = submitFuture.checkedGet(); - /*if (optionalDataObject != null && optionalDataObject.isPresent()) { - ret = optionalDataObject.get(); - txOk++; - }*/ - if (optionalDataObject != null && optionalDataObject.isPresent()) { - outerList = optionalDataObject.get(); - - String[] objectsArray = new String[outerList.getInnerList().size()]; - - //LOG.info("innerList element: " + objectsArray ); - for (InnerList innerList : outerList.getInnerList()) { - if (objectsArray[innerList.getName()] != null) { - LOG.error("innerList: DUPLICATE name: {}, value: {}", innerList.getName(), innerList.getValue()); + final LogicalDatastoreType dsType = getDataStoreType(); + + try (ReadTransaction tx = bindingDataBroker.newReadOnlyTransaction()) { + for (long l = 0; l < outerListElem; l++) { + + InstanceIdentifier iid = InstanceIdentifier.create(TestExec.class) + .child(OuterList.class, new OuterListKey((int) l)); + FluentFuture> submitFuture = tx.read(dsType, iid); + + try { + Optional optionalDataObject = submitFuture.get(); + if (optionalDataObject != null && optionalDataObject.isPresent()) { + OuterList outerList = optionalDataObject.get(); + + String[] objectsArray = new String[outerList.getInnerList().size()]; + for (InnerList innerList : outerList.getInnerList()) { + if (objectsArray[innerList.getName()] != null) { + LOG.error("innerList: DUPLICATE name: {}, value: {}", innerList.getName(), + innerList.getValue()); + } + objectsArray[innerList.getName()] = innerList.getValue(); } - objectsArray[innerList.getName()] = innerList.getValue(); - // LOG.info("innerList: name: {}, value: {}", innerList.getName(), innerList.getValue()); - } - boolean foundAll = true; - for (int i = 0; i < outerList.getInnerList().size(); i++) { - String itemStr = objectsArray[i]; - if (!itemStr.contentEquals("Item-" + String.valueOf(l) + "-" + String.valueOf(i))) { - foundAll = false; - LOG.error("innerList: name: {}, value: {}", i, itemStr); - break; + for (int i = 0; i < outerList.getInnerList().size(); i++) { + String itemStr = objectsArray[i]; + if (!itemStr.contentEquals("Item-" + String.valueOf(l) + "-" + String.valueOf(i))) { + LOG.error("innerList: name: {}, value: {}", i, itemStr); + break; + } } + txOk++; + } else { + txError++; } - txOk++; - } - else { + } catch (final InterruptedException | ExecutionException e) { + LOG.warn("failed to ....", e); txError++; } - } catch (ReadFailedException e) { - LOG.warn("failed to ....", e); - txError++; } } } @Override - public void onTransactionChainFailed(TransactionChain chain, - AsyncTransaction transaction, Throwable cause) { - LOG.error("Broken chain {} in TxchainBaDelete, transaction {}, cause {}", - chain, transaction.getIdentifier(), cause); + public void onTransactionChainFailed(final TransactionChain chain, final Transaction transaction, + final Throwable cause) { + LOG.error("Broken chain {} in TxchainBaDelete, transaction {}", chain, transaction.getIdentifier(), cause); } @Override - public void onTransactionChainSuccessful(TransactionChain chain) { - LOG.info("TxchainBaDelete closed successfully, chain {}", chain); + public void onTransactionChainSuccessful(final TransactionChain chain) { + LOG.debug("TxchainBaDelete closed successfully, chain {}", chain); } - }