Improve schemeshard codegen (#11579)

Author: Enjection

ydb/core/tx/schemeshard/generated/codegen/main.cpp

@@ -1,18 +1,20 @@
+#include <ydb/core/protos/flat_scheme_op.pb.h>
+
+#include <google/protobuf/descriptor.pb.h>
+#include <jinja2cpp/reflected_value.h>
+#include <jinja2cpp/template.h>
+#include <jinja2cpp/template_env.h>
+#include <jinja2cpp/value.h>
+
 #include <util/stream/file.h>
 #include <util/stream/output.h>
 #include <util/string/builder.h>
 #include <util/system/src_location.h>
-#include <ydb/core/protos/flat_scheme_op.pb.h>
-#include <google/protobuf/descriptor.pb.h>
 
-#include <jinja2cpp/template_env.h>
-#include <jinja2cpp/template.h>
-#include <jinja2cpp/value.h>
-#include <jinja2cpp/reflected_value.h>
 #include <cstdint>
+#include <iostream>
 #include <string>
 #include <vector>
-#include <iostream>
 
 std::string replace(
     const std::string& str,

ydb/core/tx/schemeshard/generated/dispatch_op.h.in

@@ -1,19 +1,19 @@
 // Auto-generated by {{ generator }}, do not modify.
 #pragma once
 
-#include <ydb/core/tx/schemeshard/generated/traits.h>
+#include <ydb/core/protos/flat_scheme_op.pb.h>
 
 namespace NKikimr::NSchemeShard::NGenerated {
 
-template <class TFn>
+template <template <NKikimrSchemeOp::EOperationType> class TTraits, class TTraitsFallback, class TFn>
 constexpr auto DispatchOp(const TTxTransaction& tx, TFn fn) {
     switch (tx.GetOperationType()) {
 {% for opType in opTypes %}
         case {{ opType }}:
-            return fn(TSchemeTxTraits<{{ opType }}>{});
+            return fn(TTraits<{{ opType }}>{});
 {% endfor %}
         default:
-            return fn(TSchemeTxTraitsFallback{});
+            return fn(TTraitsFallback{});
     }
 }
 

ydb/core/tx/schemeshard/generated/ya.make

@@ -11,11 +11,7 @@ RUN_PROGRAM(
     IN dispatch_op.h.in
     OUT dispatch_op.h
     OUTPUT_INCLUDES
-        ydb/core/tx/schemeshard/generated/traits.h
-)
-
-SRCS(
-    traits.h
+        ydb/core/protos/flat_scheme_op.pb.h
 )
 
 END()

ydb/core/tx/schemeshard/schemeshard__dispatch_op.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#include "schemeshard__op_traits.h"
+
+#include <ydb/core/tx/schemeshard/generated/dispatch_op.h>
+
+namespace NKikimr::NSchemeShard {
+
+template <class TFn>
+constexpr auto DispatchOp(const TTxTransaction& tx, TFn fn) {
+    return NGenerated::DispatchOp<TSchemeTxTraits, TSchemeTxTraitsFallback, TFn>(tx, std::forward<TFn>(fn));
+}
+
+} // namespace NKikimr::NSchemeShard

ydb/core/tx/schemeshard/generated/traits.h renamed to ydb/core/tx/schemeshard/schemeshard__op_traits.h

@@ -1,13 +1,13 @@
 #pragma once
 
+#include <ydb/core/protos/flat_scheme_op.pb.h>
+
 #include <util/generic/string.h>
 #include <util/generic/map.h>
 
 #include <optional>
 
-#include <ydb/core/protos/flat_scheme_op.pb.h>
-
-namespace NKikimr::NSchemeShard::NGenerated {
+namespace NKikimr::NSchemeShard {
 
 using TTxTransaction = NKikimrSchemeOp::TModifyScheme;
 
@@ -290,4 +290,4 @@ struct TSchemeTxTraits<NKikimrSchemeOp::EOperationType::ESchemeOpCreateBackupCol
     constexpr inline static bool CreateDirsFromName = true;
 };
 
-} // namespace NKikimr::NSchemeShard::NGenerated
+} // namespace NKikimr::NSchemeShard

ydb/core/tx/schemeshard/schemeshard__operation.cpp

@@ -1,14 +1,13 @@
 #include "schemeshard__operation.h"
-#include "schemeshard__operation_part.h"
 
-#include "schemeshard__operation_side_effects.h"
-#include "schemeshard__operation_memory_changes.h"
+#include "schemeshard__dispatch_op.h"
 #include "schemeshard__operation_db_changes.h"
-
+#include "schemeshard__operation_memory_changes.h"
+#include "schemeshard__operation_part.h"
+#include "schemeshard__operation_side_effects.h"
 #include "schemeshard_audit_log.h"
 #include "schemeshard_impl.h"
 
-#include <ydb/core/tx/schemeshard/generated/dispatch_op.h>
 #include <ydb/core/tablet/tablet_exception.h>
 #include <ydb/core/tablet_flat/flat_cxx_database.h>
 #include <ydb/core/tablet_flat/tablet_flat_executor.h>
@@ -792,6 +791,7 @@ bool CreateDirs(const TTxTransaction& tx, const TPath& parentPath, TPath path, T
 
     while (path != parentPath) {
         if (createdPaths.contains(path.PathString())) {
+            path.Rise();
             continue;
         }
 
@@ -854,8 +854,6 @@ bool CreateDirs(const TTxTransaction& tx, const TPath& parentPath, TPath path, T
 
 // # Generates additional MkDirs for transactions
 TOperation::TSplitTransactionsResult TOperation::SplitIntoTransactions(const TTxTransaction& tx, const TOperationContext& context) {
-    using namespace NGenerated;
-
     TSplitTransactionsResult result;
     THashSet<TString> createdPaths;