fix: prevent NPE when isFinished() is called before DataDriver init#17440
Merged
JackieTien97 merged 2 commits intomasterfrom Apr 8, 2026
Merged
fix: prevent NPE when isFinished() is called before DataDriver init#17440JackieTien97 merged 2 commits intomasterfrom
JackieTien97 merged 2 commits intomasterfrom
Conversation
|
JackieTien97
approved these changes
Apr 8, 2026
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #17440 +/- ##
============================================
- Coverage 39.75% 39.75% -0.01%
Complexity 312 312
============================================
Files 5135 5135
Lines 346996 347002 +6
Branches 44212 44213 +1
============================================
- Hits 137959 137958 -1
- Misses 209037 209044 +7 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.



Summary
Fix NullPointerException that occurs when
isFinished()is called on DataDriverbefore the query data source is properly initialized.
Problem
When DataDriver initializes but fails to acquire the read lock (returning
UNFINISHED_QUERY_DATA_SOURCE), callingisFinished()on the driver would stillinvoke
root.isFinished(). This triggers a chain of calls:Driver.isFinished() -> SingleDeviceViewOperator.isFinished() -> hasNextWithTimer() -> ... -> AbstractSeriesScanOperator.hasNext() -> SeriesScanUtil.hasNextFile() -> dataSource.hasNextSeqResource() // NPE: dataSource is null
The root cause is that
SeriesScanUtil.dataSourceis only set duringinitQueryDataSource(), which may not complete if the data source is unfinished.Solution
Add an
isInit()method to Driver and check it inisFinishedInternal():Driver.isFinishedInternal()now checks(isInit() && root.isFinished())instead of just
root.isFinished()DataDriver.isInit()returns theinitfieldSchemaDriver.isInit()returnstrue(always initialized)This ensures that child operator methods are not called until the driver
is properly initialized.
Testing
Added
DataDriverTest.testCallIsFinishedBeforeDataSourcePrepared()to verifythe fix works correctly when the query returns null data source.