Skip to content

Commit 2e715be

Browse files
jjerphanjjerphan
committed
Unify naming of DatabaseVariant instances
Signed-off-by: Julien Jerphanion <[email protected]>
1 parent 448e79c commit 2e715be

File tree

3 files changed

+54
-49
lines changed

3 files changed

+54
-49
lines changed

‎libmamba/src/api/install.cpp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -682,22 +682,22 @@ namespace mamba
682682
bool remove_prefix_on_failure
683683
)
684684
{
685-
solver::DatabaseVariant db = ctx.experimental_resolvo_solver
686-
? solver::DatabaseVariant(
687-
std::in_place_type<solver::resolvo::Database>,
688-
channel_context.params()
689-
)
690-
: solver::DatabaseVariant(
691-
std::in_place_type<solver::libsolv::Database>,
692-
channel_context.params(),
693-
solver::libsolv::Database::Settings{
694-
ctx.experimental_matchspec_parsing
695-
? solver::libsolv::MatchSpecParser::Mamba
696-
: solver::libsolv::MatchSpecParser::Libsolv }
697-
);
685+
solver::DatabaseVariant db_variant = ctx.experimental_resolvo_solver
686+
? solver::DatabaseVariant(
687+
std::in_place_type<solver::resolvo::Database>,
688+
channel_context.params()
689+
)
690+
: solver::DatabaseVariant(
691+
std::in_place_type<solver::libsolv::Database>,
692+
channel_context.params(),
693+
solver::libsolv::Database::Settings{
694+
ctx.experimental_matchspec_parsing
695+
? solver::libsolv::MatchSpecParser::Mamba
696+
: solver::libsolv::MatchSpecParser::Libsolv }
697+
);
698698
if (!ctx.experimental_resolvo_solver)
699699
{
700-
add_spdlog_logger_to_database(std::get<solver::libsolv::Database>(db));
700+
add_spdlog_logger_to_database(std::get<solver::libsolv::Database>(db_variant));
701701
}
702702

703703
init_channels(ctx, channel_context);
@@ -717,19 +717,19 @@ namespace mamba
717717

718718
MultiPackageCache pkg_caches(ctx.pkgs_dirs, ctx.validation_params);
719719

720-
if (auto* libsolv_db = std::get_if<solver::libsolv::Database>(&db))
720+
if (auto* libsolv_db = std::get_if<solver::libsolv::Database>(&db_variant))
721721
{
722722
load_installed_packages_in_database(ctx, *libsolv_db, prefix_data);
723723
}
724-
else if (auto* resolvo_db = std::get_if<solver::resolvo::Database>(&db))
724+
else if (auto* resolvo_db = std::get_if<solver::resolvo::Database>(&db_variant))
725725
{
726726
load_installed_packages_in_database(ctx, *resolvo_db, prefix_data);
727727
}
728728

729729
std::vector<detail::other_pkg_mgr_spec> others;
730730
// Note that the Transaction will gather the Solvables,
731731
// so they must have been ready in the database's pool before this line
732-
auto transaction = create_transaction(db, pkg_caches, others);
732+
auto transaction = create_transaction(db_variant, pkg_caches, others);
733733

734734
std::vector<LockFile> lock_pkgs;
735735

‎libmamba/src/api/remove.cpp‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -143,16 +143,16 @@ namespace mamba
143143
: solver::libsolv::MatchSpecParser::Libsolv,
144144
},
145145
};
146-
solver::DatabaseVariant db = ctx.experimental_resolvo_solver
147-
? solver::DatabaseVariant(
148-
std::in_place_type<solver::resolvo::Database>,
149-
channel_context.params()
150-
)
151-
: solver::DatabaseVariant(std::move(database));
146+
solver::DatabaseVariant db_variant = ctx.experimental_resolvo_solver
147+
? solver::DatabaseVariant(
148+
std::in_place_type<solver::resolvo::Database>,
149+
channel_context.params()
150+
)
151+
: solver::DatabaseVariant(std::move(database));
152152

153153
if (!ctx.experimental_resolvo_solver)
154154
{
155-
add_spdlog_logger_to_database(std::get<solver::libsolv::Database>(db));
155+
add_spdlog_logger_to_database(std::get<solver::libsolv::Database>(db_variant));
156156
}
157157

158158
load_installed_packages_in_database(
@@ -162,7 +162,7 @@ namespace mamba
162162
std::reference_wrapper<solver::libsolv::Database>,
163163
std::reference_wrapper<solver::resolvo::Database>>
164164
{ return std::ref(db); },
165-
db
165+
db_variant
166166
),
167167
prefix_data
168168
);
@@ -202,7 +202,6 @@ namespace mamba
202202
pkgs_to_remove.push_back(iter->second);
203203
}
204204
}
205-
solver::DatabaseVariant db_variant = std::move(db);
206205
auto transaction = MTransaction(ctx, db_variant, pkgs_to_remove, {}, package_caches);
207206
return execute_transaction(transaction);
208207
}
@@ -220,7 +219,7 @@ namespace mamba
220219

221220
auto outcome = solver::libsolv::Solver()
222221
.solve(
223-
std::get<solver::libsolv::Database>(db),
222+
std::get<solver::libsolv::Database>(db_variant),
224223
request,
225224
ctx.experimental_matchspec_parsing
226225
? solver::libsolv::MatchSpecParser::Mamba
@@ -234,7 +233,7 @@ namespace mamba
234233
Console::instance().json_write(
235234
{ { "success", false },
236235
{ "solver_problems",
237-
unsolvable->problems(std::get<solver::libsolv::Database>(db)) } }
236+
unsolvable->problems(std::get<solver::libsolv::Database>(db_variant)) } }
238237
);
239238
}
240239
throw mamba_error(
@@ -244,7 +243,7 @@ namespace mamba
244243
}
245244

246245
Console::instance().json_write({ { "success", true } });
247-
solver::DatabaseVariant db_variant2 = std::move(db);
246+
solver::DatabaseVariant db_variant2 = std::move(db_variant);
248247
auto transaction2 = MTransaction(
249248
ctx,
250249
db_variant2,

‎libmamba/src/api/update.cpp‎

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -157,27 +157,27 @@ namespace mamba
157157

158158
populate_context_channels_from_specs(raw_update_specs, ctx);
159159

160-
solver::DatabaseVariant db = ctx.experimental_resolvo_solver
161-
? solver::DatabaseVariant(
162-
std::in_place_type<solver::resolvo::Database>,
163-
channel_context.params()
164-
)
165-
: solver::DatabaseVariant(solver::libsolv::Database{
166-
channel_context.params(),
167-
{
168-
ctx.experimental_matchspec_parsing
169-
? solver::libsolv::MatchSpecParser::Mamba
170-
: solver::libsolv::MatchSpecParser::Libsolv,
171-
} });
160+
solver::DatabaseVariant db_variant = ctx.experimental_resolvo_solver
161+
? solver::DatabaseVariant(
162+
std::in_place_type<solver::resolvo::Database>,
163+
channel_context.params()
164+
)
165+
: solver::DatabaseVariant(solver::libsolv::Database{
166+
channel_context.params(),
167+
{
168+
ctx.experimental_matchspec_parsing
169+
? solver::libsolv::MatchSpecParser::Mamba
170+
: solver::libsolv::MatchSpecParser::Libsolv,
171+
} });
172172

173173
if (!ctx.experimental_resolvo_solver)
174174
{
175-
add_spdlog_logger_to_database(std::get<solver::libsolv::Database>(db));
175+
add_spdlog_logger_to_database(std::get<solver::libsolv::Database>(db_variant));
176176
}
177177

178178
MultiPackageCache package_caches(ctx.pkgs_dirs, ctx.validation_params);
179179

180-
auto exp_loaded = load_channels(ctx, channel_context, db, package_caches);
180+
auto exp_loaded = load_channels(ctx, channel_context, db_variant, package_caches);
181181
if (!exp_loaded)
182182
{
183183
throw std::runtime_error(exp_loaded.error().what());
@@ -198,7 +198,7 @@ namespace mamba
198198
std::reference_wrapper<solver::libsolv::Database>,
199199
std::reference_wrapper<solver::resolvo::Database>>
200200
{ return std::ref(db); },
201-
db
201+
db_variant
202202
),
203203
prefix_data
204204
);
@@ -224,7 +224,7 @@ namespace mamba
224224
using LibsolvOutcome = std::variant<mamba::solver::Solution, mamba::solver::libsolv::UnSolvable>;
225225
auto outcome = ctx.experimental_resolvo_solver
226226
? solver::resolvo::Solver()
227-
.solve(std::get<solver::resolvo::Database>(db), request)
227+
.solve(std::get<solver::resolvo::Database>(db_variant), request)
228228
.map(
229229
[](auto&& result) -> LibsolvOutcome
230230
{
@@ -233,7 +233,7 @@ namespace mamba
233233
}
234234
)
235235
: solver::libsolv::Solver().solve(
236-
std::get<solver::libsolv::Database>(db),
236+
std::get<solver::libsolv::Database>(db_variant),
237237
request,
238238
ctx.experimental_matchspec_parsing
239239
? solver::libsolv::MatchSpecParser::Mamba
@@ -248,7 +248,7 @@ namespace mamba
248248
if (auto* unsolvable = std::get_if<solver::libsolv::UnSolvable>(&result))
249249
{
250250
unsolvable->explain_problems_to(
251-
std::get<solver::libsolv::Database>(db),
251+
std::get<solver::libsolv::Database>(db_variant),
252252
LOG_ERROR,
253253
{
254254
/* .unavailable= */ ctx.graphics_params.palette.failure,
@@ -260,7 +260,7 @@ namespace mamba
260260
Console::instance().json_write(nlohmann::json{
261261
{ "success", false },
262262
{ "solver_problems",
263-
unsolvable->problems(std::get<solver::libsolv::Database>(db)) } });
263+
unsolvable->problems(std::get<solver::libsolv::Database>(db_variant)) } });
264264
}
265265
throw mamba_error(
266266
"Could not solve for environment specs",
@@ -269,7 +269,13 @@ namespace mamba
269269
}
270270

271271
Console::instance().json_write(nlohmann::json{ { "success", true } });
272-
auto transaction = MTransaction(ctx, db, request, std::get<solver::Solution>(result), package_caches);
272+
auto transaction = MTransaction(
273+
ctx,
274+
db_variant,
275+
request,
276+
std::get<solver::Solution>(result),
277+
package_caches
278+
);
273279

274280

275281
auto execute_transaction = [&](MTransaction& trans)

0 commit comments

Comments
 (0)