VGalaxies commented on code in PR #3039:
URL: https://github.com/apache/hugegraph/pull/3039#discussion_r3331568649
##########
hugegraph-server/hugegraph-core/src/main/java/org/apache/hugegraph/traversal/optimize/TraversalUtil.java:
##########
@@ -179,7 +193,103 @@ public static void extractHasContainer(HugeGraphStep<?,
?> newStep,
TraversalHelper.copyLabels(step, step.getPreviousStep(),
false);
traversal.removeStep(step);
}
- } while (step instanceof HasStep || step instanceof NoOpBarrierStep);
+ step = nextStep;
+ }
+ }
+
+ private static boolean followedByMatchStep(Step<?, ?> step) {
+ Step<?, ?> next = step.getNextStep();
+ while (next instanceof HasStep || next instanceof NoOpBarrierStep) {
+ next = next.getNextStep();
+ }
+ return next instanceof MatchStep;
+ }
+
+ private static boolean hasUnusableMatchPredicate(HugeGraphStep<?, ?> step,
+ HasContainerHolder
holder) {
+ HugeGraph graph = tryGetGraph(step);
+ for (HasContainer has : holder.getHasContainers()) {
+ if (!hasMatchIndexSensitivePredicate(has)) {
+ continue;
+ }
+ if (graph == null || !hasUsableMatchIndex(graph, step, has)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private static void extractUsableHasContainers(HugeGraphStep<?, ?> step,
+ HasContainerHolder holder) {
+ HugeGraph graph = tryGetGraph(step);
+ for (HasContainer has : holder.getHasContainers()) {
+ if (hasMatchIndexSensitivePredicate(has) &&
+ (graph == null || !hasUsableMatchIndex(graph, step, has))) {
+ continue;
+ }
+ if (!GraphStep.processHasContainerIds(step, has)) {
+ step.addHasContainer(has);
+ }
+ }
+ }
+
+ private static boolean hasMatchIndexSensitivePredicate(HasContainer has) {
+ List<P<Object>> predicates = new ArrayList<>();
+ collectPredicates(predicates, ImmutableList.of(has.getPredicate()));
+ for (P<Object> pred : predicates) {
+ BiPredicate<?, ?> bp = pred.getBiPredicate();
+ if (bp == Compare.neq ||
+ bp == Compare.gt || bp == Compare.gte ||
+ bp == Compare.lt || bp == Compare.lte) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private static boolean hasUsableMatchIndex(HugeGraph graph,
+ HugeGraphStep<?, ?> step,
+ HasContainer has) {
+ if (isSysProp(has.getKey())) {
+ return true;
+ }
+
+ PropertyKey pkey = graph.propertyKey(has.getKey());
+ if (pkey.dataType() != DataType.BOOLEAN) {
Review Comment:
Non-blocking: `hasUsableMatchIndex()` currently treats only boolean
properties with secondary/unique indexes as safe to push down before `match()`.
That seems narrower than the predicate set being handled (`gt/gte/lt/lte/neq`)
and may stop range-indexed numeric/text predicates from using the backend
index. Please add a regression test for an indexed non-boolean range predicate
before `match()`, or generalize the index-type check.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
