fix(query): clarify condition resolution semantics for label queries#2994
fix(query): clarify condition resolution semantics for label queries#2994contrueCT wants to merge 8 commits into
Conversation
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #2994 +/- ##
============================================
- Coverage 36.11% 29.71% -6.40%
- Complexity 338 375 +37
============================================
Files 803 803
Lines 68234 68445 +211
Branches 8964 9003 +39
============================================
- Hits 24640 20341 -4299
- Misses 40936 45770 +4834
+ Partials 2658 2334 -324 ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
4c42786 to
cc9af24
Compare
There was a problem hiding this comment.
I found one correctness issue in the latest revision. The CI failures were posted separately as a PR-level reminder.
CI/status checks are failing on the latest head (cc9af24929e42af1c90e1f55f3e60adc351e0318). Could you check the failed jobs before the next review round?
Failed checks include:
build-server (memory, 11): https://github.com/apache/hugegraph/actions/runs/26448131941/job/77861497015
cc9af24 to
2e82f83
Compare
There was a problem hiding this comment.
I don't see a clear blocking correctness issue in the latest head, and the previous LABEL-resolution comments look addressed. One remaining merge risk is that the latest checks are still red: hstore failed in VertexCoreTest#testQueryByDateProperty.
Since this PR also touches HstoreStore, could you rerun or clarify whether the hstore failure is an existing flaky/environment issue?
Add explicit condition resolution APIs to ConditionQuery while preserving the legacy condition() behavior. Introduce containsCondition(Object), conditionValues(Object), and conditionValue(Object) so callers can distinguish missing, empty, unique, and multi-value results without overloading null semantics. Migrate LABEL-specific consumers in graph/index transactions, serializers, traversers, and stores to use the new APIs for unique-label resolution and conservative fallback behavior. Extend QueryTest and VertexCoreTest to cover absent, conflicting, and multi-value label conditions as well as collectMatchedIndexes() behavior for multi-label and conflicting label queries.
94408b7 to
b10e3c2
Compare
801923a to
ebc31c8
Compare
|
Thanks for your patience. The hstore CI failure exposed an existing latent issue in hstore's range-index query path. For range-index scans with limit/paging, the upper layer assumed that backend scan results were globally ordered by the range-index key and that the returned page state could be reused as a HugeGraph range cursor. In hstore, multi-node/tablet scans can return entries in backend iterator order, and the page state is an internal storage cursor, so those assumptions may lead to unstable ordering or skipped results. This PR keeps the fix intentionally scoped: hstore range-index queries whose visible result depends on limit/offset/paging are sorted and sliced in the index layer, while unbounded scans still use the original streaming path to avoid disturbing count, joint-index, and cleanup paths. I think this is enough for the current PR, but the underlying hstore scan/page-state contract should be handled in a dedicated follow-up, ideally by defining whether range scans must be globally ordered and fixing the hstore iterator/page-state semantics at the storage-client layer. |
imbajin
left a comment
There was a problem hiding this comment.
Blocking: yes. Summary: HStore range-index offset queries can skip too many sorted results. Evidence: static review of GraphIndexTransaction/query offset handling.
| ConditionQuery scanQuery = query.copy(); | ||
| scanQuery.page(null); | ||
| scanQuery.limit(Query.NO_LIMIT); |
There was a problem hiding this comment.
Evidence: querySortedRangeIndexes() copies the original query, clears page, and changes only limit before calling super.query(scanQuery). For range() / offset queries, scanQuery still carries the original offset, so the backend iterator can skip those entries during the full scan. The returned BatchIdHolder still keeps the original query, and QueryList.IndexQuery.each() applies bindQuery.skipOffsetIfNeeded(ids) again to the sorted ids.
Impact: HStore range-index queries with offset/range can drop too many results after this fallback path is selected. Please reset the scan query offset before reading all range-index entries, then let the sorted holder apply the original offset once.
| ConditionQuery scanQuery = query.copy(); | |
| scanQuery.page(null); | |
| scanQuery.limit(Query.NO_LIMIT); | |
| ConditionQuery scanQuery = query.copy(); | |
| scanQuery.page(null); | |
| scanQuery.offset(0L); | |
| scanQuery.limit(Query.NO_LIMIT); |
There was a problem hiding this comment.
Good catch, thanks. Fixed in 2df4802 by resetting scanQuery.offset(0L) before the full sorted scan, so the fallback reads the complete matched range first and lets the original query apply offset/limit once after sorting. I also added range-offset coverage to VertexCoreTest#testQueryByDateProperty for the double-skip case. Local checks passed: git diff --check, hugegraph-core compile, and VertexCoreTest#testQueryByDateProperty with the rocksdb core-test profile.
|
Thanks. I fixed this by resetting |
Purpose of the PR
ConditionQuery.condition()currently mixes several different meanings in one API, including:This PR keeps the legacy
condition()behavior unchanged, adds explicit condition-resolution APIs, and migrates the high-riskLABELcall sites to use the clearer semantics.Main Changes
ConditionQuerycontainsCondition(Object key)conditionValues(Object key)conditionValue(Object key)condition()method backward-compatibleLABEL-related high-risk callers to the new APIs in:LABELlegacy usages in this first stepVerifying these changes
Added and extended regression coverage for the new semantics:
QueryTest#testConditionWithoutLabelQueryTest#testConditionWithEqAndInQueryTest#testConditionWithSingleInValuesQueryTest#testConditionWithConflictingEqAndInQueryTest#testConditionWithMultipleMatchedInValuesAdded a targeted regression for the label-index fallback path:
VertexCoreTest#testCollectMatchedIndexesByJointLabelsWithIndexedPropertiesThis test verifies:
Existing label-query regressions were also rechecked to ensure no behavior regression:
EdgeCoreTest#testQueryInEdgesOfVertexByLabelsEdgeCoreTest#testQueryInEdgesOfVertexByConflictingLabelsEdgeCoreTest#testQueryInEdgesOfVertexBySortkeyVertexCoreTest#testQueryByJointLabelsDoes this PR potentially affect the following parts?
Documentation Status
Doc - TODODoc - DoneDoc - No Need