Rust: Type inference refactor and improve join orders #20076

paldepind · 2025-07-17T11:06:37Z

This PR makes a few refactors to the type inference library.

I think these changes make sense on their own, but on databend they also reduce the total number of tuples (observed using "Compare Performance" in VSCode) and the following bad join reported by VScode (also observed on databend) disappears:

Bad join

Pipeline standard for TypeInference::CallExprBaseMatching::typeConstraintBaseTypeMatch/5#ebeb4216@f3cabgyd was evaluated in 530 iterations totaling 145ms (delta sizes total: 36047).
             5442   ~0%    {5} r1 = JOIN `TypeInference::CallExprBaseMatchingInput::Access.getTarget/0#dispred#29d66fd1#prev_delta` WITH TypeInference::CallExprBaseMatching::AccessConstraint::MkRelevantAccess#8a6252ad#prev ON FIRST 1 OUTPUT Rhs.2, Lhs.0, Lhs.1, Rhs.3, Rhs.4
             5442   ~0%    {5}    | JOIN WITH `TypeInference::CallExprBaseMatchingInput::accessDeclarationPositionMatch/2#6c58c89d` ON FIRST 1 OUTPUT Lhs.2, Rhs.1, Lhs.3, Lhs.1, Lhs.4
              240   ~0%    {6}    | JOIN WITH `project#TypeInference::CallExprBaseMatching::typeParameterConstraintHasTypeParameter/7#7f1e227b#2` ON FIRST 3 OUTPUT Lhs.3, Lhs.0, Lhs.4, Rhs.3, Rhs.4, Rhs.5
                           {6}    | AND NOT `_GenericParamList::GenericParamList.getTypeParam/1#dispred#01a987e9_21#join_rhs_Type::Type#75554d9d___#antijoin_rhs#1`(FIRST 6)
              184   ~0%    {6}    | SCAN OUTPUT In.2, In.3, In.0, In.1, In.4, In.5
                0   ~0%    {7}    | JOIN WITH `TypeInference::M2::SatisfiesConstraint<TypeInference::CallExprBaseMatching::AccessConstraint::RelevantAccess,TypeInference::CallExprBaseMatching::AccessConstraint::SatisfiesConstraintInput>::satisfiesConstraintType/4#d5b1679c#prev` ON FIRST 2 OUTPUT Lhs.2, Lhs.3, Lhs.5, Rhs.3, _, Lhs.4, Rhs.2
                           {5}    | REWRITE WITH Tmp.4 := "", Out.4 := InverseAppend(In.5,Tmp.4,In.6) KEEPING 5
                0   ~0%    {5}    | SCAN OUTPUT In.0, In.1, In.4, In.3, In.2
                       
          2676185   ~2%    {6} r2 = JOIN `TypeInference::M2::SatisfiesConstraint<TypeInference::CallExprBaseMatching::AccessConstraint::RelevantAccess,TypeInference::CallExprBaseMatching::AccessConstraint::SatisfiesConstraintInput>::satisfiesConstraintType/4#d5b1679c#prev_delta` WITH TypeInference::CallExprBaseMatching::AccessConstraint::MkRelevantAccess#8a6252ad#reorder_4_0_1_2_3#prev ON FIRST 1 OUTPUT Rhs.3, Lhs.1, Lhs.2, Lhs.3, Rhs.1, Rhs.4
          2669957   ~3%    {6}    | JOIN WITH `TypeInference::CallExprBaseMatchingInput::accessDeclarationPositionMatch/2#6c58c89d` ON FIRST 1 OUTPUT Lhs.4, Lhs.1, Lhs.2, Lhs.3, Lhs.5, Rhs.1
        143545032   ~8%    {7}    | JOIN WITH `TypeInference::CallExprBaseMatchingInput::Access.getTarget/0#dispred#29d66fd1#prev` ON FIRST 1 OUTPUT Rhs.1, Lhs.5, Lhs.4, Lhs.1, Lhs.2, Lhs.3, Lhs.0
            63836   ~1%    {6}    | JOIN WITH `project#TypeInference::CallExprBaseMatching::typeParameterConstraintHasTypeParameter/7#7f1e227b#2` ON FIRST 4 OUTPUT Lhs.4, Lhs.5, Lhs.6, Lhs.0, Rhs.4, Rhs.5
                           {6}    | AND NOT `_GenericParamList::GenericParamList.getTypeParam/1#dispred#01a987e9_21#join_rhs_Type::Type#75554d9d___#antijoin_rhs#2`(FIRST 6)
            63701   ~0%    {7}    | SCAN OUTPUT In.1, In.2, In.3, In.5, _, In.4, In.0
                           {5}    | REWRITE WITH Tmp.4 := "", Out.4 := InverseAppend(In.5,Tmp.4,In.6) KEEPING 5
            42102   ~1%    {5}    | SCAN OUTPUT In.1, In.2, In.4, In.0, In.3
                       
            65650   ~1%    {4} r3 = SCAN TypeInference::CallExprBaseMatching::AccessConstraint::MkRelevantAccess#8a6252ad#prev_delta OUTPUT In.0, In.2, In.3, In.4
            80414   ~1%    {5}    | JOIN WITH `TypeInference::CallExprBaseMatchingInput::Access.getTarget/0#dispred#29d66fd1#prev` ON FIRST 1 OUTPUT Lhs.1, Lhs.0, Lhs.2, Lhs.3, Rhs.1
            80414   ~0%    {5}    | JOIN WITH `TypeInference::CallExprBaseMatchingInput::accessDeclarationPositionMatch/2#6c58c89d` ON FIRST 1 OUTPUT Lhs.4, Rhs.1, Lhs.2, Lhs.1, Lhs.3
            98323   ~1%    {6}    | JOIN WITH `project#TypeInference::CallExprBaseMatching::typeParameterConstraintHasTypeParameter/7#7f1e227b#2` ON FIRST 3 OUTPUT Lhs.3, Lhs.4, Lhs.0, Rhs.3, Rhs.4, Rhs.5
                           {6}    | AND NOT `_GenericParamList::GenericParamList.getTypeParam/1#dispred#01a987e9_21#join_rhs_Type::Type#75554d9d___#antijoin_rhs#3`(FIRST 6)
            98176   ~0%    {6}    | SCAN OUTPUT In.1, In.3, In.0, In.2, In.4, In.5
                0   ~0%    {7}    | JOIN WITH `TypeInference::M2::SatisfiesConstraint<TypeInference::CallExprBaseMatching::AccessConstraint::RelevantAccess,TypeInference::CallExprBaseMatching::AccessConstraint::SatisfiesConstraintInput>::satisfiesConstraintType/4#d5b1679c#prev` ON FIRST 2 OUTPUT Lhs.2, Lhs.3, Lhs.5, Rhs.3, _, Lhs.4, Rhs.2
                           {5}    | REWRITE WITH Tmp.4 := "", Out.4 := InverseAppend(In.5,Tmp.4,In.6) KEEPING 5
                0   ~0%    {5}    | SCAN OUTPUT In.0, In.1, In.4, In.3, In.2
                       
            42102   ~1%    {5} r4 = r1 UNION r2 UNION r3
            36047   ~1%    {5}    | AND NOT `TypeInference::CallExprBaseMatching::typeConstraintBaseTypeMatch/5#ebeb4216#prev`(FIRST 5)
                           return r4

I don't have an "after" join order to show as I can't find the equivalent thing after the refactors.

DCA is uneventful and don't show any change in analysis time 😢

shared/typeinference/codeql/typeinference/internal/TypeInference.qll

…` are in `relevantConstraint`

… and factor out `multipleConstraintImplementations`

Copilot

Pull Request Overview

This PR refactors the Rust type inference library to improve join orders and reduce computational overhead. The changes focus on optimizing predicate evaluation and streamlining constraint satisfaction logic.

Key changes:

Extracted multipleConstraintImplementations predicate to improve reusability and join ordering
Moved hasTypeConstraint predicate definition earlier for better join optimization
Simplified typeParameterConstraintHasTypeParameter predicate by reducing unnecessary joins and intermediate variables

shared/typeinference/codeql/typeinference/internal/TypeInference.qll

paldepind · 2025-07-19T08:44:49Z

shared/typeinference/codeql/typeinference/internal/TypeInference.qll

@@ -989,7 +996,7 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
          path = prefix0.append(suffix)
        )
        or
-        tt.getTypeAt(TypePath::nil()) = constraint and
+        hasTypeConstraint(tt, constraint, constraint) and


The crux here is hat hasTypeConstraint includes relevantConstraint. Before that this disjunct allowed constraint to be anything tt.getTypeAt(TypePath::nil()) which caused the relation to contain a lot of junk.

geoffw0

LGTM, one question.

geoffw0 · 2025-07-22T08:27:21Z

shared/typeinference/codeql/typeinference/internal/TypeInference.qll

@@ -1409,15 +1413,9 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
        Access a, Declaration target, TypePath path, Type t, TypeParameter tp
      ) {
        not exists(getTypeArgument(a, target, tp, _)) and
-        target = a.getTarget() and


What has happened to this constraint?

Good question. It's implied by AccessConstraint::satisfiesConstraintType(a, target, ...) so including it here didn't add anything.

paldepind changed the title ~~Shared, Rust: Adjust type inference predicates to better match use sites~~ Shared, Rust: Type inference refactor and improve join orders Jul 17, 2025

paldepind added the Rust Pull requests that update Rust code label Jul 17, 2025

github-advanced-security bot found potential problems Jul 18, 2025

View reviewed changes

shared/typeinference/codeql/typeinference/internal/TypeInference.qll Fixed Show fixed Hide fixed

paldepind added 3 commits July 18, 2025 15:32

Shared, Rust: Adjust type inference predicates to better match use sites

475d872

Shared, Rust: Ensure that the constraints in `satisfiesConstraintType…

bdcecdf

…` are in `relevantConstraint`

Shared, Rust: Reuse hasTypeConstraint in potentialInstantiationOf…

43b2977

… and factor out `multipleConstraintImplementations`

paldepind force-pushed the rust/type-inference-cleanup-join branch from c00cf2f to 43b2977 Compare July 18, 2025 13:39

github-actions bot removed the Rust Pull requests that update Rust code label Jul 18, 2025

paldepind changed the title ~~Shared, Rust: Type inference refactor and improve join orders~~ Rust: Type inference refactor and improve join orders Jul 18, 2025

paldepind added Rust Pull requests that update Rust code no-change-note-required This PR does not need a change note labels Jul 18, 2025

paldepind marked this pull request as ready for review July 19, 2025 08:43

Copilot AI review requested due to automatic review settings July 19, 2025 08:43

Copilot AI reviewed Jul 19, 2025

View reviewed changes

shared/typeinference/codeql/typeinference/internal/TypeInference.qll Show resolved Hide resolved

paldepind commented Jul 19, 2025

View reviewed changes

geoffw0 reviewed Jul 22, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rust: Type inference refactor and improve join orders #20076

Rust: Type inference refactor and improve join orders #20076

paldepind commented Jul 17, 2025 •

edited

Loading

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

paldepind Jul 19, 2025

Uh oh!

geoffw0 left a comment

Uh oh!

geoffw0 Jul 22, 2025

Uh oh!

paldepind Jul 22, 2025

Uh oh!

Uh oh!

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Rust: Type inference refactor and improve join orders #20076

Are you sure you want to change the base?

Rust: Type inference refactor and improve join orders #20076

Conversation

paldepind commented Jul 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Uh oh!

Uh oh!

paldepind Jul 19, 2025

Choose a reason for hiding this comment

Uh oh!

geoffw0 left a comment

Choose a reason for hiding this comment

Uh oh!

geoffw0 Jul 22, 2025

Choose a reason for hiding this comment

Uh oh!

paldepind Jul 22, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

paldepind commented Jul 17, 2025 •

edited

Loading