Skip to content

Commit

Permalink
fix(interactive): Minor fix for Interactive Metadata store (#4449)
Browse files Browse the repository at this point in the history
Fix #4443
  • Loading branch information
zhanglei1949 authored Jan 24, 2025
1 parent 7d13f48 commit 5535293
Showing 1 changed file with 22 additions and 2 deletions.
24 changes: 22 additions & 2 deletions flex/engines/http_server/actor/admin_actor.act.cc
Original file line number Diff line number Diff line change
Expand Up @@ -930,9 +930,29 @@ seastar::future<admin_query_result> admin_actor::start_service(
return seastar::make_ready_future<admin_query_result>(
gs::Result<seastar::sstring>(plugins_res.status()));
}
// Note that the plugin meta contains both builtin and user-defined plugins,
// we need to remove the builtin plugins from the plugin meta.
auto& graph_meta = get_graph_res.value();
auto& additional_plugins = plugins_res.value();
const auto& all_builtin_plugins = gs::get_builtin_plugin_metas();
for (const auto& builtin_plugin : all_builtin_plugins) {
auto it =
std::remove_if(additional_plugins.begin(), additional_plugins.end(),
[&builtin_plugin](const gs::PluginMeta& plugin_meta) {
return plugin_meta.id == builtin_plugin.id;
});
additional_plugins.erase(it, additional_plugins.end());
auto it2 = std::remove_if(
graph_meta.plugin_metas.begin(), graph_meta.plugin_metas.end(),
[&builtin_plugin](const gs::PluginMeta& plugin_meta) {
return plugin_meta.id == builtin_plugin.id;
});
graph_meta.plugin_metas.erase(it2, graph_meta.plugin_metas.end());
}

// With all enabled plugins and graph schema, dump to a new schema file.
auto dump_res = WorkDirManipulator::DumpGraphSchema(get_graph_res.value(),
plugins_res.value());
auto dump_res =
WorkDirManipulator::DumpGraphSchema(graph_meta, additional_plugins);
if (!dump_res.ok()) {
LOG(ERROR) << "Fail to dump graph schema: "
<< dump_res.status().error_message();
Expand Down

0 comments on commit 5535293

Please sign in to comment.