remove macros clash with absl libraries

library/cpp/actors/core/log.cpp

@@ -77,7 +77,7 @@ namespace NActors {
             HTML(str) {
                 DIV_CLASS("row") {
                     DIV_CLASS("col-md-12") {
-                        H4() {
+                        TAG(TH4) {
                             str << "Counters" << Endl;
                         }
                         DynamicCounters->OutputHtml(str);
@@ -142,7 +142,7 @@ namespace NActors {
             HTML(str) {
                 DIV_CLASS("row") {
                     DIV_CLASS("col-md-12") {
-                        H4() {
+                        TAG(TH4) {
                             str << "Metrics" << Endl;
                         }
                         // TODO: Now, TMetricRegistry does not have the GetOutputHtml function
@@ -312,7 +312,7 @@ namespace NActors {
     void TLoggerActor::RenderComponentPriorities(IOutputStream& str) {
         using namespace NLog;
         HTML(str) {
-            H4() {
+            TAG(TH4) {
                 str << "Priority Settings for the Components";
             }
             TABLE_SORTABLE_CLASS("table") {
@@ -415,7 +415,7 @@ namespace NActors {
             HTML(str) {
                 DIV_CLASS("row") {
                     DIV_CLASS("col-md-12") {
-                        H4() {
+                        TAG(TH4) {
                             str << "Current log settings for " << Settings->ComponentName(component) << Endl;
                         }
                         UL() {
@@ -437,7 +437,7 @@ namespace NActors {
 
                 DIV_CLASS("row") {
                     DIV_CLASS("col-md-12") {
-                        H4() {
+                        TAG(TH4) {
                             str << "Change priority" << Endl;
                         }
                         UL() {
@@ -448,7 +448,7 @@ namespace NActors {
                                 }
                             }
                         }
-                        H4() {
+                        TAG(TH4) {
                             str << "Change sampling priority" << Endl;
                         }
                         UL() {
@@ -459,7 +459,7 @@ namespace NActors {
                                 }
                             }
                         }
-                        H4() {
+                        TAG(TH4) {
                             str << "Change sampling rate" << Endl;
                         }
                         str << "<form method=\"GET\">" << Endl;
@@ -467,7 +467,7 @@ namespace NActors {
                         str << "<input type=\"hidden\" name=\"c\" value=\"" << component << "\">" << Endl;
                         str << "<input class=\"btn btn-primary\" type=\"submit\" value=\"Change\"/>" << Endl;
                         str << "</form>" << Endl;
-                        H4() {
+                        TAG(TH4) {
                             str << "<a href='logger'>Cancel</a>" << Endl;
                         }
                     }
@@ -503,7 +503,7 @@ namespace NActors {
                         RenderComponentPriorities(str);
                     }
                     DIV_CLASS("col-md-6") {
-                        H4() {
+                        TAG(TH4) {
                             str << "Change priority for all components";
                         }
                         TABLE_CLASS("table table-condensed") {
@@ -525,7 +525,7 @@ namespace NActors {
                                 }
                             }
                         }
-                        H4() {
+                        TAG(TH4) {
                             str << "Change sampling priority for all components";
                         }
                         TABLE_CLASS("table table-condensed") {
@@ -547,7 +547,7 @@ namespace NActors {
                                 }
                             }
                         }
-                        H4() {
+                        TAG(TH4) {
                             str << "Change sampling rate for all components";
                         }
                         str << "<form method=\"GET\">" << Endl;
@@ -555,7 +555,7 @@ namespace NActors {
                         str << "<input type=\"hidden\" name=\"c\" value=\"-1\">" << Endl;
                         str << "<input class=\"btn btn-primary\" type=\"submit\" value=\"Change\"/>" << Endl;
                         str << "</form>" << Endl;
-                        H4() {
+                        TAG(TH4) {
                             str << "Drop log entries in case of overflow: "
                                 << (Settings->AllowDrop ? "Enabled" : "Disabled");
                         }

library/cpp/monlib/dynamic_counters/page.cpp

@@ -123,7 +123,7 @@ void TDynamicCountersPage::BeforePre(IMonHttpRequest& request) {
             out << " for Solomon";
         }
 
-        H5() {
+        TAG(TH5) {
             out << "Counters subgroups";
         }
         UL() {
@@ -136,7 +136,7 @@ void TDynamicCountersPage::BeforePre(IMonHttpRequest& request) {
             });
         }
 
-        H4() {
+        TAG(TH4) {
             out << "Counters as text";
         }
     }

library/cpp/monlib/service/pages/templates.h

@@ -55,17 +55,11 @@
 #define PARA() TAG(TPara)
 #define PARA_CLASS(cls) TAG_CLASS(TPara, cls)
 
-#define H1() TAG(TH1)
 #define H1_CLASS(cls) TAG_CLASS(TH1, cls)
-#define H2() TAG(TH2)
 #define H2_CLASS(cls) TAG_CLASS(TH2, cls)
-#define H3() TAG(TH3)
 #define H3_CLASS(cls) TAG_CLASS(TH3, cls)
-#define H4() TAG(TH4)
 #define H4_CLASS(cls) TAG_CLASS(TH4, cls)
-#define H5() TAG(TH5)
 #define H5_CLASS(cls) TAG_CLASS(TH5, cls)
-#define H6() TAG(TH6)
 #define H6_CLASS(cls) TAG_CLASS(TH6, cls)
 
 #define SMALL() TAG(TSMALL)

ydb/core/base/statestorage_monitoring.cpp

@@ -50,7 +50,7 @@ class TStateStorageMonitoringActor : public TActorBootstrapped<TStateStorageMoni
         TStringStream str;
 
         HTML(str) {
-            H3() { str << "State Storage";}
+            TAG(TH3) { str << "State Storage";}
             DIV_CLASS("container") {
                 DIV_CLASS("row") {str << "TabletID: " << TabletID;}
                 DIV_CLASS("row") {str << "Response: " << response;}

ydb/core/blobstorage/nodewarden/node_warden_mon.cpp

@@ -89,10 +89,10 @@ void TNodeWarden::RenderWholePage(IOutputStream& out) {
             </style>
             )__";
 
-        H2() { out << "NodeWarden on node " << LocalNodeId; }
+        TAG(TH2) { out << "NodeWarden on node " << LocalNodeId; }
         RenderLocalDrives(out);
 
-        H3() { out << "PDisks"; }
+        TAG(TH3) { out << "PDisks"; }
         TABLE_CLASS("table oddgray") {
             TABLEHEAD() {
                 TABLER() {
@@ -114,7 +114,7 @@ void TNodeWarden::RenderWholePage(IOutputStream& out) {
             }
         }
 
-        H3() { out << "VDisks"; }
+        TAG(TH3) { out << "VDisks"; }
         TABLE_CLASS("table oddgray") {
             TABLEHEAD() {
                 TABLER() {
@@ -223,10 +223,10 @@ void TNodeWarden::RenderDSProxies(IOutputStream& out) {
             numStarted += bool(group.ProxyId);
         }
 
-        H3() { out << "Started DSProxies"; }
+        TAG(TH3) { out << "Started DSProxies"; }
         createTable(out, "started", numStarted);
 
-        H3() { out << "Ejected DSProxies"; }
+        TAG(TH3) { out << "Ejected DSProxies"; }
         createTable(out, "ejected", numEjected);
     }
 }
@@ -235,7 +235,7 @@ void TNodeWarden::RenderLocalDrives(IOutputStream& out) {
     TVector<NPDisk::TDriveData> onlineLocalDrives = ListLocalDrives();
 
     HTML(out) {
-        H3() { out << "LocalDrives"; }
+        TAG(TH3) { out << "LocalDrives"; }
         out << "\n";
         TABLE_CLASS("table oddgray") {
             TABLEHEAD() {

ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl_http.cpp

@@ -11,7 +11,7 @@ void TPDisk::RenderState(IOutputStream &str, THttpInfo &httpInfo) {
 #define RED_TEXT(str, text) THtmlLightSignalRenderer(NKikimrWhiteboard::EFlag::Red, text).Output(str)
 #define YELLOW_TEXT(str, text) THtmlLightSignalRenderer(NKikimrWhiteboard::EFlag::Yellow, text).Output(str)
     HTML(str) {
-        H4() {str << "Current state";}
+        TAG(TH4) {str << "Current state";}
         TABLE_CLASS ("table") {
             TABLEHEAD() {
                 TABLER() {
@@ -78,7 +78,7 @@ void TPDisk::RenderState(IOutputStream &str, THttpInfo &httpInfo) {
                 }
             }
         }
-        H4() {str << "State description"; }
+        TAG(TH4) {str << "State description"; }
         if (Cfg->SectorMap) {
             PARA() {str << "Note - this is SectorMap device<br>"; }
         }
@@ -86,7 +86,7 @@ void TPDisk::RenderState(IOutputStream &str, THttpInfo &httpInfo) {
             PARA() {str << "Note - PDisk sector enctyption is disabled<br>"; }
         }
         PARA() {str << httpInfo.ErrorStr; }
-        H4() {str << "Uptime"; }
+        TAG(TH4) {str << "Uptime"; }
         PARA() {
             TDuration uptime = TInstant::Now() - CreationTime;
             if (uptime.Days() > 0) {
@@ -95,7 +95,7 @@ void TPDisk::RenderState(IOutputStream &str, THttpInfo &httpInfo) {
             str << Sprintf("%02lu:%02lu:%02lu", uptime.Hours() % 24, uptime.Minutes() % 60, uptime.Seconds() % 60);
         }
         // Restart button
-        H4() {str << "Restart"; }
+        TAG(TH4) {str << "Restart"; }
         DIV() {
             str << R"___(
                 <script>
@@ -141,29 +141,29 @@ void TPDisk::RenderState(IOutputStream &str, THttpInfo &httpInfo) {
             }
         }
         if (Cfg->SectorMap) {
-            H4() {str << "SectorMap"; }
+            TAG(TH4) {str << "SectorMap"; }
             PRE() {str << Cfg->SectorMap->ToString();}
         }
-        H4() {str << "Config"; }
+        TAG(TH4) {str << "Config"; }
         PRE() {str << Cfg->ToString(true);}
         if (Mon.PDiskBriefState->Val() != TPDiskMon::TPDisk::Booting) {
-            H4() {str << "Drive Data"; }
+            TAG(TH4) {str << "Drive Data"; }
             PRE() {str << DriveData.ToString(true);}
-            H4() {str << "Fair Scheduler"; }
+            TAG(TH4) {str << "Fair Scheduler"; }
             PRE() {str << httpInfo.FairSchedulerStr;}
-            H4() {str << "Format info"; }
+            TAG(TH4) {str << "Format info"; }
             PRE() {str << Format.ToString(true);}
-            H4() {str << "Drive model"; }
+            TAG(TH4) {str << "Drive model"; }
             PRE() {str << DriveModel.ToString(true);}
-            H4() {str << "Sys log record"; }
+            TAG(TH4) {str << "Sys log record"; }
             PRE() {str << SysLogRecord.ToString(true);}
-            H4() {str << "Logged NONCEs"; }
+            TAG(TH4) {str << "Logged NONCEs"; }
             PRE() {str << LoggedNonces.ToString(true);}
-            H4() {str << "Dynamic state"; }
+            TAG(TH4) {str << "Dynamic state"; }
             PRE() {str << DynamicStateToString(true);}
-            H4() {str << "Last Nonce Jump Log Page Header"; }
+            TAG(TH4) {str << "Last Nonce Jump Log Page Header"; }
             PRE() {str << LastNonceJumpLogPageHeader2.ToString(true);}
-            H4() {str << "VDisk statuses"; }
+            TAG(TH4) {str << "VDisk statuses"; }
             PRE() {
                 for (const TOwnerData& data : OwnerData) {
                     if (data.VDiskId != TVDiskID::InvalidId) {

ydb/core/blobstorage/vdisk/hulldb/generic/hullds_idx.cpp

@@ -198,7 +198,7 @@ namespace NKikimr {
                 DIV_CLASS("panel-body") {
                     DIV_CLASS("row") {
                         DIV_CLASS("col-md-1") {
-                            H5() { str << "Fresh"; }
+                            TAG(TH5) { str << "Fresh"; }
                             const char *comp = Fresh.CompactionInProgress() ? "Compaction In Progress" : "No Compaction";
                             H6_CLASS ("text-info") {str << comp << " W:" << FreshCompWritesInFlight;}
                         }
@@ -206,7 +206,7 @@ namespace NKikimr {
                     }
                     DIV_CLASS("row") {
                         DIV_CLASS("col-md-1") {
-                            H5() { str << "Levels"; }
+                            TAG(TH5) { str << "Levels"; }
                             H6_CLASS ("text-info") {str << GetCompStateStr(HullCompReadsInFlight, HullCompWritesInFlight);}
                         }
                         DIV_CLASS("col-md-11") {CurSlice->OutputHtml(str);}

ydb/core/kesus/tablet/tablet_html.cpp

@@ -27,7 +27,7 @@ struct TKesusTablet::THtmlRenderer {
 
     void RenderError(IOutputStream& out, const TString& message) {
         HTML(out) {
-            H3() { out << "ERROR: " << message; }
+            TAG(TH3) { out << "ERROR: " << message; }
         }
     }
 
@@ -39,7 +39,7 @@ struct TKesusTablet::THtmlRenderer {
 
     void RenderProxyList(IOutputStream& out) {
         HTML(out) {
-            H3() { out << "Proxies"; }
+            TAG(TH3) { out << "Proxies"; }
 
             TABLE_SORTABLE_CLASS("table") {
                 TABLEHEAD() {
@@ -71,13 +71,13 @@ struct TKesusTablet::THtmlRenderer {
         }
 
         HTML(out) {
-            H2() { out << "Kesus proxy " << actorId; }
+            TAG(TH2) { out << "Kesus proxy " << actorId; }
 
             PRE() {
                 out << "Generation: " << proxy->Generation << "\n";
             }
 
-            H3() { out << "Attached sessions"; }
+            TAG(TH3) { out << "Attached sessions"; }
 
             TABLE_SORTABLE_CLASS("table") {
                 TABLEHEAD() {
@@ -113,7 +113,7 @@ struct TKesusTablet::THtmlRenderer {
 
     void RenderSessionList(IOutputStream& out) {
         HTML(out) {
-            H3() { out << "Sessions"; }
+            TAG(TH3) { out << "Sessions"; }
 
             TABLE_SORTABLE_CLASS("table") {
                 TABLEHEAD() {
@@ -154,7 +154,7 @@ struct TKesusTablet::THtmlRenderer {
         }
 
         HTML(out) {
-            H2() { out << "Kesus session " << sessionId; }
+            TAG(TH2) { out << "Kesus session " << sessionId; }
 
             PRE() {
                 out << "Description: " << session->Description.Quote() << "\n";
@@ -170,7 +170,7 @@ struct TKesusTablet::THtmlRenderer {
                 out << "Last attach seqno: " << session->LastOwnerSeqNo << "\n";
             }
 
-            H3() { out << "Owned semaphores"; }
+            TAG(TH3) { out << "Owned semaphores"; }
 
             TABLE_SORTABLE_CLASS("table") {
                 TABLEHEAD() {
@@ -194,7 +194,7 @@ struct TKesusTablet::THtmlRenderer {
                 }
             }
 
-            H3() { out << "Waiting semaphores"; }
+            TAG(TH3) { out << "Waiting semaphores"; }
 
             TABLE_SORTABLE_CLASS("table") {
                 TABLEHEAD() {
@@ -242,7 +242,7 @@ struct TKesusTablet::THtmlRenderer {
 
     void RenderSemaphoreList(IOutputStream& out) {
         HTML(out) {
-            H3() { out << "Semaphores"; }
+            TAG(TH3) { out << "Semaphores"; }
 
             TABLE_SORTABLE_CLASS("table") {
                 TABLEHEAD() {
@@ -280,7 +280,7 @@ struct TKesusTablet::THtmlRenderer {
         }
 
         HTML(out) {
-            H2() { out << "Kesus semaphore " << EscapeC(name); }
+            TAG(TH2) { out << "Kesus semaphore " << EscapeC(name); }
 
             PRE() {
                 out << "Data: " << semaphore->Data.Quote() << "\n";
@@ -289,7 +289,7 @@ struct TKesusTablet::THtmlRenderer {
                 out << "Ephemeral: " << (semaphore->Ephemeral ? "true" : "false") << "\n";
             }
 
-            H3() { out << "Owner sessions"; }
+            TAG(TH3) { out << "Owner sessions"; }
 
             TABLE_SORTABLE_CLASS("table") {
                 TABLEHEAD() {
@@ -310,7 +310,7 @@ struct TKesusTablet::THtmlRenderer {
                 }
             }
 
-            H3() { out << "Waiting sessions"; }
+            TAG(TH3) { out << "Waiting sessions"; }
 
             TABLE_SORTABLE_CLASS("table") {
                 TABLEHEAD() {
@@ -376,7 +376,7 @@ struct TKesusTablet::THtmlRenderer {
 
     void RenderQuoterResources(IOutputStream& out) {
         HTML(out) {
-            H3() { out << "Quoter resources"; }
+            TAG(TH3) { out << "Quoter resources"; }
 
             std::vector<const TQuoterResourceTree*> resources;
             resources.reserve(Self->QuoterResources.GetAllResources().size());
@@ -391,7 +391,7 @@ struct TKesusTablet::THtmlRenderer {
     void RenderQuoterResourceDetails(IOutputStream& out, const TString& path) {
         if (const TQuoterResourceTree* resource = Self->QuoterResources.FindPath(path)) {
             HTML(out) {
-                H2() { out << "Kesus quoter resource " << EscapeC(path); }
+                TAG(TH2) { out << "Kesus quoter resource " << EscapeC(path); }
 
                 PRE() {
                     if (resource->GetParent()) {
@@ -403,12 +403,12 @@ struct TKesusTablet::THtmlRenderer {
                     out << "Props:" << props << "\n";
                 }
 
-                H3() { out << "Children resources"; }
+                TAG(TH3) { out << "Children resources"; }
 
                 std::vector<const TQuoterResourceTree*> resources(resource->GetChildren().begin(), resource->GetChildren().end());
                 RenderQuoterResourceTable(out, resources);
 
-                H3() { out << "Sessions"; }
+                TAG(TH3) { out << "Sessions"; }
                 RenderQuoterResourceSessions(out, resource);
             }
         } else {
@@ -465,7 +465,7 @@ bool TKesusTablet::OnRenderAppHtmlPage(NMon::TEvRemoteHttpInfo::TPtr ev, const T
         } else if (params.Has("quoter_resource")) {
             renderer.RenderQuoterResourceDetails(out, params.Get("quoter_resource"));
         } else {
-            H2() { out << "Kesus " << EscapeC(KesusPath); }
+            TAG(TH2) { out << "Kesus " << EscapeC(KesusPath); }
             renderer.RenderProxyList(out);
             renderer.RenderSessionList(out);
             renderer.RenderSemaphoreList(out);

ydb/core/keyvalue/keyvalue_state.cpp

@@ -3262,7 +3262,7 @@ void TKeyValueState::VerifyEqualIndex(const TKeyValueState& state) const {
 
 void TKeyValueState::RenderHTMLPage(IOutputStream &out) const {
     HTML(out) {
-        H2() {out << "KeyValue Tablet";}
+        TAG(TH2) {out << "KeyValue Tablet";}
         UL_CLASS("nav nav-tabs") {
             LI_CLASS("active") {
                 out << "<a href=\"#database\" data-toggle=\"tab\">Database</a>";

ydb/core/kqp/runtime/kqp_spilling_file.cpp

@@ -643,7 +643,7 @@ private:
         }
 
         HTML(s) {
-            H2() { s << "Configuration"; }
+            TAG(TH2) { s << "Configuration"; }
             PRE() {
                 s << "  - Root: " << Config.GetRoot() << Endl;
                 s << "  - MaxTotalSize: " << Config.GetMaxTotalSize() << Endl;
@@ -653,11 +653,11 @@ private:
                     << ", queue: " << Config.GetIoThreadPool().GetQueueSize() << Endl;
             }
 
-            H2() { s << "Active files"; }
+            TAG(TH2) { s << "Active files"; }
             PRE() { s << "Used space: " << TotalSize << Endl; }
 
             for (const auto& tx : byTx) {
-                H4() { s << "Transaction " << tx.first; }
+                TAG(TH2) { s << "Transaction " << tx.first; }
                 s << "Open files:" << Endl;
                 UL() {
                     for (const auto* fd : tx.second) {
@@ -690,7 +690,7 @@ private:
                 }
             }
 
-            H2() { s << "Last closed files"; }
+            TAG(TH2) { s << "Last closed files"; }
             UL() {
                 for (auto it = ClosedFiles.rbegin(); it != ClosedFiles.rend(); ++it) {
                     auto& fd = *it;