diff --git a/tree/dataframe/src/RLoopManager.cxx b/tree/dataframe/src/RLoopManager.cxx index d750b4dfa8ddf..d8dc764612871 100644 --- a/tree/dataframe/src/RLoopManager.cxx +++ b/tree/dataframe/src/RLoopManager.cxx @@ -614,6 +614,8 @@ void RLoopManager::RunDataSource() ROOT::Internal::RDF::RDSRangeRAII __{*this, 0u, 0ull}; ranges = fDataSource->GetEntryRanges(); + if (ranges.empty()) + break; fSampleInfos[0] = ROOT::Internal::RDF::CreateSampleInfo(*fDataSource, /*slot*/ 0, fSampleMap); diff --git a/tree/dataframe/test/datasource_ntuple.cxx b/tree/dataframe/test/datasource_ntuple.cxx index 7645f7026b85c..a30c5245785bc 100644 --- a/tree/dataframe/test/datasource_ntuple.cxx +++ b/tree/dataframe/test/datasource_ntuple.cxx @@ -915,3 +915,40 @@ TEST_F(RNTupleDSTest, GetTopLevelFieldNames) std::vector{"VecElectron", "VecElectron.pt", "electron", "electron.pt", "energy", "jets", "nElectron", "nnlo", "pt", "rvec", "tag"}); } + +void ReadSingleEmptyRNTuple(const std::string &dataset_name, const std::string &file_name) +{ + FileRAII fileGuard(file_name); + { + ROOT::RDataFrame df{1}; + // Filter away everything creating an output with zero entries + auto flt = df.Define("x", []() -> int { return 42; }).Filter([](int x) { return x > 42; }, {"x"}); + + ROOT::RDF::RSnapshotOptions opts; + opts.fOutputFormat = ROOT::RDF::ESnapshotOutputFormat::kRNTuple; + + flt.Snapshot(dataset_name, file_name, {"x"}, opts); + } + { + ROOT::RDataFrame df{dataset_name, fileGuard.GetPath()}; + EXPECT_EQ(df.Count().GetValue(), 0); + } +} + +TEST(EmptyRNTupleTest, Seq) +{ + std::string dataset_name{"ReadSingleEmptyRNTuple"}; + std::string file_name{"ReadSingleEmptyRNTuple.root"}; + ReadSingleEmptyRNTuple(dataset_name, file_name); +} + +#ifdef R__USE_IMT +TEST(EmptyRNTupleTest, MT) +{ + IMTRAII _; + + std::string dataset_name{"ReadSingleEmptyRNTupleMT"}; + std::string file_name{"ReadSingleEmptyRNTupleMT.root"}; + ReadSingleEmptyRNTuple(dataset_name, file_name); +} +#endif