xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #1659 Stop derived parameters from sending empty requests for cached times" into development

Browse source 
Former-commit-id: be9370576a [formerly 53850dcdaf54d9ef74bb08cca5b966c448cc054e]
Former-commit-id: 1669945cdb
This commit is contained in:
Richard Peter 2013-02-25 17:47:14 -06:00 • committed by Gerrit Code Review
commit aa5f3c80a0
2 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/data/AbstractDataCubeAdapter.java
View file

@ -60,6 +60,8 @@ import com.raytheon.uf.viz.derivparam.tree.AbstractRequestableNode;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Jan 30, 2012 mschenke Initial creation
* Feb 25, 2013 1659 bsteffen Stop derived parameters from sending
* empty requests for cached times
*
* </pre>
*
@ -120,11 +122,14 @@ public abstract class AbstractDataCubeAdapter implements IDataCubeAdapter {
}
// bulk up all the requests.
DbQueryRequestSet requestSet = new DbQueryRequestSet();
requestSet.setQueries(fullList.toArray(new DbQueryRequest[0]));
DbQueryResponseSet responseSet = (DbQueryResponseSet) ThriftClient
.sendRequest(requestSet);
DbQueryResponse[] responses = responseSet.getResults();
DbQueryResponse[] responses = new DbQueryResponse[0];
if (!fullList.isEmpty()) {
DbQueryRequestSet requestSet = new DbQueryRequestSet();
requestSet.setQueries(fullList.toArray(new DbQueryRequest[0]));
DbQueryResponseSet responseSet = (DbQueryResponseSet) ThriftClient
.sendRequest(requestSet);
responses = responseSet.getResults();
}
int responseIndex = 0;
List<List<DataTime>> finalResponse = new ArrayList<List<DataTime>>(
requests.size());

21
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/inv/AvailabilityContainer.java
View file

@ -54,6 +54,8 @@ import com.raytheon.uf.viz.derivparam.tree.AbstractRequestableNode.Dependency;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Apr 11, 2012 bsteffen Initial creation
* Feb 25, 2013 1659 bsteffen Stop derived parameters from sending
* empty requests for cached times
*
* </pre>
*
@ -171,15 +173,18 @@ public class AvailabilityContainer {
*/
protected void processRequests() throws VizException {
List<DbQueryRequest> requests = getAvailabilityRequests();
DbQueryRequestSet requestSet = new DbQueryRequestSet();
requestSet.setQueries(requests.toArray(new DbQueryRequest[0]));
DbQueryResponseSet responseSet = (DbQueryResponseSet) ThriftClient
.sendRequest(requestSet);
DbQueryResponse[] responses = responseSet.getResults();
Map<DbQueryRequest, DbQueryResponse> responseMap = new HashMap<DbQueryRequest, DbQueryResponse>(
(int) (responses.length / 0.75) + 1, 0.75f);
for (int i = 0; i < responses.length; i++) {
responseMap.put(requests.get(i), responses[i]);
(int) (requests.size() / 0.75) + 1, 0.75f);
if (!requests.isEmpty()) {
DbQueryRequestSet requestSet = new DbQueryRequestSet();
requestSet.setQueries(requests.toArray(new DbQueryRequest[0]));
DbQueryResponseSet responseSet = (DbQueryResponseSet) ThriftClient
.sendRequest(requestSet);
DbQueryResponse[] responses = responseSet.getResults();
for (int i = 0; i < responses.length; i++) {
responseMap.put(requests.get(i), responses[i]);
}
}
setAvailabilityResponses(responseMap);
}