Skip to content
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,7 @@ protected void removeQueryFuture(long reqId) {
if (req.cancel()) {
cancelIds.add(new CancelMessageId(req.id(), sndId));

if (req.fields())
removeFieldsQueryResult(sndId, req.id());
else
removeQueryResult(sndId, req.id());
removeQueryResult(sndId, req.id());
}
else {
if (!cancelIds.contains(new CancelMessageId(req.id(), sndId))) {
Expand All @@ -207,10 +204,7 @@ protected void removeQueryFuture(long reqId) {
if (info == null)
return;

if (req.fields())
runFieldsQuery(info);
else
runQuery(info);
runQuery(info);
}
catch (Throwable e) {
U.error(log(), "Failed to run query.", e);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,7 @@ private class LocalQueryRunnable implements GridPlainRunnable {
try {
qry.query().validate();

if (fields())
cctx.queries().runFieldsQuery(localQueryInfo());
else
cctx.queries().runQuery(localQueryInfo());
cctx.queries().runQuery(localQueryInfo());
}
catch (Throwable e) {
onDone(e);
Expand Down
Loading