(doris) branch branch-3.1 updated: branch-3.1 [Fix](Variant) fix explode table function with variant type (#52713)

morrysnow Thu, 03 Jul 2025 19:42:43 -0700

This is an automated email from the ASF dual-hosted git repository.

morrysnow pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git



The following commit(s) were added to refs/heads/branch-3.1 by this push:
     new 649d066a942 branch-3.1 [Fix](Variant) fix explode table function with 
variant type (#52713)
649d066a942 is described below

commit 649d066a9422ab4b85b91efabbd73155098c2c94
Author: lihangyu <[email protected]>
AuthorDate: Fri Jul 4 10:42:29 2025 +0800

    branch-3.1 [Fix](Variant) fix explode table function with variant type 
(#52713)
    
    1. Plan should use correct Variant type with properties
    2. fix explode function, with finalized variant type
    3. mv regression-test/data/variant_github_events_index_type_p2 cases
    4. fix and refine variant nested cases
---
 be/src/vec/exprs/table_function/vexplode_v2.cpp    |   3 ++-
 .../functions/generator/ExplodeVariantArray.java   |   4 +--
 .../variant_github_events_index_type_p2/load.out   | Bin 28513 -> 0 bytes
 .../variant_github_events_index_type_p2/load.out   | Bin 0 -> 28585 bytes
 .../sql/affinityByIssuesAndPRs1.out                | Bin
 .../sql/affinityByIssuesAndPRs2.out                | Bin
 .../sql/authorsWithTheMostPushes.out               | Bin
 .../sql/countingStar1.out                          | Bin
 .../sql/countingStar2.out                          | Bin
 .../sql/countingStar3.out                          | Bin
 .../sql/distributionOfRepositoriesByStarCount.out  | Bin
 .../sql/githubRoulette.out                         | Bin
 ...heListOfTopRepositoriesChangedOverTheYears1.out | Bin
 ...heListOfTopRepositoriesChangedOverTheYears2.out | Bin
 ...heListOfTopRepositoriesChangedOverTheYears3.out | Bin
 ...heListOfTopRepositoriesChangedOverTheYears4.out | Bin
 ...heListOfTopRepositoriesChangedOverTheYears5.out | Bin
 ...heListOfTopRepositoriesChangedOverTheYears6.out | Bin
 .../howHasTheTotalNumberOfStarsChangedOverTime.out | Bin
 .../sql/issuesWithTheMostComments1.out             | Bin
 .../sql/issuesWithTheMostComments2.out             | Bin
 .../sql/issuesWithTheMostComments3.out             | Bin
 .../sql/issuesWithTheMostComments4.out             | Bin
 .../sql/issuesWithTheMostComments5.out             | Bin
 .../sql/issuesWithTheMostComments6.out             | Bin
 .../sql/issuesWithTheMostComments7.out             | Bin
 .../sql/load.out                                   | Bin
 .../sql/mostForkedRepositories.out                 | Bin
 .../sql/mostPopularCommentsOnGithub.out            | Bin
 .../sql/organizationsByTheNumberOfRepositories.out | Bin
 .../sql/organizationsByTheNumberOfStars.out        | Bin
 .../sql/proportionsBetweenStarsAndForks1.out       | Bin
 .../sql/proportionsBetweenStarsAndForks2.out       | Bin
 .../sql/proportionsBetweenStarsAndForks3.out       | Bin
 .../sql/proportionsBetweenStarsAndForks4.out       | Bin
 .../sql/proportionsBetweenStarsAndForks5.out       | Bin
 .../sql/repositoriesByAmountOfModifiedCode.out     | Bin
 .../sql/repositoriesByTheNumberOfPushes.out        | Bin
 ...epositoriesWithClickhouse_related_comments1.out | Bin
 ...epositoriesWithClickhouse_related_comments2.out | Bin
 .../repositoriesWithDoris_related_comments1.out    | Bin
 .../repositoriesWithDoris_related_comments2.out    | Bin
 .../sql/repositoriesWithTheHighestGrowthYoY.out    | Bin
 .../repositoriesWithTheMaximumAmountOfIssues1.out  | Bin
 .../repositoriesWithTheMaximumAmountOfIssues2.out  | Bin
 .../repositoriesWithTheMaximumAmountOfIssues3.out  | Bin
 .../repositoriesWithTheMaximumAmountOfIssues4.out  | Bin
 ...sitoriesWithTheMaximumAmountOfPullRequests1.out | Bin
 ...sitoriesWithTheMaximumAmountOfPullRequests2.out | Bin
 ...esWithTheMaximumNumberOfAcceptedInvitations.out | Bin
 ...sitoriesWithTheMostPeopleWhoHavePushAccess1.out | Bin
 .../repositoriesWithTheMostStarsOverOneDay1.out    | Bin
 ...repositoriesWithTheMostSteadyGrowthOverTime.out | Bin
 .../repositoriesWithTheWorstStagnation_order.out   | Bin
 .../sql/repositoryAffinityList1.out                | Bin
 .../sql/repositoryAffinityList2.out                | Bin
 .../sql/starsFromHeavyGithubUsers1.out             | Bin
 .../sql/starsFromHeavyGithubUsers2.out             | Bin
 .../sql/theLongestRepositoryNames1.out             | Bin
 .../sql/theLongestRepositoryNames2.out             | Bin
 .../sql/theMostToughCodeReviews.out                | Bin
 .../sql/theTotalNumberOfRepositoriesOnGithub.out   | Bin
 .../sql/theTotalNumberOfUsersOnGithub1.out         | Bin
 .../sql/theTotalNumberOfUsersOnGithub2.out         | Bin
 .../sql/theTotalNumberOfUsersOnGithub3.out         | Bin
 .../sql/theTotalNumberOfUsersOnGithub4.out         | Bin
 .../sql/topRepositoriesByStars.out                 | Bin
 .../sql/whatIsTheBestDayOfTheWeekToCatchAStar.out  | Bin
 .../sql/whoAreAllThosePeopleGivingStars1.out       | Bin
 .../sql/whoAreAllThosePeopleGivingStars2.out       | Bin
 .../sql/whoAreAllThosePeopleGivingStars3.out       | Bin
 .../load.out                                       | Bin 28455 -> 28527 bytes
 regression-test/data/variant_p0/nested.out         | Bin 14648 -> 14874 bytes
 .../test_double_write_when_schema_change.out       | Bin 8049 -> 7992 bytes
 .../sql_functions/table_function/explode.groovy    |   1 -
 .../load.groovy                                    |   8 +++---
 .../sql/affinityByIssuesAndPRs1.sql                |   0
 .../sql/affinityByIssuesAndPRs2.sql                |   0
 .../sql/authorsWithTheMostPushes.sql               |   0
 .../sql/countingStar1.sql                          |   0
 .../sql/countingStar2.sql                          |   0
 .../sql/countingStar3.sql                          |   0
 .../sql/distributionOfRepositoriesByStarCount.sql  |   0
 .../sql/githubRoulette.sql                         |   0
 ...heListOfTopRepositoriesChangedOverTheYears1.sql |   0
 ...heListOfTopRepositoriesChangedOverTheYears2.sql |   0
 ...heListOfTopRepositoriesChangedOverTheYears3.sql |   0
 ...heListOfTopRepositoriesChangedOverTheYears4.sql |   0
 ...heListOfTopRepositoriesChangedOverTheYears5.sql |   0
 ...heListOfTopRepositoriesChangedOverTheYears6.sql |   0
 ...heListOfTopRepositoriesChangedOverTheYears7.sql |   0
 .../howHasTheTotalNumberOfStarsChangedOverTime.sql |   0
 .../sql/issuesWithTheMostComments1.sql             |   0
 .../sql/issuesWithTheMostComments2.sql             |   0
 .../sql/issuesWithTheMostComments3.sql             |   0
 .../sql/issuesWithTheMostComments4.sql             |   0
 .../sql/issuesWithTheMostComments5.sql             |   0
 .../sql/issuesWithTheMostComments6.sql             |   0
 .../sql/issuesWithTheMostComments7.sql             |   0
 .../sql/issuesWithTheMostComments8.sql             |   0
 .../sql/mostForkedRepositories.sql                 |   0
 .../sql/mostPopularCommentsOnGithub.sql            |   0
 .../sql/organizationsByTheNumberOfRepositories.sql |   0
 .../sql/organizationsByTheNumberOfStars.sql        |   0
 .../sql/organizationsByTheSizeOfCommunity.sql      |   0
 .../sql/proportionsBetweenStarsAndForks1.sql       |   0
 .../sql/proportionsBetweenStarsAndForks2.sql       |   0
 .../sql/proportionsBetweenStarsAndForks3.sql       |   0
 .../sql/proportionsBetweenStarsAndForks4.sql       |   0
 .../sql/proportionsBetweenStarsAndForks5.sql       |   0
 .../sql/repositoriesByAmountOfModifiedCode.sql     |   0
 .../sql/repositoriesByTheNumberOfPushes.sql        |   0
 ...epositoriesWithClickhouse_related_comments1.sql |   0
 ...epositoriesWithClickhouse_related_comments2.sql |   0
 .../repositoriesWithDoris_related_comments1.sql    |   0
 .../repositoriesWithDoris_related_comments2.sql    |   0
 .../sql/repositoriesWithTheHighestGrowthYoY.sql    |   0
 .../repositoriesWithTheMaximumAmountOfIssues1.sql  |   0
 .../repositoriesWithTheMaximumAmountOfIssues2.sql  |   0
 .../repositoriesWithTheMaximumAmountOfIssues3.sql  |   0
 .../repositoriesWithTheMaximumAmountOfIssues4.sql  |   0
 ...sitoriesWithTheMaximumAmountOfPullRequests1.sql |   0
 ...sitoriesWithTheMaximumAmountOfPullRequests2.sql |   0
 ...esWithTheMaximumNumberOfAcceptedInvitations.sql |   0
 ...sitoriesWithTheMostPeopleWhoHavePushAccess1.sql |   0
 ...sitoriesWithTheMostPeopleWhoHavePushAccess2.sql |   0
 ...sitoriesWithTheMostPeopleWhoHavePushAccess3.sql |   0
 .../repositoriesWithTheMostStarsOverOneDay1.sql    |   0
 .../repositoriesWithTheMostStarsOverOneDay2.sql    |   0
 .../repositoriesWithTheMostStarsOverOneDay3.sql    |   0
 ...repositoriesWithTheMostSteadyGrowthOverTime.sql |   0
 .../repositoriesWithTheWorstStagnation_order.sql   |   0
 .../sql/repositoryAffinityList1.sql                |   0
 .../sql/repositoryAffinityList2.sql                |   0
 .../sql/starsFromHeavyGithubUsers1.sql             |   0
 .../sql/starsFromHeavyGithubUsers2.sql             |   0
 .../sql/theLongestRepositoryNames1.sql             |   0
 .../sql/theLongestRepositoryNames2.sql             |   0
 .../sql/theMostToughCodeReviews.sql                |   0
 .../sql/theTotalNumberOfRepositoriesOnGithub.sql   |   0
 .../sql/theTotalNumberOfUsersOnGithub1.sql         |   0
 .../sql/theTotalNumberOfUsersOnGithub2.sql         |   0
 .../sql/theTotalNumberOfUsersOnGithub3.sql         |   0
 .../sql/theTotalNumberOfUsersOnGithub4.sql         |   0
 .../sql/topLabels1.sql                             |   0
 .../sql/topLabels2.sql                             |   0
 .../sql/topLabels3.sql                             |   0
 .../sql/topRepositoriesByStars.sql                 |   0
 .../sql/whatIsTheBestDayOfTheWeekToCatchAStar.sql  |   0
 .../sql/whoAreAllThosePeopleGivingStars1.sql       |   0
 .../sql/whoAreAllThosePeopleGivingStars2.sql       |   0
 .../sql/whoAreAllThosePeopleGivingStars3.sql       |   0
 .../suites/variant_p0/delete_update.groovy         |   2 +-
 regression-test/suites/variant_p0/nested.groovy    |  30 +++++++++------------
 .../test_double_write_when_schema_change.groovy    |   2 +-
 .../suites/variant_p1/predefine/load.groovy        |   2 +-
 156 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/be/src/vec/exprs/table_function/vexplode_v2.cpp 
b/be/src/vec/exprs/table_function/vexplode_v2.cpp
index ccebae91f34..44659dde806 100644
--- a/be/src/vec/exprs/table_function/vexplode_v2.cpp
+++ b/be/src/vec/exprs/table_function/vexplode_v2.cpp
@@ -49,7 +49,8 @@ Status VExplodeV2TableFunction::_process_init_variant(Block* 
block, int value_co
     // explode variant array
     auto column_without_nullable = 
remove_nullable(block->get_by_position(value_column_idx).column);
     auto column = column_without_nullable->convert_to_full_column_if_const();
-    const auto& variant_column = assert_cast<const ColumnObject&>(*column);
+    auto& variant_column = 
assert_cast<ColumnObject&>(*(column->assume_mutable()));
+    variant_column.finalize();
     _multi_detail[children_column_idx].output_as_variant = true;
     if (!variant_column.is_null_root()) {
         _array_columns[children_column_idx] = variant_column.get_root();
diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/generator/ExplodeVariantArray.java
 
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/generator/ExplodeVariantArray.java
index 7e4546ee4f0..3dd0dcabe5a 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/generator/ExplodeVariantArray.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/expressions/functions/generator/ExplodeVariantArray.java
@@ -75,8 +75,8 @@ public class ExplodeVariantArray extends 
TableGeneratingFunction implements
         for (int i = 0; i < children.size(); i++) {
             if (children.get(i).getDataType() instanceof VariantType) {
                 structFields.add(
-                    new StructField("col" + (i + 1), VariantType.INSTANCE, 
true, ""));
-                arguments.add(VariantType.INSTANCE);
+                    new StructField("col" + (i + 1), 
children.get(i).getDataType(), true, ""));
+                arguments.add(children.get(i).getDataType());
             } else {
                 
SearchSignature.throwCanNotFoundFunctionException(this.getName(), 
getArguments());
             }
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/load.out
 
b/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/load.out
deleted file mode 100644
index 4bc0ce42f6c..00000000000
Binary files 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/load.out
 and /dev/null differ
diff --git a/regression-test/data/variant_github_events_index_type_p2/load.out 
b/regression-test/data/variant_github_events_index_type_p2/load.out
new file mode 100644
index 00000000000..fcdb64f96c0
Binary files /dev/null and 
b/regression-test/data/variant_github_events_index_type_p2/load.out differ
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/affinityByIssuesAndPRs1.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/affinityByIssuesAndPRs1.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/affinityByIssuesAndPRs1.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/affinityByIssuesAndPRs1.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/affinityByIssuesAndPRs2.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/affinityByIssuesAndPRs2.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/affinityByIssuesAndPRs2.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/affinityByIssuesAndPRs2.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/authorsWithTheMostPushes.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/authorsWithTheMostPushes.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/authorsWithTheMostPushes.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/authorsWithTheMostPushes.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/countingStar1.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/countingStar1.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/countingStar1.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/countingStar1.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/countingStar2.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/countingStar2.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/countingStar2.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/countingStar2.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/countingStar3.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/countingStar3.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/countingStar3.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/countingStar3.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/distributionOfRepositoriesByStarCount.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/distributionOfRepositoriesByStarCount.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/distributionOfRepositoriesByStarCount.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/distributionOfRepositoriesByStarCount.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/githubRoulette.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/githubRoulette.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/githubRoulette.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/githubRoulette.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears1.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears1.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears1.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears1.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears2.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears2.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears2.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears2.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears3.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears3.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears3.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears3.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears4.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears4.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears4.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears4.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears5.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears5.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears5.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears5.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears6.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears6.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears6.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears6.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/howHasTheTotalNumberOfStarsChangedOverTime.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/howHasTheTotalNumberOfStarsChangedOverTime.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/howHasTheTotalNumberOfStarsChangedOverTime.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/howHasTheTotalNumberOfStarsChangedOverTime.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/issuesWithTheMostComments1.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/issuesWithTheMostComments1.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/issuesWithTheMostComments1.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/issuesWithTheMostComments1.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/issuesWithTheMostComments2.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/issuesWithTheMostComments2.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/issuesWithTheMostComments2.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/issuesWithTheMostComments2.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/issuesWithTheMostComments3.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/issuesWithTheMostComments3.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/issuesWithTheMostComments3.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/issuesWithTheMostComments3.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/issuesWithTheMostComments4.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/issuesWithTheMostComments4.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/issuesWithTheMostComments4.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/issuesWithTheMostComments4.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/issuesWithTheMostComments5.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/issuesWithTheMostComments5.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/issuesWithTheMostComments5.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/issuesWithTheMostComments5.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/issuesWithTheMostComments6.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/issuesWithTheMostComments6.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/issuesWithTheMostComments6.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/issuesWithTheMostComments6.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/issuesWithTheMostComments7.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/issuesWithTheMostComments7.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/issuesWithTheMostComments7.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/issuesWithTheMostComments7.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/load.out
 b/regression-test/data/variant_github_events_index_type_p2/sql/load.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/load.out
rename to regression-test/data/variant_github_events_index_type_p2/sql/load.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/mostForkedRepositories.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/mostForkedRepositories.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/mostForkedRepositories.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/mostForkedRepositories.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/mostPopularCommentsOnGithub.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/mostPopularCommentsOnGithub.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/mostPopularCommentsOnGithub.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/mostPopularCommentsOnGithub.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/organizationsByTheNumberOfRepositories.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/organizationsByTheNumberOfRepositories.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/organizationsByTheNumberOfRepositories.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/organizationsByTheNumberOfRepositories.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/organizationsByTheNumberOfStars.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/organizationsByTheNumberOfStars.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/organizationsByTheNumberOfStars.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/organizationsByTheNumberOfStars.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks1.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks1.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks1.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks1.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks2.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks2.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks2.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks2.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks3.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks3.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks3.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks3.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks4.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks4.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks4.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks4.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks5.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks5.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks5.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks5.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesByAmountOfModifiedCode.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/repositoriesByAmountOfModifiedCode.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesByAmountOfModifiedCode.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/repositoriesByAmountOfModifiedCode.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesByTheNumberOfPushes.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/repositoriesByTheNumberOfPushes.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesByTheNumberOfPushes.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/repositoriesByTheNumberOfPushes.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithClickhouse_related_comments1.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithClickhouse_related_comments1.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithClickhouse_related_comments1.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithClickhouse_related_comments1.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithClickhouse_related_comments2.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithClickhouse_related_comments2.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithClickhouse_related_comments2.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithClickhouse_related_comments2.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithDoris_related_comments1.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithDoris_related_comments1.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithDoris_related_comments1.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithDoris_related_comments1.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithDoris_related_comments2.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithDoris_related_comments2.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithDoris_related_comments2.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithDoris_related_comments2.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheHighestGrowthYoY.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithTheHighestGrowthYoY.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheHighestGrowthYoY.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithTheHighestGrowthYoY.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues1.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues1.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues1.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues1.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues2.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues2.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues2.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues2.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues3.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues3.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues3.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues3.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues4.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues4.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues4.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues4.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfPullRequests1.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfPullRequests1.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfPullRequests1.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfPullRequests1.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfPullRequests2.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfPullRequests2.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfPullRequests2.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfPullRequests2.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumNumberOfAcceptedInvitations.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumNumberOfAcceptedInvitations.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumNumberOfAcceptedInvitations.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumNumberOfAcceptedInvitations.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMostPeopleWhoHavePushAccess1.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithTheMostPeopleWhoHavePushAccess1.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMostPeopleWhoHavePushAccess1.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithTheMostPeopleWhoHavePushAccess1.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMostStarsOverOneDay1.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithTheMostStarsOverOneDay1.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMostStarsOverOneDay1.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithTheMostStarsOverOneDay1.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMostSteadyGrowthOverTime.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithTheMostSteadyGrowthOverTime.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMostSteadyGrowthOverTime.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithTheMostSteadyGrowthOverTime.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheWorstStagnation_order.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithTheWorstStagnation_order.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheWorstStagnation_order.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/repositoriesWithTheWorstStagnation_order.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoryAffinityList1.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/repositoryAffinityList1.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoryAffinityList1.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/repositoryAffinityList1.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoryAffinityList2.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/repositoryAffinityList2.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/repositoryAffinityList2.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/repositoryAffinityList2.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/starsFromHeavyGithubUsers1.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/starsFromHeavyGithubUsers1.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/starsFromHeavyGithubUsers1.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/starsFromHeavyGithubUsers1.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/starsFromHeavyGithubUsers2.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/starsFromHeavyGithubUsers2.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/starsFromHeavyGithubUsers2.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/starsFromHeavyGithubUsers2.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/theLongestRepositoryNames1.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/theLongestRepositoryNames1.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/theLongestRepositoryNames1.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/theLongestRepositoryNames1.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/theLongestRepositoryNames2.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/theLongestRepositoryNames2.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/theLongestRepositoryNames2.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/theLongestRepositoryNames2.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/theMostToughCodeReviews.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/theMostToughCodeReviews.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/theMostToughCodeReviews.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/theMostToughCodeReviews.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/theTotalNumberOfRepositoriesOnGithub.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/theTotalNumberOfRepositoriesOnGithub.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/theTotalNumberOfRepositoriesOnGithub.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/theTotalNumberOfRepositoriesOnGithub.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub1.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub1.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub1.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub1.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub2.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub2.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub2.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub2.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub3.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub3.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub3.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub3.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub4.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub4.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub4.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub4.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/topRepositoriesByStars.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/topRepositoriesByStars.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/topRepositoriesByStars.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/topRepositoriesByStars.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/whatIsTheBestDayOfTheWeekToCatchAStar.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/whatIsTheBestDayOfTheWeekToCatchAStar.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/whatIsTheBestDayOfTheWeekToCatchAStar.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/whatIsTheBestDayOfTheWeekToCatchAStar.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/whoAreAllThosePeopleGivingStars1.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/whoAreAllThosePeopleGivingStars1.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/whoAreAllThosePeopleGivingStars1.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/whoAreAllThosePeopleGivingStars1.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/whoAreAllThosePeopleGivingStars2.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/whoAreAllThosePeopleGivingStars2.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/whoAreAllThosePeopleGivingStars2.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/whoAreAllThosePeopleGivingStars2.out
diff --git 
a/regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/whoAreAllThosePeopleGivingStars3.out
 
b/regression-test/data/variant_github_events_index_type_p2/sql/whoAreAllThosePeopleGivingStars3.out
similarity index 100%
rename from 
regression-test/data/nonConcurrent/variant_github_events_index_type_p2/sql/whoAreAllThosePeopleGivingStars3.out
rename to 
regression-test/data/variant_github_events_index_type_p2/sql/whoAreAllThosePeopleGivingStars3.out
diff --git 
a/regression-test/data/variant_github_events_nonConcurrent_p2/load.out 
b/regression-test/data/variant_github_events_nonConcurrent_p2/load.out
index 0e35a32adf7..4bee99a71a9 100644
Binary files 
a/regression-test/data/variant_github_events_nonConcurrent_p2/load.out and 
b/regression-test/data/variant_github_events_nonConcurrent_p2/load.out differ
diff --git a/regression-test/data/variant_p0/nested.out 
b/regression-test/data/variant_p0/nested.out
index f5c96de7ded..57eb7ce60bf 100644
Binary files a/regression-test/data/variant_p0/nested.out and 
b/regression-test/data/variant_p0/nested.out differ
diff --git 
a/regression-test/data/variant_p0/schema_change/test_double_write_when_schema_change.out
 
b/regression-test/data/variant_p0/schema_change/test_double_write_when_schema_change.out
index f646f83bb03..2d8418a555a 100644
Binary files 
a/regression-test/data/variant_p0/schema_change/test_double_write_when_schema_change.out
 and 
b/regression-test/data/variant_p0/schema_change/test_double_write_when_schema_change.out
 differ
diff --git 
a/regression-test/suites/query_p0/sql_functions/table_function/explode.groovy 
b/regression-test/suites/query_p0/sql_functions/table_function/explode.groovy
index 51405bfc4d3..76d79705704 100644
--- 
a/regression-test/suites/query_p0/sql_functions/table_function/explode.groovy
+++ 
b/regression-test/suites/query_p0/sql_functions/table_function/explode.groovy
@@ -76,7 +76,6 @@ suite("explode") {
     def dataFile = "am.json"
     sql """ DROP TABLE IF EXISTS $testTable; """
     // TODO support more subcolumns count
-    sql "set global_variant_max_subcolumns_count = 0"
     sql """
         CREATE TABLE `$testTable` (
           `id` bigint(20) NULL,
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/load.groovy
 b/regression-test/suites/variant_github_events_index_type_p2/load.groovy
similarity index 95%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/load.groovy
rename to regression-test/suites/variant_github_events_index_type_p2/load.groovy
index 46af72f2cd3..85fdbb99b9f 100644
--- 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/load.groovy
+++ b/regression-test/suites/variant_github_events_index_type_p2/load.groovy
@@ -17,7 +17,7 @@
 
 import org.codehaus.groovy.runtime.IOGroovyMethods
 
-suite("test_variant_github_events_index_type_p2", "nonConcurrent,p2"){
+suite("test_variant_index_type_p2", "p2"){
     // prepare test table
     def timeout = 300000
     def delta_time = 1000
@@ -91,7 +91,7 @@ suite("test_variant_github_events_index_type_p2", 
"nonConcurrent,p2"){
         )
         DUPLICATE KEY(`k`)
         DISTRIBUTED BY HASH(k) BUCKETS 4 
-        properties("replication_num" = "1", "disable_auto_compaction" = 
"true", "variant_enable_flatten_nested" = "false", 
"variant_max_subcolumns_count" = "${rand_subcolumns_count}");
+        properties("replication_num" = "1", "disable_auto_compaction" = 
"true", "variant_enable_flatten_nested" = "true", 
"variant_max_subcolumns_count" = "${rand_subcolumns_count}");
     """
     
     // 2015
@@ -140,7 +140,7 @@ suite("test_variant_github_events_index_type_p2", 
"nonConcurrent,p2"){
         )
         UNIQUE KEY(`k`)
         DISTRIBUTED BY HASH(k) BUCKETS 4 
-        properties("replication_num" = "1", "disable_auto_compaction" = 
"false", "variant_enable_flatten_nested" = "false", "bloom_filter_columns" = 
"v", "variant_max_subcolumns_count" = "${rand_subcolumns_count}");
+        properties("replication_num" = "1", "disable_auto_compaction" = 
"false", "variant_enable_flatten_nested" = "true", "bloom_filter_columns" = 
"v", "variant_max_subcolumns_count" = "${rand_subcolumns_count}");
         """
     sql """insert into github_events2 select * from github_events order by k"""
     sql """select v['payload']['commits'] from github_events order by k ;"""
@@ -171,7 +171,7 @@ suite("test_variant_github_events_index_type_p2", 
"nonConcurrent,p2"){
         )
         DUPLICATE KEY(`k`)
         DISTRIBUTED BY HASH(k) BUCKETS 4 
-        properties("replication_num" = "1", "disable_auto_compaction" = 
"false", "variant_enable_flatten_nested" = "false", "bloom_filter_columns" = 
"v", "variant_max_subcolumns_count" = "${rand_subcolumns_count}");
+        properties("replication_num" = "1", "disable_auto_compaction" = 
"false", "variant_enable_flatten_nested" = "true", "bloom_filter_columns" = 
"v", "variant_max_subcolumns_count" = "${rand_subcolumns_count}");
         """
     sql """insert into github_events3 select * from github_events order by k"""
     // query with inverted index
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/affinityByIssuesAndPRs1.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/affinityByIssuesAndPRs1.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/affinityByIssuesAndPRs1.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/affinityByIssuesAndPRs1.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/affinityByIssuesAndPRs2.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/affinityByIssuesAndPRs2.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/affinityByIssuesAndPRs2.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/affinityByIssuesAndPRs2.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/authorsWithTheMostPushes.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/authorsWithTheMostPushes.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/authorsWithTheMostPushes.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/authorsWithTheMostPushes.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/countingStar1.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/countingStar1.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/countingStar1.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/countingStar1.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/countingStar2.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/countingStar2.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/countingStar2.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/countingStar2.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/countingStar3.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/countingStar3.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/countingStar3.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/countingStar3.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/distributionOfRepositoriesByStarCount.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/distributionOfRepositoriesByStarCount.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/distributionOfRepositoriesByStarCount.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/distributionOfRepositoriesByStarCount.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/githubRoulette.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/githubRoulette.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/githubRoulette.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/githubRoulette.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears1.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears1.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears1.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears1.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears2.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears2.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears2.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears2.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears3.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears3.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears3.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears3.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears4.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears4.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears4.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears4.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears5.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears5.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears5.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears5.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears6.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears6.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears6.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears6.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears7.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears7.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears7.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears7.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/howHasTheTotalNumberOfStarsChangedOverTime.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/howHasTheTotalNumberOfStarsChangedOverTime.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/howHasTheTotalNumberOfStarsChangedOverTime.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/howHasTheTotalNumberOfStarsChangedOverTime.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/issuesWithTheMostComments1.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/issuesWithTheMostComments1.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/issuesWithTheMostComments1.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/issuesWithTheMostComments1.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/issuesWithTheMostComments2.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/issuesWithTheMostComments2.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/issuesWithTheMostComments2.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/issuesWithTheMostComments2.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/issuesWithTheMostComments3.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/issuesWithTheMostComments3.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/issuesWithTheMostComments3.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/issuesWithTheMostComments3.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/issuesWithTheMostComments4.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/issuesWithTheMostComments4.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/issuesWithTheMostComments4.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/issuesWithTheMostComments4.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/issuesWithTheMostComments5.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/issuesWithTheMostComments5.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/issuesWithTheMostComments5.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/issuesWithTheMostComments5.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/issuesWithTheMostComments6.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/issuesWithTheMostComments6.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/issuesWithTheMostComments6.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/issuesWithTheMostComments6.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/issuesWithTheMostComments7.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/issuesWithTheMostComments7.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/issuesWithTheMostComments7.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/issuesWithTheMostComments7.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/issuesWithTheMostComments8.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/issuesWithTheMostComments8.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/issuesWithTheMostComments8.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/issuesWithTheMostComments8.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/mostForkedRepositories.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/mostForkedRepositories.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/mostForkedRepositories.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/mostForkedRepositories.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/mostPopularCommentsOnGithub.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/mostPopularCommentsOnGithub.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/mostPopularCommentsOnGithub.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/mostPopularCommentsOnGithub.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/organizationsByTheNumberOfRepositories.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/organizationsByTheNumberOfRepositories.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/organizationsByTheNumberOfRepositories.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/organizationsByTheNumberOfRepositories.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/organizationsByTheNumberOfStars.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/organizationsByTheNumberOfStars.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/organizationsByTheNumberOfStars.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/organizationsByTheNumberOfStars.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/organizationsByTheSizeOfCommunity.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/organizationsByTheSizeOfCommunity.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/organizationsByTheSizeOfCommunity.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/organizationsByTheSizeOfCommunity.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks1.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks1.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks1.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks1.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks2.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks2.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks2.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks2.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks3.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks3.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks3.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks3.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks4.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks4.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks4.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks4.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks5.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks5.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks5.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/proportionsBetweenStarsAndForks5.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesByAmountOfModifiedCode.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesByAmountOfModifiedCode.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesByAmountOfModifiedCode.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesByAmountOfModifiedCode.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesByTheNumberOfPushes.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesByTheNumberOfPushes.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesByTheNumberOfPushes.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesByTheNumberOfPushes.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithClickhouse_related_comments1.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithClickhouse_related_comments1.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithClickhouse_related_comments1.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithClickhouse_related_comments1.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithClickhouse_related_comments2.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithClickhouse_related_comments2.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithClickhouse_related_comments2.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithClickhouse_related_comments2.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithDoris_related_comments1.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithDoris_related_comments1.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithDoris_related_comments1.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithDoris_related_comments1.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithDoris_related_comments2.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithDoris_related_comments2.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithDoris_related_comments2.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithDoris_related_comments2.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheHighestGrowthYoY.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheHighestGrowthYoY.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheHighestGrowthYoY.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheHighestGrowthYoY.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues1.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues1.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues1.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues1.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues2.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues2.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues2.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues2.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues3.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues3.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues3.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues3.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues4.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues4.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues4.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfIssues4.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfPullRequests1.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfPullRequests1.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfPullRequests1.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfPullRequests1.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfPullRequests2.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfPullRequests2.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfPullRequests2.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumAmountOfPullRequests2.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumNumberOfAcceptedInvitations.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumNumberOfAcceptedInvitations.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumNumberOfAcceptedInvitations.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheMaximumNumberOfAcceptedInvitations.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMostPeopleWhoHavePushAccess1.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheMostPeopleWhoHavePushAccess1.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMostPeopleWhoHavePushAccess1.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheMostPeopleWhoHavePushAccess1.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMostPeopleWhoHavePushAccess2.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheMostPeopleWhoHavePushAccess2.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMostPeopleWhoHavePushAccess2.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheMostPeopleWhoHavePushAccess2.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMostPeopleWhoHavePushAccess3.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheMostPeopleWhoHavePushAccess3.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMostPeopleWhoHavePushAccess3.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheMostPeopleWhoHavePushAccess3.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMostStarsOverOneDay1.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheMostStarsOverOneDay1.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMostStarsOverOneDay1.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheMostStarsOverOneDay1.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMostStarsOverOneDay2.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheMostStarsOverOneDay2.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMostStarsOverOneDay2.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheMostStarsOverOneDay2.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMostStarsOverOneDay3.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheMostStarsOverOneDay3.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMostStarsOverOneDay3.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheMostStarsOverOneDay3.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMostSteadyGrowthOverTime.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheMostSteadyGrowthOverTime.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheMostSteadyGrowthOverTime.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheMostSteadyGrowthOverTime.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheWorstStagnation_order.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheWorstStagnation_order.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoriesWithTheWorstStagnation_order.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/repositoriesWithTheWorstStagnation_order.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoryAffinityList1.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/repositoryAffinityList1.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoryAffinityList1.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/repositoryAffinityList1.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoryAffinityList2.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/repositoryAffinityList2.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/repositoryAffinityList2.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/repositoryAffinityList2.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/starsFromHeavyGithubUsers1.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/starsFromHeavyGithubUsers1.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/starsFromHeavyGithubUsers1.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/starsFromHeavyGithubUsers1.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/starsFromHeavyGithubUsers2.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/starsFromHeavyGithubUsers2.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/starsFromHeavyGithubUsers2.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/starsFromHeavyGithubUsers2.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/theLongestRepositoryNames1.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/theLongestRepositoryNames1.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/theLongestRepositoryNames1.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/theLongestRepositoryNames1.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/theLongestRepositoryNames2.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/theLongestRepositoryNames2.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/theLongestRepositoryNames2.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/theLongestRepositoryNames2.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/theMostToughCodeReviews.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/theMostToughCodeReviews.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/theMostToughCodeReviews.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/theMostToughCodeReviews.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/theTotalNumberOfRepositoriesOnGithub.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/theTotalNumberOfRepositoriesOnGithub.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/theTotalNumberOfRepositoriesOnGithub.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/theTotalNumberOfRepositoriesOnGithub.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub1.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub1.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub1.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub1.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub2.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub2.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub2.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub2.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub3.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub3.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub3.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub3.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub4.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub4.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub4.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/theTotalNumberOfUsersOnGithub4.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/topLabels1.sql
 b/regression-test/suites/variant_github_events_index_type_p2/sql/topLabels1.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/topLabels1.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/topLabels1.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/topLabels2.sql
 b/regression-test/suites/variant_github_events_index_type_p2/sql/topLabels2.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/topLabels2.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/topLabels2.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/topLabels3.sql
 b/regression-test/suites/variant_github_events_index_type_p2/sql/topLabels3.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/topLabels3.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/topLabels3.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/topRepositoriesByStars.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/topRepositoriesByStars.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/topRepositoriesByStars.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/topRepositoriesByStars.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/whatIsTheBestDayOfTheWeekToCatchAStar.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/whatIsTheBestDayOfTheWeekToCatchAStar.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/whatIsTheBestDayOfTheWeekToCatchAStar.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/whatIsTheBestDayOfTheWeekToCatchAStar.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/whoAreAllThosePeopleGivingStars1.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/whoAreAllThosePeopleGivingStars1.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/whoAreAllThosePeopleGivingStars1.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/whoAreAllThosePeopleGivingStars1.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/whoAreAllThosePeopleGivingStars2.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/whoAreAllThosePeopleGivingStars2.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/whoAreAllThosePeopleGivingStars2.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/whoAreAllThosePeopleGivingStars2.sql
diff --git 
a/regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/whoAreAllThosePeopleGivingStars3.sql
 
b/regression-test/suites/variant_github_events_index_type_p2/sql/whoAreAllThosePeopleGivingStars3.sql
similarity index 100%
rename from 
regression-test/suites/nonConcurrent/variant_github_events_index_type_p2/sql/whoAreAllThosePeopleGivingStars3.sql
rename to 
regression-test/suites/variant_github_events_index_type_p2/sql/whoAreAllThosePeopleGivingStars3.sql
diff --git a/regression-test/suites/variant_p0/delete_update.groovy 
b/regression-test/suites/variant_p0/delete_update.groovy
index 839b796b1f3..89a98cc2a26 100644
--- a/regression-test/suites/variant_p0/delete_update.groovy
+++ b/regression-test/suites/variant_p0/delete_update.groovy
@@ -28,7 +28,7 @@ suite("regression_test_variant_delete_and_update", 
"variant_type"){
         )
         UNIQUE KEY(`k`)
         DISTRIBUTED BY HASH(k) BUCKETS 3
-        properties("replication_num" = "1", "enable_unique_key_merge_on_write" 
= "false", "variant_enable_flatten_nested" = "false");
+        properties("replication_num" = "1", "enable_unique_key_merge_on_write" 
= "false", "variant_enable_flatten_nested" = "true");
     """
     // test mor table
 
diff --git a/regression-test/suites/variant_p0/nested.groovy 
b/regression-test/suites/variant_p0/nested.groovy
index e16f79527c8..82cb3e1018a 100644
--- a/regression-test/suites/variant_p0/nested.groovy
+++ b/regression-test/suites/variant_p0/nested.groovy
@@ -16,10 +16,6 @@
 // under the License.
 
 suite("regression_test_variant_nested", "p0"){
-    def backendId_to_backendIP = [:]
-    def backendId_to_backendHttpPort = [:]
-    getBackendIpHttpPort(backendId_to_backendIP, backendId_to_backendHttpPort);
-
     try {
         def table_name = "var_nested"
         sql "DROP TABLE IF EXISTS ${table_name}"
@@ -119,11 +115,11 @@ 
parallel_pipeline_task_num=7,profile_level=1,enable_pipeline_engine=true,enable_
         qt_sql """select   
/*+SET_VAR(batch_size=4064,broker_load_batch_size=16352,disable_streaming_preaggregations=true,enable_distinct_streaming_aggregation=true,parallel_pipeline_task_num=1,profile_level=1,enable_pipeline_engine=false,enable_parallel_scan=true,parallel_scan_max_scanners_count=48,parallel_scan_min_rows_per_scanner=16384,enable_fold_constant_by_be=true,enable_rewrite_element_at_to_slot=true,runtime_filter_type=12,enable_parallel_result_sink=false,enable_nereids_planner
 [...]
         qt_sql """select v['nested'] from var_nested2 where k < 10 and 
length(v['nested']) > 3 order by k limit 10;"""
         // 0. nomal explode variant array
-        // order_qt_explode_sql """select count(),cast(vv['xx'] as int) from 
var_nested lateral view explode_variant_array(v['nested']) tmp as vv where 
vv['xx'] = 10 group by cast(vv['xx'] as int)"""
+        order_qt_explode_sql """select count(),cast(vv['xx'] as int) from 
var_nested lateral view explode_variant_array(v['nested']) tmp as vv where 
vv['xx'] = 10 group by cast(vv['xx'] as int)"""
         sql """truncate table var_nested2"""
         sql """insert into var_nested2 values(1119111, 
'{"eventId":1,"firstName":"Name1","lastName":"Surname1","body":{"phoneNumbers":[{"number":"5550219210","type":"GSM","callLimit":5},{"number":"02124713252","type":"HOME","callLimit":3},{"number":"05550219211","callLimit":2,"type":"WORK"}]}}
 ')"""
-        // order_qt_explode_sql """select v['eventId'], phone_numbers from 
var_nested2 lateral view explode_variant_array(v['body']['phoneNumbers']) tmp1 
as phone_numbers where phone_numbers['type'] = 'GSM' OR phone_numbers['type'] = 
'HOME' and phone_numbers['callLimit'] > 2;"""
+        order_qt_explode_sql """select v['eventId'], phone_numbers from 
var_nested2 lateral view explode_variant_array(v['body']['phoneNumbers']) tmp1 
as phone_numbers where phone_numbers['type'] = 'GSM' OR phone_numbers['type'] = 
'HOME' and phone_numbers['callLimit'] > 2;"""
 
         // test array_function
         sql "DROP TABLE IF EXISTS var_nested_array_agg"
@@ -155,24 +151,24 @@ 
parallel_pipeline_task_num=7,profile_level=1,enable_pipeline_engine=true,enable_
             """
         sql "insert into var_nested_explode_variant_with_abnomal select * from 
var_nested"
         // 1. v['nested']['x'] is null root
-        // order_qt_explode_sql """select count(),cast(vv as int) from 
var_nested_explode_variant_with_abnomal lateral view 
explode_variant_array(v['nested']['x']) tmp as vv where vv = 10 group by 
cast(vv as int)"""
+        order_qt_explode_sql """select count(),cast(vv as int) from 
var_nested_explode_variant_with_abnomal lateral view 
explode_variant_array(v['nested']['x']) tmp as vv where vv = 10 group by 
cast(vv as int)"""
         // 2. v['nested']['xx'] is normal array
-        // order_qt_explode_sql """select count(),cast(vv as int) from 
var_nested_explode_variant_with_abnomal lateral view 
explode_variant_array(v['nested']['xx']) tmp as vv where vv = 10 group by 
cast(vv as int)"""
+        order_qt_explode_sql """select count(),cast(vv as int) from 
var_nested_explode_variant_with_abnomal lateral view 
explode_variant_array(v['nested']['xx']) tmp as vv where vv = 10 group by 
cast(vv as int)"""
         // 3. v['xx'] is none array scalar type 
-        // test {
-        //     sql """select count(),cast(vv as int) from 
var_nested_explode_variant_with_abnomal lateral view 
explode_variant_array(v['xx']) tmp as vv where vv = 10 group by cast(vv as 
int)"""
-        //     exception("explode not support none array type")
-        // }
+        test {
+            sql """select count(),cast(vv as int) from 
var_nested_explode_variant_with_abnomal lateral view 
explode_variant_array(v['xx']) tmp as vv where vv = 10 group by cast(vv as 
int)"""
+            exception("explode not support none array type")
+        }
         // // 4. v['k1'] is json scalar type 
-        // test {
-        //     sql """select count(),cast(vv as int) from 
var_nested_explode_variant_with_abnomal lateral view 
explode_variant_array(v['k1']) tmp as vv where vv = 10 group by cast(vv as 
int)"""
-        //     exception("explode not support none array type")
-        // }
+        test {
+            sql """select count(),cast(vv as int) from 
var_nested_explode_variant_with_abnomal lateral view 
explode_variant_array(v['k1']) tmp as vv where vv = 10 group by cast(vv as 
int)"""
+            exception("explode not support none array type")
+        }
         // 5. toplevel nested array
         sql "truncate table var_nested_explode_variant_with_abnomal"
         sql """insert into var_nested_explode_variant_with_abnomal values(1, 
'[{"a" : 10}, {"b" : "20", "c" :1024, "a" : 11}]')"""
         sql """insert into var_nested_explode_variant_with_abnomal values(2, 
'[{"a" : 10}, {"b" : "20", "a" : 150}]')"""
-        // order_qt_explode_sql """select count(),cast(vv as int) from 
var_nested_explode_variant_with_abnomal lateral view 
explode_variant_array(v['a']) tmp as vv where vv = 10 group by cast(vv as 
int)"""
+        order_qt_explode_sql """select count(),cast(vv as int) from 
var_nested_explode_variant_with_abnomal lateral view 
explode_variant_array(v['a']) tmp as vv where vv = 10 group by cast(vv as 
int)"""
         // FIXME after refator
         // order_qt_explode_sql """select count(),cast(vv as int) from 
var_nested_explode_variant_with_abnomal lateral view explode_variant_array(v) 
tmp as vv where vv['a'] = 10 group by cast(vv as int)"""
     } finally {
diff --git 
a/regression-test/suites/variant_p0/schema_change/test_double_write_when_schema_change.groovy
 
b/regression-test/suites/variant_p0/schema_change/test_double_write_when_schema_change.groovy
index 151c6c67227..5c9d85fb8ed 100644
--- 
a/regression-test/suites/variant_p0/schema_change/test_double_write_when_schema_change.groovy
+++ 
b/regression-test/suites/variant_p0/schema_change/test_double_write_when_schema_change.groovy
@@ -66,7 +66,7 @@ suite("double_write_schema_change_with_variant", 
"nonConcurrent") {
         )
         DUPLICATE KEY(`k`)
         DISTRIBUTED BY HASH(k) BUCKETS 2
-        properties("replication_num" = "1", "disable_auto_compaction" = 
"false", "variant_enable_flatten_nested" = "false");
+        properties("replication_num" = "1", "disable_auto_compaction" = 
"false", "variant_enable_flatten_nested" = "true");
     """
 
     set_be_config.call("memory_limitation_per_thread_for_schema_change_bytes", 
"6294967296")
diff --git a/regression-test/suites/variant_p1/predefine/load.groovy 
b/regression-test/suites/variant_p1/predefine/load.groovy
index 313fe4826ef..6143b723d07 100644
--- a/regression-test/suites/variant_p1/predefine/load.groovy
+++ b/regression-test/suites/variant_p1/predefine/load.groovy
@@ -73,7 +73,7 @@ suite("test_predefine_type_multi_index", "p1"){
         )
         DUPLICATE KEY(`k`)
         DISTRIBUTED BY HASH(k) BUCKETS 4 
-        properties("replication_num" = "1", "disable_auto_compaction" = 
"true", "variant_enable_flatten_nested" = "false", 
"variant_max_subcolumns_count" = "${rand_subcolumns_count}");
+        properties("replication_num" = "1", "disable_auto_compaction" = 
"true", "variant_enable_flatten_nested" = "true", 
"variant_max_subcolumns_count" = "${rand_subcolumns_count}");
     """
 
     // 2015


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

(doris) branch branch-3.1 updated: branch-3.1 [Fix](Variant) fix explode table function with variant type (#52713)

Reply via email to