aboutsummaryrefslogtreecommitdiff
path: root/libbrep
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2017-05-16 23:27:53 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2017-05-19 11:44:48 +0300
commit4718a059f842a791c89a1922996bb8f1dbea8f65 (patch)
treea6dcc621f8287d444a699355f89b4a383eafd283 /libbrep
parente2264d6c34de011753913dd9b447b3d38649619c (diff)
Add filter form to builds page
Diffstat (limited to 'libbrep')
-rw-r--r--libbrep/build.cxx6
-rw-r--r--libbrep/build.hxx68
-rw-r--r--libbrep/build.xml3
-rw-r--r--libbrep/common.hxx8
4 files changed, 72 insertions, 13 deletions
diff --git a/libbrep/build.cxx b/libbrep/build.cxx
index c0b780d..33aad45 100644
--- a/libbrep/build.cxx
+++ b/libbrep/build.cxx
@@ -36,7 +36,8 @@ namespace brep
build (string pnm, version pvr,
string cfg,
string tnm, version tvr,
- string mnm, string msm)
+ string mnm, string msm,
+ optional<butl::target_triplet> trg)
: id (package_id (move (pnm), pvr), move (cfg), tvr),
package_name (id.package.name),
package_version (move (pvr)),
@@ -47,7 +48,8 @@ namespace brep
timestamp (timestamp_type::clock::now ()),
forced (false),
machine (move (mnm)),
- machine_summary (move (msm))
+ machine_summary (move (msm)),
+ target (move (trg))
{
}
}
diff --git a/libbrep/build.hxx b/libbrep/build.hxx
index 90e6523..112100a 100644
--- a/libbrep/build.hxx
+++ b/libbrep/build.hxx
@@ -10,6 +10,8 @@
#include <odb/core.hxx>
#include <odb/section.hxx>
+#include <libbutl/target-triplet.hxx>
+
#include <libbbot/manifest.hxx>
#include <libbrep/types.hxx>
@@ -19,9 +21,9 @@
// Used by the data migration entries.
//
-#define LIBBREP_BUILD_SCHEMA_VERSION_BASE 1
+#define LIBBREP_BUILD_SCHEMA_VERSION_BASE 2
-#pragma db model version(LIBBREP_BUILD_SCHEMA_VERSION_BASE, 1, closed)
+#pragma db model version(LIBBREP_BUILD_SCHEMA_VERSION_BASE, 2, open)
// We have to keep these mappings at the global scope instead of inside
// the brep namespace because they need to be also effective in the
@@ -92,6 +94,16 @@ namespace brep
? bbot::to_result_status (*(?)) \
: brep::optional_result_status ())
+ // target_triplet
+ //
+ using optional_target_triplet = optional<butl::target_triplet>;
+
+ #pragma db map type(optional_target_triplet) as(optional_string) \
+ to((?) ? (?)->string () : brep::optional_string ()) \
+ from((?) \
+ ? butl::target_triplet (*(?)) \
+ : brep::optional_target_triplet ())
+
// operation_results
//
using bbot::operation_result;
@@ -111,7 +123,8 @@ namespace brep
build (string package_name, version package_version,
string configuration,
string toolchain_name, version toolchain_version,
- string machine, string machine_summary);
+ string machine, string machine_summary,
+ optional<butl::target_triplet> target);
build_id id;
@@ -140,13 +153,14 @@ namespace brep
optional<string> machine;
optional<string> machine_summary;
+ // Default for the machine if absent.
+ //
+ optional<butl::target_triplet> target;
+
// Note that the logs are stored as std::string/TEXT which is Ok since
// they are UTF-8 and our database is UTF-8.
//
- #pragma db section(results_section)
operation_results results;
-
- #pragma db load(lazy) update(always)
odb::section results_section;
// Database mapping.
@@ -160,7 +174,10 @@ namespace brep
#pragma db member(toolchain_version) \
set(this.toolchain_version.init (this.id.toolchain_version, (?)))
- #pragma db member(results) id_column("") value_column("")
+ #pragma db member(results) id_column("") value_column("") \
+ section(results_section)
+
+ #pragma db member(results_section) load(lazy) update(always)
build (const build&) = delete;
build& operator= (const build&) = delete;
@@ -182,6 +199,43 @@ namespace brep
//
#pragma db member(result) column("count(" + build::package_name + ")")
};
+
+ #pragma db view object(build) query(distinct)
+ struct toolchain
+ {
+ string name;
+ upstream_version version;
+
+ // Database mapping. Note that the version member must be loaded after
+ // the virtual members since the version_ member must filled by that time.
+ //
+ #pragma db member(name) column(build::toolchain_name)
+
+ #pragma db member(version) column(build::toolchain_version) \
+ set(this.version.init (this.version_, (?)))
+
+ #pragma db member(epoch) virtual(uint16_t) \
+ before(version) access(version_.epoch) \
+ column(build::id.toolchain_version.epoch)
+
+ #pragma db member(canonical_upstream) virtual(std::string) \
+ before(version) access(version_.canonical_upstream) \
+ column(build::id.toolchain_version.canonical_upstream)
+
+ #pragma db member(canonical_release) virtual(std::string) \
+ before(version) access(version_.canonical_release) \
+ column(build::id.toolchain_version.canonical_release)
+
+ #pragma db member(revision) virtual(uint16_t) \
+ before(version) access(version_.revision) \
+ column(build::id.toolchain_version.revision)
+
+ private:
+ friend class odb::access;
+
+ #pragma db transient
+ canonical_version version_;
+ };
}
#endif // LIBBREP_BUILD_HXX
diff --git a/libbrep/build.xml b/libbrep/build.xml
index 5793de3..72cbd5f 100644
--- a/libbrep/build.xml
+++ b/libbrep/build.xml
@@ -1,5 +1,5 @@
<changelog xmlns="http://www.codesynthesis.com/xmlns/odb/changelog" database="pgsql" schema-name="build" version="1">
- <model version="1">
+ <model version="2">
<table name="build" kind="object">
<column name="package_name" type="TEXT" null="false"/>
<column name="package_version_epoch" type="INTEGER" null="false"/>
@@ -22,6 +22,7 @@
<column name="status" type="TEXT" null="true"/>
<column name="machine" type="TEXT" null="true"/>
<column name="machine_summary" type="TEXT" null="true"/>
+ <column name="target" type="TEXT" null="true"/>
<primary-key>
<column name="package_name"/>
<column name="package_version_epoch"/>
diff --git a/libbrep/common.hxx b/libbrep/common.hxx
index 942790c..6bc5aca 100644
--- a/libbrep/common.hxx
+++ b/libbrep/common.hxx
@@ -318,10 +318,12 @@ namespace brep
template <typename T>
inline auto
- order_by_version_desc (const T& x) -> //decltype ("ORDER BY" + x.epoch)
- decltype (x.epoch == 0)
+ order_by_version_desc (
+ const T& x,
+ bool first = true) -> //decltype ("ORDER BY" + x.epoch)
+ decltype (x.epoch == 0)
{
- return "ORDER BY"
+ return (first ? "ORDER BY" : ", ")
+ x.epoch + "DESC,"
+ x.canonical_upstream + "DESC,"
+ x.canonical_release + "DESC,"