#1327 QueryBatcher now stops when query fails #1505
Conversation
rjrudin
force-pushed
the
feature/147-query-bug
branch
from
490b47d to
775feed
Compare
rjrudin
force-pushed
the
feature/147-query-bug
branch
from
775feed to
4c9f364
Compare
| @@ -785,7 +779,15 @@ public void run() { | |||
| isDone.set(true); | |||
| shutdownIfAllForestsAreDone(); | |||
| return; | |||
| } | |||
| } catch (Throwable t) { | |||
There was a problem hiding this comment.
@llinggit I believe this catch used to exist prior to this change for #1269, which resulted in this catch being removed. The test I added captures the issue, which is that without this catch, a failed query results in QueryBatcherImpl hanging indefinitely. I am not 100% sure of the contents of this block though, but it does result in the desired fix, which is that the job is stopped and control returns back to the user.
| @@ -704,7 +703,6 @@ private class QueryTask implements Runnable { | |||
| this.filtered = filtered; | |||
| this.forestBatchNum = forestBatchNum; | |||
| this.start = start; | |||
| this.isQueryBatch = isQueryBatch; | |||
There was a problem hiding this comment.
Removed, isQueryBatch is not used anywhere and this was assigning the variable to itself.
| private QueryBatchImpl batch; | ||
| private int totalProcessedCount = 0; | ||
| private boolean isLastBatch; |
There was a problem hiding this comment.
Removed isLastBatch and lastBatchNum as neither were used anywhere.
| // change date to now minus seven years | ||
| date.roll(Calendar.YEAR, -7); | ||
| String sevenYearsAgo = DatatypeConverter.printDateTime(date); | ||
| // TODO This test failed when 2022 became 2023; increasing -7 to a higher number fixed it. The test could obviously |
There was a problem hiding this comment.
Including this here as this test started failing when 2022 became 2023.
rjrudin
force-pushed
the
feature/147-query-bug
branch
2 times, most recently
from
4c5e756 to
4649905
Compare
Addresses DEVEXP-147 (internal bug). Also enabled a test that had been disabled due to this bug.
rjrudin
force-pushed
the
feature/147-query-bug
branch
from
4649905 to
81d6a81
Compare
Addresses DEVEXP-147 (internal bug).