alire/alire-index-community
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Query migrated alire -> alr

Browse Source
This commit is contained in:
Alejandro R Mosteo
2018-02-28 21:08:35 +01:00
parent 8bae7ae8dc
commit 496a0d0646
5 changed files with 53 additions and 280 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/alire-index.adb
+33
View File
@@ -1,5 +1,38 @@
package body Alire.Index is
------------
-- Exists --
------------
function Exists (Project : Project_Name;
Version : Semantic_Versioning.Version)
return Boolean is
begin
for R of Releases loop
if R.Project = Project and then R.Version = Version then
return True;
end if;
end loop;
return False;
end Exists;
----------
-- Find --
----------
function Find (Project : Project_Name;
Version : Semantic_Versioning.Version) return Release is
begin
for R of Releases loop
if R.Project = Project and then R.Version = Version then
return R;
end if;
end loop;
raise Constraint_Error with "Not in index: " & Project & "=" & Semantic_Versioning.Image (Version);
end Find;
--------------
-- Register --
--------------
src/alire-index.ads
+17
View File
@@ -45,7 +45,24 @@ package Alire.Index is
-- Requisites are properties that dependencies have to fulfill, not used yet.
-- Available_On are properties the platform has to fulfill.
---------------------
-- BASIC QUERIES --
---------------------
function Exists (Project : Project_Name;
Version : Semantic_Versioning.Version)
return Boolean;
function Find (Project : Project_Name;
Version : Semantic_Versioning.Version) return Release;
------------------------
-- INDEXING SUPPORT --
------------------------
-- Shortcuts for common origins:
function Apt (Pack : String ) return Origins.Origin renames Origins.New_Apt;
function Git (URL : Alire.URL; Commit : Origins.Git_Commit) return Origins.Origin renames Origins.New_Git;
function Hg (URL : Alire.URL; Commit : Origins.Hg_Commit) return Origins.Origin renames Origins.New_Hg;
src/alire-query.adb
-236
View File
@@ -1,236 +0,0 @@
with Alire.Dependencies;
with Alire.Utils;
package body Alire.Query is
package Semver renames Semantic_Versioning;
use all type Semver.Version_Set;
----------------------
-- Dependency_Image --
----------------------
function Dependency_Image (Project : Project_Name;
Versions : Semantic_Versioning.Version_Set;
Policy : Policies := Newest) return String is
(Project &
(if Versions /= Semver.Any
then " version " & Semver.Image (Versions)
else " with " & Utils.To_Mixed_Case (Policy'Img) & " version"));
------------
-- Exists --
------------
function Exists (Project : Project_Name;
Allowed : Semantic_Versioning.Version_Set := Semantic_Versioning.Any)
return Boolean
is
use Semver;
begin
for R of Releases loop
if R.Project = Project and then Satisfies (R.Version, Allowed) then
return True;
end if;
end loop;
return False;
end Exists;
----------
-- Find --
----------
function Find (Project : Project_Name;
Allowed : Semantic_Versioning.Version_Set := Semantic_Versioning.Any;
Policy : Policies) return Release
is
use Semantic_Versioning;
-----------
-- Check --
-----------
function Check (R : Index.Release) return Boolean is
begin
if R.Project = Project then
if Satisfies (R.Version, Allowed) then
return True;
else
Trace.Debug ("Skipping unsatisfactory version: " & Image (R.Version));
end if;
end if;
return False;
end Check;
begin
if Policy = Newest then
for R of reverse Index.Releases loop
if Check (R) then
return R;
end if;
end loop;
else
for R of Index.Releases loop
if Check (R) then
return R;
end if;
end loop;
end if;
raise Query_Unsuccessful with "Release not found: " & Project;
end Find;
------------
-- Exists --
------------
function Exists (Project : Project_Name;
Version : Semantic_Versioning.Version)
return Boolean is
(Exists (Project, Semver.Exactly (Version)));
----------
-- Find --
----------
function Find (Project : Project_Name;
Version : Semantic_Versioning.Version) return Release is
(Find (Project, Semver.Exactly (Version), Newest));
--------------------
-- Print_Solution --
--------------------
procedure Print_Solution (I : Instance) is
use Containers.Project_Release_Maps;
begin
for Rel of I loop
Log (" " & Rel.Milestone.Image, Debug);
end loop;
end Print_Solution;
-------------
-- Resolve --
-------------
function Resolve (Unresolved : Index.Dependencies;
Frozen : Instance;
Policy : Policies;
Success : in out Boolean) return Instance
is
-- FIXME: since this is depth-first, Frozen can be passed in-out and updated on the spot,
-- thus saving copies. Probably the same applies to Unresolved.
Dep : constant Alire.Dependencies.Dependency := (if Unresolved.Is_Empty
then Dependencies.New_Dependency ("fake", Semver.Any)
else Unresolved.First_Element);
-- The fake project will never be referenced, since the first check is that unresolved is empty
-- we are done
Remain : Index.Dependencies := Unresolved;
-----------
-- Check --
-----------
function Check (R : Release) return Instance is
begin
if Dep.Project = R.Project and then Semver.Satisfies (R.Version, Dep.Versions) then
declare
New_Frozen : Instance := Frozen;
New_Remain : Index.Dependencies := Remain;
Solution : Instance;
begin
New_Frozen.Insert (R.Project, R);
New_Remain.Append (R.Depends);
Solution := Resolve (New_Remain, New_Frozen, Policy, Success);
if not Solution.Is_Empty then
return Solution; -- Success!
end if;
end;
end if;
return Empty_Instance;
end Check;
begin
if Unresolved.Is_Empty then
Log ("Dependencies resolved", Detail);
Print_Solution (Frozen);
Success := True;
return Frozen;
end if;
Remain.Delete_First;
if Frozen.Contains (Dep.Project) then
if Semver.Satisfies (Frozen.Element (Dep.Project).Version, Dep.Versions) then
-- Dependency already met, simply go down...
return Resolve (Remain, Frozen, Policy, Success);
else
-- Failure because an already frozen version is incompatible
return Empty_Instance;
end if;
else
-- Need to check all versions for the first one...
-- FIXME: complexity can be improved not visiting blindly all releases to match by project
if Policy = Newest then
for R of reverse Index.Releases loop
declare
Solution : constant Instance := Check (R);
begin
if not Solution.Is_Empty then
return Solution;
end if;
end;
end loop;
else
for R of Index.Releases loop
declare
Solution : constant Instance := Check (R);
begin
if not Solution.Is_Empty then
return Solution;
end if;
end;
end loop;
end if;
-- We found no milestone compatible with the first unresolved dependency...
return Empty_Instance;
end if;
end Resolve;
-------------
-- Resolve --
-------------
function Resolve (Deps : Index.Dependencies;
Success : out Boolean;
Policy : Policies) return Instance is
begin
Success := False;
if Deps.Is_Empty then
Success := True;
return Empty_Instance;
end if;
return I : constant Instance := Resolve (Deps,
Containers.Project_Release_Maps.Empty_Map,
Policy,
Success)
do
if not Success then
Log ("Dependency resolution failed");
end if;
end return;
end Resolve;
end Alire.Query;
src/alire-query.ads
-41
View File
@@ -1,41 +0,0 @@
with Alire.Containers;
with Alire.Index; use Alire.Index;
with Semantic_Versioning;
package Alire.Query is
type Policies is (Oldest, Newest);
--subtype Solution is Containers.Version_Map; -- A dependence-valid mapping of project -> version
subtype Instance is Containers.Release_Map; -- A list of releases complying with a Solution
Empty_Instance : constant Instance := Containers.Project_Release_Maps.Empty_Map;
function Exists (Project : Project_Name;
Allowed : Semantic_Versioning.Version_Set := Semantic_Versioning.Any)
return Boolean;
function Find (Project : Project_Name;
Allowed : Semantic_Versioning.Version_Set := Semantic_Versioning.Any;
Policy : Policies) return Release;
function Exists (Project : Project_Name;
Version : Semantic_Versioning.Version)
return Boolean;
function Find (Project : Project_Name;
Version : Semantic_Versioning.Version) return Release;
function Resolve (Deps : Index.Dependencies;
Success : out Boolean;
Policy : Policies) return Instance;
procedure Print_Solution (I : Instance);
function Dependency_Image (Project : Project_Name;
Versions : Semantic_Versioning.Version_Set;
Policy : Policies := Newest) return String;
end Alire.Query;
src/alire-root_project.adb
+3 -3
View File
@@ -2,8 +2,8 @@
with Ada.Directories;
with Alire.Containers;
with Alire.Index;
with Alire.Origins;
with Alire.Query;
with Alire.Requisites;
package body Alire.Root_Project is
@@ -50,10 +50,10 @@ package body Alire.Root_Project is
Requisites => Requisites.No_Requisites,
Available => Requisites.No_Requisites);
begin
if Query.Exists (Project, Version) then
if Index.Exists (Project, Version) then
-- This is done to ensure that properties are all available
Trace.Debug ("Storing pre-indexed release of root project");
Root.Replace_Element (Query.Find (Project, Version));
Root.Replace_Element (Index.Find (Project, Version));
else
Trace.Debug ("Storing unindexed release of root project");
Root.Replace_Element (Rel);