X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Frepo.c;h=b266d8d575d7a27c8a1c4b2a87359db3693ed333;hb=de92b8ea19562961f973960c0f8f5aec7f6d9c75;hp=594295f1dba9a10ec97a72a01222ad2d07276573;hpb=6af0f8f8cc46636f39552d5a0e9a3f708a04ddb2;p=platform%2Fupstream%2Flibsolv.git diff --git a/src/repo.c b/src/repo.c index 594295f..b266d8d 100644 --- a/src/repo.c +++ b/src/repo.c @@ -92,11 +92,13 @@ repo_empty(Repo *repo, int reuseids) if (s->repo != repo) break; pool_free_solvable_block(pool, i + 1, repo->end - (i + 1), reuseids); + repo->end = i + 1; } /* zero out (i.e. free) solvables belonging to this repo */ for (i = repo->start, s = pool->solvables + i; i < repo->end; i++, s++) if (s->repo == repo) memset(s, 0, sizeof(*s)); + repo->end = repo->start; repo->nsolvables = 0; /* free all data belonging to this repo */ @@ -146,7 +148,7 @@ repo_add_solvable(Repo *repo) repo->start = repo->end = p; /* warning: sidedata must be extended before adapting start/end */ if (repo->rpmdbid) - repo->rpmdbid = (Id *)repo_sidedata_extend(repo, repo->rpmdbid, sizeof(Id), p, 1); + repo->rpmdbid = (Id *)repo_sidedata_extend(repo, repo->rpmdbid, sizeof(Id), p, 1); if (p < repo->start) repo->start = p; if (p + 1 > repo->end) @@ -160,7 +162,7 @@ Id repo_add_solvable_block(Repo *repo, int count) { Id p; - Solvable *s; + Solvable *s; if (!count) return 0; p = pool_add_solvable_block(repo->pool, count); @@ -211,6 +213,8 @@ repo_free_solvable_block(Repo *repo, Id start, int count, int reuseids) int j; for (j = dstart; j < dend; j++) data->attrs[j - data->start] = solv_free(data->attrs[j - data->start]); + if (data->lasthandle >= dstart && data->lasthandle < dend) + data->lasthandle = 0; } if (data->incoreoffset) memset(data->incoreoffset + (dstart - data->start), 0, (dend - dstart) * sizeof(Id)); @@ -218,6 +222,54 @@ repo_free_solvable_block(Repo *repo, Id start, int count, int reuseids) } } +/* specialized version of repo_add_solvable_block that inserts the new solvable + * block before the indicated repo, which gets relocated. + * used in repo_add_rpmdb + */ +Id +repo_add_solvable_block_before(Repo *repo, int count, Repo *beforerepo) +{ + Pool *pool = repo->pool; + Id p; + Solvable *s; + Repodata *data; + int i; + + if (!count || !beforerepo || beforerepo->end != pool->nsolvables || beforerepo->start == beforerepo->end) + return repo_add_solvable_block(repo, count); + p = beforerepo->start; + /* make sure all solvables belong to beforerepo */ + for (i = p, s = pool->solvables + i; i < beforerepo->end; i++, s++) + if (s->repo && s->repo != beforerepo) + return repo_add_solvable_block(repo, count); + /* now move beforerepo to back */ + pool_add_solvable_block(pool, count); /* must return beforerepo->end! */ + memmove(pool->solvables + p + count, pool->solvables + p, (beforerepo->end - p) * sizeof(Solvable)); + memset(pool->solvables + p, 0, sizeof(Solvable) * count); + /* adapt repodata */ + FOR_REPODATAS(beforerepo, i, data) + { + if (data->start < p) + continue; + data->start += count; + data->end += count; + } + beforerepo->start += count; + beforerepo->end += count; + /* we now have count free solvables at id p */ + /* warning: sidedata must be extended before adapting start/end */ + if (repo->rpmdbid) + repo->rpmdbid = (Id *)repo_sidedata_extend(repo, repo->rpmdbid, sizeof(Id), p, count); + if (p < repo->start) + repo->start = p; + if (p + count > repo->end) + repo->end = p + count; + repo->nsolvables += count; + for (s = pool->solvables + p; count--; s++) + s->repo = repo; + return p; +} + /* repository sidedata is solvable data allocated on demand. * It is used for data that is normally not present @@ -312,7 +364,7 @@ repo_addid(Repo *repo, Offset olddeps, Id id) #define REPO_ADDID_DEP_HASHTHRES 64 #define REPO_ADDID_DEP_HASHMIN 128 -/* +/* * Optimization for packages with an excessive amount of provides/requires: * if the number of deps exceed a threshold, we build a hash of the already * seen ids. @@ -338,10 +390,10 @@ repo_addid_dep_hash(Repo *repo, Offset olddeps, Id id, Id marker, int size) } /* maintain hash and lastmarkerpos */ - if (repo->lastidhash_idarraysize != repo->idarraysize || size * 2 > repo->lastidhash_mask || repo->lastmarker != marker) + if (repo->lastidhash_idarraysize != repo->idarraysize || (Hashval)size * 2 > repo->lastidhash_mask || repo->lastmarker != marker) { repo->lastmarkerpos = 0; - if (size * 2 > repo->lastidhash_mask) + if ((Hashval)size * 2 > repo->lastidhash_mask) { repo->lastidhash_mask = mkmask(size < REPO_ADDID_DEP_HASHMIN ? REPO_ADDID_DEP_HASHMIN : size); repo->lastidhash = solv_realloc2(repo->lastidhash, repo->lastidhash_mask + 1, sizeof(Id)); @@ -542,6 +594,20 @@ repo_addid_dep(Repo *repo, Offset olddeps, Id id, Id marker) return repo_addid(repo, olddeps, id); } +/* return standard marker for the keyname dependency. + * 1: return positive marker, -1: return negative marker + */ +Id +solv_depmarker(Id keyname, Id marker) +{ + if (marker != 1 && marker != -1) + return marker; + if (keyname == SOLVABLE_PROVIDES) + return marker < 0 ? -SOLVABLE_FILEMARKER : SOLVABLE_FILEMARKER; + if (keyname == SOLVABLE_REQUIRES) + return marker < 0 ? -SOLVABLE_PREREQMARKER : SOLVABLE_PREREQMARKER; + return 0; +} /* * reserve Ids @@ -550,7 +616,6 @@ repo_addid_dep(Repo *repo, Offset olddeps, Id id, Id marker) * * reserved ids will always begin at offset idarraysize */ - Offset repo_reserve_ids(Repo *repo, Offset olddeps, int num) { @@ -603,252 +668,39 @@ repo_reserve_ids(Repo *repo, Offset olddeps, int num) /***********************************************************************/ -/* - * some SUSE specific fixups, should go into a separate file - */ - -Offset -repo_fix_supplements(Repo *repo, Offset provides, Offset supplements, Offset freshens) -{ - Pool *pool = repo->pool; - Id id, idp, idl; - char buf[1024], *p, *dep; - int i, l; - - if (provides) - { - for (i = provides; repo->idarraydata[i]; i++) - { - id = repo->idarraydata[i]; - if (ISRELDEP(id)) - continue; - dep = (char *)pool_id2str(pool, id); - if (!strncmp(dep, "locale(", 7) && strlen(dep) < sizeof(buf) - 2) - { - idp = 0; - strcpy(buf + 2, dep); - dep = buf + 2 + 7; - if ((p = strchr(dep, ':')) != 0 && p != dep) - { - *p++ = 0; - idp = pool_str2id(pool, dep, 1); - dep = p; - } - id = 0; - while ((p = strchr(dep, ';')) != 0) - { - if (p == dep) - { - dep = p + 1; - continue; - } - *p++ = 0; - idl = pool_str2id(pool, dep, 1); - idl = pool_rel2id(pool, NAMESPACE_LANGUAGE, idl, REL_NAMESPACE, 1); - if (id) - id = pool_rel2id(pool, id, idl, REL_OR, 1); - else - id = idl; - dep = p; - } - if (dep[0] && dep[1]) - { - for (p = dep; *p && *p != ')'; p++) - ; - *p = 0; - idl = pool_str2id(pool, dep, 1); - idl = pool_rel2id(pool, NAMESPACE_LANGUAGE, idl, REL_NAMESPACE, 1); - if (id) - id = pool_rel2id(pool, id, idl, REL_OR, 1); - else - id = idl; - } - if (idp) - id = pool_rel2id(pool, idp, id, REL_AND, 1); - if (id) - supplements = repo_addid_dep(repo, supplements, id, 0); - } - else if ((p = strchr(dep, ':')) != 0 && p != dep && p[1] == '/' && strlen(dep) < sizeof(buf)) - { - strcpy(buf, dep); - p = buf + (p - dep); - *p++ = 0; - idp = pool_str2id(pool, buf, 1); - /* strip trailing slashes */ - l = strlen(p); - while (l > 1 && p[l - 1] == '/') - p[--l] = 0; - id = pool_str2id(pool, p, 1); - id = pool_rel2id(pool, idp, id, REL_WITH, 1); - id = pool_rel2id(pool, NAMESPACE_SPLITPROVIDES, id, REL_NAMESPACE, 1); - supplements = repo_addid_dep(repo, supplements, id, 0); - } - } - } - if (supplements) - { - for (i = supplements; repo->idarraydata[i]; i++) - { - id = repo->idarraydata[i]; - if (ISRELDEP(id)) - continue; - dep = (char *)pool_id2str(pool, id); - if (!strncmp(dep, "system:modalias(", 16)) - dep += 7; - if (!strncmp(dep, "modalias(", 9) && dep[9] && dep[10] && strlen(dep) < sizeof(buf)) - { - strcpy(buf, dep); - p = strchr(buf + 9, ':'); - if (p && p != buf + 9 && strchr(p + 1, ':')) - { - *p++ = 0; - idp = pool_str2id(pool, buf + 9, 1); - p[strlen(p) - 1] = 0; - id = pool_str2id(pool, p, 1); - id = pool_rel2id(pool, NAMESPACE_MODALIAS, id, REL_NAMESPACE, 1); - id = pool_rel2id(pool, idp, id, REL_AND, 1); - } - else - { - p = buf + 9; - p[strlen(p) - 1] = 0; - id = pool_str2id(pool, p, 1); - id = pool_rel2id(pool, NAMESPACE_MODALIAS, id, REL_NAMESPACE, 1); - } - if (id) - repo->idarraydata[i] = id; - } - else if (!strncmp(dep, "packageand(", 11) && strlen(dep) < sizeof(buf)) - { - strcpy(buf, dep); - id = 0; - dep = buf + 11; - while ((p = strchr(dep, ':')) != 0) - { - if (p == dep) - { - dep = p + 1; - continue; - } - /* argh, allow pattern: prefix. sigh */ - if (p - dep == 7 && !strncmp(dep, "pattern", 7)) - { - p = strchr(p + 1, ':'); - if (!p) - break; - } - *p++ = 0; - idp = pool_str2id(pool, dep, 1); - if (id) - id = pool_rel2id(pool, id, idp, REL_AND, 1); - else - id = idp; - dep = p; - } - if (dep[0] && dep[1]) - { - dep[strlen(dep) - 1] = 0; - idp = pool_str2id(pool, dep, 1); - if (id) - id = pool_rel2id(pool, id, idp, REL_AND, 1); - else - id = idp; - } - if (id) - repo->idarraydata[i] = id; - } - else if (!strncmp(dep, "filesystem(", 11) && strlen(dep) < sizeof(buf)) - { - strcpy(buf, dep + 11); - if ((p = strrchr(buf, ')')) != 0) - *p = 0; - id = pool_str2id(pool, buf, 1); - id = pool_rel2id(pool, NAMESPACE_FILESYSTEM, id, REL_NAMESPACE, 1); - repo->idarraydata[i] = id; - } - } - } - if (freshens && repo->idarraydata[freshens]) - { - Id idsupp = 0, idfresh = 0; - if (!supplements || !repo->idarraydata[supplements]) - return freshens; - for (i = supplements; repo->idarraydata[i]; i++) - { - if (!idsupp) - idsupp = repo->idarraydata[i]; - else - idsupp = pool_rel2id(pool, idsupp, repo->idarraydata[i], REL_OR, 1); - } - for (i = freshens; repo->idarraydata[i]; i++) - { - if (!idfresh) - idfresh = repo->idarraydata[i]; - else - idfresh = pool_rel2id(pool, idfresh, repo->idarraydata[i], REL_OR, 1); - } - if (!idsupp) - idsupp = idfresh; - else - idsupp = pool_rel2id(pool, idsupp, idfresh, REL_AND, 1); - supplements = repo_addid_dep(repo, 0, idsupp, 0); - } - return supplements; -} - -Offset -repo_fix_conflicts(Repo *repo, Offset conflicts) -{ - char buf[1024], *p, *dep; - Pool *pool = repo->pool; - Id id; - int i; - - if (!conflicts) - return conflicts; - for (i = conflicts; repo->idarraydata[i]; i++) - { - id = repo->idarraydata[i]; - if (ISRELDEP(id)) - continue; - dep = (char *)pool_id2str(pool, id); - if (!strncmp(dep, "otherproviders(", 15) && strlen(dep) < sizeof(buf) - 2) - { - strcpy(buf, dep + 15); - if ((p = strchr(buf, ')')) != 0) - *p = 0; - id = pool_str2id(pool, buf, 1); - id = pool_rel2id(pool, NAMESPACE_OTHERPROVIDERS, id, REL_NAMESPACE, 1); - repo->idarraydata[i] = id; - } - } - return conflicts; -} - -/***********************************************************************/ - struct matchdata { Pool *pool; int flags; Datamatcher matcher; int stop; + Id *keyskip; int (*callback)(void *cbdata, Solvable *s, Repodata *data, Repokey *key, KeyValue *kv); void *callback_data; }; -int +static int repo_matchvalue(void *cbdata, Solvable *s, Repodata *data, Repokey *key, KeyValue *kv) { struct matchdata *md = cbdata; if (md->matcher.match) { - if (!repodata_stringify(md->pool, data, key, kv, md->flags)) + const char *str; + if (key->name == SOLVABLE_FILELIST && key->type == REPOKEY_TYPE_DIRSTRARRAY && (md->matcher.flags & SEARCH_FILES) != 0) + if (!datamatcher_checkbasename(&md->matcher, kv->str)) + return 0; + if (!(str = repodata_stringify(md->pool, data, key, kv, md->flags))) return 0; - if (!datamatcher_match(&md->matcher, kv->str)) + if (!datamatcher_match(&md->matcher, str)) return 0; } + else + { + /* stringify filelist if requested */ + if (key->name == SOLVABLE_FILELIST && key->type == REPOKEY_TYPE_DIRSTRARRAY && (md->matcher.flags & SEARCH_FILES) != 0) + repodata_stringify(md->pool, data, key, kv, md->flags); + } md->stop = md->callback(md->callback_data, s, data, key, kv); return md->stop; } @@ -887,14 +739,41 @@ domatch_idarray(Solvable *s, Id keyname, struct matchdata *md, Id *ida) } } +static Offset * +solvable_offsetptr(Solvable *s, Id keyname) +{ + switch(keyname) + { + case SOLVABLE_PROVIDES: + return &s->provides; + case SOLVABLE_OBSOLETES: + return &s->obsoletes; + case SOLVABLE_CONFLICTS: + return &s->conflicts; + case SOLVABLE_REQUIRES: + return &s->requires; + case SOLVABLE_RECOMMENDS: + return &s->recommends; + case SOLVABLE_SUGGESTS: + return &s->suggests; + case SOLVABLE_SUPPLEMENTS: + return &s->supplements; + case SOLVABLE_ENHANCES: + return &s->enhances; + default: + return 0; + } +} + static void repo_search_md(Repo *repo, Id p, Id keyname, struct matchdata *md) { KeyValue kv; Pool *pool = repo->pool; Repodata *data; - int i, j, flags; + int i, flags; Solvable *s; + Id *keyskip; kv.parent = 0; md->stop = 0; @@ -909,12 +788,10 @@ repo_search_md(Repo *repo, Id p, Id keyname, struct matchdata *md) } return; } - else if (p < 0) - /* The callback only supports solvables, so we can't iterate over the - extra things. */ - return; + if (p < 0 && p != SOLVID_META) + return; /* SOLVID_POS not supported yet */ flags = md->flags; - if (!(flags & SEARCH_NO_STORAGE_SOLVABLE)) + if (p > 0 && !(flags & SEARCH_NO_STORAGE_SOLVABLE)) { s = pool->solvables + p; switch(keyname) @@ -995,7 +872,7 @@ repo_search_md(Repo *repo, Id p, Id keyname, struct matchdata *md) case RPM_RPMDBID: if (repo->rpmdbid) { - kv.num = repo->rpmdbid[p - repo->start]; + kv.num = (unsigned int)repo->rpmdbid[p - repo->start]; kv.num2 = 0; repo_matchvalue(md, s, 0, repo_solvablekeys + (RPM_RPMDBID - SOLVABLE_NAME), &kv); } @@ -1007,42 +884,23 @@ repo_search_md(Repo *repo, Id p, Id keyname, struct matchdata *md) } } + if (keyname) + { + if (keyname == SOLVABLE_FILELIST) + data = repo_lookup_filelist_repodata(repo, p, &md->matcher); + else + data = repo_lookup_repodata_opt(repo, p, keyname); + if (data) + repodata_search(data, p, keyname, md->flags, repo_matchvalue, md); + return; + } + + keyskip = repo_create_keyskip(repo, p, &md->keyskip); FOR_REPODATAS(repo, i, data) { - if (p < data->start || p >= data->end) - continue; - if (keyname && !repodata_precheck_keyname(data, keyname)) - continue; - if (keyname == SOLVABLE_FILELIST && !(md->flags & SEARCH_COMPLETE_FILELIST)) - { - /* do not search filelist extensions */ - if (data->state != REPODATA_AVAILABLE) - continue; - for (j = 1; j < data->nkeys; j++) - if (data->keys[j].name != REPOSITORY_SOLVABLES && data->keys[j].name != SOLVABLE_FILELIST) - break; - if (j == data->nkeys) - continue; - } - if (data->state == REPODATA_STUB) - { - if (keyname) - { - for (j = 1; j < data->nkeys; j++) - if (keyname == data->keys[j].name) - break; - if (j == data->nkeys) - continue; - } - /* load it */ - if (data->loadcallback) - data->loadcallback(data); - else - data->state = REPODATA_ERROR; - } - if (data->state == REPODATA_ERROR) + if (p != SOLVID_META && (p < data->start || p >= data->end)) continue; - repodata_search(data, p, keyname, md->flags, repo_matchvalue, md); + repodata_search_keyskip(data, p, keyname, md->flags, keyskip, repo_matchvalue, md); if (md->stop > SEARCH_NEXT_KEY) break; } @@ -1065,18 +923,181 @@ repo_search(Repo *repo, Id p, Id keyname, const char *match, int flags, int (*ca repo_search_md(repo, p, keyname, &md); if (match) datamatcher_free(&md.matcher); + solv_free(md.keyskip); +} + +Repodata * +repo_lookup_repodata(Repo *repo, Id entry, Id keyname) +{ + Repodata *data; + int rdid; + Id type; + + if (entry == SOLVID_POS) + { + Pool *pool = repo->pool; + return pool->pos.repo == repo && pool->pos.repodataid ? pool->pos.repo->repodata + pool->pos.repodataid : 0; + } + for (rdid = repo->nrepodata - 1, data = repo->repodata + rdid; rdid > 0; rdid--, data--) + { + if (entry != SOLVID_META && (entry < data->start || entry >= data->end)) + continue; + if (!repodata_precheck_keyname(data, keyname)) + continue; + if ((type = repodata_lookup_type(data, entry, keyname)) != 0) + return type == REPOKEY_TYPE_DELETED ? 0 : data; + } + return 0; +} + +/* like repo_lookup_repodata, but may return a repodata that contains no match instead of NULL */ +Repodata * +repo_lookup_repodata_opt(Repo *repo, Id entry, Id keyname) +{ + Repodata *data, *found = 0; + int rdid; + Id type; + + if (entry == SOLVID_POS) + { + Pool *pool = repo->pool; + return pool->pos.repo == repo && pool->pos.repodataid ? pool->pos.repo->repodata + pool->pos.repodataid : 0; + } + for (rdid = repo->nrepodata - 1, data = repo->repodata + rdid; rdid > 0; rdid--, data--) + { + if (entry != SOLVID_META && (entry < data->start || entry >= data->end)) + continue; + if (!repodata_precheck_keyname(data, keyname)) + continue; + if (found && (type = repodata_lookup_type(found, entry, keyname)) != 0) + return type == REPOKEY_TYPE_DELETED ? 0 : found; + found = data; + } + return found; +} + +Repodata * +repo_lookup_filelist_repodata(Repo *repo, Id entry, Datamatcher *matcher) +{ + Repodata *data; + int haveextension; + int rdid; + Id type; + + if (entry <= 0 || !matcher || !matcher->match || ((matcher->flags & (SEARCH_STRINGMASK|SEARCH_NOCASE)) != SEARCH_STRING + && (matcher->flags & (SEARCH_STRINGMASK|SEARCH_NOCASE)) != SEARCH_GLOB)) + return repo_lookup_repodata_opt(repo, entry, SOLVABLE_FILELIST); /* cannot use filtered filelist */ + + haveextension = 0; + for (rdid = repo->nrepodata - 1, data = repo->repodata + rdid; rdid > 0; rdid--, data--) + { + if (entry < data->start || entry >= data->end) + continue; + if (data->filelisttype == REPODATA_FILELIST_FILTERED) + { + if (data->state != REPODATA_AVAILABLE) + { + if (data->state != REPODATA_STUB) + continue; + repodata_load(data); + if (data->state != REPODATA_AVAILABLE || entry < data->start || entry >= data->end) + continue; + } + /* does this contain any data about the solvable we're looking for? */ + if (!data->incoreoffset[entry - data->start]) + continue; /* no, ignore */ + if (haveextension && repodata_filelistfilter_matches(data, matcher->match)) + return data; + break; /* fall back to normal code */ + } + if (!repodata_has_keyname(data, SOLVABLE_FILELIST)) + continue; + if (data->filelisttype == REPODATA_FILELIST_EXTENSION) + { + haveextension++; + continue; + } + if ((type = repodata_lookup_type(data, entry, SOLVABLE_FILELIST)) != 0) + { + if (haveextension) + break; /* need to look in extension */ + return type == REPOKEY_TYPE_DELETED ? 0 : data; + } + } + /* cannot use filtered filelist */ + return repo_lookup_repodata_opt(repo, entry, SOLVABLE_FILELIST); +} + + +/* the keyskip array has the following format: + * 0: keyname area size + * 1: repoid base + * 2: repoid end + * 3: entry for keyname 0 + * 4: entry for keyname 1 + * ... + */ +Id * +repo_create_keyskip(Repo *repo, Id entry, Id **oldkeyskip) +{ + Repodata *data, *last = 0; + Id *keyskip; + int rdid, cnt = 0; + + if (repo->nrepodata <= 2) + return 0; /* just one repodata, nothing to filter */ + keyskip = oldkeyskip ? *oldkeyskip : 0; + if (keyskip) + { + if (keyskip[1] >= 0x10000000) + keyskip = solv_free(keyskip); + else + keyskip[1] = keyskip[2]; + } + FOR_REPODATAS(repo, rdid, data) + { + if (entry != SOLVID_META) + { + if (data->state != REPODATA_AVAILABLE && data->state != REPODATA_LOADING) + { + if (data->state != REPODATA_STUB) + continue; + repodata_load(data); + if (data->state != REPODATA_AVAILABLE) + continue; + } + if ((entry < data->start || entry >= data->end)) + continue; + if (!data->incoreoffset[entry - data->start]) + continue; + } + if (last) + keyskip = repodata_fill_keyskip(last, entry, keyskip); + last = data; + cnt++; + } + if (cnt <= 1) + { + if (oldkeyskip) + *oldkeyskip = keyskip; + return 0; + } + keyskip = repodata_fill_keyskip(last, entry, keyskip); + if (keyskip) + keyskip[2] = keyskip[1] + repo->nrepodata; + if (oldkeyskip) + *oldkeyskip = keyskip; + return keyskip; } const char * repo_lookup_str(Repo *repo, Id entry, Id keyname) { - Pool *pool = repo->pool; Repodata *data; - int i; - const char *str; if (entry >= 0) { + Pool *pool = repo->pool; switch (keyname) { case SOLVABLE_NAME: @@ -1089,19 +1110,8 @@ repo_lookup_str(Repo *repo, Id entry, Id keyname) return pool_id2str(pool, pool->solvables[entry].vendor); } } - FOR_REPODATAS(repo, i, data) - { - if (entry != SOLVID_META && (entry < data->start || entry >= data->end)) - continue; - if (!repodata_precheck_keyname(data, keyname)) - continue; - str = repodata_lookup_str(data, entry, keyname); - if (str) - return str; - if (repodata_lookup_type(data, entry, keyname)) - return 0; - } - return 0; + data = repo_lookup_repodata_opt(repo, entry, keyname); + return data ? repodata_lookup_str(data, entry, keyname) : 0; } @@ -1109,37 +1119,24 @@ unsigned long long repo_lookup_num(Repo *repo, Id entry, Id keyname, unsigned long long notfound) { Repodata *data; - int i; - unsigned long long value; if (entry >= 0) { if (keyname == RPM_RPMDBID) { if (repo->rpmdbid && entry >= repo->start && entry < repo->end) - return repo->rpmdbid[entry - repo->start]; + return (unsigned int)repo->rpmdbid[entry - repo->start]; return notfound; } } - FOR_REPODATAS(repo, i, data) - { - if (entry != SOLVID_META && (entry < data->start || entry >= data->end)) - continue; - if (!repodata_precheck_keyname(data, keyname)) - continue; - if (repodata_lookup_num(data, entry, keyname, &value)) - return value; - if (repodata_lookup_type(data, entry, keyname)) - return notfound; - } - return notfound; + data = repo_lookup_repodata_opt(repo, entry, keyname); + return data ? repodata_lookup_num(data, entry, keyname, notfound) : notfound; } Id repo_lookup_id(Repo *repo, Id entry, Id keyname) { Repodata *data; - int i; Id id; if (entry >= 0) @@ -1156,33 +1153,12 @@ repo_lookup_id(Repo *repo, Id entry, Id keyname) return repo->pool->solvables[entry].vendor; } } - FOR_REPODATAS(repo, i, data) - { - if (entry != SOLVID_META && (entry < data->start || entry >= data->end)) - continue; - if (!repodata_precheck_keyname(data, keyname)) - continue; - id = repodata_lookup_id(data, entry, keyname); - if (id) - return data->localpool ? repodata_globalize_id(data, id, 1) : id; - if (repodata_lookup_type(data, entry, keyname)) - return 0; - } + data = repo_lookup_repodata_opt(repo, entry, keyname); + if (data && (id = repodata_lookup_id(data, entry, keyname)) != 0) + return data->localpool ? repodata_globalize_id(data, id, 1) : id; return 0; } -static int -lookup_idarray_solvable(Repo *repo, Offset off, Queue *q) -{ - Id *p; - - queue_empty(q); - if (off) - for (p = repo->idarraydata + off; *p; p++) - queue_push(q, *p); - return 1; -} - int repo_lookup_idarray(Repo *repo, Id entry, Id keyname, Queue *q) { @@ -1190,43 +1166,36 @@ repo_lookup_idarray(Repo *repo, Id entry, Id keyname, Queue *q) int i; if (entry >= 0) { + Offset *offp; switch (keyname) { case SOLVABLE_PROVIDES: - return lookup_idarray_solvable(repo, repo->pool->solvables[entry].provides, q); case SOLVABLE_OBSOLETES: - return lookup_idarray_solvable(repo, repo->pool->solvables[entry].obsoletes, q); case SOLVABLE_CONFLICTS: - return lookup_idarray_solvable(repo, repo->pool->solvables[entry].conflicts, q); case SOLVABLE_REQUIRES: - return lookup_idarray_solvable(repo, repo->pool->solvables[entry].requires, q); case SOLVABLE_RECOMMENDS: - return lookup_idarray_solvable(repo, repo->pool->solvables[entry].recommends, q); case SOLVABLE_SUGGESTS: - return lookup_idarray_solvable(repo, repo->pool->solvables[entry].suggests, q); case SOLVABLE_SUPPLEMENTS: - return lookup_idarray_solvable(repo, repo->pool->solvables[entry].supplements, q); case SOLVABLE_ENHANCES: - return lookup_idarray_solvable(repo, repo->pool->solvables[entry].enhances, q); + offp = solvable_offsetptr(repo->pool->solvables + entry, keyname); + if (*offp) + { + Id *p; + for (p = repo->idarraydata + *offp; *p; p++) + queue_push(q, *p); + } + return 1; } } - FOR_REPODATAS(repo, i, data) + data = repo_lookup_repodata_opt(repo, entry, keyname); + if (data && repodata_lookup_idarray(data, entry, keyname, q)) { - if (entry != SOLVID_META && (entry < data->start || entry >= data->end)) - continue; - if (!repodata_precheck_keyname(data, keyname)) - continue; - if (repodata_lookup_idarray(data, entry, keyname, q)) + if (data->localpool) { - if (data->localpool) - { - for (i = 0; i < q->count; i++) - q->elements[i] = repodata_globalize_id(data, q->elements[i], 1); - } - return 1; + for (i = 0; i < q->count; i++) + q->elements[i] = repodata_globalize_id(data, q->elements[i], 1); } - if (repodata_lookup_type(data, entry, keyname)) - break; + return 1; } queue_empty(q); return 0; @@ -1236,7 +1205,11 @@ int repo_lookup_deparray(Repo *repo, Id entry, Id keyname, Queue *q, Id marker) { int r = repo_lookup_idarray(repo, entry, keyname, q); - if (r && marker && q->count) + if (!r) + return 0; + if (marker == -1 || marker == 1) + marker = solv_depmarker(keyname, marker); + if (marker && q->count) { int i; if (marker < 0) @@ -1266,22 +1239,10 @@ repo_lookup_deparray(Repo *repo, Id entry, Id keyname, Queue *q, Id marker) const unsigned char * repo_lookup_bin_checksum(Repo *repo, Id entry, Id keyname, Id *typep) { - Repodata *data; - int i; const unsigned char *chk; - - FOR_REPODATAS(repo, i, data) - { - if (entry != SOLVID_META && (entry < data->start || entry >= data->end)) - continue; - if (!repodata_precheck_keyname(data, keyname)) - continue; - chk = repodata_lookup_bin_checksum(data, entry, keyname, typep); - if (chk) - return chk; - if (repodata_lookup_type(data, entry, keyname)) - return 0; - } + Repodata *data = repo_lookup_repodata_opt(repo, entry, keyname); + if (data && (chk = repodata_lookup_bin_checksum(data, entry, keyname, typep)) != 0) + return chk; *typep = 0; return 0; } @@ -1296,41 +1257,65 @@ repo_lookup_checksum(Repo *repo, Id entry, Id keyname, Id *typep) int repo_lookup_void(Repo *repo, Id entry, Id keyname) { - Repodata *data; - int i; - Id type; - - FOR_REPODATAS(repo, i, data) - { - if (entry != SOLVID_META && (entry < data->start || entry >= data->end)) - continue; - if (!repodata_precheck_keyname(data, keyname)) - continue; - type = repodata_lookup_type(data, entry, keyname); - if (type) - return type == REPOKEY_TYPE_VOID; - } + Repodata *data = repo_lookup_repodata_opt(repo, entry, keyname); + if (data) + return repodata_lookup_void(data, entry, keyname); return 0; } Id repo_lookup_type(Repo *repo, Id entry, Id keyname) { - Repodata *data; - int i; Id type; + Repodata *data; + if (keyname >= SOLVABLE_NAME && keyname <= RPM_RPMDBID) + return repo_solvablekeys[keyname - SOLVABLE_NAME].type; + data = repo_lookup_repodata_opt(repo, entry, keyname); + if (data && (type = repodata_lookup_type(data, entry, keyname)) != 0 && type != REPOKEY_TYPE_DELETED) + return type; + return 0; +} - FOR_REPODATAS(repo, i, data) +const void * +repo_lookup_binary(Repo *repo, Id entry, Id keyname, int *lenp) +{ + const void *bin; + Repodata *data = repo_lookup_repodata_opt(repo, entry, keyname); + if (data && (bin = repodata_lookup_binary(data, entry, keyname, lenp)) != 0) + return bin; + *lenp = 0; + return 0; +} + +unsigned int +repo_lookup_count(Repo *repo, Id entry, Id keyname) +{ + Repodata *data; + if (keyname >= SOLVABLE_NAME && keyname <= RPM_RPMDBID) + if (entry >= 0 && keyname >= SOLVABLE_NAME && keyname <= RPM_RPMDBID) { - if (entry != SOLVID_META && (entry < data->start || entry >= data->end)) - continue; - if (!repodata_precheck_keyname(data, keyname)) - continue; - type = repodata_lookup_type(data, entry, keyname); - if (type) - return type == REPOKEY_TYPE_DELETED ? 0 : type; + Id *p; + Offset *offp; + unsigned int cnt; + switch (keyname) + { + case SOLVABLE_PROVIDES: + case SOLVABLE_OBSOLETES: + case SOLVABLE_CONFLICTS: + case SOLVABLE_REQUIRES: + case SOLVABLE_RECOMMENDS: + case SOLVABLE_SUGGESTS: + case SOLVABLE_SUPPLEMENTS: + case SOLVABLE_ENHANCES: + offp = solvable_offsetptr(repo->pool->solvables + entry, keyname); + for (cnt = 0, p = repo->idarraydata + *offp; *p; p++) + cnt++; + return cnt; + } + return 1; } - return 0; + data = repo_lookup_repodata_opt(repo, entry, keyname); + return data ? repodata_lookup_count(data, entry, keyname) : 0; } /***********************************************************************/ @@ -1361,16 +1346,16 @@ repo_add_repodata(Repo *repo, int flags) return repo->repodata + i; } if (!repo->nrepodata) - { + { repo->nrepodata = 2; /* start with id 1 */ repo->repodata = solv_calloc(repo->nrepodata, sizeof(*data)); - } - else - { + } + else + { repo->nrepodata++; repo->repodata = solv_realloc2(repo->repodata, repo->nrepodata, sizeof(*data)); - } - data = repo->repodata + repo->nrepodata - 1; + } + data = repo->repodata + repo->nrepodata - 1; repodata_initdata(data, repo, (flags & REPO_LOCALPOOL) ? 1 : 0); return data; } @@ -1429,7 +1414,7 @@ repo_set_num(Repo *repo, Id p, Id keyname, unsigned long long num) { if (!repo->rpmdbid) repo->rpmdbid = repo_sidedata_create(repo, sizeof(Id)); - repo->rpmdbid[p] = num; + repo->rpmdbid[p - repo->start] = (Id)num; return; } } @@ -1488,34 +1473,23 @@ void repo_add_deparray(Repo *repo, Id p, Id keyname, Id dep, Id marker) { Repodata *data; + if (marker == -1 || marker == 1) + marker = solv_depmarker(keyname, marker); if (p >= 0) { - Solvable *s = repo->pool->solvables + p; + Offset *offp; switch (keyname) { case SOLVABLE_PROVIDES: - s->provides = repo_addid_dep(repo, s->provides, dep, marker); - return; case SOLVABLE_OBSOLETES: - s->obsoletes = repo_addid_dep(repo, s->obsoletes, dep, marker); - return; case SOLVABLE_CONFLICTS: - s->conflicts = repo_addid_dep(repo, s->conflicts, dep, marker); - return; case SOLVABLE_REQUIRES: - s->requires = repo_addid_dep(repo, s->requires, dep, marker); - return; case SOLVABLE_RECOMMENDS: - s->recommends = repo_addid_dep(repo, s->recommends, dep, marker); - return; case SOLVABLE_SUGGESTS: - s->suggests = repo_addid_dep(repo, s->suggests, dep, marker); - return; case SOLVABLE_SUPPLEMENTS: - s->supplements = repo_addid_dep(repo, s->supplements, dep, marker); - return; case SOLVABLE_ENHANCES: - s->enhances = repo_addid_dep(repo, s->enhances, dep, marker); + offp = solvable_offsetptr(repo->pool->solvables + p, keyname); + *offp = repo_addid_dep(repo, *offp, dep, marker); return; } } @@ -1529,20 +1503,12 @@ repo_add_idarray(Repo *repo, Id p, Id keyname, Id id) repo_add_deparray(repo, p, keyname, id, 0); } -static Offset -repo_set_idarray_solvable(Repo *repo, Queue *q) -{ - Offset o = 0; - int i; - for (i = 0; i < q->count; i++) - repo_addid_dep(repo, o, q->elements[i], 0); - return o; -} - void repo_set_deparray(Repo *repo, Id p, Id keyname, Queue *q, Id marker) { Repodata *data; + if (marker == -1 || marker == 1) + marker = solv_depmarker(keyname, marker); if (marker) { /* complex case, splice old and new arrays */ @@ -1563,9 +1529,7 @@ repo_set_deparray(Repo *repo, Id p, Id keyname, Queue *q, Id marker) { if (q2.count) queue_insert(&q2, 0, -marker); - queue_insertn(&q2, 0, q->count); - for (i = 0; i < q->count; i++) - q2.elements[i] = q->elements[i]; + queue_insertn(&q2, 0, q->count, q->elements); } repo_set_deparray(repo, p, keyname, &q2, 0); queue_free(&q2); @@ -1573,32 +1537,23 @@ repo_set_deparray(Repo *repo, Id p, Id keyname, Queue *q, Id marker) } if (p >= 0) { - Solvable *s = repo->pool->solvables + p; + Offset off, *offp; + int i; switch (keyname) { case SOLVABLE_PROVIDES: - s->provides = repo_set_idarray_solvable(repo, q); - return; case SOLVABLE_OBSOLETES: - s->obsoletes = repo_set_idarray_solvable(repo, q); - return; case SOLVABLE_CONFLICTS: - s->conflicts = repo_set_idarray_solvable(repo, q); - return; case SOLVABLE_REQUIRES: - s->requires = repo_set_idarray_solvable(repo, q); - return; case SOLVABLE_RECOMMENDS: - s->recommends = repo_set_idarray_solvable(repo, q); - return; case SOLVABLE_SUGGESTS: - s->suggests = repo_set_idarray_solvable(repo, q); - return; case SOLVABLE_SUPPLEMENTS: - s->supplements = repo_set_idarray_solvable(repo, q); - return; case SOLVABLE_ENHANCES: - s->enhances = repo_set_idarray_solvable(repo, q); + off = 0; + for (i = 0; i < q->count; i++) + off = repo_addid_dep(repo, off, q->elements[i], 0); + offp = solvable_offsetptr(repo->pool->solvables + p, keyname); + *offp = off; return; } } @@ -1613,6 +1568,62 @@ repo_set_idarray(Repo *repo, Id p, Id keyname, Queue *q) } void +repo_unset(Repo *repo, Id p, Id keyname) +{ + Repodata *data; + if (p >= 0) + { + Solvable *s = repo->pool->solvables + p; + switch (keyname) + { + case SOLVABLE_NAME: + s->name = 0; + return; + case SOLVABLE_ARCH: + s->arch = 0; + return; + case SOLVABLE_EVR: + s->evr = 0; + return; + case SOLVABLE_VENDOR: + s->vendor = 0; + return; + case RPM_RPMDBID: + if (repo->rpmdbid) + repo->rpmdbid[p - repo->start] = 0; + return; + case SOLVABLE_PROVIDES: + s->provides = 0; + return; + case SOLVABLE_OBSOLETES: + s->obsoletes = 0; + return; + case SOLVABLE_CONFLICTS: + s->conflicts = 0; + return; + case SOLVABLE_REQUIRES: + s->requires = 0; + return; + case SOLVABLE_RECOMMENDS: + s->recommends = 0; + return; + case SOLVABLE_SUGGESTS: + s->suggests = 0; + return; + case SOLVABLE_SUPPLEMENTS: + s->supplements = 0; + case SOLVABLE_ENHANCES: + s->enhances = 0; + return; + default: + break; + } + } + data = repo_last_repodata(repo); + repodata_unset(data, p, keyname); +} + +void repo_internalize(Repo *repo) { int i; @@ -1633,6 +1644,3 @@ repo_disable_paging(Repo *repo) repodata_disable_paging(data); } -/* -vim:cinoptions={.5s,g0,p5,t0,(0,^-0.5s,n-0.5s:tw=78:cindent:sw=4: -*/