Skip to content

Commit 577a41f

Browse files
committed
[df] Remove Snapshot info about change in default compression settings
It was scheduled for removal after 6.38.
1 parent 00b8fd8 commit 577a41f

File tree

4 files changed

+2
-35
lines changed

4 files changed

+2
-35
lines changed

README/ReleaseNotes/v640/index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ The following people have contributed to this new version:
5353

5454
## RDataFrame
5555

56+
- The message shown in ROOT 6.38 to inform users about change of default compression setting used by Snapshot (was 101 before 6.38, became 505 in 6.38) is now removed.
57+
5658
## Python Interface
5759

5860
## Command-line utilities

config/rootrc.in

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -615,9 +615,3 @@ Rint.Canvas.HighLightColor: 5
615615
# 1 All Branches (default)
616616
# Can be overridden by the environment variable ROOT_TTREECACHE_PREFILL
617617
# TTreeCache.Prefill: 1
618-
619-
# Set whether to show or suppress an info message coming from RDataFrame
620-
# Snapshot informing the user on the change of default output dataset
621-
# compression settings introduced in ROOT 6.38 (1 means show the info, 0 means
622-
# suppress, 1 by default).
623-
# ROOT.RDF.Snapshot.Info: 1

roottest/root/dataframe/.rootrc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
# First two lines are taken from ROOTTEST_ADD_TESTDIRS in RootMacros.cmake
22
Rint.History: .root_hist
33
ACLiC.LinkLibs: 1
4-
# Suppress the info message from Snapshot to prevent test failures
5-
ROOT.RDF.Snapshot.Info: 0

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

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,6 @@
4545
#include "TProfile2D.h"
4646
#include "TStatistic.h"
4747

48-
// TODO: Needed to show the info message in Snapshot, remove in 6.40
49-
#include "ROOT/RLogger.hxx"
50-
#include "ROOT/RVersion.hxx"
51-
#include "TEnv.h"
52-
#include <cstdlib>
53-
#include <cstring>
54-
5548
#include <algorithm>
5649
#include <cstddef>
5750
#include <initializer_list>
@@ -1328,26 +1321,6 @@ public:
13281321
const ColumnNames_t &columnList,
13291322
const RSnapshotOptions &options = RSnapshotOptions())
13301323
{
1331-
// TODO: Remove before releasing 6.40.00
1332-
#if ROOT_VERSION_CODE >= ROOT_VERSION(6, 40, 0)
1333-
static_assert(false && "Remove information about change of Snapshot defaut compression settings.");
1334-
#endif
1335-
[[maybe_unused]] static bool once = []() {
1336-
if (const char *suppress = std::getenv("ROOT_RDF_SNAPSHOT_INFO"))
1337-
if (std::strcmp(suppress, "0") == 0)
1338-
return true;
1339-
if (const char *suppress = gEnv->GetValue("ROOT.RDF.Snapshot.Info", "1"))
1340-
if (std::strcmp(suppress, "0") == 0)
1341-
return true;
1342-
RLogScopedVerbosity showInfo{ROOT::Detail::RDF::RDFLogChannel(), ROOT::ELogLevel::kInfo};
1343-
R__LOG_INFO(ROOT::Detail::RDF::RDFLogChannel())
1344-
<< "\n\tIn ROOT 6.38, the default compression settings of Snapshot have been changed from 101 (ZLIB with "
1345-
"compression level 1, the TTree default) to 505 (ZSTD with compression level 5). This change may result "
1346-
"in smaller Snapshot output dataset size by default. In order to suppress this message, set "
1347-
"'ROOT_RDF_SNAPSHOT_INFO=0' in your environment or set 'ROOT.RDF.Snapshot.Info: 0' in your .rootrc "
1348-
"file.";
1349-
return true;
1350-
}();
13511324
// like columnList but with `#var` columns removed
13521325
auto colListNoPoundSizes = RDFInternal::FilterArraySizeColNames(columnList, "Snapshot");
13531326
// like columnListWithoutSizeColumns but with aliases resolved

0 commit comments

Comments
 (0)