[snee] r1367 committed - fix to stop join operatprs breaking packet model when join operator wo...

[sn...@googlecode.com]

Revision: 1367
Author: alan.bar...@gmail.com
Date: Mon Mar 4 13:20:13 2013
Log: fix to stop join operatprs breaking packet model when join
operator wont be transmitting packets.

aggretgation and select* queries work. join queries produce 0.

fixed utils class so that the duplciated ids dont make the file stuipdly
large.
http://code.google.com/p/snee/source/detail?r=1367

Modified:

/branches/alan_2012_07_19_unreliableChannels/snee-wsn-manager/src/main/java/uk/ac/manchester/cs/snee/manager/executer/Executer.java

/branches/alan_2012_07_19_unreliableChannels/snee-wsn-manager/src/main/java/uk/ac/manchester/cs/snee/manager/planner/costbenifitmodel/model/channel/ChannelModelSite.java

/branches/alan_2012_07_19_unreliableChannels/snee-wsn-manager/src/main/java/uk/ac/manchester/cs/snee/manager/planner/costbenifitmodel/model/channel/ChannelModelUtils.java

=======================================
---
/branches/alan_2012_07_19_unreliableChannels/snee-wsn-manager/src/main/java/uk/ac/manchester/cs/snee/manager/executer/Executer.java
Sun Mar 3 14:33:24 2013
+++
/branches/alan_2012_07_19_unreliableChannels/snee-wsn-manager/src/main/java/uk/ac/manchester/cs/snee/manager/executer/Executer.java
Mon Mar 4 13:20:13 2013
@@ -150,8 +150,8 @@
tuplesReturnedFromEachTypeOfQEP.addWithDuplicates(type.RQEP,
tuplesReturned);
tuplesReturnedFromEachTypeOfQEP.addWithDuplicates(type.MAX,
maxTuplesReturnable);
tuplesReturnedFromEachTypeOfQEP.addWithDuplicates(type.AGGR,
aggreTuples);
- // ChannelModelUtils utils = new
ChannelModelUtils(channelModel.getChannelModel(),
rQEP.getLogicalOverlayNetwork());
- // utils.plotPacketRates(iteration, executerOutputFolder);
+ ChannelModelUtils utils = new
ChannelModelUtils(channelModel.getChannelModel(),
rQEP.getLogicalOverlayNetwork());
+ utils.plotPacketRates(iteration, executerOutputFolder);
channelModel.clearModel();
rQEP.getLogicalOverlayNetwork().removeClonedData();
}
=======================================
---
/branches/alan_2012_07_19_unreliableChannels/snee-wsn-manager/src/main/java/uk/ac/manchester/cs/snee/manager/planner/costbenifitmodel/model/channel/ChannelModelSite.java
Mon Mar 4 09:34:19 2013
+++
/branches/alan_2012_07_19_unreliableChannels/snee-wsn-manager/src/main/java/uk/ac/manchester/cs/snee/manager/planner/costbenifitmodel/model/channel/ChannelModelSite.java
Mon Mar 4 13:20:13 2013
@@ -414,8 +414,8 @@
exOp.setExtent(exOp.getPrevious().getExtent());
ArrayList<Window> windows =

packetToTupleConversion(transmittablePacketsCount, exOp, exOp.getPrevious(),
- currentUsedRecievedPacketCount);
- tuples.updateCollection(preExOp, windows);
+
currentUsedRecievedPacketCount);
+ tuples.updateCollection(exOp, windows);
int outputPackets = this.tupleToPacketConversion(tuples,
preExOp, exOp, cPacketCount);
addToPacketCounts(outputPackets, cPacketCount, isleaf,
packetIds);
currentPacketCount.remove(exOp.getSite().getID());
@@ -861,6 +861,8 @@
int maxMessagePayloadSize = costs.getMaxMessagePayloadSize();
int payloadOverhead = costs.getPayloadOverhead();
int numTuplesPerMessage = (int) Math.floor(maxMessagePayloadSize -
payloadOverhead) / (tupleSize);
+ if(numTuplesPerMessage == 0)
+ numTuplesPerMessage++;
int totalTuples = tuples.determineNoTuplesFromWindows(op);
int pacekts = (totalTuples / numTuplesPerMessage);

@@ -894,6 +896,8 @@
else
payloadOverhead = costs.getPayloadOverhead();
int numTuplesPerMessage = (int) Math.floor(maxMessagePayloadSize -
payloadOverhead) / (tupleSize);
+ if(numTuplesPerMessage == 0)
+ numTuplesPerMessage++;
int totalTuples = tuples.determineNoTuplesFromWindows(op);
Double frac = new Double(totalTuples) / new
Double(numTuplesPerMessage);
Double packetsD = Math.ceil(frac);
=======================================
---
/branches/alan_2012_07_19_unreliableChannels/snee-wsn-manager/src/main/java/uk/ac/manchester/cs/snee/manager/planner/costbenifitmodel/model/channel/ChannelModelUtils.java
Wed Dec 5 07:03:43 2012
+++
/branches/alan_2012_07_19_unreliableChannels/snee-wsn-manager/src/main/java/uk/ac/manchester/cs/snee/manager/planner/costbenifitmodel/model/channel/ChannelModelUtils.java
Mon Mar 4 13:20:13 2013
@@ -7,6 +7,9 @@
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.Set;
+
+import org.apache.cxf.common.util.SortedArraySet;

import uk.ac.manchester.cs.snee.compiler.costmodels.HashMapList;
import uk.ac.manchester.cs.snee.compiler.queryplan.RT;
@@ -77,8 +80,10 @@
else
{
//rest of nodes in logical node
- Iterator<String> eqNodesIterator =
-
logicaloverlayNetwork.getActiveEquivilentNodes(currentSite.getID()).iterator();
+ Set<String> eq = new SortedArraySet<String>();
+
eq.addAll(logicaloverlayNetwork.getActiveEquivilentNodes(currentSite.getID()));
+ Iterator<String> eqNodesIterator = eq.iterator();
+
while(eqNodesIterator.hasNext())
{
String eqNode = eqNodesIterator.next();