Merge pull request FoundationDB#1897 from normen662/main

fix incorrect error thrown when planning queries over synthetic record types
jjezra · Nov 5, 2022 · c4a348b · c4a348b
2 parents 148fc53 + 19bdbeb
commit c4a348b
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/...layer-core/src/main/java/com/apple/foundationdb/record/query/plan/RecordQueryPlanner.java b/...layer-core/src/main/java/com/apple/foundationdb/record/query/plan/RecordQueryPlanner.java
@@ -551,7 +551,7 @@ private ScoredPlan planFilterForInJoin(@Nonnull PlanContext planContext, @Nonnul
         List<ScoredPlan> intersectionCandidates = new ArrayList<>();
         ScoredPlan bestPlan = null;
         Index bestIndex = null;
-        if (planContext.commonPrimaryKey != null) {
+        if (planContext.commonPrimaryKey != null && !avoidScanPlan(planContext)) {
             bestPlan = planIndex(planContext, filter, null, planContext.commonPrimaryKey, intersectionCandidates);
         }
         for (Index index : planContext.indexes) {
@@ -1430,8 +1430,7 @@ private RecordQueryPlan planScan(@Nonnull CandidateScan candidateScan,
                 possibleTypes = metaData.getRecordTypes().keySet();
             }
 
-            if (!queriedRecordTypes.isEmpty() && // ok if user queried all record types which excludes synthetic ones
-                    queriedRecordTypes.stream().anyMatch(syntheticRecordTypes::contains)) {
+            if (avoidScanPlan(candidateScan.planContext)) {
                 throw new RecordCoreException("cannot create scan plan for a synthetic record type");
             }
 
@@ -1452,6 +1451,14 @@ private RecordQueryPlan planScan(@Nonnull CandidateScan candidateScan,
         return plan;
     }
 
+    private boolean avoidScanPlan(@Nonnull PlanContext planContext) {
+        final var queriedRecordTypes = planContext.query.getRecordTypes();
+        final var syntheticRecordTypes = metaData.getSyntheticRecordTypes().keySet();
+
+        return !queriedRecordTypes.isEmpty() && // ok if user queried all record types which excludes synthetic ones
+               queriedRecordTypes.stream().anyMatch(syntheticRecordTypes::contains);
+    }
+
     /**
      * Method to statically resolve the method of how records are fetched given an index key. In particular,
      * {@link com.apple.foundationdb.record.metadata.SyntheticRecordType}s have constituent parts which need to