[df] Remove remaining TDS occurrences

Author: vepadulano

tree/dataframe/inc/ROOT/RArrowDS.hxx

@@ -6,8 +6,8 @@
  * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  *************************************************************************/
 
-#ifndef ROOT_RARROWTDS
-#define ROOT_RARROWTDS
+#ifndef ROOT_RARROWDS
+#define ROOT_RARROWDS
 
 #include "ROOT/RDataFrame.hxx"
 #include "ROOT/RDataSource.hxx"

tree/dataframe/inc/ROOT/RCsvDS.hxx

@@ -8,8 +8,8 @@
  * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  *************************************************************************/
 
-#ifndef ROOT_RCSVTDS
-#define ROOT_RCSVTDS
+#ifndef ROOT_RCSVDS
+#define ROOT_RCSVDS
 
 #include "ROOT/RDataFrame.hxx"
 #include "ROOT/RDataSource.hxx"

tree/dataframe/inc/ROOT/RDF/RLazyDSImpl.hxx

@@ -26,11 +26,11 @@
 
 namespace ROOT::Internal::RDF {
 class R__CLING_PTRCHECK(off) RLazyDSColumnReader final : public ROOT::Detail::RDF::RColumnReaderBase {
-   ROOT::Internal::TDS::TPointerHolder *fPtr;
+   ROOT::Internal::RDF::TPointerHolder *fPtr;
    void *GetImpl(Long64_t) final { return fPtr->GetPointer(); }
 
 public:
-   RLazyDSColumnReader(ROOT::Internal::TDS::TPointerHolder *ptr) : fPtr(ptr) {}
+   RLazyDSColumnReader(ROOT::Internal::RDF::TPointerHolder *ptr) : fPtr(ptr) {}
 };
 } // namespace ROOT::Internal::RDF
 
@@ -49,7 +49,7 @@ namespace RDF {
 /// information, e.g. expanding in a smart way the template parameters packs.
 template <typename... ColumnTypes>
 class RLazyDS final : public ROOT::RDF::RDataSource {
-   using PointerHolderPtrs_t = std::vector<ROOT::Internal::TDS::TPointerHolder *>;
+   using PointerHolderPtrs_t = std::vector<ROOT::Internal::RDF::TPointerHolder *>;
 
    std::tuple<RResultPtr<std::vector<ColumnTypes>>...> fColumns;
    const std::vector<std::string> fColNames;
@@ -106,7 +106,7 @@ public:
       : fColumns(std::tuple<RResultPtr<std::vector<ColumnTypes>>...>(colsNameVals.second...)),
         fColNames({colsNameVals.first...}),
         fColTypesMap({{colsNameVals.first, ROOT::Internal::RDF::TypeID2TypeName(typeid(ColumnTypes))}...}),
-        fPointerHoldersModels({new ROOT::Internal::TDS::TTypedPointerHolder<ColumnTypes>(new ColumnTypes())...})
+        fPointerHoldersModels({new ROOT::Internal::RDF::TTypedPointerHolder<ColumnTypes>(new ColumnTypes())...})
    {
    }
 

tree/dataframe/inc/ROOT/RDataSource.hxx

@@ -51,7 +51,7 @@ std::string printValue(ROOT::RDF::RDataSource *ds);
 namespace ROOT {
 
 namespace Internal {
-namespace TDS {
+namespace RDF {
 
 /// Mother class of TTypedPointerHolder. The instances
 /// of this class can be put in a container. Upon destruction,
@@ -85,9 +85,6 @@ public:
    ~TTypedPointerHolder() { delete static_cast<T *>(fPointer); }
 };
 
-} // ns TDS
-
-namespace RDF {
 std::string GetTypeNameWithOpts(const ROOT::RDF::RDataSource &ds, std::string_view colName, bool vector2RVec);
 const std::vector<std::string> &GetTopLevelFieldNames(const ROOT::RDF::RDataSource &ds);
 const std::vector<std::string> &GetColumnNamesNoDuplicates(const ROOT::RDF::RDataSource &ds);

tree/dataframe/inc/ROOT/RRootDS.hxx

@@ -8,8 +8,8 @@
  * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  *************************************************************************/
 
-#ifndef ROOT_RROOTTDS
-#define ROOT_RROOTTDS
+#ifndef ROOT_RROOTDS
+#define ROOT_RROOTDS
 
 #include "ROOT/RDataFrame.hxx"
 #include "ROOT/RDataSource.hxx"

tree/dataframe/inc/ROOT/RTrivialDS.hxx

@@ -8,8 +8,8 @@
  * For the list of contributors see $ROOTSYS/README/CREDITS.             *
  *************************************************************************/
 
-#ifndef ROOT_RTRIVIALTDS
-#define ROOT_RTRIVIALTDS
+#ifndef ROOT_RTRIVIALDS
+#define ROOT_RTRIVIALDS
 
 #include "ROOT/RDF/RInterface.hxx"
 #include "ROOT/RDataSource.hxx"

tree/dataframe/inc/ROOT/RVecDS.hxx

@@ -43,7 +43,7 @@ namespace RDF {
 /// so that the lifetime of the data is tied to the datasource.
 template <typename... ColumnTypes>
 class RVecDS final : public ROOT::RDF::RDataSource {
-   using PointerHolderPtrs_t = std::vector<ROOT::Internal::TDS::TPointerHolder *>;
+   using PointerHolderPtrs_t = std::vector<ROOT::Internal::RDF::TPointerHolder *>;
 
    std::tuple<ROOT::RVec<ColumnTypes>...> fColumns;
    const std::vector<std::string> fColNames;
@@ -125,7 +125,7 @@ public:
       : fColumns(colsNameVals.second...),
         fColNames{colsNameVals.first...},
         fColTypesMap({{colsNameVals.first, ROOT::Internal::RDF::TypeID2TypeName(typeid(ColumnTypes))}...}),
-        fPointerHoldersModels({new ROOT::Internal::TDS::TTypedPointerHolder<ColumnTypes>(new ColumnTypes())...}),
+        fPointerHoldersModels({new ROOT::Internal::RDF::TTypedPointerHolder<ColumnTypes>(new ColumnTypes())...}),
         fDeleteRVecs(deleteRVecs)
    {
    }

tree/dataframe/test/dataframe_cache.cxx

@@ -53,7 +53,7 @@ TEST(Cache, Ambiguity)
 }
 
 /*
-// The contiguity has been dropped since now caching is backed up by a TDS
+// The contiguity has been dropped since now caching is backed up by a data source
 // TODO: we can optimise this. The reason why addresses are not contiguous with
 // data sources (now cache is achieved with a data source) is linked to Snapshot.
 // Indeed we need to set an address for each branch and keep that constant

tree/dataframe/test/datasource_root.cxx

@@ -11,10 +11,10 @@
 using namespace ROOT;
 using namespace ROOT::RDF;
 
-auto fileName0 = "TRootTDS_input_0.root";
-auto fileName1 = "TRootTDS_input_1.root";
-auto fileName2 = "TRootTDS_input_2.root";
-auto fileGlob = "TRootTDS_input_*.root";
+auto fileName0 = "RRootDS_input_0.root";
+auto fileName1 = "RRootDS_input_1.root";
+auto fileName2 = "RRootDS_input_2.root";
+auto fileGlob = "RRootDS_input_*.root";
 auto treeName = "t";
 
 TEST(RRootDS, GenerateData)
@@ -51,7 +51,7 @@ TEST(RRootDS, ColTypeNames)
    EXPECT_STREQ("TGraph", tds.GetTypeName("g").c_str());
 }
 
-TEST(TRootTDS, EntryRanges)
+TEST(RRootDS, EntryRanges)
 {
    ROOT::Internal::RDF::RRootDS tds(treeName, fileGlob);
    tds.SetNSlots(3U);
@@ -69,7 +69,7 @@ TEST(TRootTDS, EntryRanges)
    EXPECT_EQ(30U, ranges[2].second);
 }
 
-TEST(TRootTDS, ColumnReaders)
+TEST(RRootDS, ColumnReaders)
 {
    ROOT::Internal::RDF::RRootDS tds(treeName, fileGlob);
    const auto nSlots = 3U;
@@ -89,7 +89,7 @@ TEST(TRootTDS, ColumnReaders)
    }
 }
 
-TEST(TRootTDS, ColumnReadersWrongType)
+TEST(RRootDS, ColumnReadersWrongType)
 {
    ROOT::Internal::RDF::RRootDS tds(treeName, fileGlob);
    const auto nSlots = 3U;
@@ -106,7 +106,7 @@ TEST(TRootTDS, ColumnReadersWrongType)
 
 #ifndef NDEBUG
 
-TEST(TRootTDS, SetNSlotsTwice)
+TEST(RRootDS, SetNSlotsTwice)
 {
    auto theTest = []() {
       ROOT::Internal::RDF::RRootDS tds(treeName, fileGlob);
@@ -117,7 +117,7 @@ TEST(TRootTDS, SetNSlotsTwice)
 }
 #endif
 
-TEST(TRootTDS, FromARDF)
+TEST(RRootDS, FromARDF)
 {
    std::unique_ptr<RDataSource> tds(new ROOT::Internal::RDF::RRootDS(treeName, fileGlob));
    RDataFrame tdf(std::move(tds));
@@ -130,7 +130,7 @@ TEST(TRootTDS, FromARDF)
    EXPECT_DOUBLE_EQ(0., *min);
 }
 
-TEST(TRootTDS, FromARDFWithJitting)
+TEST(RRootDS, FromARDFWithJitting)
 {
    std::unique_ptr<RDataSource> tds(new ROOT::Internal::RDF::RRootDS(treeName, fileGlob));
    RDataFrame tdf(std::move(tds));
@@ -144,7 +144,7 @@ TEST(TRootTDS, FromARDFWithJitting)
 // NOW MT!-------------
 #ifdef R__USE_IMT
 
-TEST(TRootTDS, DefineSlotMT)
+TEST(RRootDS, DefineSlotMT)
 {
    const auto nSlots = 4U;
    ROOT::EnableImplicitMT(nSlots);
@@ -163,7 +163,7 @@ TEST(TRootTDS, DefineSlotMT)
    EXPECT_LE(nUsedSlots, nSlots);
 }
 
-TEST(TRootTDS, FromARDFMT)
+TEST(RRootDS, FromARDFMT)
 {
    std::unique_ptr<RDataSource> tds(new ROOT::Internal::RDF::RRootDS(treeName, fileGlob));
    RDataFrame tdf(std::move(tds));
@@ -176,7 +176,7 @@ TEST(TRootTDS, FromARDFMT)
    EXPECT_DOUBLE_EQ(0., *min);
 }
 
-TEST(TRootTDS, FromARDFWithJittingMT)
+TEST(RRootDS, FromARDFWithJittingMT)
 {
    std::unique_ptr<RDataSource> tds(new ROOT::Internal::RDF::RRootDS(treeName, fileGlob));
    RDataFrame tdf(std::move(tds));