Added workloadType and ECommandType to workload params validation

Author: Emgariko

ydb/library/workload/abstract/workload_query_generator.h

@@ -178,7 +178,7 @@ class TWorkloadParams {
     }
     virtual TString GetWorkloadName() const = 0;
 
-    virtual void Validate(int /*workloadType*/) const {};
+    virtual void Validate(const ECommandType /*commandType*/, int /*workloadType*/) const {};
 public:
     ui64 BulkSize = 10000;
     std::string DbPath;

ydb/library/workload/log/log.cpp

@@ -398,35 +398,54 @@ void TLogWorkloadParams::ConfigureOptsFillData(NLastGetopt::TOpts& opts) {
         .DefaultValue(NullPercent).StoreResult(&NullPercent);
 }
 
-void TLogWorkloadParams::Validate(int workloadType) const {
-    if (static_cast<TLogGenerator::EType>(workloadType) == TLogGenerator::EType::Select) {
-        return;
-    }
-
+void TLogWorkloadParams::Validate(const ECommandType commandType, int workloadType) const {
     const bool timestampDevPassed = TimestampStandardDeviationMinutes;
     const bool dateFromPassed = !!TimestampDateFrom;
     const bool dateToPassed = !!TimestampDateTo;
 
-    Cerr << "TimestampDevPassed: " << timestampDevPassed << "\n";
-    Cerr << "DateFromPassed: " << dateFromPassed << "\n";
-    Cerr << "DateToPassed: " << dateToPassed << "\n";
-
-    if (!timestampDevPassed && (!dateFromPassed || !dateToPassed)) {
-        throw yexception() << "One of parameter should be provided - timestamp_deviation or date-from and date-to";
-    }
+    switch (commandType) {
+        case TWorkloadParams::ECommandType::Init:
+            break;
+        case TWorkloadParams::ECommandType::Run:
+            switch (static_cast<TLogGenerator::EType>(workloadType)) {
+                case TLogGenerator::EType::Insert:
+                case TLogGenerator::EType::Upsert:
+                case TLogGenerator::EType::BulkUpsert:
+                    
+
+                    Cerr << "TimestampDevPassed: " << timestampDevPassed << "\n";
+                    Cerr << "DateFromPassed: " << dateFromPassed << "\n";
+                    Cerr << "DateToPassed: " << dateToPassed << "\n";
+
+                    if (!timestampDevPassed && (!dateFromPassed || !dateToPassed)) {
+                        throw yexception() << "One of parameter should be provided - timestamp_deviation or date-from and date-to";
+                    }
 
-    if (timestampDevPassed && (dateFromPassed || dateToPassed)) {
-        throw yexception() << "The `timestamp_deviation` and `date-from`, `date-to` are mutually exclusive and shouldn't be provided at once";
-    }
+                    if (timestampDevPassed && (dateFromPassed || dateToPassed)) {
+                        throw yexception() << "The `timestamp_deviation` and `date-from`, `date-to` are mutually exclusive and shouldn't be provided at once";
+                    }
 
-    if ((dateFromPassed && !dateToPassed) || (!dateFromPassed && dateToPassed)) {
-        throw yexception() << "The `date-from` and `date-to` parameters must be provided together to specify the interval for uniform PK generation";
-    }
+                    if ((dateFromPassed && !dateToPassed) || (!dateFromPassed && dateToPassed)) {
+                        throw yexception() << "The `date-from` and `date-to` parameters must be provided together to specify the interval for uniform PK generation";
+                    }
 
-    if (dateFromPassed && dateToPassed && *TimestampDateFrom >= *TimestampDateTo) {
-        throw yexception() << "Invalid interval [`date-from`, `date-to`)";
+                    if (dateFromPassed && dateToPassed && *TimestampDateFrom >= *TimestampDateTo) {
+                        throw yexception() << "Invalid interval [`date-from`, `date-to`)";
+                    }
+                    
+                    break;
+                case TLogGenerator::EType::Select:
+                    
+                    break;
+            }
+            break;
+        case TWorkloadParams::ECommandType::Clean:
+            break;
+        case TWorkloadParams::ECommandType::Root:
+            break;
+        case TWorkloadParams::ECommandType::Import:
+          break;
     }
-    
     return;
 }
 

ydb/library/workload/log/log.h

@@ -37,7 +37,7 @@ class TLogWorkloadParams : public TWorkloadParams {
     YDB_READONLY(EStoreType, StoreType, EStoreType::Row);
     TWorkloadDataInitializer::TList CreateDataInitializers() const override;
 
-    void Validate(int workloadType) const override;
+    void Validate(const ECommandType commandType, int workloadType) const override;
 private:
     void ConfigureOptsFillData(NLastGetopt::TOpts& opts);
     void ConfigureOptsColumns(NLastGetopt::TOpts& opts);

ydb/public/lib/ydb_cli/commands/ydb_workload.cpp

@@ -351,7 +351,7 @@ int TWorkloadCommandRun::Run(TConfig& config) {
     PrepareForRun(config);
     Params.DbPath = config.Database;
     auto workloadGen = Params.CreateGenerator();
-    Params.Validate(Type);
+    Params.Validate(NYdbWorkload::TWorkloadParams::ECommandType::Run, Type);
     return RunWorkload(*workloadGen, Type);
 }