From: Omar Sandoval <osandov@fb.com>
Since the schema change adding _r_seekable was done in a backward
compatible way, seekable archives that were previously scanned will not
be in _r_seekable. Whenever an archive is going to be extracted to
satisfy a request, check if it is seekable. If so, populate _r_seekable
while extracting it so that future requests use the optimized path.
The next time that BUILDIDS is bumped, all archives will be checked at
scan time. At that point, checking again will be unnecessary and this
commit can be reverted.
Signed-off-by: Omar Sandoval <osandov@fb.com>
---
debuginfod/debuginfod.cxx | 76 +++++++++++++++++++++++++++++++++++----
1 file changed, 70 insertions(+), 6 deletions(-)
@@ -2737,6 +2737,7 @@ handle_buildid_r_match (bool internal_req_p,
}
// no match ... look for a seekable entry
+ bool populate_seekable = true;
unique_ptr<sqlite_ps> pp (new sqlite_ps (db, "rpm-seekable-query",
"select type, size, offset, mtime from " BUILDIDS "_r_seekable "
"where file = ? and content = ?"));
@@ -2745,6 +2746,9 @@ handle_buildid_r_match (bool internal_req_p,
{
if (rc != SQLITE_ROW)
throw sqlite_exception(rc, "step");
+ // if we found a match in _r_seekable but we fail to extract it, don't
+ // bother populating it again
+ populate_seekable = false;
const char* seekable_type = (const char*) sqlite3_column_text (*pp, 0);
if (seekable_type != NULL && strcmp (seekable_type, "xz") == 0)
{
@@ -2836,16 +2840,39 @@ handle_buildid_r_match (bool internal_req_p,
throw archive_exception(a, "cannot open archive from pipe");
}
- // archive traversal is in three stages, no, four stages:
- // 1) skip entries whose names do not match the requested one
- // 2) extract the matching entry name (set r = result)
- // 3) extract some number of prefetched entries (just into fdcache)
- // 4) abort any further processing
+ // If the archive was scanned in a version without _r_seekable, then we may
+ // need to populate _r_seekable now. This can be removed the next time
+ // BUILDIDS is updated.
+ if (populate_seekable)
+ {
+ populate_seekable = is_seekable_archive (b_source0, a);
+ if (populate_seekable)
+ {
+ // NB: the names are already interned
+ pp.reset(new sqlite_ps (db, "rpm-seekable-insert2",
+ "insert or ignore into " BUILDIDS "_r_seekable (file, content, type, size, offset, mtime) "
+ "values (?, "
+ "(select id from " BUILDIDS "_files "
+ "where dirname = (select id from " BUILDIDS "_fileparts where name = ?) "
+ "and basename = (select id from " BUILDIDS "_fileparts where name = ?) "
+ "), 'xz', ?, ?, ?)"));
+ }
+ }
+
+ // archive traversal is in five stages:
+ // 1) before we find a matching entry, insert it into _r_seekable if needed or
+ // skip it otherwise
+ // 2) extract the matching entry (set r = result). Also insert it into
+ // _r_seekable if needed
+ // 3) extract some number of prefetched entries (just into fdcache). Also
+ // insert them into _r_seekable if needed
+ // 4) if needed, insert all of the remaining entries into _r_seekable
+ // 5) abort any further processing
struct MHD_Response* r = 0; // will set in stage 2
unsigned prefetch_count =
internal_req_p ? 0 : fdcache_prefetch; // will decrement in stage 3
- while(r == 0 || prefetch_count > 0) // stage 1, 2, or 3
+ while(r == 0 || prefetch_count > 0 || populate_seekable) // stage 1-4
{
if (interrupted)
break;
@@ -2859,6 +2886,43 @@ handle_buildid_r_match (bool internal_req_p,
continue;
string fn = canonicalized_archive_entry_pathname (e);
+
+ if (populate_seekable)
+ {
+ string dn, bn;
+ size_t slash = fn.rfind('/');
+ if (slash == std::string::npos) {
+ dn = "";
+ bn = fn;
+ } else {
+ dn = fn.substr(0, slash);
+ bn = fn.substr(slash + 1);
+ }
+
+ int64_t seekable_size = archive_entry_size (e);
+ int64_t seekable_offset = archive_filter_bytes (a, 0);
+ time_t seekable_mtime = archive_entry_mtime (e);
+
+ pp->reset();
+ pp->bind(1, b_id0);
+ pp->bind(2, dn);
+ pp->bind(3, bn);
+ pp->bind(4, seekable_size);
+ pp->bind(5, seekable_offset);
+ pp->bind(6, seekable_mtime);
+ rc = pp->step();
+ if (rc != SQLITE_DONE)
+ obatched(clog) << "recording seekable file=" << fn
+ << " sqlite3 error: " << (sqlite3_errstr(rc) ?: "?") << endl;
+ else if (verbose > 2)
+ obatched(clog) << "recorded seekable file=" << fn
+ << " size=" << seekable_size
+ << " offset=" << seekable_offset
+ << " mtime=" << seekable_mtime << endl;
+ if (r != 0 && prefetch_count == 0) // stage 4
+ continue;
+ }
+
if ((r == 0) && (fn != b_source1)) // stage 1
continue;