Skip to content

[DF] Fix warnings on Ubuntu 16 #8076

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 3, 2021
Merged

[DF] Fix warnings on Ubuntu 16 #8076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions tree/dataframe/src/RDFGraphUtils.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,7 @@ std::shared_ptr<GraphNode> CreateRangeNode(const ROOT::Detail::RDF::RRangeBase *
return node;
}

std::shared_ptr<GraphNode> AddDefinesToGraph(std::shared_ptr<GraphNode> node,
const RDFInternal::RBookedDefines &defines,
std::shared_ptr<GraphNode> AddDefinesToGraph(std::shared_ptr<GraphNode> node, const RBookedDefines &defines,
const std::vector<std::string> &prevNodeDefines)
{
auto upmostNode = node;
Expand All @@ -150,7 +149,7 @@ std::shared_ptr<GraphNode> AddDefinesToGraph(std::shared_ptr<GraphNode> node,
for (auto i = int(defineNames.size()) - 1; i >= 0; --i) { // walk backwards through the names of defined columns
const auto colName = defineNames[i];
const bool isAlias = defineMap.find(colName) == defineMap.end();
if (isAlias || RDFInternal::IsInternalColumn(colName))
if (isAlias || IsInternalColumn(colName))
continue; // aliases appear in the list of defineNames but we don't support them yet
const bool isANewDefine =
std::find(prevNodeDefines.begin(), prevNodeDefines.end(), colName) == prevNodeDefines.end();
Expand Down
15 changes: 7 additions & 8 deletions tree/dataframe/src/RDFInterfaceUtils.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ ConvertRegexToColumns(const ColumnNames_t &colNames, std::string_view columnName
// we need to use TPRegexp
TPRegexp regexp(theRegex);
for (auto &&colName : colNames) {
if ((isEmptyRegex || regexp.MatchB(colName.c_str())) && !RDFInternal::IsInternalColumn(colName)) {
if ((isEmptyRegex || regexp.MatchB(colName.c_str())) && !IsInternalColumn(colName)) {
selectedColumns.emplace_back(colName);
}
}
Expand Down Expand Up @@ -584,8 +584,7 @@ std::string PrettyPrintAddr(const void *const addr)
void BookFilterJit(const std::shared_ptr<RJittedFilter> &jittedFilter,
std::shared_ptr<RDFDetail::RNodeBase> *prevNodeOnHeap, std::string_view name,
std::string_view expression, const std::map<std::string, std::string> &aliasMap,
const ColumnNames_t &branches, const RDFInternal::RBookedDefines &customCols, TTree *tree,
RDataSource *ds)
const ColumnNames_t &branches, const RBookedDefines &customCols, TTree *tree, RDataSource *ds)
{
const auto &dsColumns = ds ? ds->GetColumnNames() : ColumnNames_t{};

Expand Down Expand Up @@ -629,7 +628,7 @@ void BookFilterJit(const std::shared_ptr<RJittedFilter> &jittedFilter,

// Jit a Define call
std::shared_ptr<RJittedDefine> BookDefineJit(std::string_view name, std::string_view expression, RLoopManager &lm,
RDataSource *ds, const RDFInternal::RBookedDefines &customCols,
RDataSource *ds, const RBookedDefines &customCols,
const ColumnNames_t &branches,
std::shared_ptr<RNodeBase> *upcastNodeOnHeap)
{
Expand All @@ -644,7 +643,7 @@ std::shared_ptr<RJittedDefine> BookDefineJit(std::string_view name, std::string_
const auto lambdaName = DeclareLambda(parsedExpr.fExpr, parsedExpr.fVarNames, exprVarTypes);
const auto type = RetTypeOfLambda(lambdaName);

auto definesCopy = new RDFInternal::RBookedDefines(customCols);
auto definesCopy = new RBookedDefines(customCols);
auto definesAddr = PrettyPrintAddr(definesCopy);
auto jittedDefine = std::make_shared<RDFDetail::RJittedDefine>(name, type, lm.GetNSlots(), lm.GetDSValuePtrs());

Expand Down Expand Up @@ -676,8 +675,8 @@ std::shared_ptr<RJittedDefine> BookDefineJit(std::string_view name, std::string_
// (see comments in the body for actual jitted code)
std::string JitBuildAction(const ColumnNames_t &cols, std::shared_ptr<RDFDetail::RNodeBase> *prevNode,
const std::type_info &helperArgType, const std::type_info &at, void *helperArgOnHeap,
TTree *tree, const unsigned int nSlots, const RDFInternal::RBookedDefines &customCols,
RDataSource *ds, std::weak_ptr<RJittedAction> *jittedActionOnHeap)
TTree *tree, const unsigned int nSlots, const RBookedDefines &customCols, RDataSource *ds,
std::weak_ptr<RJittedAction> *jittedActionOnHeap)
{
// retrieve type of result of the action as a string
auto helperArgClass = TClass::GetClass(helperArgType);
Expand All @@ -696,7 +695,7 @@ std::string JitBuildAction(const ColumnNames_t &cols, std::shared_ptr<RDFDetail:
const std::string actionTypeName = actionTypeClass->GetName();
const std::string actionTypeNameBase = actionTypeName.substr(actionTypeName.rfind(':') + 1);

auto definesCopy = new RDFInternal::RBookedDefines(customCols); // deleted in jitted CallBuildAction
auto definesCopy = new RBookedDefines(customCols); // deleted in jitted CallBuildAction
auto definesAddr = PrettyPrintAddr(definesCopy);

// Build a call to CallBuildAction with the appropriate argument. When run through the interpreter, this code will
Expand Down