Filter use-constraint violating providers of packages #607

laeubi · 2024-05-03T17:20:05Z

If a provider is chosen for a given requirement this can imply that also other providers are now become invalid, currently the resolver simply checks the whole state and adds new permutations what is rather expensive.

This now adds an additional local filtering step that checks for the chosen provider for the requirement and discards any incompatible provider for other packages in the same resource.

As a result for a small testcase this saves 3 out of 23 (~ 10%) uses permutations.

laeubi · 2024-05-03T17:28:25Z

This is how it looks for example before the filtering:

=== remove uses violations for Import-Package: com.google.gson; version="[2.9.0,3.0.0)"
== current candidate is Export-Package: com.google.gson; bundle-symbolic-name="com.google.gson"; bundle-version="2.9.1.v20220915-1632"; version="2.9.1"; uses:="com.google.gson.internal,com.google.gson.reflect,com.google.gson.stream"
  [?]com.google.gson 2.9.1.v20220915-1632 (UNRESOLVED)
    [!]Import-Package: com.google.gson; version="[2.9.0,3.0.0)": 
        Export-Package: com.google.gson; bundle-symbolic-name="com.google.gson"; bundle-version="2.9.1.v20220915-1632"; version="2.9.1"; uses:="com.google.gson.internal,com.google.gson.reflect,com.google.gson.stream"
    [?]Import-Package: com.google.gson.annotations; version="[2.9.0,3.0.0)": 
        Export-Package: com.google.gson.annotations; bundle-symbolic-name="com.google.gson"; bundle-version="2.10.1.v20230109-0753"; version="2.10.1"
        Export-Package: com.google.gson.annotations; bundle-symbolic-name="com.google.gson"; bundle-version="2.9.1.v20220915-1632"; version="2.9.1"
    [?]Import-Package: com.google.gson.internal; version="[2.9.0,3.0.0)": 
        Export-Package: com.google.gson.internal; bundle-symbolic-name="com.google.gson"; bundle-version="2.10.1.v20230109-0753"; version="2.10.1"; x-internal:="true"; uses:="com.google.gson,com.google.gson.reflect,com.google.gson.stream"
        Export-Package: com.google.gson.internal; bundle-symbolic-name="com.google.gson"; bundle-version="2.9.1.v20220915-1632"; version="2.9.1"; x-internal:="true"; uses:="  com.google.gson,  com.google.gson.reflect,  com.google.gson.stream "
    [?]Import-Package: com.google.gson.internal.bind; version="[2.9.0,3.0.0)": 
        Export-Package: com.google.gson.internal.bind; bundle-symbolic-name="com.google.gson"; bundle-version="2.10.1.v20230109-0753"; version="2.10.1"; x-internal:="true"; uses:="com.google.gson,com.google.gson.internal,com.google.gson.reflect,com.google.gson.stream"
        Export-Package: com.google.gson.internal.bind; bundle-symbolic-name="com.google.gson"; bundle-version="2.9.1.v20220915-1632"; version="2.9.1"; x-internal:="true"; uses:="  com.google.gson,  com.google.gson.internal,  com.google.gson.reflect,  com.google.gson.stream "
    [?]Import-Package: com.google.gson.internal.bind.util; version="[2.9.0,3.0.0)": 
        Export-Package: com.google.gson.internal.bind.util; bundle-symbolic-name="com.google.gson"; bundle-version="2.10.1.v20230109-0753"; version="2.10.1"; x-internal:="true"
        Export-Package: com.google.gson.internal.bind.util; bundle-symbolic-name="com.google.gson"; bundle-version="2.9.1.v20220915-1632"; version="2.9.1"; x-internal:="true"
    [?]Import-Package: com.google.gson.internal.reflect; version="[2.9.0,3.0.0)": 
        Export-Package: com.google.gson.internal.reflect; bundle-symbolic-name="com.google.gson"; bundle-version="2.10.1.v20230109-0753"; version="2.10.1"; x-internal:="true"; uses:="com.google.gson"
        Export-Package: com.google.gson.internal.reflect; bundle-symbolic-name="com.google.gson"; bundle-version="2.9.1.v20220915-1632"; version="2.9.1"; x-internal:="true"; uses:="com.google.gson"
    [?]Import-Package: com.google.gson.internal.sql; version="[2.9.0,3.0.0)": 
        Export-Package: com.google.gson.internal.sql; bundle-symbolic-name="com.google.gson"; bundle-version="2.10.1.v20230109-0753"; version="2.10.1"; x-internal:="true"; uses:="com.google.gson,com.google.gson.internal.bind"
        Export-Package: com.google.gson.internal.sql; bundle-symbolic-name="com.google.gson"; bundle-version="2.9.1.v20220915-1632"; version="2.9.1"; x-internal:="true"; uses:="com.google.gson,com.google.gson.internal.bind"
    [?]Import-Package: com.google.gson.reflect; version="[2.9.0,3.0.0)": 
        Export-Package: com.google.gson.reflect; bundle-symbolic-name="com.google.gson"; bundle-version="2.10.1.v20230109-0753"; version="2.10.1"
        Export-Package: com.google.gson.reflect; bundle-symbolic-name="com.google.gson"; bundle-version="2.9.1.v20220915-1632"; version="2.9.1"
    [?]Import-Package: com.google.gson.stream; version="[2.9.0,3.0.0)": 
        Export-Package: com.google.gson.stream; bundle-symbolic-name="com.google.gson"; bundle-version="2.10.1.v20230109-0753"; version="2.10.1"
        Export-Package: com.google.gson.stream; bundle-symbolic-name="com.google.gson"; bundle-version="2.9.1.v20220915-1632"; version="2.9.1"
    [!]Import-Package: sun.misc; resolution:="optional": 
        Export-Package: sun.misc; bundle-symbolic-name="org.eclipse.osgi"; bundle-version="3.18.500.v20230801-1826"; version="0.0.0"
    [!]Require-Capability: osgi.ee; filter:="(&(osgi.ee=JavaSE)(version=1.7))": 
        Provide-Capability: osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0.0,1.1.0,1.2.0,1.3.0,1.4.0,1.5.0,1.6.0,1.7.0,1.8.0,9.0.0,10.0.0,11.0.0,12.0.0,13.0.0,14.0.0,15.0.0,16.0.0,17.0.0"
    [!]Require-Capability: osgi.ee; filter:="(&(osgi.ee=JavaSE)(version=1.7))": 
        Provide-Capability: osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0.0,1.1.0,1.2.0,1.3.0,1.4.0,1.5.0,1.6.0,1.7.0,1.8.0,9.0.0,10.0.0,11.0.0,12.0.0,13.0.0,14.0.0,15.0.0,16.0.0,17.0.0"

as one can see the provider chosen for com.google.gson makes it only possible for some other packages to choose the same provider due to its uses constraints what are the following (transitively):

 uses: com.google.gson
 uses: com.google.gson.internal
 uses: com.google.gson.reflect
 uses: com.google.gson.stream

this then results in the following filtered candidate set:

  [?]com.google.gson 2.9.1.v20220915-1632 (UNRESOLVED)
    [!]Import-Package: com.google.gson; version="[2.9.0,3.0.0)": 
        Export-Package: com.google.gson; bundle-symbolic-name="com.google.gson"; bundle-version="2.9.1.v20220915-1632"; version="2.9.1"; uses:="com.google.gson.internal,com.google.gson.reflect,com.google.gson.stream"
    [?]Import-Package: com.google.gson.annotations; version="[2.9.0,3.0.0)": 
        Export-Package: com.google.gson.annotations; bundle-symbolic-name="com.google.gson"; bundle-version="2.10.1.v20230109-0753"; version="2.10.1"
        Export-Package: com.google.gson.annotations; bundle-symbolic-name="com.google.gson"; bundle-version="2.9.1.v20220915-1632"; version="2.9.1"
    [!]Import-Package: com.google.gson.internal; version="[2.9.0,3.0.0)": 
        Export-Package: com.google.gson.internal; bundle-symbolic-name="com.google.gson"; bundle-version="2.9.1.v20220915-1632"; version="2.9.1"; x-internal:="true"; uses:="  com.google.gson,  com.google.gson.reflect,  com.google.gson.stream "
    [?]Import-Package: com.google.gson.internal.bind; version="[2.9.0,3.0.0)": 
        Export-Package: com.google.gson.internal.bind; bundle-symbolic-name="com.google.gson"; bundle-version="2.10.1.v20230109-0753"; version="2.10.1"; x-internal:="true"; uses:="com.google.gson,com.google.gson.internal,com.google.gson.reflect,com.google.gson.stream"
        Export-Package: com.google.gson.internal.bind; bundle-symbolic-name="com.google.gson"; bundle-version="2.9.1.v20220915-1632"; version="2.9.1"; x-internal:="true"; uses:="  com.google.gson,  com.google.gson.internal,  com.google.gson.reflect,  com.google.gson.stream "
    [?]Import-Package: com.google.gson.internal.bind.util; version="[2.9.0,3.0.0)": 
        Export-Package: com.google.gson.internal.bind.util; bundle-symbolic-name="com.google.gson"; bundle-version="2.10.1.v20230109-0753"; version="2.10.1"; x-internal:="true"
        Export-Package: com.google.gson.internal.bind.util; bundle-symbolic-name="com.google.gson"; bundle-version="2.9.1.v20220915-1632"; version="2.9.1"; x-internal:="true"
    [?]Import-Package: com.google.gson.internal.reflect; version="[2.9.0,3.0.0)": 
        Export-Package: com.google.gson.internal.reflect; bundle-symbolic-name="com.google.gson"; bundle-version="2.10.1.v20230109-0753"; version="2.10.1"; x-internal:="true"; uses:="com.google.gson"
        Export-Package: com.google.gson.internal.reflect; bundle-symbolic-name="com.google.gson"; bundle-version="2.9.1.v20220915-1632"; version="2.9.1"; x-internal:="true"; uses:="com.google.gson"
    [?]Import-Package: com.google.gson.internal.sql; version="[2.9.0,3.0.0)": 
        Export-Package: com.google.gson.internal.sql; bundle-symbolic-name="com.google.gson"; bundle-version="2.10.1.v20230109-0753"; version="2.10.1"; x-internal:="true"; uses:="com.google.gson,com.google.gson.internal.bind"
        Export-Package: com.google.gson.internal.sql; bundle-symbolic-name="com.google.gson"; bundle-version="2.9.1.v20220915-1632"; version="2.9.1"; x-internal:="true"; uses:="com.google.gson,com.google.gson.internal.bind"
    [!]Import-Package: com.google.gson.reflect; version="[2.9.0,3.0.0)": 
        Export-Package: com.google.gson.reflect; bundle-symbolic-name="com.google.gson"; bundle-version="2.9.1.v20220915-1632"; version="2.9.1"
    [!]Import-Package: com.google.gson.stream; version="[2.9.0,3.0.0)": 
        Export-Package: com.google.gson.stream; bundle-symbolic-name="com.google.gson"; bundle-version="2.9.1.v20220915-1632"; version="2.9.1"
    [!]Import-Package: sun.misc; resolution:="optional": 
        Export-Package: sun.misc; bundle-symbolic-name="org.eclipse.osgi"; bundle-version="3.18.500.v20230801-1826"; version="0.0.0"
    [!]Require-Capability: osgi.ee; filter:="(&(osgi.ee=JavaSE)(version=1.7))": 
        Provide-Capability: osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0.0,1.1.0,1.2.0,1.3.0,1.4.0,1.5.0,1.6.0,1.7.0,1.8.0,9.0.0,10.0.0,11.0.0,12.0.0,13.0.0,14.0.0,15.0.0,16.0.0,17.0.0"
    [!]Require-Capability: osgi.ee; filter:="(&(osgi.ee=JavaSE)(version=1.7))": 
        Provide-Capability: osgi.ee; osgi.ee="JavaSE"; version:List<Version>="1.0.0,1.1.0,1.2.0,1.3.0,1.4.0,1.5.0,1.6.0,1.7.0,1.8.0,9.0.0,10.0.0,11.0.0,12.0.0,13.0.0,14.0.0,15.0.0,16.0.0,17.0.0"

github-actions · 2024-05-03T17:44:30Z

Test Results

660 files ±0 660 suites ±0 1h 17m 22s ⏱️ +13s
2 201 tests ±0 2 154 ✅ ±0 47 💤 ±0 0 ❌ ±0
6 747 runs ±0 6 604 ✅ ±0 143 💤 ±0 0 ❌ ±0

Results for commit 52f09fc. ± Comparison against base commit c386b71.

♻️ This comment has been updated with latest results.

laeubi · 2024-05-04T08:06:43Z

I now added a system property to disable the feature just in case it causes problems somewhere.

bundles/org.eclipse.osgi/felix/src/org/apache/felix/resolver/Candidates.java

laeubi · 2024-06-09T16:46:33Z

Rebased and build is now green again!

laeubi · 2024-06-16T06:52:27Z

@tjwatson I have now reworked this to pass the debugging through the logger, that way we can reuse Equinox formatting and it can be enabled/disabled by the usual debugging properties and makes the using code much cleaner.

laeubi · 2024-09-10T09:44:31Z

I plan to merge this if there are no further comments/concerns so we have enough time to find possible issues.

If a provider is chosen for a given requirement this can imply that also other providers are now become invalid, currently the resolver simply checks the whole state and adds new permutations what is rather expensive. This now adds an additional local filtering step that checks for the chosen provider for the requirement and discards any incompatible provider for other packages in the same resource. As a result for a small testcase this saves 3 out of 23 (~ 10%) uses permutations.

iloveeclipse · 2024-09-17T06:17:27Z

This change causes API error The minor version should be incremented in version 3.21.100, since new APIs have been added since version 3.21.0.

- The non-abstract method org.eclipse.osgi.container.ModuleContainer.toString(Resource) has been added

See eclipse-equinox#607

iloveeclipse · 2024-09-17T06:25:03Z

Fix: #673

See #607

laeubi force-pushed the filter_uses_violations branch 2 times, most recently from 21847e4 to 5b7de35 Compare May 4, 2024 08:06

tjwatson reviewed May 6, 2024

View reviewed changes

laeubi force-pushed the filter_uses_violations branch from 5b7de35 to 63b2053 Compare May 11, 2024 16:20

laeubi requested a review from tjwatson May 11, 2024 16:23

laeubi force-pushed the filter_uses_violations branch 5 times, most recently from 3168237 to 09f19aa Compare June 9, 2024 05:10

laeubi force-pushed the filter_uses_violations branch from 09f19aa to e083009 Compare June 16, 2024 06:49

laeubi force-pushed the filter_uses_violations branch from e083009 to 7ddbc24 Compare June 16, 2024 07:01

laeubi force-pushed the filter_uses_violations branch 2 times, most recently from 6e3bb41 to 23aa376 Compare September 10, 2024 09:42

laeubi force-pushed the filter_uses_violations branch 2 times, most recently from 81e4423 to a5715d6 Compare September 13, 2024 13:38

laeubi force-pushed the filter_uses_violations branch from a5715d6 to 52f09fc Compare September 13, 2024 14:20

laeubi merged commit b1adfa2 into eclipse-equinox:master Sep 14, 2024
26 of 27 checks passed

iloveeclipse added a commit to iloveeclipse/equinox that referenced this pull request Sep 17, 2024

Fixed API error introduced in b1adfa2

92fbc76

See eclipse-equinox#607

iloveeclipse mentioned this pull request Sep 17, 2024

Fixed API error introduced in b1adfa20784797c3e9a07f10df53bf8f447bc6f0 #673

Merged

iloveeclipse added a commit that referenced this pull request Sep 17, 2024

Fixed API error introduced in b1adfa2

cbd261e

See #607

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Filter use-constraint violating providers of packages #607

Filter use-constraint violating providers of packages #607

laeubi commented May 3, 2024

laeubi commented May 3, 2024

github-actions bot commented May 3, 2024 •

edited

Loading

laeubi commented May 4, 2024

laeubi commented Jun 9, 2024

laeubi commented Jun 16, 2024

laeubi commented Sep 10, 2024

iloveeclipse commented Sep 17, 2024

iloveeclipse commented Sep 17, 2024

Filter use-constraint violating providers of packages #607

Filter use-constraint violating providers of packages #607

Conversation

laeubi commented May 3, 2024

laeubi commented May 3, 2024

github-actions bot commented May 3, 2024 • edited Loading

Test Results

laeubi commented May 4, 2024

laeubi commented Jun 9, 2024

laeubi commented Jun 16, 2024

laeubi commented Sep 10, 2024

iloveeclipse commented Sep 17, 2024

iloveeclipse commented Sep 17, 2024

github-actions bot commented May 3, 2024 •

edited

Loading