diff --git a/regression-test/suites/new_shapes_p0/clickbench/load.groovy b/regression-test/suites/new_shapes_p0/clickbench/load.groovy
index f2851345849920..3a4831469fcea2 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/load.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/load.groovy
@@ -25,11 +25,7 @@
 
 // Note: To filter out tables from sql files, use the following one-liner comamnd
 // sed -nr 's/.*tables: (.*)$/\1/gp' /path/to/*.sql | sed -nr 's/,/\n/gp' | sort | uniq
-suite("load") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("load") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query1.groovy b/regression-test/suites/new_shapes_p0/clickbench/query1.groovy
index 5385417063c820..e32d5a03ba9686 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query1.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query1.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query1") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query1") {    if (isCloudMode()) {
         return
     }
     sql 'set enable_nereids_planner=true'
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query10.groovy b/regression-test/suites/new_shapes_p0/clickbench/query10.groovy
index 4795db2af580fc..41cae95cafcd7f 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query10.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query10.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query10") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query10") {    if (isCloudMode()) {
         return
     }
     sql 'set enable_nereids_planner=true'
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query11.groovy b/regression-test/suites/new_shapes_p0/clickbench/query11.groovy
index 460e74a9af51bf..4027aabe054292 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query11.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query11.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query11") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query11") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query12.groovy b/regression-test/suites/new_shapes_p0/clickbench/query12.groovy
index 6e2853a53f39c1..0723cd80105ff8 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query12.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query12.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query12") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query12") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query13.groovy b/regression-test/suites/new_shapes_p0/clickbench/query13.groovy
index fe05897d787f32..44860e57f39e01 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query13.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query13.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query13") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query13") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query14.groovy b/regression-test/suites/new_shapes_p0/clickbench/query14.groovy
index f5a33bbc8b75ed..646bc4f9b3d297 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query14.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query14.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query14") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query14") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query15.groovy b/regression-test/suites/new_shapes_p0/clickbench/query15.groovy
index 4e025d9cbdaba8..e962823a03c720 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query15.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query15.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query15") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query15") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query16.groovy b/regression-test/suites/new_shapes_p0/clickbench/query16.groovy
index a48339fc7f13cb..61465fb0131856 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query16.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query16.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query16") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query16") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query17.groovy b/regression-test/suites/new_shapes_p0/clickbench/query17.groovy
index e6f44f7930df2d..fa4dd9c6e0995d 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query17.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query17.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query17") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query17") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query18.groovy b/regression-test/suites/new_shapes_p0/clickbench/query18.groovy
index d81df0cf92c4d7..2a954aa140b6f8 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query18.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query18.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query18") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query18") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query19.groovy b/regression-test/suites/new_shapes_p0/clickbench/query19.groovy
index 0e0d82244bdd28..5a578030d8bb81 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query19.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query19.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query19") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query19") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query2.groovy b/regression-test/suites/new_shapes_p0/clickbench/query2.groovy
index d6ad1c4eb1290d..8763a2f5ff3bf1 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query2.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query2.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query2") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query2") {    if (isCloudMode()) {
         return
     }
     sql 'set enable_nereids_planner=true'
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query20.groovy b/regression-test/suites/new_shapes_p0/clickbench/query20.groovy
index b8b4d0cd3bf445..4a46117779db25 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query20.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query20.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query20") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query20") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query21.groovy b/regression-test/suites/new_shapes_p0/clickbench/query21.groovy
index 541aaacc153231..457b5dffe28a08 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query21.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query21.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query21") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query21") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query22.groovy b/regression-test/suites/new_shapes_p0/clickbench/query22.groovy
index 18f99a60dc09ef..34730b40d9dadb 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query22.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query22.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query22") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query22") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query23.groovy b/regression-test/suites/new_shapes_p0/clickbench/query23.groovy
index 544ed7f73a7f5c..eb8607029c4a3b 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query23.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query23.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query23") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query23") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query24.groovy b/regression-test/suites/new_shapes_p0/clickbench/query24.groovy
index 1d984fd82957bf..7e4368805dfef8 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query24.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query24.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query24") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query24") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query25.groovy b/regression-test/suites/new_shapes_p0/clickbench/query25.groovy
index 91ef888a41fa12..4ee4ef4f7f43bc 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query25.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query25.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query25") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query25") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query26.groovy b/regression-test/suites/new_shapes_p0/clickbench/query26.groovy
index 4381a3ebb3260f..036ea6d8830625 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query26.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query26.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query26") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query26") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query27.groovy b/regression-test/suites/new_shapes_p0/clickbench/query27.groovy
index 1da4b36a224bfe..bd3303f20f61e7 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query27.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query27.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query27") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query27") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query28.groovy b/regression-test/suites/new_shapes_p0/clickbench/query28.groovy
index 156b22253c105d..fca648fa13976d 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query28.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query28.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query28") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query28") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query29.groovy b/regression-test/suites/new_shapes_p0/clickbench/query29.groovy
index 6b116692ab71ec..e83de5f3c69910 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query29.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query29.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query29") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query29") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query3.groovy b/regression-test/suites/new_shapes_p0/clickbench/query3.groovy
index 23fc9b34a476ab..09237c7f990172 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query3.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query3.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query3") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query3") {    if (isCloudMode()) {
         return
     }
     sql 'set enable_nereids_planner=true'
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query30.groovy b/regression-test/suites/new_shapes_p0/clickbench/query30.groovy
index b5f07c4f193d54..3d0f0d5da74e95 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query30.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query30.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query30") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query30") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query31.groovy b/regression-test/suites/new_shapes_p0/clickbench/query31.groovy
index 0cd31a5d6c7183..ddcabe2cc5509d 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query31.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query31.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query31") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query31") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query32.groovy b/regression-test/suites/new_shapes_p0/clickbench/query32.groovy
index e935f07dd91006..87a33a661748ea 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query32.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query32.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query32") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query32") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query33.groovy b/regression-test/suites/new_shapes_p0/clickbench/query33.groovy
index e392fe9befba0b..ed887e48050993 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query33.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query33.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query33") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query33") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query34.groovy b/regression-test/suites/new_shapes_p0/clickbench/query34.groovy
index 74fbbf1f3c92f6..c4fb593559e354 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query34.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query34.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query34") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query34") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query35.groovy b/regression-test/suites/new_shapes_p0/clickbench/query35.groovy
index aa7461f3e24cba..93cc6006b0266f 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query35.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query35.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query35") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query35") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query36.groovy b/regression-test/suites/new_shapes_p0/clickbench/query36.groovy
index a1d3f51d4888f2..04e11b4a759c28 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query36.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query36.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query36") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query36") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query37.groovy b/regression-test/suites/new_shapes_p0/clickbench/query37.groovy
index 991ac4fea4cc88..02834e29c234ec 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query37.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query37.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query37") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query37") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query38.groovy b/regression-test/suites/new_shapes_p0/clickbench/query38.groovy
index ae19509acb406b..825e690d136668 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query38.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query38.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query38") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query38") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query39.groovy b/regression-test/suites/new_shapes_p0/clickbench/query39.groovy
index 68e77832e883a2..21a487217f9213 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query39.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query39.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query39") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query39") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query4.groovy b/regression-test/suites/new_shapes_p0/clickbench/query4.groovy
index 345b07bdb83998..62056f68b7e45f 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query4.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query4.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query4") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query4") {    if (isCloudMode()) {
         return
     }
     sql 'set enable_nereids_planner=true'
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query40.groovy b/regression-test/suites/new_shapes_p0/clickbench/query40.groovy
index bc595877ce8cd6..b733de6604d7ec 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query40.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query40.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query40") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query40") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query41.groovy b/regression-test/suites/new_shapes_p0/clickbench/query41.groovy
index 643f15f7a31523..44870d7e04de52 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query41.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query41.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query41") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query41") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query42.groovy b/regression-test/suites/new_shapes_p0/clickbench/query42.groovy
index efc76a30b5a7c4..f439b82c4bad1f 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query42.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query42.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query42") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query42") {    if (isCloudMode()) {
         return
     }
 
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query43.groovy b/regression-test/suites/new_shapes_p0/clickbench/query43.groovy
index f53fb7fe68de6a..31e54bc6111556 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query43.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query43.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query43") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query43") {    if (isCloudMode()) {
         return
     }
     sql 'set enable_nereids_planner=true'
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query5.groovy b/regression-test/suites/new_shapes_p0/clickbench/query5.groovy
index 8e97381108c1a9..5ad4642e71ed09 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query5.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query5.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query5") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query5") {    if (isCloudMode()) {
         return
     }
     sql 'set enable_nereids_planner=true'
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query6.groovy b/regression-test/suites/new_shapes_p0/clickbench/query6.groovy
index 59b607703c473d..452d710d782f94 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query6.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query6.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query6") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query6") {    if (isCloudMode()) {
         return
     }
     sql 'set enable_nereids_planner=true'
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query7.groovy b/regression-test/suites/new_shapes_p0/clickbench/query7.groovy
index 3dc3985da15c62..56d854f1c72ca2 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query7.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query7.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query7") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query7") {    if (isCloudMode()) {
         return
     }
     sql 'set enable_nereids_planner=true'
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query8.groovy b/regression-test/suites/new_shapes_p0/clickbench/query8.groovy
index 081c61d988bf3a..20479cc82f8176 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query8.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query8.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query8") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query8") {    if (isCloudMode()) {
         return
     }
     sql 'set enable_nereids_planner=true'
diff --git a/regression-test/suites/new_shapes_p0/clickbench/query9.groovy b/regression-test/suites/new_shapes_p0/clickbench/query9.groovy
index cf5a646ad3fc2d..79e84ea86a6634 100644
--- a/regression-test/suites/new_shapes_p0/clickbench/query9.groovy
+++ b/regression-test/suites/new_shapes_p0/clickbench/query9.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query9") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query9") {    if (isCloudMode()) {
         return
     }
     sql 'set enable_nereids_planner=true'
diff --git a/regression-test/suites/new_shapes_p0/hint_tpcds/load.groovy b/regression-test/suites/new_shapes_p0/hint_tpcds/load.groovy
index 228a3a950535b3..c9b95d48e7bb3d 100644
--- a/regression-test/suites/new_shapes_p0/hint_tpcds/load.groovy
+++ b/regression-test/suites/new_shapes_p0/hint_tpcds/load.groovy
@@ -15,11 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-suite("load") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("load") {    if (isCloudMode()) {
         return
     }
     String database = context.config.getDbNameByFile(context.file)
diff --git a/regression-test/suites/new_shapes_p0/hint_tpcds/shape/query1.groovy b/regression-test/suites/new_shapes_p0/hint_tpcds/shape/query1.groovy
index e3dd806677c474..8df0c8df7972e8 100644
--- a/regression-test/suites/new_shapes_p0/hint_tpcds/shape/query1.groovy
+++ b/regression-test/suites/new_shapes_p0/hint_tpcds/shape/query1.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query1") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query1") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/hint_tpcds/shape/query24.groovy b/regression-test/suites/new_shapes_p0/hint_tpcds/shape/query24.groovy
index bc71e8b4123dfc..a9c6e7ed15f7a2 100644
--- a/regression-test/suites/new_shapes_p0/hint_tpcds/shape/query24.groovy
+++ b/regression-test/suites/new_shapes_p0/hint_tpcds/shape/query24.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query24") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query24") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/hint_tpcds/shape/query64.groovy b/regression-test/suites/new_shapes_p0/hint_tpcds/shape/query64.groovy
index e536b0def61cdb..c30a90ca1a0254 100644
--- a/regression-test/suites/new_shapes_p0/hint_tpcds/shape/query64.groovy
+++ b/regression-test/suites/new_shapes_p0/hint_tpcds/shape/query64.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query64") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query64") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/hint_tpcds/shape/query67.groovy b/regression-test/suites/new_shapes_p0/hint_tpcds/shape/query67.groovy
index d30ff4b5c71e85..fdd14334fd9ce1 100644
--- a/regression-test/suites/new_shapes_p0/hint_tpcds/shape/query67.groovy
+++ b/regression-test/suites/new_shapes_p0/hint_tpcds/shape/query67.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query67") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query67") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/hint_tpcds/shape/query72.groovy b/regression-test/suites/new_shapes_p0/hint_tpcds/shape/query72.groovy
index 695edc46a1fb19..ba6361e2f7380d 100644
--- a/regression-test/suites/new_shapes_p0/hint_tpcds/shape/query72.groovy
+++ b/regression-test/suites/new_shapes_p0/hint_tpcds/shape/query72.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query72") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query72") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/hint_tpcds/shape/query78.groovy b/regression-test/suites/new_shapes_p0/hint_tpcds/shape/query78.groovy
index 2bd09686ad38e1..fba09d9a1a0ea7 100644
--- a/regression-test/suites/new_shapes_p0/hint_tpcds/shape/query78.groovy
+++ b/regression-test/suites/new_shapes_p0/hint_tpcds/shape/query78.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query78") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query78") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/hint_tpch/load.groovy b/regression-test/suites/new_shapes_p0/hint_tpch/load.groovy
index d7fe8ace142cfb..69398129a414ad 100644
--- a/regression-test/suites/new_shapes_p0/hint_tpch/load.groovy
+++ b/regression-test/suites/new_shapes_p0/hint_tpch/load.groovy
@@ -15,11 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-suite("load") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("load") {    if (isCloudMode()) {
         return
     }
     String database = context.config.getDbNameByFile(context.file)
diff --git a/regression-test/suites/new_shapes_p0/hint_tpch/shape/q10.groovy b/regression-test/suites/new_shapes_p0/hint_tpch/shape/q10.groovy
index d7f23ca7566466..8eab383ac97d1f 100644
--- a/regression-test/suites/new_shapes_p0/hint_tpch/shape/q10.groovy
+++ b/regression-test/suites/new_shapes_p0/hint_tpch/shape/q10.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("q10") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("q10") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/hint_tpch/shape/q11.groovy b/regression-test/suites/new_shapes_p0/hint_tpch/shape/q11.groovy
index 77faf825eb2b16..caddfe666aae79 100644
--- a/regression-test/suites/new_shapes_p0/hint_tpch/shape/q11.groovy
+++ b/regression-test/suites/new_shapes_p0/hint_tpch/shape/q11.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("q11") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("q11") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/hint_tpch/shape/q12.groovy b/regression-test/suites/new_shapes_p0/hint_tpch/shape/q12.groovy
index b7304e39281899..95e6e9d307b22e 100644
--- a/regression-test/suites/new_shapes_p0/hint_tpch/shape/q12.groovy
+++ b/regression-test/suites/new_shapes_p0/hint_tpch/shape/q12.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("q12") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("q12") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/hint_tpch/shape/q13.groovy b/regression-test/suites/new_shapes_p0/hint_tpch/shape/q13.groovy
index 0f71e3830aeb12..264b366a47bfa4 100644
--- a/regression-test/suites/new_shapes_p0/hint_tpch/shape/q13.groovy
+++ b/regression-test/suites/new_shapes_p0/hint_tpch/shape/q13.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("q13") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("q13") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/hint_tpch/shape/q14.groovy b/regression-test/suites/new_shapes_p0/hint_tpch/shape/q14.groovy
index 6fa6acffe5dd15..66b1433e1cc0ff 100644
--- a/regression-test/suites/new_shapes_p0/hint_tpch/shape/q14.groovy
+++ b/regression-test/suites/new_shapes_p0/hint_tpch/shape/q14.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("q14") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("q14") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/hint_tpch/shape/q15.groovy b/regression-test/suites/new_shapes_p0/hint_tpch/shape/q15.groovy
index 023ac6b5ad07f4..40a822d660bbcc 100644
--- a/regression-test/suites/new_shapes_p0/hint_tpch/shape/q15.groovy
+++ b/regression-test/suites/new_shapes_p0/hint_tpch/shape/q15.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("q15") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("q15") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/hint_tpch/shape/q17.groovy b/regression-test/suites/new_shapes_p0/hint_tpch/shape/q17.groovy
index 3836f16e83d54d..1107d2f08ca17f 100644
--- a/regression-test/suites/new_shapes_p0/hint_tpch/shape/q17.groovy
+++ b/regression-test/suites/new_shapes_p0/hint_tpch/shape/q17.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("q17") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("q17") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/hint_tpch/shape/q19.groovy b/regression-test/suites/new_shapes_p0/hint_tpch/shape/q19.groovy
index ec10d1ce6fae61..3edccfdfa89dce 100644
--- a/regression-test/suites/new_shapes_p0/hint_tpch/shape/q19.groovy
+++ b/regression-test/suites/new_shapes_p0/hint_tpch/shape/q19.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("q19") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("q19") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/hint_tpch/shape/q3.groovy b/regression-test/suites/new_shapes_p0/hint_tpch/shape/q3.groovy
index f72772eceb363a..039ef4cdd118f8 100644
--- a/regression-test/suites/new_shapes_p0/hint_tpch/shape/q3.groovy
+++ b/regression-test/suites/new_shapes_p0/hint_tpch/shape/q3.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("q3") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("q3") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/hint_tpch/shape/q4.groovy b/regression-test/suites/new_shapes_p0/hint_tpch/shape/q4.groovy
index f8fac8da460acd..3496aaea4b317a 100644
--- a/regression-test/suites/new_shapes_p0/hint_tpch/shape/q4.groovy
+++ b/regression-test/suites/new_shapes_p0/hint_tpch/shape/q4.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("q4") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("q4") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/hint_tpch/shape/q5.groovy b/regression-test/suites/new_shapes_p0/hint_tpch/shape/q5.groovy
index d8485925370ba5..44f4212b2c538a 100644
--- a/regression-test/suites/new_shapes_p0/hint_tpch/shape/q5.groovy
+++ b/regression-test/suites/new_shapes_p0/hint_tpch/shape/q5.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("q5") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("q5") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/hint_tpch/shape/q7.groovy b/regression-test/suites/new_shapes_p0/hint_tpch/shape/q7.groovy
index 0c46af1230b5d3..ed5275a00e384a 100644
--- a/regression-test/suites/new_shapes_p0/hint_tpch/shape/q7.groovy
+++ b/regression-test/suites/new_shapes_p0/hint_tpch/shape/q7.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("q7") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("q7") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/hint_tpch/shape/q8.groovy b/regression-test/suites/new_shapes_p0/hint_tpch/shape/q8.groovy
index 288a0a2dd843f7..a54fd7a53d429a 100644
--- a/regression-test/suites/new_shapes_p0/hint_tpch/shape/q8.groovy
+++ b/regression-test/suites/new_shapes_p0/hint_tpch/shape/q8.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("q8") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("q8") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/hint_tpch/shape/q9.groovy b/regression-test/suites/new_shapes_p0/hint_tpch/shape/q9.groovy
index 5af1da3e423c6b..bf3eee29835e6a 100644
--- a/regression-test/suites/new_shapes_p0/hint_tpch/shape/q9.groovy
+++ b/regression-test/suites/new_shapes_p0/hint_tpch/shape/q9.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("q9") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("q9") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/ssb_sf100/load.groovy b/regression-test/suites/new_shapes_p0/ssb_sf100/load.groovy
index 4e1ee2e05748d6..6bc67efe127b4e 100644
--- a/regression-test/suites/new_shapes_p0/ssb_sf100/load.groovy
+++ b/regression-test/suites/new_shapes_p0/ssb_sf100/load.groovy
@@ -15,11 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-suite("load") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("load") {    if (isCloudMode()) {
         return
     }
     String database = context.config.getDbNameByFile(context.file)
diff --git a/regression-test/suites/new_shapes_p0/ssb_sf100/shape/flat.groovy b/regression-test/suites/new_shapes_p0/ssb_sf100/shape/flat.groovy
index cb1fd5f0130397..9abdcecbd53f58 100644
--- a/regression-test/suites/new_shapes_p0/ssb_sf100/shape/flat.groovy
+++ b/regression-test/suites/new_shapes_p0/ssb_sf100/shape/flat.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("q1.1") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("q1.1") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q1.1.groovy b/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q1.1.groovy
index b96c8d34157a21..11ebd35fbae5c1 100644
--- a/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q1.1.groovy
+++ b/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q1.1.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("q1.1") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("q1.1") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q1.2.groovy b/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q1.2.groovy
index 13886a95d44c04..75a25cb9a3755b 100644
--- a/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q1.2.groovy
+++ b/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q1.2.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("q1.2") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("q1.2") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q1.3.groovy b/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q1.3.groovy
index ef4700820ec177..0cea67b56afa54 100644
--- a/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q1.3.groovy
+++ b/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q1.3.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("q1.3") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("q1.3") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q2.1.groovy b/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q2.1.groovy
index c642242d43c221..acf02d1f4e7272 100644
--- a/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q2.1.groovy
+++ b/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q2.1.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("q2.1") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("q2.1") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q2.2.groovy b/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q2.2.groovy
index be201499b4284c..8c7ea9f04f19e0 100644
--- a/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q2.2.groovy
+++ b/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q2.2.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("q2.2") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("q2.2") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q2.3.groovy b/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q2.3.groovy
index e43f676c28121d..67beaf6c1fdcd6 100644
--- a/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q2.3.groovy
+++ b/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q2.3.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("q2.3") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("q2.3") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q3.1.groovy b/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q3.1.groovy
index 748648bc841a8e..0f894c5e499b1c 100644
--- a/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q3.1.groovy
+++ b/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q3.1.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("q3.1") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("q3.1") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q3.2.groovy b/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q3.2.groovy
index 59b481f775ada5..2bfc6060ac4f23 100644
--- a/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q3.2.groovy
+++ b/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q3.2.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("q3.2") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("q3.2") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q3.3.groovy b/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q3.3.groovy
index cb147e232bc695..32a8f7ecdedeaa 100644
--- a/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q3.3.groovy
+++ b/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q3.3.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("q3.3") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("q3.3") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q3.4.groovy b/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q3.4.groovy
index d12af6a5e758a2..13237e247ea1a7 100644
--- a/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q3.4.groovy
+++ b/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q3.4.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("q3.4") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("q3.4") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q4.1.groovy b/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q4.1.groovy
index 3aff8063b1f670..03b77f64806a75 100644
--- a/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q4.1.groovy
+++ b/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q4.1.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("q4.1") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("q4.1") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q4.2.groovy b/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q4.2.groovy
index 578cd05f9a96a2..ee7ecc98960cdb 100644
--- a/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q4.2.groovy
+++ b/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q4.2.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("q4.2") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("q4.2") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q4.3.groovy b/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q4.3.groovy
index 43886c6413342d..91431ed0718a53 100644
--- a/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q4.3.groovy
+++ b/regression-test/suites/new_shapes_p0/ssb_sf100/shape/q4.3.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("q4.3") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("q4.3") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/constraints/load.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/constraints/load.groovy
index 72be294214a283..1f76f928de587a 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/constraints/load.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/constraints/load.groovy
@@ -15,11 +15,7 @@
 // specific language governing permissions and limitations
 // under the License.
 
-suite("load") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("load") {    if (isCloudMode()) {
         return
     }
     String database = context.config.getDbNameByFile(context.file)
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/constraints/query23.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/constraints/query23.groovy
index d2e9f2a88ea4c8..646f6dc9ad5c0d 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/constraints/query23.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/constraints/query23.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query23") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query23") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(context.file)
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query1.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query1.groovy
index 17ff3bafbac0ee..7924abcbbcb448 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query1.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query1.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query1") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query1") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query10.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query10.groovy
index 4e56144fe7900c..9a51b20e0b725b 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query10.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query10.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query10") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query10") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query11.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query11.groovy
index c77ee10389ab1a..32e9aecf8e01e1 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query11.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query11.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query11") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query11") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query12.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query12.groovy
index 7fb161ba39cbdf..47abedfddab7b8 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query12.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query12.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query12") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query12") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query13.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query13.groovy
index 70b1cef5cd4e51..c5a026cbbb71f9 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query13.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query13.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query13") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query13") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query14.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query14.groovy
index a777b0d5f8d315..94e8412d78b351 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query14.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query14.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query14") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query14") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query15.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query15.groovy
index 906ce8a14359ea..ee209312a64965 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query15.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query15.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query15") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query15") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query16.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query16.groovy
index 049f01c2d161ea..36ebaaba69af10 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query16.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query16.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query16") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query16") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query17.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query17.groovy
index 8ad97b7aa031a4..c3ed301863838b 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query17.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query17.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query17") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query17") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query18.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query18.groovy
index d72f0eadd385fa..cc27258bc273d3 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query18.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query18.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query18") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query18") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query19.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query19.groovy
index 5ae71eb5b7bad2..50c829281e4077 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query19.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query19.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query19") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query19") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query2.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query2.groovy
index ddc50b329d9e4f..845138ae955f86 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query2.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query2.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query2") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query2") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query20.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query20.groovy
index bf654bf5825bb3..545e75ee803b8d 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query20.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query20.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query20") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query20") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query21.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query21.groovy
index 44e71bedf76b4b..a7d30b4e6cc04a 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query21.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query21.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query21") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query21") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query22.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query22.groovy
index 222e83cf522f08..fdc6d92078f0f9 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query22.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query22.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query22") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query22") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query23.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query23.groovy
index d222599b389b2b..5df85f1034e427 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query23.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query23.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query23") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query23") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query24.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query24.groovy
index dce53b00673c7a..b3881dc0477b8b 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query24.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query24.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query24") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query24") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query25.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query25.groovy
index 5c0441f3fb7181..b1d982047f4835 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query25.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query25.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query25") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query25") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query26.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query26.groovy
index 18388abeea5e60..d4d0b6e13ccb91 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query26.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query26.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query26") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query26") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query27.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query27.groovy
index c9cc88bcbd3dc1..49f86e376d1624 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query27.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query27.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query27") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query27") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query28.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query28.groovy
index 2f2a32f87e10df..4342633d727137 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query28.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query28.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query28") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query28") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query29.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query29.groovy
index 464ab674b0fad9..be2462b7864977 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query29.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query29.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query29") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query29") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query3.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query3.groovy
index 992197814ab9c8..9b1b2179b4f803 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query3.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query3.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query3") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query3") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query30.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query30.groovy
index d4cc48a3a2f89d..48340c277107b3 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query30.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query30.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query30") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query30") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query31.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query31.groovy
index bd9a1a5ca908a8..dba57bafd1c764 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query31.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query31.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query31") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query31") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query32.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query32.groovy
index 580d2138c5dc44..fd784f2c269f9d 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query32.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query32.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query32") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query32") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query33.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query33.groovy
index 1662dd86124ffc..bd36544430372b 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query33.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query33.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query33") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query33") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query34.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query34.groovy
index 8bc80e13316ec3..4938052572ca61 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query34.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query34.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query34") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query34") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query35.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query35.groovy
index 20958554057e85..7ac41897d15a05 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query35.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query35.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query35") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query35") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query36.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query36.groovy
index 9a450946d05e95..8a74b80412f332 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query36.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query36.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query36") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query36") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query37.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query37.groovy
index 2e1dc89d7d3569..4f323d4108ea9a 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query37.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query37.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query37") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query37") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query38.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query38.groovy
index e5fe76f5ed4fdd..2c1027492b68d8 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query38.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query38.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query38") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query38") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query39.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query39.groovy
index 5048798e40e3a9..92d3cc08e80800 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query39.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query39.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query39") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query39") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query4.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query4.groovy
index a9b93e6db875e7..f94c18db970706 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query4.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query4.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query4") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query4") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query40.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query40.groovy
index e5c52ce68c39cb..64657fe4730a45 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query40.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query40.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query40") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query40") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query41.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query41.groovy
index 41a3eb80401757..bb1d0373bf348b 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query41.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query41.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query41") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query41") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query42.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query42.groovy
index 1c82be0d5c0458..ea015e358b548a 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query42.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query42.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query42") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query42") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query43.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query43.groovy
index 6069319549b79f..9cfcaca1098791 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query43.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query43.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query43") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query43") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query44.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query44.groovy
index 5450390f519dc8..1ffb8f371d6d50 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query44.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query44.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query44") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query44") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query45.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query45.groovy
index 71f354db806864..0464b9cee5d103 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query45.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query45.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query45") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query45") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query46.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query46.groovy
index ce477d15b49378..07bbeb17a7a561 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query46.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query46.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query46") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query46") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query47.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query47.groovy
index 9ed85b930ce538..a275c82ce71c0f 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query47.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query47.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query47") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query47") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query48.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query48.groovy
index 97b61c1717c183..0fe510265754b8 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query48.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/no_stats_shape/query48.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query48") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query48") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query10.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query10.groovy
index eb82236030ca63..d1c42f1eed7872 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query10.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query10.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query10") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query10") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query11.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query11.groovy
index ef7372d6283f6b..befc068b0e405d 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query11.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query11.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query11") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query11") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query13.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query13.groovy
index d468132fa962f6..075e013a89d33f 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query13.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query13.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query13") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query13") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query14.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query14.groovy
index 35fe74f08bfa3e..4471321b963401 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query14.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query14.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query14") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query14") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query15.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query15.groovy
index 011a784913294d..00375c5c7b21c2 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query15.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query15.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query15") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query15") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query18.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query18.groovy
index 7649d332cab7a6..0ad5b8c094aa45 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query18.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query18.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query18") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query18") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query19.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query19.groovy
index 5812deb8fa24b0..637fc250ba093c 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query19.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query19.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query19") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query19") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query70.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query70.groovy
index 011c811192b26a..69f985c8d495eb 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query70.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query70.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query70") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query70") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query74.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query74.groovy
index 0f9aaa5d15f26b..1b56c843f2c19f 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query74.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query74.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query74") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query74") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query78.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query78.groovy
index a1dec477ff0e36..d8ba8bb6d4d2c8 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query78.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query78.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query78") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query78") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query81.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query81.groovy
index 514d5c5d9da25e..cb5738c4819f4e 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query81.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query81.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query81") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query81") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query82.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query82.groovy
index ffb935de508161..8b0b83ce44c0b1 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query82.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query82.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query82") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query82") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query83.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query83.groovy
index 1967a43d1d545e..437da436e00dc6 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query83.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query83.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query83") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query83") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query86.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query86.groovy
index dd2253e6a2f090..6ea6ba5613399c 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query86.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query86.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query86") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query86") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query87.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query87.groovy
index 4adce7f122fc86..f67e92946b9f97 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query87.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf100/shape/query87.groovy
@@ -17,11 +17,7 @@
  * under the License.
  */
 
-suite("query87") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query87") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))
diff --git a/regression-test/suites/new_shapes_p0/tpcds_sf1000/shape/query51.groovy b/regression-test/suites/new_shapes_p0/tpcds_sf1000/shape/query51.groovy
index 9eafbed42e6ad6..76a9446f8c3d8d 100644
--- a/regression-test/suites/new_shapes_p0/tpcds_sf1000/shape/query51.groovy
+++ b/regression-test/suites/new_shapes_p0/tpcds_sf1000/shape/query51.groovy
@@ -19,11 +19,7 @@ import java.util.stream.Collectors
  * under the License.
  */
 
-suite("query51") {
-    if (isCloudMode()) {
-        return
-    }
-    if (isCloudMode()) {
+suite("query51") {    if (isCloudMode()) {
         return
     }
     String db = context.config.getDbNameByFile(new File(context.file.parent))