Add scope guards for config changes

Author: kurapov-peter

omniscidb/Tests/GroupByTest.cpp

@@ -22,6 +22,7 @@
 #include "QueryEngine/CardinalityEstimator.h"
 #include "QueryEngine/Execute.h"
 #include "QueryEngine/InputMetadata.h"
+#include "Shared/scope.h"
 
 #include <boost/filesystem.hpp>
 #include <fstream>
@@ -313,13 +314,16 @@ class LowCardinalityThresholdTest : public ::testing::Test {
 };
 
 TEST_F(LowCardinalityThresholdTest, GroupBy) {
+  const auto allow_cpu_retry_state = config().exec.heterogeneous.allow_cpu_retry;
+  ScopeGuard reset = [&] {
+    config().exec.heterogeneous.allow_cpu_retry = allow_cpu_retry_state;
+  };
   config().exec.heterogeneous.allow_cpu_retry = true;
   for (auto dt : testedDevices()) {
     auto result = run_multiple_agg(
         R"(select fl,ar,dep from low_cardinality group by fl,ar,dep;)", dt);
     EXPECT_EQ(result->rowCount(), config().exec.group_by.big_group_threshold);
   }
-  config().exec.heterogeneous.allow_cpu_retry = false;
 }
 
 class BigCardinalityThresholdTest : public ::testing::Test {

omniscidb/Tests/ResultSetTest.cpp

@@ -23,6 +23,7 @@
 
 #include "ArrowSQLRunner/ArrowSQLRunner.h"
 #include "ResultSetTestUtils.h"
+#include "Shared/scope.h"
 #include "TestHelpers.h"
 
 #include "DataMgr/DataMgrDataProvider.h"
@@ -2967,6 +2968,14 @@ TEST(ResultsetConversion, EnforceParallelColumnarConversion) {
   // we trigger parallel columnarize conversion for SELECT query
   // so, the purpose of this test is to check
   // whether the large columnar conversion is done correctly
+  const auto allow_cpu_retry_state = config().exec.heterogeneous.allow_cpu_retry;
+  const auto allow_query_step_cpu_retry_state =
+      config().exec.heterogeneous.allow_query_step_cpu_retry;
+  ScopeGuard reset = [&] {
+    config().exec.heterogeneous.allow_cpu_retry = allow_cpu_retry_state;
+    config().exec.heterogeneous.allow_query_step_cpu_retry =
+        allow_query_step_cpu_retry_state;
+  };
   config().exec.heterogeneous.allow_cpu_retry = true;
   config().exec.heterogeneous.allow_query_step_cpu_retry = true;
 
@@ -3014,8 +3023,6 @@ TEST(ResultsetConversion, EnforceParallelColumnarConversion) {
     const auto crt_row2 = res2.get()->getNextRow(false, false);
     EXPECT_EQ(answer, v<int64_t>(crt_row1[0]));
   }
-  config().exec.heterogeneous.allow_cpu_retry = true;
-  config().exec.heterogeneous.allow_query_step_cpu_retry = true;
 }
 
 TEST(Util, ReinterpretBits) {