You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by el...@apache.org on 2024/07/18 08:46:01 UTC
(doris) branch branch-3.0 updated: [Pick](Variant) fix heap use after free and optimize cases (#38039)
This is an automated email from the ASF dual-hosted git repository.
eldenmoon pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new a9c27c792a8 [Pick](Variant) fix heap use after free and optimize cases (#38039)
a9c27c792a8 is described below
commit a9c27c792a88cbcc3cba9e0a66089ada105cd7ca
Author: lihangyu <15...@163.com>
AuthorDate: Thu Jul 18 16:45:53 2024 +0800
[Pick](Variant) fix heap use after free and optimize cases (#38039)
https://github.com/apache/doris/pull/37991
https://github.com/apache/doris/pull/37976
---
.../rowset/segment_v2/vertical_segment_writer.cpp | 4 +-
.../load.out | 0
.../sql}/affinityByIssuesAndPRs1.out | 0
.../sql}/affinityByIssuesAndPRs2.out | 0
.../sql}/authorsWithTheMostPushes.out | 0
.../sql}/countingStar1.out | 0
.../sql}/countingStar2.out | 0
.../sql}/countingStar3.out | 0
.../sql}/distributionOfRepositoriesByStarCount.out | 0
.../sql}/githubRoulette.out | 0
...heListOfTopRepositoriesChangedOverTheYears1.out | 0
...heListOfTopRepositoriesChangedOverTheYears2.out | 0
...heListOfTopRepositoriesChangedOverTheYears3.out | 0
...heListOfTopRepositoriesChangedOverTheYears4.out | 0
...heListOfTopRepositoriesChangedOverTheYears5.out | 0
...heListOfTopRepositoriesChangedOverTheYears6.out | 0
.../howHasTheTotalNumberOfStarsChangedOverTime.out | 0
.../sql}/issuesWithTheMostComments1.out | 0
.../sql}/issuesWithTheMostComments2.out | 0
.../sql}/issuesWithTheMostComments3.out | 0
.../sql}/issuesWithTheMostComments4.out | 0
.../sql}/issuesWithTheMostComments5.out | 0
.../sql}/issuesWithTheMostComments6.out | 0
.../sql}/issuesWithTheMostComments7.out | 0
.../sql}/mostForkedRepositories.out | 0
.../sql}/mostPopularCommentsOnGithub.out | 0
.../organizationsByTheNumberOfRepositories.out | 0
.../sql}/organizationsByTheNumberOfStars.out | 0
.../sql}/proportionsBetweenStarsAndForks1.out | 0
.../sql}/proportionsBetweenStarsAndForks2.out | 0
.../sql}/proportionsBetweenStarsAndForks3.out | 0
.../sql}/proportionsBetweenStarsAndForks4.out | 0
.../sql}/proportionsBetweenStarsAndForks5.out | 0
.../sql}/repositoriesByAmountOfModifiedCode.out | 0
.../sql}/repositoriesByTheNumberOfPushes.out | 0
...epositoriesWithClickhouse_related_comments1.out | 0
...epositoriesWithClickhouse_related_comments2.out | 0
.../repositoriesWithDoris_related_comments1.out | 0
.../repositoriesWithDoris_related_comments2.out | 0
.../sql}/repositoriesWithTheHighestGrowthYoY.out | 0
.../repositoriesWithTheMaximumAmountOfIssues1.out | 0
.../repositoriesWithTheMaximumAmountOfIssues2.out | 0
.../repositoriesWithTheMaximumAmountOfIssues3.out | 0
.../repositoriesWithTheMaximumAmountOfIssues4.out | 0
...sitoriesWithTheMaximumAmountOfPullRequests1.out | 0
...sitoriesWithTheMaximumAmountOfPullRequests2.out | 0
...esWithTheMaximumNumberOfAcceptedInvitations.out | 0
...sitoriesWithTheMostPeopleWhoHavePushAccess1.out | 0
.../repositoriesWithTheMostStarsOverOneDay1.out | 0
...repositoriesWithTheMostSteadyGrowthOverTime.out | 0
.../repositoriesWithTheWorstStagnation_order.out | 0
.../sql}/repositoryAffinityList1.out | 0
.../sql}/repositoryAffinityList2.out | 0
.../sql}/starsFromHeavyGithubUsers1.out | 0
.../sql}/starsFromHeavyGithubUsers2.out | 0
.../sql/test_distinct_streaming_agg.out | 0
.../sql}/theLongestRepositoryNames1.out | 0
.../sql}/theLongestRepositoryNames2.out | 0
.../sql}/theMostToughCodeReviews.out | 0
.../sql}/theTotalNumberOfRepositoriesOnGithub.out | 0
.../sql}/theTotalNumberOfUsersOnGithub1.out | 0
.../sql}/theTotalNumberOfUsersOnGithub2.out | 0
.../sql}/theTotalNumberOfUsersOnGithub3.out | 0
.../sql}/theTotalNumberOfUsersOnGithub4.out | 0
.../sql}/topRepositoriesByStars.out | 0
.../sql}/whatIsTheBestDayOfTheWeekToCatchAStar.out | 0
.../sql}/whoAreAllThosePeopleGivingStars1.out | 0
.../sql}/whoAreAllThosePeopleGivingStars2.out | 0
.../sql}/whoAreAllThosePeopleGivingStars3.out | 0
.../affinityByIssuesAndPRs1.out | 0
.../affinityByIssuesAndPRs2.out | 0
.../authorsWithTheMostPushes.out | 0
.../countingStar1.out | 0
.../countingStar2.out | 0
.../countingStar3.out | 0
.../distributionOfRepositoriesByStarCount.out | 0
.../githubRoulette.out | 0
...heListOfTopRepositoriesChangedOverTheYears1.out | 0
...heListOfTopRepositoriesChangedOverTheYears2.out | 0
...heListOfTopRepositoriesChangedOverTheYears3.out | 0
...heListOfTopRepositoriesChangedOverTheYears4.out | 0
...heListOfTopRepositoriesChangedOverTheYears5.out | 0
...heListOfTopRepositoriesChangedOverTheYears6.out | 0
.../howHasTheTotalNumberOfStarsChangedOverTime.out | 0
.../issuesWithTheMostComments1.out | 0
.../issuesWithTheMostComments2.out | 0
.../issuesWithTheMostComments3.out | 0
.../issuesWithTheMostComments4.out | 0
.../issuesWithTheMostComments5.out | 0
.../issuesWithTheMostComments6.out | 0
.../issuesWithTheMostComments7.out | 0
.../load.out | 0
.../mostForkedRepositories.out | 0
.../mostPopularCommentsOnGithub.out | 0
.../organizationsByTheNumberOfRepositories.out | 0
.../organizationsByTheNumberOfStars.out | 0
.../proportionsBetweenStarsAndForks1.out | 0
.../proportionsBetweenStarsAndForks2.out | 0
.../proportionsBetweenStarsAndForks3.out | 0
.../proportionsBetweenStarsAndForks4.out | 0
.../proportionsBetweenStarsAndForks5.out | 0
.../repositoriesByAmountOfModifiedCode.out | 0
.../repositoriesByTheNumberOfPushes.out | 0
...epositoriesWithClickhouse_related_comments1.out | 0
...epositoriesWithClickhouse_related_comments2.out | 0
.../repositoriesWithDoris_related_comments1.out | 0
.../repositoriesWithDoris_related_comments2.out | 0
.../repositoriesWithTheHighestGrowthYoY.out | 0
.../repositoriesWithTheMaximumAmountOfIssues1.out | 0
.../repositoriesWithTheMaximumAmountOfIssues2.out | 0
.../repositoriesWithTheMaximumAmountOfIssues3.out | 0
.../repositoriesWithTheMaximumAmountOfIssues4.out | 0
...sitoriesWithTheMaximumAmountOfPullRequests1.out | 0
...sitoriesWithTheMaximumAmountOfPullRequests2.out | 0
...esWithTheMaximumNumberOfAcceptedInvitations.out | 0
...sitoriesWithTheMostPeopleWhoHavePushAccess1.out | 0
.../repositoriesWithTheMostStarsOverOneDay1.out | 0
...repositoriesWithTheMostSteadyGrowthOverTime.out | 0
.../repositoriesWithTheWorstStagnation_order.out | 0
.../repositoryAffinityList1.out | 0
.../repositoryAffinityList2.out | 0
.../starsFromHeavyGithubUsers1.out | 0
.../starsFromHeavyGithubUsers2.out | 0
.../theLongestRepositoryNames1.out | 0
.../theLongestRepositoryNames2.out | 0
.../theMostToughCodeReviews.out | 0
.../theTotalNumberOfRepositoriesOnGithub.out | 0
.../theTotalNumberOfUsersOnGithub1.out | 0
.../theTotalNumberOfUsersOnGithub2.out | 0
.../theTotalNumberOfUsersOnGithub3.out | 0
.../theTotalNumberOfUsersOnGithub4.out | 0
.../topRepositoriesByStars.out | 0
.../whatIsTheBestDayOfTheWeekToCatchAStar.out | 0
.../whoAreAllThosePeopleGivingStars1.out | 0
.../whoAreAllThosePeopleGivingStars2.out | 0
.../whoAreAllThosePeopleGivingStars3.out | 0
regression-test/data/variant_log_data_p2/load.out | 20 ++
regression-test/data/variant_p0/load.out | 21 +-
regression-test/data/variant_p0/mv/multi_slot.out | 15 --
.../test_double_write_when_schema_change.out | 12 -
.../data/variant_p0/tpch/sql/q01_trans.out | 8 +-
.../data/variant_p0/tpch/sql/q05_trans.out | 8 +-
.../data/variant_p0/tpch/sql/q06_trans.out | 2 +-
.../data/variant_p0/tpch/sql/q08_trans.out | 2 +-
.../data/variant_p0/tpch/sql/q09_trans.out | 298 ++++++++++-----------
.../data/variant_p0/tpch/sql/q10_trans.out | 22 +-
.../load.groovy | 2 +-
.../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/test_distinct_streaming_agg.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
.../affinityByIssuesAndPRs1.sql | 0
.../affinityByIssuesAndPRs2.sql | 0
.../authorsWithTheMostPushes.sql | 0
.../countingStar1.sql | 0
.../countingStar2.sql | 0
.../countingStar3.sql | 0
.../distributionOfRepositoriesByStarCount.sql | 0
.../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
.../issuesWithTheMostComments1.sql | 0
.../issuesWithTheMostComments2.sql | 0
.../issuesWithTheMostComments3.sql | 0
.../issuesWithTheMostComments4.sql | 0
.../issuesWithTheMostComments5.sql | 0
.../issuesWithTheMostComments6.sql | 0
.../issuesWithTheMostComments7.sql | 0
.../issuesWithTheMostComments8.sql | 0
.../load.groovy | 2 +-
.../mostForkedRepositories.sql | 0
.../mostPopularCommentsOnGithub.sql | 0
.../organizationsByTheNumberOfRepositories.sql | 0
.../organizationsByTheNumberOfStars.sql | 0
.../organizationsByTheSizeOfCommunity.sql | 0
.../proportionsBetweenStarsAndForks1.sql | 0
.../proportionsBetweenStarsAndForks2.sql | 0
.../proportionsBetweenStarsAndForks3.sql | 0
.../proportionsBetweenStarsAndForks4.sql | 0
.../proportionsBetweenStarsAndForks5.sql | 0
.../repositoriesByAmountOfModifiedCode.sql | 0
.../repositoriesByTheNumberOfPushes.sql | 0
...epositoriesWithClickhouse_related_comments1.sql | 0
...epositoriesWithClickhouse_related_comments2.sql | 0
.../repositoriesWithDoris_related_comments1.sql | 0
.../repositoriesWithDoris_related_comments2.sql | 0
.../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
.../repositoryAffinityList1.sql | 0
.../repositoryAffinityList2.sql | 0
.../starsFromHeavyGithubUsers1.sql | 0
.../starsFromHeavyGithubUsers2.sql | 0
.../theLongestRepositoryNames1.sql | 0
.../theLongestRepositoryNames2.sql | 0
.../theMostToughCodeReviews.sql | 0
.../theTotalNumberOfRepositoriesOnGithub.sql | 0
.../theTotalNumberOfUsersOnGithub1.sql | 0
.../theTotalNumberOfUsersOnGithub2.sql | 0
.../theTotalNumberOfUsersOnGithub3.sql | 0
.../theTotalNumberOfUsersOnGithub4.sql | 0
.../topLabels1.sql | 0
.../topLabels2.sql | 0
.../topLabels3.sql | 0
.../topRepositoriesByStars.sql | 0
.../whatIsTheBestDayOfTheWeekToCatchAStar.sql | 0
.../whoAreAllThosePeopleGivingStars1.sql | 0
.../whoAreAllThosePeopleGivingStars2.sql | 0
.../whoAreAllThosePeopleGivingStars3.sql | 0
.../suites/variant_log_data_p2/load.groovy | 98 +++++++
.../variant_p0/compaction_sparse_column.groovy | 3 +
regression-test/suites/variant_p0/load.groovy | 39 +--
regression-test/suites/variant_p0/mtmv.groovy | 2 +-
regression-test/suites/variant_p2/load.groovy | 2 +-
306 files changed, 301 insertions(+), 259 deletions(-)
diff --git a/be/src/olap/rowset/segment_v2/vertical_segment_writer.cpp b/be/src/olap/rowset/segment_v2/vertical_segment_writer.cpp
index 92ac65deb6d..0307a53d740 100644
--- a/be/src/olap/rowset/segment_v2/vertical_segment_writer.cpp
+++ b/be/src/olap/rowset/segment_v2/vertical_segment_writer.cpp
@@ -712,7 +712,9 @@ Status VerticalSegmentWriter::_append_block_with_variant_subcolumns(RowsInBlock&
continue;
}
if (_flush_schema == nullptr) {
- _flush_schema = std::make_shared<TabletSchema>(*_tablet_schema);
+ _flush_schema = std::make_shared<TabletSchema>();
+ // deep copy
+ _flush_schema->copy_from(*_tablet_schema);
}
auto column_ref = data.block->get_by_position(i).column;
const vectorized::ColumnObject& object_column = assert_cast<vectorized::ColumnObject&>(
diff --git a/regression-test/data/variant_github_events_p0_new/load.out b/regression-test/data/variant_github_events_new_p2/load.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/load.out
rename to regression-test/data/variant_github_events_new_p2/load.out
diff --git a/regression-test/data/variant_github_events_p0/affinityByIssuesAndPRs1.out b/regression-test/data/variant_github_events_new_p2/sql/affinityByIssuesAndPRs1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/affinityByIssuesAndPRs1.out
rename to regression-test/data/variant_github_events_new_p2/sql/affinityByIssuesAndPRs1.out
diff --git a/regression-test/data/variant_github_events_p0/affinityByIssuesAndPRs2.out b/regression-test/data/variant_github_events_new_p2/sql/affinityByIssuesAndPRs2.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/affinityByIssuesAndPRs2.out
rename to regression-test/data/variant_github_events_new_p2/sql/affinityByIssuesAndPRs2.out
diff --git a/regression-test/data/variant_github_events_p0/authorsWithTheMostPushes.out b/regression-test/data/variant_github_events_new_p2/sql/authorsWithTheMostPushes.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/authorsWithTheMostPushes.out
rename to regression-test/data/variant_github_events_new_p2/sql/authorsWithTheMostPushes.out
diff --git a/regression-test/data/variant_github_events_p0/countingStar1.out b/regression-test/data/variant_github_events_new_p2/sql/countingStar1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/countingStar1.out
rename to regression-test/data/variant_github_events_new_p2/sql/countingStar1.out
diff --git a/regression-test/data/variant_github_events_p0/countingStar2.out b/regression-test/data/variant_github_events_new_p2/sql/countingStar2.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/countingStar2.out
rename to regression-test/data/variant_github_events_new_p2/sql/countingStar2.out
diff --git a/regression-test/data/variant_github_events_p0/countingStar3.out b/regression-test/data/variant_github_events_new_p2/sql/countingStar3.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/countingStar3.out
rename to regression-test/data/variant_github_events_new_p2/sql/countingStar3.out
diff --git a/regression-test/data/variant_github_events_p0/distributionOfRepositoriesByStarCount.out b/regression-test/data/variant_github_events_new_p2/sql/distributionOfRepositoriesByStarCount.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/distributionOfRepositoriesByStarCount.out
rename to regression-test/data/variant_github_events_new_p2/sql/distributionOfRepositoriesByStarCount.out
diff --git a/regression-test/data/variant_github_events_p0/githubRoulette.out b/regression-test/data/variant_github_events_new_p2/sql/githubRoulette.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/githubRoulette.out
rename to regression-test/data/variant_github_events_new_p2/sql/githubRoulette.out
diff --git a/regression-test/data/variant_github_events_p0/howHasTheListOfTopRepositoriesChangedOverTheYears1.out b/regression-test/data/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/howHasTheListOfTopRepositoriesChangedOverTheYears1.out
rename to regression-test/data/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears1.out
diff --git a/regression-test/data/variant_github_events_p0/howHasTheListOfTopRepositoriesChangedOverTheYears2.out b/regression-test/data/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears2.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/howHasTheListOfTopRepositoriesChangedOverTheYears2.out
rename to regression-test/data/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears2.out
diff --git a/regression-test/data/variant_github_events_p0/howHasTheListOfTopRepositoriesChangedOverTheYears3.out b/regression-test/data/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears3.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/howHasTheListOfTopRepositoriesChangedOverTheYears3.out
rename to regression-test/data/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears3.out
diff --git a/regression-test/data/variant_github_events_p0/howHasTheListOfTopRepositoriesChangedOverTheYears4.out b/regression-test/data/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears4.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/howHasTheListOfTopRepositoriesChangedOverTheYears4.out
rename to regression-test/data/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears4.out
diff --git a/regression-test/data/variant_github_events_p0/howHasTheListOfTopRepositoriesChangedOverTheYears5.out b/regression-test/data/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears5.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/howHasTheListOfTopRepositoriesChangedOverTheYears5.out
rename to regression-test/data/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears5.out
diff --git a/regression-test/data/variant_github_events_p0/howHasTheListOfTopRepositoriesChangedOverTheYears6.out b/regression-test/data/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears6.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/howHasTheListOfTopRepositoriesChangedOverTheYears6.out
rename to regression-test/data/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears6.out
diff --git a/regression-test/data/variant_github_events_p0/howHasTheTotalNumberOfStarsChangedOverTime.out b/regression-test/data/variant_github_events_new_p2/sql/howHasTheTotalNumberOfStarsChangedOverTime.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/howHasTheTotalNumberOfStarsChangedOverTime.out
rename to regression-test/data/variant_github_events_new_p2/sql/howHasTheTotalNumberOfStarsChangedOverTime.out
diff --git a/regression-test/data/variant_github_events_p0/issuesWithTheMostComments1.out b/regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/issuesWithTheMostComments1.out
rename to regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments1.out
diff --git a/regression-test/data/variant_github_events_p0/issuesWithTheMostComments2.out b/regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments2.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/issuesWithTheMostComments2.out
rename to regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments2.out
diff --git a/regression-test/data/variant_github_events_p0/issuesWithTheMostComments3.out b/regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments3.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/issuesWithTheMostComments3.out
rename to regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments3.out
diff --git a/regression-test/data/variant_github_events_p0/issuesWithTheMostComments4.out b/regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments4.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/issuesWithTheMostComments4.out
rename to regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments4.out
diff --git a/regression-test/data/variant_github_events_p0/issuesWithTheMostComments5.out b/regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments5.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/issuesWithTheMostComments5.out
rename to regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments5.out
diff --git a/regression-test/data/variant_github_events_p0/issuesWithTheMostComments6.out b/regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments6.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/issuesWithTheMostComments6.out
rename to regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments6.out
diff --git a/regression-test/data/variant_github_events_p0/issuesWithTheMostComments7.out b/regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments7.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/issuesWithTheMostComments7.out
rename to regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments7.out
diff --git a/regression-test/data/variant_github_events_p0/mostForkedRepositories.out b/regression-test/data/variant_github_events_new_p2/sql/mostForkedRepositories.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/mostForkedRepositories.out
rename to regression-test/data/variant_github_events_new_p2/sql/mostForkedRepositories.out
diff --git a/regression-test/data/variant_github_events_p0/mostPopularCommentsOnGithub.out b/regression-test/data/variant_github_events_new_p2/sql/mostPopularCommentsOnGithub.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/mostPopularCommentsOnGithub.out
rename to regression-test/data/variant_github_events_new_p2/sql/mostPopularCommentsOnGithub.out
diff --git a/regression-test/data/variant_github_events_p0/organizationsByTheNumberOfRepositories.out b/regression-test/data/variant_github_events_new_p2/sql/organizationsByTheNumberOfRepositories.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/organizationsByTheNumberOfRepositories.out
rename to regression-test/data/variant_github_events_new_p2/sql/organizationsByTheNumberOfRepositories.out
diff --git a/regression-test/data/variant_github_events_p0/organizationsByTheNumberOfStars.out b/regression-test/data/variant_github_events_new_p2/sql/organizationsByTheNumberOfStars.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/organizationsByTheNumberOfStars.out
rename to regression-test/data/variant_github_events_new_p2/sql/organizationsByTheNumberOfStars.out
diff --git a/regression-test/data/variant_github_events_p0/proportionsBetweenStarsAndForks1.out b/regression-test/data/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/proportionsBetweenStarsAndForks1.out
rename to regression-test/data/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks1.out
diff --git a/regression-test/data/variant_github_events_p0/proportionsBetweenStarsAndForks2.out b/regression-test/data/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks2.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/proportionsBetweenStarsAndForks2.out
rename to regression-test/data/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks2.out
diff --git a/regression-test/data/variant_github_events_p0/proportionsBetweenStarsAndForks3.out b/regression-test/data/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks3.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/proportionsBetweenStarsAndForks3.out
rename to regression-test/data/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks3.out
diff --git a/regression-test/data/variant_github_events_p0/proportionsBetweenStarsAndForks4.out b/regression-test/data/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks4.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/proportionsBetweenStarsAndForks4.out
rename to regression-test/data/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks4.out
diff --git a/regression-test/data/variant_github_events_p0/proportionsBetweenStarsAndForks5.out b/regression-test/data/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks5.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/proportionsBetweenStarsAndForks5.out
rename to regression-test/data/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks5.out
diff --git a/regression-test/data/variant_github_events_p0/repositoriesByAmountOfModifiedCode.out b/regression-test/data/variant_github_events_new_p2/sql/repositoriesByAmountOfModifiedCode.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/repositoriesByAmountOfModifiedCode.out
rename to regression-test/data/variant_github_events_new_p2/sql/repositoriesByAmountOfModifiedCode.out
diff --git a/regression-test/data/variant_github_events_p0/repositoriesByTheNumberOfPushes.out b/regression-test/data/variant_github_events_new_p2/sql/repositoriesByTheNumberOfPushes.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/repositoriesByTheNumberOfPushes.out
rename to regression-test/data/variant_github_events_new_p2/sql/repositoriesByTheNumberOfPushes.out
diff --git a/regression-test/data/variant_github_events_p0/repositoriesWithClickhouse_related_comments1.out b/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithClickhouse_related_comments1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/repositoriesWithClickhouse_related_comments1.out
rename to regression-test/data/variant_github_events_new_p2/sql/repositoriesWithClickhouse_related_comments1.out
diff --git a/regression-test/data/variant_github_events_p0/repositoriesWithClickhouse_related_comments2.out b/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithClickhouse_related_comments2.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/repositoriesWithClickhouse_related_comments2.out
rename to regression-test/data/variant_github_events_new_p2/sql/repositoriesWithClickhouse_related_comments2.out
diff --git a/regression-test/data/variant_github_events_p0/repositoriesWithDoris_related_comments1.out b/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithDoris_related_comments1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/repositoriesWithDoris_related_comments1.out
rename to regression-test/data/variant_github_events_new_p2/sql/repositoriesWithDoris_related_comments1.out
diff --git a/regression-test/data/variant_github_events_p0/repositoriesWithDoris_related_comments2.out b/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithDoris_related_comments2.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/repositoriesWithDoris_related_comments2.out
rename to regression-test/data/variant_github_events_new_p2/sql/repositoriesWithDoris_related_comments2.out
diff --git a/regression-test/data/variant_github_events_p0/repositoriesWithTheHighestGrowthYoY.out b/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheHighestGrowthYoY.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/repositoriesWithTheHighestGrowthYoY.out
rename to regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheHighestGrowthYoY.out
diff --git a/regression-test/data/variant_github_events_p0/repositoriesWithTheMaximumAmountOfIssues1.out b/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfIssues1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/repositoriesWithTheMaximumAmountOfIssues1.out
rename to regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfIssues1.out
diff --git a/regression-test/data/variant_github_events_p0/repositoriesWithTheMaximumAmountOfIssues2.out b/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfIssues2.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/repositoriesWithTheMaximumAmountOfIssues2.out
rename to regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfIssues2.out
diff --git a/regression-test/data/variant_github_events_p0/repositoriesWithTheMaximumAmountOfIssues3.out b/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfIssues3.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/repositoriesWithTheMaximumAmountOfIssues3.out
rename to regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfIssues3.out
diff --git a/regression-test/data/variant_github_events_p0/repositoriesWithTheMaximumAmountOfIssues4.out b/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfIssues4.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/repositoriesWithTheMaximumAmountOfIssues4.out
rename to regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfIssues4.out
diff --git a/regression-test/data/variant_github_events_p0/repositoriesWithTheMaximumAmountOfPullRequests1.out b/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfPullRequests1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/repositoriesWithTheMaximumAmountOfPullRequests1.out
rename to regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfPullRequests1.out
diff --git a/regression-test/data/variant_github_events_p0/repositoriesWithTheMaximumAmountOfPullRequests2.out b/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfPullRequests2.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/repositoriesWithTheMaximumAmountOfPullRequests2.out
rename to regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfPullRequests2.out
diff --git a/regression-test/data/variant_github_events_p0/repositoriesWithTheMaximumNumberOfAcceptedInvitations.out b/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumNumberOfAcceptedInvitations.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/repositoriesWithTheMaximumNumberOfAcceptedInvitations.out
rename to regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumNumberOfAcceptedInvitations.out
diff --git a/regression-test/data/variant_github_events_p0/repositoriesWithTheMostPeopleWhoHavePushAccess1.out b/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMostPeopleWhoHavePushAccess1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/repositoriesWithTheMostPeopleWhoHavePushAccess1.out
rename to regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMostPeopleWhoHavePushAccess1.out
diff --git a/regression-test/data/variant_github_events_p0/repositoriesWithTheMostStarsOverOneDay1.out b/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMostStarsOverOneDay1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/repositoriesWithTheMostStarsOverOneDay1.out
rename to regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMostStarsOverOneDay1.out
diff --git a/regression-test/data/variant_github_events_p0/repositoriesWithTheMostSteadyGrowthOverTime.out b/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMostSteadyGrowthOverTime.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/repositoriesWithTheMostSteadyGrowthOverTime.out
rename to regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMostSteadyGrowthOverTime.out
diff --git a/regression-test/data/variant_github_events_p0/repositoriesWithTheWorstStagnation_order.out b/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheWorstStagnation_order.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/repositoriesWithTheWorstStagnation_order.out
rename to regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheWorstStagnation_order.out
diff --git a/regression-test/data/variant_github_events_p0/repositoryAffinityList1.out b/regression-test/data/variant_github_events_new_p2/sql/repositoryAffinityList1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/repositoryAffinityList1.out
rename to regression-test/data/variant_github_events_new_p2/sql/repositoryAffinityList1.out
diff --git a/regression-test/data/variant_github_events_p0/repositoryAffinityList2.out b/regression-test/data/variant_github_events_new_p2/sql/repositoryAffinityList2.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/repositoryAffinityList2.out
rename to regression-test/data/variant_github_events_new_p2/sql/repositoryAffinityList2.out
diff --git a/regression-test/data/variant_github_events_p0/starsFromHeavyGithubUsers1.out b/regression-test/data/variant_github_events_new_p2/sql/starsFromHeavyGithubUsers1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/starsFromHeavyGithubUsers1.out
rename to regression-test/data/variant_github_events_new_p2/sql/starsFromHeavyGithubUsers1.out
diff --git a/regression-test/data/variant_github_events_p0/starsFromHeavyGithubUsers2.out b/regression-test/data/variant_github_events_new_p2/sql/starsFromHeavyGithubUsers2.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/starsFromHeavyGithubUsers2.out
rename to regression-test/data/variant_github_events_new_p2/sql/starsFromHeavyGithubUsers2.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/test_distinct_streaming_agg.out b/regression-test/data/variant_github_events_new_p2/sql/test_distinct_streaming_agg.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/test_distinct_streaming_agg.out
rename to regression-test/data/variant_github_events_new_p2/sql/test_distinct_streaming_agg.out
diff --git a/regression-test/data/variant_github_events_p0/theLongestRepositoryNames1.out b/regression-test/data/variant_github_events_new_p2/sql/theLongestRepositoryNames1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/theLongestRepositoryNames1.out
rename to regression-test/data/variant_github_events_new_p2/sql/theLongestRepositoryNames1.out
diff --git a/regression-test/data/variant_github_events_p0/theLongestRepositoryNames2.out b/regression-test/data/variant_github_events_new_p2/sql/theLongestRepositoryNames2.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/theLongestRepositoryNames2.out
rename to regression-test/data/variant_github_events_new_p2/sql/theLongestRepositoryNames2.out
diff --git a/regression-test/data/variant_github_events_p0/theMostToughCodeReviews.out b/regression-test/data/variant_github_events_new_p2/sql/theMostToughCodeReviews.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/theMostToughCodeReviews.out
rename to regression-test/data/variant_github_events_new_p2/sql/theMostToughCodeReviews.out
diff --git a/regression-test/data/variant_github_events_p0/theTotalNumberOfRepositoriesOnGithub.out b/regression-test/data/variant_github_events_new_p2/sql/theTotalNumberOfRepositoriesOnGithub.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/theTotalNumberOfRepositoriesOnGithub.out
rename to regression-test/data/variant_github_events_new_p2/sql/theTotalNumberOfRepositoriesOnGithub.out
diff --git a/regression-test/data/variant_github_events_p0/theTotalNumberOfUsersOnGithub1.out b/regression-test/data/variant_github_events_new_p2/sql/theTotalNumberOfUsersOnGithub1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/theTotalNumberOfUsersOnGithub1.out
rename to regression-test/data/variant_github_events_new_p2/sql/theTotalNumberOfUsersOnGithub1.out
diff --git a/regression-test/data/variant_github_events_p0/theTotalNumberOfUsersOnGithub2.out b/regression-test/data/variant_github_events_new_p2/sql/theTotalNumberOfUsersOnGithub2.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/theTotalNumberOfUsersOnGithub2.out
rename to regression-test/data/variant_github_events_new_p2/sql/theTotalNumberOfUsersOnGithub2.out
diff --git a/regression-test/data/variant_github_events_p0/theTotalNumberOfUsersOnGithub3.out b/regression-test/data/variant_github_events_new_p2/sql/theTotalNumberOfUsersOnGithub3.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/theTotalNumberOfUsersOnGithub3.out
rename to regression-test/data/variant_github_events_new_p2/sql/theTotalNumberOfUsersOnGithub3.out
diff --git a/regression-test/data/variant_github_events_p0/theTotalNumberOfUsersOnGithub4.out b/regression-test/data/variant_github_events_new_p2/sql/theTotalNumberOfUsersOnGithub4.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/theTotalNumberOfUsersOnGithub4.out
rename to regression-test/data/variant_github_events_new_p2/sql/theTotalNumberOfUsersOnGithub4.out
diff --git a/regression-test/data/variant_github_events_p0/topRepositoriesByStars.out b/regression-test/data/variant_github_events_new_p2/sql/topRepositoriesByStars.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/topRepositoriesByStars.out
rename to regression-test/data/variant_github_events_new_p2/sql/topRepositoriesByStars.out
diff --git a/regression-test/data/variant_github_events_p0/whatIsTheBestDayOfTheWeekToCatchAStar.out b/regression-test/data/variant_github_events_new_p2/sql/whatIsTheBestDayOfTheWeekToCatchAStar.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/whatIsTheBestDayOfTheWeekToCatchAStar.out
rename to regression-test/data/variant_github_events_new_p2/sql/whatIsTheBestDayOfTheWeekToCatchAStar.out
diff --git a/regression-test/data/variant_github_events_p0/whoAreAllThosePeopleGivingStars1.out b/regression-test/data/variant_github_events_new_p2/sql/whoAreAllThosePeopleGivingStars1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/whoAreAllThosePeopleGivingStars1.out
rename to regression-test/data/variant_github_events_new_p2/sql/whoAreAllThosePeopleGivingStars1.out
diff --git a/regression-test/data/variant_github_events_p0/whoAreAllThosePeopleGivingStars2.out b/regression-test/data/variant_github_events_new_p2/sql/whoAreAllThosePeopleGivingStars2.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/whoAreAllThosePeopleGivingStars2.out
rename to regression-test/data/variant_github_events_new_p2/sql/whoAreAllThosePeopleGivingStars2.out
diff --git a/regression-test/data/variant_github_events_p0/whoAreAllThosePeopleGivingStars3.out b/regression-test/data/variant_github_events_new_p2/sql/whoAreAllThosePeopleGivingStars3.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/whoAreAllThosePeopleGivingStars3.out
rename to regression-test/data/variant_github_events_new_p2/sql/whoAreAllThosePeopleGivingStars3.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/affinityByIssuesAndPRs1.out b/regression-test/data/variant_github_events_p2/affinityByIssuesAndPRs1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/affinityByIssuesAndPRs1.out
rename to regression-test/data/variant_github_events_p2/affinityByIssuesAndPRs1.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/affinityByIssuesAndPRs2.out b/regression-test/data/variant_github_events_p2/affinityByIssuesAndPRs2.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/affinityByIssuesAndPRs2.out
rename to regression-test/data/variant_github_events_p2/affinityByIssuesAndPRs2.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/authorsWithTheMostPushes.out b/regression-test/data/variant_github_events_p2/authorsWithTheMostPushes.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/authorsWithTheMostPushes.out
rename to regression-test/data/variant_github_events_p2/authorsWithTheMostPushes.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/countingStar1.out b/regression-test/data/variant_github_events_p2/countingStar1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/countingStar1.out
rename to regression-test/data/variant_github_events_p2/countingStar1.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/countingStar2.out b/regression-test/data/variant_github_events_p2/countingStar2.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/countingStar2.out
rename to regression-test/data/variant_github_events_p2/countingStar2.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/countingStar3.out b/regression-test/data/variant_github_events_p2/countingStar3.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/countingStar3.out
rename to regression-test/data/variant_github_events_p2/countingStar3.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/distributionOfRepositoriesByStarCount.out b/regression-test/data/variant_github_events_p2/distributionOfRepositoriesByStarCount.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/distributionOfRepositoriesByStarCount.out
rename to regression-test/data/variant_github_events_p2/distributionOfRepositoriesByStarCount.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/githubRoulette.out b/regression-test/data/variant_github_events_p2/githubRoulette.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/githubRoulette.out
rename to regression-test/data/variant_github_events_p2/githubRoulette.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/howHasTheListOfTopRepositoriesChangedOverTheYears1.out b/regression-test/data/variant_github_events_p2/howHasTheListOfTopRepositoriesChangedOverTheYears1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/howHasTheListOfTopRepositoriesChangedOverTheYears1.out
rename to regression-test/data/variant_github_events_p2/howHasTheListOfTopRepositoriesChangedOverTheYears1.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/howHasTheListOfTopRepositoriesChangedOverTheYears2.out b/regression-test/data/variant_github_events_p2/howHasTheListOfTopRepositoriesChangedOverTheYears2.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/howHasTheListOfTopRepositoriesChangedOverTheYears2.out
rename to regression-test/data/variant_github_events_p2/howHasTheListOfTopRepositoriesChangedOverTheYears2.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/howHasTheListOfTopRepositoriesChangedOverTheYears3.out b/regression-test/data/variant_github_events_p2/howHasTheListOfTopRepositoriesChangedOverTheYears3.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/howHasTheListOfTopRepositoriesChangedOverTheYears3.out
rename to regression-test/data/variant_github_events_p2/howHasTheListOfTopRepositoriesChangedOverTheYears3.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/howHasTheListOfTopRepositoriesChangedOverTheYears4.out b/regression-test/data/variant_github_events_p2/howHasTheListOfTopRepositoriesChangedOverTheYears4.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/howHasTheListOfTopRepositoriesChangedOverTheYears4.out
rename to regression-test/data/variant_github_events_p2/howHasTheListOfTopRepositoriesChangedOverTheYears4.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/howHasTheListOfTopRepositoriesChangedOverTheYears5.out b/regression-test/data/variant_github_events_p2/howHasTheListOfTopRepositoriesChangedOverTheYears5.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/howHasTheListOfTopRepositoriesChangedOverTheYears5.out
rename to regression-test/data/variant_github_events_p2/howHasTheListOfTopRepositoriesChangedOverTheYears5.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/howHasTheListOfTopRepositoriesChangedOverTheYears6.out b/regression-test/data/variant_github_events_p2/howHasTheListOfTopRepositoriesChangedOverTheYears6.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/howHasTheListOfTopRepositoriesChangedOverTheYears6.out
rename to regression-test/data/variant_github_events_p2/howHasTheListOfTopRepositoriesChangedOverTheYears6.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/howHasTheTotalNumberOfStarsChangedOverTime.out b/regression-test/data/variant_github_events_p2/howHasTheTotalNumberOfStarsChangedOverTime.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/howHasTheTotalNumberOfStarsChangedOverTime.out
rename to regression-test/data/variant_github_events_p2/howHasTheTotalNumberOfStarsChangedOverTime.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/issuesWithTheMostComments1.out b/regression-test/data/variant_github_events_p2/issuesWithTheMostComments1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/issuesWithTheMostComments1.out
rename to regression-test/data/variant_github_events_p2/issuesWithTheMostComments1.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/issuesWithTheMostComments2.out b/regression-test/data/variant_github_events_p2/issuesWithTheMostComments2.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/issuesWithTheMostComments2.out
rename to regression-test/data/variant_github_events_p2/issuesWithTheMostComments2.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/issuesWithTheMostComments3.out b/regression-test/data/variant_github_events_p2/issuesWithTheMostComments3.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/issuesWithTheMostComments3.out
rename to regression-test/data/variant_github_events_p2/issuesWithTheMostComments3.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/issuesWithTheMostComments4.out b/regression-test/data/variant_github_events_p2/issuesWithTheMostComments4.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/issuesWithTheMostComments4.out
rename to regression-test/data/variant_github_events_p2/issuesWithTheMostComments4.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/issuesWithTheMostComments5.out b/regression-test/data/variant_github_events_p2/issuesWithTheMostComments5.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/issuesWithTheMostComments5.out
rename to regression-test/data/variant_github_events_p2/issuesWithTheMostComments5.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/issuesWithTheMostComments6.out b/regression-test/data/variant_github_events_p2/issuesWithTheMostComments6.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/issuesWithTheMostComments6.out
rename to regression-test/data/variant_github_events_p2/issuesWithTheMostComments6.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/issuesWithTheMostComments7.out b/regression-test/data/variant_github_events_p2/issuesWithTheMostComments7.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/issuesWithTheMostComments7.out
rename to regression-test/data/variant_github_events_p2/issuesWithTheMostComments7.out
diff --git a/regression-test/data/variant_github_events_p0/load.out b/regression-test/data/variant_github_events_p2/load.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0/load.out
rename to regression-test/data/variant_github_events_p2/load.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/mostForkedRepositories.out b/regression-test/data/variant_github_events_p2/mostForkedRepositories.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/mostForkedRepositories.out
rename to regression-test/data/variant_github_events_p2/mostForkedRepositories.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/mostPopularCommentsOnGithub.out b/regression-test/data/variant_github_events_p2/mostPopularCommentsOnGithub.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/mostPopularCommentsOnGithub.out
rename to regression-test/data/variant_github_events_p2/mostPopularCommentsOnGithub.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/organizationsByTheNumberOfRepositories.out b/regression-test/data/variant_github_events_p2/organizationsByTheNumberOfRepositories.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/organizationsByTheNumberOfRepositories.out
rename to regression-test/data/variant_github_events_p2/organizationsByTheNumberOfRepositories.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/organizationsByTheNumberOfStars.out b/regression-test/data/variant_github_events_p2/organizationsByTheNumberOfStars.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/organizationsByTheNumberOfStars.out
rename to regression-test/data/variant_github_events_p2/organizationsByTheNumberOfStars.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/proportionsBetweenStarsAndForks1.out b/regression-test/data/variant_github_events_p2/proportionsBetweenStarsAndForks1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/proportionsBetweenStarsAndForks1.out
rename to regression-test/data/variant_github_events_p2/proportionsBetweenStarsAndForks1.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/proportionsBetweenStarsAndForks2.out b/regression-test/data/variant_github_events_p2/proportionsBetweenStarsAndForks2.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/proportionsBetweenStarsAndForks2.out
rename to regression-test/data/variant_github_events_p2/proportionsBetweenStarsAndForks2.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/proportionsBetweenStarsAndForks3.out b/regression-test/data/variant_github_events_p2/proportionsBetweenStarsAndForks3.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/proportionsBetweenStarsAndForks3.out
rename to regression-test/data/variant_github_events_p2/proportionsBetweenStarsAndForks3.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/proportionsBetweenStarsAndForks4.out b/regression-test/data/variant_github_events_p2/proportionsBetweenStarsAndForks4.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/proportionsBetweenStarsAndForks4.out
rename to regression-test/data/variant_github_events_p2/proportionsBetweenStarsAndForks4.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/proportionsBetweenStarsAndForks5.out b/regression-test/data/variant_github_events_p2/proportionsBetweenStarsAndForks5.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/proportionsBetweenStarsAndForks5.out
rename to regression-test/data/variant_github_events_p2/proportionsBetweenStarsAndForks5.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/repositoriesByAmountOfModifiedCode.out b/regression-test/data/variant_github_events_p2/repositoriesByAmountOfModifiedCode.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/repositoriesByAmountOfModifiedCode.out
rename to regression-test/data/variant_github_events_p2/repositoriesByAmountOfModifiedCode.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/repositoriesByTheNumberOfPushes.out b/regression-test/data/variant_github_events_p2/repositoriesByTheNumberOfPushes.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/repositoriesByTheNumberOfPushes.out
rename to regression-test/data/variant_github_events_p2/repositoriesByTheNumberOfPushes.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/repositoriesWithClickhouse_related_comments1.out b/regression-test/data/variant_github_events_p2/repositoriesWithClickhouse_related_comments1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/repositoriesWithClickhouse_related_comments1.out
rename to regression-test/data/variant_github_events_p2/repositoriesWithClickhouse_related_comments1.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/repositoriesWithClickhouse_related_comments2.out b/regression-test/data/variant_github_events_p2/repositoriesWithClickhouse_related_comments2.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/repositoriesWithClickhouse_related_comments2.out
rename to regression-test/data/variant_github_events_p2/repositoriesWithClickhouse_related_comments2.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/repositoriesWithDoris_related_comments1.out b/regression-test/data/variant_github_events_p2/repositoriesWithDoris_related_comments1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/repositoriesWithDoris_related_comments1.out
rename to regression-test/data/variant_github_events_p2/repositoriesWithDoris_related_comments1.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/repositoriesWithDoris_related_comments2.out b/regression-test/data/variant_github_events_p2/repositoriesWithDoris_related_comments2.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/repositoriesWithDoris_related_comments2.out
rename to regression-test/data/variant_github_events_p2/repositoriesWithDoris_related_comments2.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/repositoriesWithTheHighestGrowthYoY.out b/regression-test/data/variant_github_events_p2/repositoriesWithTheHighestGrowthYoY.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/repositoriesWithTheHighestGrowthYoY.out
rename to regression-test/data/variant_github_events_p2/repositoriesWithTheHighestGrowthYoY.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/repositoriesWithTheMaximumAmountOfIssues1.out b/regression-test/data/variant_github_events_p2/repositoriesWithTheMaximumAmountOfIssues1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/repositoriesWithTheMaximumAmountOfIssues1.out
rename to regression-test/data/variant_github_events_p2/repositoriesWithTheMaximumAmountOfIssues1.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/repositoriesWithTheMaximumAmountOfIssues2.out b/regression-test/data/variant_github_events_p2/repositoriesWithTheMaximumAmountOfIssues2.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/repositoriesWithTheMaximumAmountOfIssues2.out
rename to regression-test/data/variant_github_events_p2/repositoriesWithTheMaximumAmountOfIssues2.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/repositoriesWithTheMaximumAmountOfIssues3.out b/regression-test/data/variant_github_events_p2/repositoriesWithTheMaximumAmountOfIssues3.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/repositoriesWithTheMaximumAmountOfIssues3.out
rename to regression-test/data/variant_github_events_p2/repositoriesWithTheMaximumAmountOfIssues3.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/repositoriesWithTheMaximumAmountOfIssues4.out b/regression-test/data/variant_github_events_p2/repositoriesWithTheMaximumAmountOfIssues4.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/repositoriesWithTheMaximumAmountOfIssues4.out
rename to regression-test/data/variant_github_events_p2/repositoriesWithTheMaximumAmountOfIssues4.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/repositoriesWithTheMaximumAmountOfPullRequests1.out b/regression-test/data/variant_github_events_p2/repositoriesWithTheMaximumAmountOfPullRequests1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/repositoriesWithTheMaximumAmountOfPullRequests1.out
rename to regression-test/data/variant_github_events_p2/repositoriesWithTheMaximumAmountOfPullRequests1.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/repositoriesWithTheMaximumAmountOfPullRequests2.out b/regression-test/data/variant_github_events_p2/repositoriesWithTheMaximumAmountOfPullRequests2.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/repositoriesWithTheMaximumAmountOfPullRequests2.out
rename to regression-test/data/variant_github_events_p2/repositoriesWithTheMaximumAmountOfPullRequests2.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/repositoriesWithTheMaximumNumberOfAcceptedInvitations.out b/regression-test/data/variant_github_events_p2/repositoriesWithTheMaximumNumberOfAcceptedInvitations.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/repositoriesWithTheMaximumNumberOfAcceptedInvitations.out
rename to regression-test/data/variant_github_events_p2/repositoriesWithTheMaximumNumberOfAcceptedInvitations.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/repositoriesWithTheMostPeopleWhoHavePushAccess1.out b/regression-test/data/variant_github_events_p2/repositoriesWithTheMostPeopleWhoHavePushAccess1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/repositoriesWithTheMostPeopleWhoHavePushAccess1.out
rename to regression-test/data/variant_github_events_p2/repositoriesWithTheMostPeopleWhoHavePushAccess1.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/repositoriesWithTheMostStarsOverOneDay1.out b/regression-test/data/variant_github_events_p2/repositoriesWithTheMostStarsOverOneDay1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/repositoriesWithTheMostStarsOverOneDay1.out
rename to regression-test/data/variant_github_events_p2/repositoriesWithTheMostStarsOverOneDay1.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/repositoriesWithTheMostSteadyGrowthOverTime.out b/regression-test/data/variant_github_events_p2/repositoriesWithTheMostSteadyGrowthOverTime.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/repositoriesWithTheMostSteadyGrowthOverTime.out
rename to regression-test/data/variant_github_events_p2/repositoriesWithTheMostSteadyGrowthOverTime.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/repositoriesWithTheWorstStagnation_order.out b/regression-test/data/variant_github_events_p2/repositoriesWithTheWorstStagnation_order.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/repositoriesWithTheWorstStagnation_order.out
rename to regression-test/data/variant_github_events_p2/repositoriesWithTheWorstStagnation_order.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/repositoryAffinityList1.out b/regression-test/data/variant_github_events_p2/repositoryAffinityList1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/repositoryAffinityList1.out
rename to regression-test/data/variant_github_events_p2/repositoryAffinityList1.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/repositoryAffinityList2.out b/regression-test/data/variant_github_events_p2/repositoryAffinityList2.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/repositoryAffinityList2.out
rename to regression-test/data/variant_github_events_p2/repositoryAffinityList2.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/starsFromHeavyGithubUsers1.out b/regression-test/data/variant_github_events_p2/starsFromHeavyGithubUsers1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/starsFromHeavyGithubUsers1.out
rename to regression-test/data/variant_github_events_p2/starsFromHeavyGithubUsers1.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/starsFromHeavyGithubUsers2.out b/regression-test/data/variant_github_events_p2/starsFromHeavyGithubUsers2.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/starsFromHeavyGithubUsers2.out
rename to regression-test/data/variant_github_events_p2/starsFromHeavyGithubUsers2.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/theLongestRepositoryNames1.out b/regression-test/data/variant_github_events_p2/theLongestRepositoryNames1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/theLongestRepositoryNames1.out
rename to regression-test/data/variant_github_events_p2/theLongestRepositoryNames1.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/theLongestRepositoryNames2.out b/regression-test/data/variant_github_events_p2/theLongestRepositoryNames2.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/theLongestRepositoryNames2.out
rename to regression-test/data/variant_github_events_p2/theLongestRepositoryNames2.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/theMostToughCodeReviews.out b/regression-test/data/variant_github_events_p2/theMostToughCodeReviews.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/theMostToughCodeReviews.out
rename to regression-test/data/variant_github_events_p2/theMostToughCodeReviews.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/theTotalNumberOfRepositoriesOnGithub.out b/regression-test/data/variant_github_events_p2/theTotalNumberOfRepositoriesOnGithub.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/theTotalNumberOfRepositoriesOnGithub.out
rename to regression-test/data/variant_github_events_p2/theTotalNumberOfRepositoriesOnGithub.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/theTotalNumberOfUsersOnGithub1.out b/regression-test/data/variant_github_events_p2/theTotalNumberOfUsersOnGithub1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/theTotalNumberOfUsersOnGithub1.out
rename to regression-test/data/variant_github_events_p2/theTotalNumberOfUsersOnGithub1.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/theTotalNumberOfUsersOnGithub2.out b/regression-test/data/variant_github_events_p2/theTotalNumberOfUsersOnGithub2.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/theTotalNumberOfUsersOnGithub2.out
rename to regression-test/data/variant_github_events_p2/theTotalNumberOfUsersOnGithub2.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/theTotalNumberOfUsersOnGithub3.out b/regression-test/data/variant_github_events_p2/theTotalNumberOfUsersOnGithub3.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/theTotalNumberOfUsersOnGithub3.out
rename to regression-test/data/variant_github_events_p2/theTotalNumberOfUsersOnGithub3.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/theTotalNumberOfUsersOnGithub4.out b/regression-test/data/variant_github_events_p2/theTotalNumberOfUsersOnGithub4.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/theTotalNumberOfUsersOnGithub4.out
rename to regression-test/data/variant_github_events_p2/theTotalNumberOfUsersOnGithub4.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/topRepositoriesByStars.out b/regression-test/data/variant_github_events_p2/topRepositoriesByStars.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/topRepositoriesByStars.out
rename to regression-test/data/variant_github_events_p2/topRepositoriesByStars.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/whatIsTheBestDayOfTheWeekToCatchAStar.out b/regression-test/data/variant_github_events_p2/whatIsTheBestDayOfTheWeekToCatchAStar.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/whatIsTheBestDayOfTheWeekToCatchAStar.out
rename to regression-test/data/variant_github_events_p2/whatIsTheBestDayOfTheWeekToCatchAStar.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/whoAreAllThosePeopleGivingStars1.out b/regression-test/data/variant_github_events_p2/whoAreAllThosePeopleGivingStars1.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/whoAreAllThosePeopleGivingStars1.out
rename to regression-test/data/variant_github_events_p2/whoAreAllThosePeopleGivingStars1.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/whoAreAllThosePeopleGivingStars2.out b/regression-test/data/variant_github_events_p2/whoAreAllThosePeopleGivingStars2.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/whoAreAllThosePeopleGivingStars2.out
rename to regression-test/data/variant_github_events_p2/whoAreAllThosePeopleGivingStars2.out
diff --git a/regression-test/data/variant_github_events_p0_new/sql/whoAreAllThosePeopleGivingStars3.out b/regression-test/data/variant_github_events_p2/whoAreAllThosePeopleGivingStars3.out
similarity index 100%
rename from regression-test/data/variant_github_events_p0_new/sql/whoAreAllThosePeopleGivingStars3.out
rename to regression-test/data/variant_github_events_p2/whoAreAllThosePeopleGivingStars3.out
diff --git a/regression-test/data/variant_log_data_p2/load.out b/regression-test/data/variant_log_data_p2/load.out
new file mode 100644
index 00000000000..457788544e0
--- /dev/null
+++ b/regression-test/data/variant_log_data_p2/load.out
@@ -0,0 +1,20 @@
+-- This file is automatically generated. You should know what you did if you want to edit this
+-- !sql_32 --
+"2023-06-21 16:35:58.468 INFO [sino-webhook,6dee61f0605a70f3,6dee61f0605a70f3,true] 1 --- [io-8001-exec-13] c.s.c.a.CustomRequestBodyAdviceAdapter : REQUEST DATA: {String={\\"id\\":\\"3293880a36cd163754ea4f90270331f6\\",\\"token\\":\\"3293880a36cd163754ea4f90270331f6\\",\\"line_items\\":[{\\"id\\":43073082228985,\\"properties\\":{},\\"quantity\\":1000000,\\"variant_id\\":43073082228985,\\"key\\":\\"43073082228985:381f0b4b03d0c76493aa028c4ed006a9\\",\\"discounted_price\\":\\"28.95\\",\ [...]
+
+-- !sql_32_1 --
+2023-06-21 16:35:58.468 INFO [sino-webhook,6dee61f0605a70f3,6dee61f0605a70f3,true] 1 --- [io-8001-exec-13] c.s.c.a.CustomRequestBodyAdviceAdapter : REQUEST DATA: {String={"id":"3293880a36cd163754ea4f90270331f6","token":"3293880a36cd163754ea4f90270331f6","line_items":[{"id":43073082228985,"properties":{},"quantity":1000000,"variant_id":43073082228985,"key":"43073082228985:381f0b4b03d0c76493aa028c4ed006a9","discounted_price":"28.95","discounts":[],"gift_card":false,"grams":0,"line_price [...]
+
+-- !sql_33 --
+"2023-06-21 16:35:58.468 INFO [sino-webhook,6dee61f0605a70f3,6dee61f0605a70f3,true] 1 --- [io-8001-exec-13] c.s.c.a.CustomRequestBodyAdviceAdapter : REQUEST DATA: {String={\\"id\\":\\"3293880a36cd163754ea4f90270331f6\\",\\"token\\":\\"3293880a36cd163754ea4f90270331f6\\",\\"line_items\\":[{\\"id\\":43073082228985,\\"properties\\":{},\\"quantity\\":1000000,\\"variant_id\\":43073082228985,\\"key\\":\\"43073082228985:381f0b4b03d0c76493aa028c4ed006a9\\",\\"discounted_price\\":\\"28.95\\",\ [...]
+
+-- !sql_33_1 --
+2023-06-21 16:35:58.468 INFO [sino-webhook,6dee61f0605a70f3,6dee61f0605a70f3,true] 1 --- [io-8001-exec-13] c.s.c.a.CustomRequestBodyAdviceAdapter : REQUEST DATA: {String={"id":"3293880a36cd163754ea4f90270331f6","token":"3293880a36cd163754ea4f90270331f6","line_items":[{"id":43073082228985,"properties":{},"quantity":1000000,"variant_id":43073082228985,"key":"43073082228985:381f0b4b03d0c76493aa028c4ed006a9","discounted_price":"28.95","discounts":[],"gift_card":false,"grams":0,"line_price [...]
+
+-- !sql_34 --
+"2023-06-21 16:35:58.468 INFO [sino-webhook,6dee61f0605a70f3,6dee61f0605a70f3,true] 1 --- [io-8001-exec-13] c.s.c.a.CustomRequestBodyAdviceAdapter : REQUEST DATA: {String={\\"id\\":\\"3293880a36cd163754ea4f90270331f6\\",\\"token\\":\\"3293880a36cd163754ea4f90270331f6\\",\\"line_items\\":[{\\"id\\":43073082228985,\\"properties\\":{},\\"quantity\\":1000000,\\"variant_id\\":43073082228985,\\"key\\":\\"43073082228985:381f0b4b03d0c76493aa028c4ed006a9\\",\\"discounted_price\\":\\"28.95\\",\ [...]
+
+-- !sql_35 --
+
+-- !sql_35_1 --
+
diff --git a/regression-test/data/variant_p0/load.out b/regression-test/data/variant_p0/load.out
index 954faffccb0..0127f11452b 100644
--- a/regression-test/data/variant_p0/load.out
+++ b/regression-test/data/variant_p0/load.out
@@ -212,7 +212,7 @@
[123]
-- !sql_25 --
-50000 54999.999999999935 6150000
+50000 55000.000000000495 6150000
-- !sql_26 --
5000
@@ -267,25 +267,6 @@
{"a":1234,"ddd":{"aaa":123,"mxmxm":[456,"789"]},"xxxx":"kaana"}
{"a":1234,"ddd":{"aaa":123,"mxmxm":[456,"789"]},"xxxx":"kaana"}
--- !sql_32 --
-"2023-06-21 16:35:58.468 INFO [sino-webhook,6dee61f0605a70f3,6dee61f0605a70f3,true] 1 --- [io-8001-exec-13] c.s.c.a.CustomRequestBodyAdviceAdapter : REQUEST DATA: {String={\\"id\\":\\"3293880a36cd163754ea4f90270331f6\\",\\"token\\":\\"3293880a36cd163754ea4f90270331f6\\",\\"line_items\\":[{\\"id\\":43073082228985,\\"properties\\":{},\\"quantity\\":1000000,\\"variant_id\\":43073082228985,\\"key\\":\\"43073082228985:381f0b4b03d0c76493aa028c4ed006a9\\",\\"discounted_price\\":\\"28.95\\",\ [...]
-
--- !sql_32_1 --
-2023-06-21 16:35:58.468 INFO [sino-webhook,6dee61f0605a70f3,6dee61f0605a70f3,true] 1 --- [io-8001-exec-13] c.s.c.a.CustomRequestBodyAdviceAdapter : REQUEST DATA: {String={"id":"3293880a36cd163754ea4f90270331f6","token":"3293880a36cd163754ea4f90270331f6","line_items":[{"id":43073082228985,"properties":{},"quantity":1000000,"variant_id":43073082228985,"key":"43073082228985:381f0b4b03d0c76493aa028c4ed006a9","discounted_price":"28.95","discounts":[],"gift_card":false,"grams":0,"line_price [...]
-
--- !sql_33 --
-"2023-06-21 16:35:58.468 INFO [sino-webhook,6dee61f0605a70f3,6dee61f0605a70f3,true] 1 --- [io-8001-exec-13] c.s.c.a.CustomRequestBodyAdviceAdapter : REQUEST DATA: {String={\\"id\\":\\"3293880a36cd163754ea4f90270331f6\\",\\"token\\":\\"3293880a36cd163754ea4f90270331f6\\",\\"line_items\\":[{\\"id\\":43073082228985,\\"properties\\":{},\\"quantity\\":1000000,\\"variant_id\\":43073082228985,\\"key\\":\\"43073082228985:381f0b4b03d0c76493aa028c4ed006a9\\",\\"discounted_price\\":\\"28.95\\",\ [...]
-
--- !sql_33_1 --
-2023-06-21 16:35:58.468 INFO [sino-webhook,6dee61f0605a70f3,6dee61f0605a70f3,true] 1 --- [io-8001-exec-13] c.s.c.a.CustomRequestBodyAdviceAdapter : REQUEST DATA: {String={"id":"3293880a36cd163754ea4f90270331f6","token":"3293880a36cd163754ea4f90270331f6","line_items":[{"id":43073082228985,"properties":{},"quantity":1000000,"variant_id":43073082228985,"key":"43073082228985:381f0b4b03d0c76493aa028c4ed006a9","discounted_price":"28.95","discounts":[],"gift_card":false,"grams":0,"line_price [...]
-
--- !sql_34 --
-"2023-06-21 16:35:58.468 INFO [sino-webhook,6dee61f0605a70f3,6dee61f0605a70f3,true] 1 --- [io-8001-exec-13] c.s.c.a.CustomRequestBodyAdviceAdapter : REQUEST DATA: {String={\\"id\\":\\"3293880a36cd163754ea4f90270331f6\\",\\"token\\":\\"3293880a36cd163754ea4f90270331f6\\",\\"line_items\\":[{\\"id\\":43073082228985,\\"properties\\":{},\\"quantity\\":1000000,\\"variant_id\\":43073082228985,\\"key\\":\\"43073082228985:381f0b4b03d0c76493aa028c4ed006a9\\",\\"discounted_price\\":\\"28.95\\",\ [...]
-
--- !sql_35 --
-
--- !sql_35_1 --
-
-- !sql_36_1 --
1 \N \N
\N \N 1
diff --git a/regression-test/data/variant_p0/mv/multi_slot.out b/regression-test/data/variant_p0/mv/multi_slot.out
index 2499e282895..e146ef05e56 100644
--- a/regression-test/data/variant_p0/mv/multi_slot.out
+++ b/regression-test/data/variant_p0/mv/multi_slot.out
@@ -26,18 +26,3 @@
456 \N
789 \N
--- !select_mv --
-\N \N
-1 \N
-3 \N
-5 \N
-
--- !select_mv --
-\N \N
-\N \N
-1 \N
-1 \N
-1 \N
-3 \N
-5 \N
-
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 1a504fcc8c0..65d90ba106d 100644
--- 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
@@ -23,15 +23,3 @@ GollumEvent 2489436580 2015-01-01T03:00:02Z
CreateEvent 2489368089 2015-01-01T00:00:01Z
PullRequestEvent 2489395770 2015-01-01T01:00:02Z
--- !sql --
-PushEvent 2489368070 2015-01-01T00:00:00Z
-PushEvent 2489395767 2015-01-01T01:00:00Z
-PushEvent 2489418154 2015-01-01T02:00:00Z
-PullRequestEvent 2489436569 2015-01-01T03:00:01Z
-PushEvent 2489368072 2015-01-01T00:00:00Z
-PushEvent 2489395768 2015-01-01T01:00:00Z
-PushEvent 2489418155 2015-01-01T02:00:00Z
-GollumEvent 2489436580 2015-01-01T03:00:02Z
-CreateEvent 2489368089 2015-01-01T00:00:01Z
-PullRequestEvent 2489395770 2015-01-01T01:00:02Z
-
diff --git a/regression-test/data/variant_p0/tpch/sql/q01_trans.out b/regression-test/data/variant_p0/tpch/sql/q01_trans.out
index 53c6d272179..c5d260caf13 100644
--- a/regression-test/data/variant_p0/tpch/sql/q01_trans.out
+++ b/regression-test/data/variant_p0/tpch/sql/q01_trans.out
@@ -1,7 +1,7 @@
-- This file is automatically generated. You should know what you did if you want to edit this
-- !q01_trans --
-A F 3774200.0 5.320753880689993E9 5.054096266682797E9 5.256751331449228E9 25.537587116854997 36002.1238290141 0.05014459706339808 147790
-N F 95257.0 1.3373779583999996E8 1.271323726512E8 1.3228629122944508E8 25.30066401062417 35521.32691633465 0.0493944223107571 3765
-N O 7459297.0 1.0512270008899876E10 9.98623833838471E9 1.0385578376585463E10 25.545537671232875 36000.92468801327 0.05009595890414324 292000
-R F 3785523.0 5.337950526469992E9 5.071818532942029E9 5.274405503049394E9 25.5259438574251 35994.02921403087 0.049989278561841474 148301
+A F 3774200.0 5.320753880689995E9 5.054096266682795E9 5.256751331449231E9 25.537587116854997 36002.123829014105 0.05014459706338475 147790
+N F 95257.0 1.3373779584000006E8 1.2713237265119994E8 1.3228629122944497E8 25.30066401062417 35521.32691633468 0.04939442231075703 3765
+N O 7459297.0 1.0512270008900036E10 9.986238338384706E9 1.0385578376585476E10 25.545537671232875 36000.92468801382 0.05009595890410998 292000
+R F 3785523.0 5.337950526470003E9 5.071818532942003E9 5.274405503049376E9 25.5259438574251 35994.02921403095 0.04998927856182775 148301
diff --git a/regression-test/data/variant_p0/tpch/sql/q05_trans.out b/regression-test/data/variant_p0/tpch/sql/q05_trans.out
index a2c94faaffb..7eb16fd3e96 100644
--- a/regression-test/data/variant_p0/tpch/sql/q05_trans.out
+++ b/regression-test/data/variant_p0/tpch/sql/q05_trans.out
@@ -1,8 +1,8 @@
-- This file is automatically generated. You should know what you did if you want to edit this
-- !q05_trans --
-CHINA 7822103.000000002
-INDIA 6376121.5085
-JAPAN 6000077.2184
-INDONESIA 5580475.4026999995
+CHINA 7822103.0
+INDIA 6376121.508500004
+JAPAN 6000077.218400001
+INDONESIA 5580475.402700002
VIETNAM 4497840.546600001
diff --git a/regression-test/data/variant_p0/tpch/sql/q06_trans.out b/regression-test/data/variant_p0/tpch/sql/q06_trans.out
index 46848482902..174241a7cd2 100644
--- a/regression-test/data/variant_p0/tpch/sql/q06_trans.out
+++ b/regression-test/data/variant_p0/tpch/sql/q06_trans.out
@@ -1,4 +1,4 @@
-- This file is automatically generated. You should know what you did if you want to edit this
-- !q06_trans --
-1.18034202534E7
+1.1803420253399998E7
diff --git a/regression-test/data/variant_p0/tpch/sql/q08_trans.out b/regression-test/data/variant_p0/tpch/sql/q08_trans.out
index c7c2ef6533f..b248362fce4 100644
--- a/regression-test/data/variant_p0/tpch/sql/q08_trans.out
+++ b/regression-test/data/variant_p0/tpch/sql/q08_trans.out
@@ -1,5 +1,5 @@
-- This file is automatically generated. You should know what you did if you want to edit this
-- !q08_trans --
-1995 0.028648741305617547
+1995 0.028648741305617544
1996 0.01825027910796215
diff --git a/regression-test/data/variant_p0/tpch/sql/q09_trans.out b/regression-test/data/variant_p0/tpch/sql/q09_trans.out
index 1fb6a5c2b8e..807b50ef4e7 100644
--- a/regression-test/data/variant_p0/tpch/sql/q09_trans.out
+++ b/regression-test/data/variant_p0/tpch/sql/q09_trans.out
@@ -1,178 +1,178 @@
-- This file is automatically generated. You should know what you did if you want to edit this
-- !q09_trans --
-ALGERIA 1998 2321785.3682
-ALGERIA 1997 3685016.8588999994
-ALGERIA 1996 4276597.4253
-ALGERIA 1995 4418370.4154
-ALGERIA 1994 3864849.9521
-ALGERIA 1993 3541051.3865
-ALGERIA 1992 4310013.3482
+ALGERIA 1998 2321785.3682000004
+ALGERIA 1997 3685016.8589
+ALGERIA 1996 4276597.4252999965
+ALGERIA 1995 4418370.4153999975
+ALGERIA 1994 3864849.952099998
+ALGERIA 1993 3541051.386499998
+ALGERIA 1992 4310013.348199998
ARGENTINA 1998 2685983.8005
ARGENTINA 1997 4242147.8124
-ARGENTINA 1996 3907867.0103
-ARGENTINA 1995 4605921.5011
+ARGENTINA 1996 3907867.0103000016
+ARGENTINA 1995 4605921.501099999
ARGENTINA 1994 3542096.1564
-ARGENTINA 1993 3949965.9388
+ARGENTINA 1993 3949965.9387999987
ARGENTINA 1992 4521180.4695
-BRAZIL 1998 2778730.3931
-BRAZIL 1997 4642037.468699999
-BRAZIL 1996 4530304.6034
-BRAZIL 1995 4502344.8657
-BRAZIL 1994 4875806.501499999
+BRAZIL 1998 2778730.393099999
+BRAZIL 1997 4642037.468700003
+BRAZIL 1996 4530304.603400001
+BRAZIL 1995 4502344.865700001
+BRAZIL 1994 4875806.501500003
BRAZIL 1993 4687478.6531
-BRAZIL 1992 5035200.0464
+BRAZIL 1992 5035200.046399999
CANADA 1998 2194509.0465
-CANADA 1997 3482197.9520999994
-CANADA 1996 3712231.2813999997
-CANADA 1995 4014814.8476
+CANADA 1997 3482197.9520999985
+CANADA 1996 3712231.281399999
+CANADA 1995 4014814.847599998
CANADA 1994 4145304.485499999
-CANADA 1993 3787069.6045
-CANADA 1992 4168009.4200999998
-CHINA 1998 3398578.0001
-CHINA 1997 6358959.333799999
-CHINA 1996 6435158.322899999
+CANADA 1993 3787069.604499998
+CANADA 1992 4168009.420099999
+CHINA 1998 3398578.0001000008
+CHINA 1997 6358959.3338
+CHINA 1996 6435158.322900003
CHINA 1995 6174776.211300001
-CHINA 1994 6385751.081199999
-CHINA 1993 5765034.119399999
-CHINA 1992 6324034.237899999
+CHINA 1994 6385751.081199998
+CHINA 1993 5765034.119399997
+CHINA 1992 6324034.237900005
EGYPT 1998 2333148.3334000004
-EGYPT 1997 3661244.2731000003
-EGYPT 1996 3765371.2368
-EGYPT 1995 4094744.2925
-EGYPT 1994 3566508.0818
-EGYPT 1993 3725283.7747
-EGYPT 1992 3373762.3334999997
+EGYPT 1997 3661244.2730999994
+EGYPT 1996 3765371.2367999996
+EGYPT 1995 4094744.292499998
+EGYPT 1994 3566508.081800001
+EGYPT 1993 3725283.7747000013
+EGYPT 1992 3373762.333499999
ETHIOPIA 1998 1953927.2682
-ETHIOPIA 1997 3285786.3266
+ETHIOPIA 1997 3285786.3266000007
ETHIOPIA 1996 3525028.7952
-ETHIOPIA 1995 3781674.8910999997
-ETHIOPIA 1994 3037409.4359999998
-ETHIOPIA 1993 3008978.2676999997
-ETHIOPIA 1992 2721203.2355
-FRANCE 1998 2604373.8805
-FRANCE 1997 3982872.0488
-FRANCE 1996 3622479.2413000003
-FRANCE 1995 4479939.7020000005
-FRANCE 1994 3531013.1981000006
-FRANCE 1993 4086437.3102
-FRANCE 1992 3637792.1333000003
-GERMANY 1998 3291023.2965
-GERMANY 1997 5139337.3443
-GERMANY 1996 4799810.4577
-GERMANY 1995 5405785.797800001
-GERMANY 1994 4555556.459200001
-GERMANY 1993 4428195.101900001
-GERMANY 1992 4656148.420399999
-INDIA 1998 2591288.1873999997
+ETHIOPIA 1995 3781674.8910999987
+ETHIOPIA 1994 3037409.435999999
+ETHIOPIA 1993 3008978.2677000007
+ETHIOPIA 1992 2721203.235500001
+FRANCE 1998 2604373.8804999986
+FRANCE 1997 3982872.0488000023
+FRANCE 1996 3622479.2412999994
+FRANCE 1995 4479939.702
+FRANCE 1994 3531013.1981000025
+FRANCE 1993 4086437.3101999997
+FRANCE 1992 3637792.1333
+GERMANY 1998 3291023.2964999974
+GERMANY 1997 5139337.344300003
+GERMANY 1996 4799810.457699999
+GERMANY 1995 5405785.797800004
+GERMANY 1994 4555556.459199997
+GERMANY 1993 4428195.101900002
+GERMANY 1992 4656148.420400001
+INDIA 1998 2591288.187399999
INDIA 1997 5159562.7033
-INDIA 1996 5307258.3049
-INDIA 1995 5148208.7902
-INDIA 1994 5164001.958199999
-INDIA 1993 4321398.4388
-INDIA 1992 5297703.6935
-INDONESIA 1998 3094900.1596999997
-INDONESIA 1997 5719773.0358
-INDONESIA 1996 6037238.599299999
-INDONESIA 1995 5266783.4899
-INDONESIA 1994 5470762.872899999
-INDONESIA 1993 6189826.661300002
-INDONESIA 1992 4414623.1549
-IRAN 1998 3214864.1208999995
-IRAN 1997 3688049.0691
-IRAN 1996 3621649.2247
-IRAN 1995 4420783.420499999
-IRAN 1994 4373984.6523
-IRAN 1993 3731301.7813999997
-IRAN 1992 4417133.3662
+INDIA 1996 5307258.304900003
+INDIA 1995 5148208.790199999
+INDIA 1994 5164001.958200001
+INDIA 1993 4321398.438800003
+INDIA 1992 5297703.693499999
+INDONESIA 1998 3094900.159700001
+INDONESIA 1997 5719773.035799999
+INDONESIA 1996 6037238.599300002
+INDONESIA 1995 5266783.489899999
+INDONESIA 1994 5470762.872900001
+INDONESIA 1993 6189826.661299997
+INDONESIA 1992 4414623.154899998
+IRAN 1998 3214864.120900001
+IRAN 1997 3688049.0690999986
+IRAN 1996 3621649.2246999983
+IRAN 1995 4420783.4205
+IRAN 1994 4373984.652300001
+IRAN 1993 3731301.7814000007
+IRAN 1992 4417133.366199998
IRAQ 1998 2338859.4098999994
-IRAQ 1997 3622681.564299999
-IRAQ 1996 4762291.8722
-IRAQ 1995 4558092.7359
-IRAQ 1994 4951604.1699
-IRAQ 1993 3830077.9910999993
-IRAQ 1992 3938636.4874
-JAPAN 1998 1849535.0802000002
-JAPAN 1997 4068688.8537
-JAPAN 1996 4044774.7597000003
-JAPAN 1995 4793005.8027
-JAPAN 1994 4114717.0567999994
-JAPAN 1993 3614468.7484999998
+IRAQ 1997 3622681.5642999993
+IRAQ 1996 4762291.872199997
+IRAQ 1995 4558092.735900002
+IRAQ 1994 4951604.169899996
+IRAQ 1993 3830077.991100002
+IRAQ 1992 3938636.4873999986
+JAPAN 1998 1849535.0802000004
+JAPAN 1997 4068688.8536999994
+JAPAN 1996 4044774.7597000017
+JAPAN 1995 4793005.802699999
+JAPAN 1994 4114717.056800001
+JAPAN 1993 3614468.7485000007
JAPAN 1992 4266694.470000001
-JORDAN 1998 1811488.0719
-JORDAN 1997 2951297.8677999997
-JORDAN 1996 3302528.3066999996
-JORDAN 1995 3221813.999000001
-JORDAN 1994 2417892.0921
-JORDAN 1993 3107641.7661
+JORDAN 1998 1811488.0718999994
+JORDAN 1997 2951297.867800001
+JORDAN 1996 3302528.3067000005
+JORDAN 1995 3221813.9990000012
+JORDAN 1994 2417892.092100001
+JORDAN 1993 3107641.7661000015
JORDAN 1992 3316379.0585000003
-KENYA 1998 2579075.4189999998
-KENYA 1997 2929194.2317
+KENYA 1998 2579075.4189999984
+KENYA 1997 2929194.231699999
KENYA 1996 3569129.5618999996
-KENYA 1995 3542889.1086999997
-KENYA 1994 3983095.3994
-KENYA 1993 3713988.9708
-KENYA 1992 3304641.834
-MOROCCO 1998 1815334.818
-MOROCCO 1997 3693214.8446999993
-MOROCCO 1996 4116175.9230000004
-MOROCCO 1995 3515127.1402
-MOROCCO 1994 4003072.1119999997
-MOROCCO 1993 3599199.6679
-MOROCCO 1992 3958335.4224000005
-MOZAMBIQUE 1998 1620428.7345999996
-MOZAMBIQUE 1997 2802166.6473
-MOZAMBIQUE 1996 2409955.1755
+KENYA 1995 3542889.108699999
+KENYA 1994 3983095.399400002
+KENYA 1993 3713988.970799999
+KENYA 1992 3304641.8340000007
+MOROCCO 1998 1815334.818000001
+MOROCCO 1997 3693214.8447000002
+MOROCCO 1996 4116175.923
+MOROCCO 1995 3515127.140199998
+MOROCCO 1994 4003072.111999998
+MOROCCO 1993 3599199.6679000016
+MOROCCO 1992 3958335.4223999996
+MOZAMBIQUE 1998 1620428.7346
+MOZAMBIQUE 1997 2802166.647299999
+MOZAMBIQUE 1996 2409955.1754999985
MOZAMBIQUE 1995 2771602.6274
-MOZAMBIQUE 1994 2548226.2158000004
-MOZAMBIQUE 1993 2843748.9053
-MOZAMBIQUE 1992 2556501.0943
-PERU 1998 2036430.3602000002
-PERU 1997 4064142.4091
-PERU 1996 4068678.5671
-PERU 1995 4657694.841200001
-PERU 1994 4731959.4655
-PERU 1993 4144006.661
-PERU 1992 3754635.0078000003
-ROMANIA 1998 1992773.6810999997
-ROMANIA 1997 2854639.8679999993
-ROMANIA 1996 3139337.3029
-ROMANIA 1995 3222153.3775999993
-ROMANIA 1994 3222844.319
-ROMANIA 1993 3488994.0288000004
-ROMANIA 1992 3029274.442
-RUSSIA 1998 2339865.6635
+MOZAMBIQUE 1994 2548226.215799999
+MOZAMBIQUE 1993 2843748.905299998
+MOZAMBIQUE 1992 2556501.0943000014
+PERU 1998 2036430.3602
+PERU 1997 4064142.409099999
+PERU 1996 4068678.5671000006
+PERU 1995 4657694.841199998
+PERU 1994 4731959.465500002
+PERU 1993 4144006.660999999
+PERU 1992 3754635.007800001
+ROMANIA 1998 1992773.6811
+ROMANIA 1997 2854639.868
+ROMANIA 1996 3139337.3029000005
+ROMANIA 1995 3222153.3776
+ROMANIA 1994 3222844.319000001
+ROMANIA 1993 3488994.0287999976
+ROMANIA 1992 3029274.4420000007
+RUSSIA 1998 2339865.6635000003
RUSSIA 1997 4153619.5424000006
-RUSSIA 1996 3772067.4041000004
-RUSSIA 1995 4704988.8607
+RUSSIA 1996 3772067.4041000023
+RUSSIA 1995 4704988.860700001
RUSSIA 1994 4479082.8694
-RUSSIA 1993 4767719.9791
-RUSSIA 1992 4533465.558999999
-SAUDI ARABIA 1998 3386948.9563999996
-SAUDI ARABIA 1997 5425980.337299999
-SAUDI ARABIA 1996 5227607.1677
+RUSSIA 1993 4767719.979100001
+RUSSIA 1992 4533465.559
+SAUDI ARABIA 1998 3386948.9564000014
+SAUDI ARABIA 1997 5425980.3373
+SAUDI ARABIA 1996 5227607.167700001
SAUDI ARABIA 1995 4506731.641100001
-SAUDI ARABIA 1994 4698658.742500001
-SAUDI ARABIA 1993 5493626.5285
-SAUDI ARABIA 1992 4573560.015000001
-UNITED KINGDOM 1998 2252021.5137
+SAUDI ARABIA 1994 4698658.742499998
+SAUDI ARABIA 1993 5493626.528499995
+SAUDI ARABIA 1992 4573560.014999997
+UNITED KINGDOM 1998 2252021.5136999995
UNITED KINGDOM 1997 4343926.802599999
-UNITED KINGDOM 1996 4189476.3064999995
-UNITED KINGDOM 1995 4469569.882900001
-UNITED KINGDOM 1994 4410094.6264
-UNITED KINGDOM 1993 4054677.1050000004
-UNITED KINGDOM 1992 3978688.8830999997
-UNITED STATES 1998 2238771.5581
+UNITED KINGDOM 1996 4189476.3064999986
+UNITED KINGDOM 1995 4469569.8829
+UNITED KINGDOM 1994 4410094.626399997
+UNITED KINGDOM 1993 4054677.104999997
+UNITED KINGDOM 1992 3978688.8831000007
+UNITED STATES 1998 2238771.558099999
UNITED STATES 1997 4135581.5733999996
UNITED STATES 1996 3624013.266
-UNITED STATES 1995 3892244.5171999997
-UNITED STATES 1994 3289224.1138000004
-UNITED STATES 1993 3626170.2028
-UNITED STATES 1992 3993973.4997000005
-VIETNAM 1998 1924313.4862000002
-VIETNAM 1997 3436195.3709
+UNITED STATES 1995 3892244.517199999
+UNITED STATES 1994 3289224.113800001
+UNITED STATES 1993 3626170.2027999996
+UNITED STATES 1992 3993973.499699999
+VIETNAM 1998 1924313.4862000004
+VIETNAM 1997 3436195.370900001
VIETNAM 1996 4017288.8926999997
-VIETNAM 1995 3644054.1371999998
-VIETNAM 1994 4141277.6665000003
+VIETNAM 1995 3644054.137200001
+VIETNAM 1994 4141277.6664999984
VIETNAM 1993 2556114.1693
VIETNAM 1992 4090524.4905000003
diff --git a/regression-test/data/variant_p0/tpch/sql/q10_trans.out b/regression-test/data/variant_p0/tpch/sql/q10_trans.out
index 51a2edf8c06..d99b59521e3 100644
--- a/regression-test/data/variant_p0/tpch/sql/q10_trans.out
+++ b/regression-test/data/variant_p0/tpch/sql/q10_trans.out
@@ -3,21 +3,21 @@
8242 Customer#000008242 622786.7296999999 6322.09 ETHIOPIA P2n4nJhy,UqSo2s43YfSvYJDZ6lk 15-792-676-1184 slyly regular packages haggle carefully ironic ideas. courts are furiously. furiously unusual theodolites cajole. i
7714 Customer#000007714 557400.3053 9799.98 IRAN SnnIGB,SkmnWpX3 20-922-418-6024 arhorses according to the blithely express re
11032 Customer#000011032 512500.9641 8496.93 UNITED KINGDOM WIKHC7K3Cn7156iNOyfVG3cZ7YqkgsR,Ly 33-102-772-3533 posits-- furiously ironic accounts are again
-2455 Customer#000002455 481592.4052999999 2070.99 GERMANY RVn1ZSRtLqPlJLIZxvpmsbgC02 17-946-225-9977 al asymptotes. finally ironic accounts cajole furiously. permanently unusual theodolites aro
-12106 Customer#000012106 479414.21329999994 5342.11 UNITED STATES wth3twOmu6vy 34-905-346-4472 ly after the blithely regular foxes. accounts haggle carefully alongside of the blithely even ideas.
-8530 Customer#000008530 457855.9467000001 9734.95 MOROCCO GMQyte94oDM7eD7exnkj 4hH9yq3 25-736-932-5850 slyly asymptotes. quickly final deposits in
-13984 Customer#000013984 446316.5104 3482.28 IRAN qZXwuapCHvxbX 20-981-264-2952 y unusual courts could wake furiously
+2455 Customer#000002455 481592.40530000004 2070.99 GERMANY RVn1ZSRtLqPlJLIZxvpmsbgC02 17-946-225-9977 al asymptotes. finally ironic accounts cajole furiously. permanently unusual theodolites aro
+12106 Customer#000012106 479414.21330000006 5342.11 UNITED STATES wth3twOmu6vy 34-905-346-4472 ly after the blithely regular foxes. accounts haggle carefully alongside of the blithely even ideas.
+8530 Customer#000008530 457855.9467 9734.95 MOROCCO GMQyte94oDM7eD7exnkj 4hH9yq3 25-736-932-5850 slyly asymptotes. quickly final deposits in
+13984 Customer#000013984 446316.5104000001 3482.28 IRAN qZXwuapCHvxbX 20-981-264-2952 y unusual courts could wake furiously
1966 Customer#000001966 444059.03819999995 1937.72 ALGERIA jPv1 UHra5JLALR5Isci5u0636RoAu7t vH 10-973-269-8886 the blithely even accounts. final deposits cajole around the blithely final packages.
11026 Customer#000011026 417913.4142 7738.76 ALGERIA XorIktoJOAEJkpNNMx 10-184-163-4632 ly even dolphins eat along the blithely even instructions. express attainments cajole slyly. busy dolphins in
-8501 Customer#000008501 412797.51000000007 6906.7 ARGENTINA 776af4rOa mZ66hczs 11-317-552-5840 y final deposits after the fluffily even accounts are slyly final, regular
-1565 Customer#000001565 412506.00619999995 1820.03 BRAZIL EWQO5Ck,nMuHVQimqL8dLrixRP6QKveXcz9QgorW 12-402-178-2007 ously regular accounts wake slyly ironic idea
-14398 Customer#000014398 408575.36 -602.24 UNITED STATES GWRCgIPHajtU21vICVvbJJerFu2cUk 34-814-111-5424 s. blithely even accounts cajole blithely. even foxes doubt--
+8501 Customer#000008501 412797.51 6906.7 ARGENTINA 776af4rOa mZ66hczs 11-317-552-5840 y final deposits after the fluffily even accounts are slyly final, regular
+1565 Customer#000001565 412506.0062 1820.03 BRAZIL EWQO5Ck,nMuHVQimqL8dLrixRP6QKveXcz9QgorW 12-402-178-2007 ously regular accounts wake slyly ironic idea
+14398 Customer#000014398 408575.36000000004 -602.24 UNITED STATES GWRCgIPHajtU21vICVvbJJerFu2cUk 34-814-111-5424 s. blithely even accounts cajole blithely. even foxes doubt--
1465 Customer#000001465 405055.34569999995 9365.93 INDIA tDRaTC7UgFbBX7VF6cVXYQA0 18-807-487-1074 s lose blithely ironic, regular packages. regular, final foxes haggle c
-12595 Customer#000012595 401402.2391 -6.92 INDIA LmeaX5cR,w9NqKugl yRm98 18-186-132-3352 o the busy accounts. blithely special gifts maintain a
+12595 Customer#000012595 401402.23909999995 -6.92 INDIA LmeaX5cR,w9NqKugl yRm98 18-186-132-3352 o the busy accounts. blithely special gifts maintain a
961 Customer#000000961 401198.17370000004 6963.68 JAPAN 5,81YDLFuRR47KKzv8GXdmi3zyP37PlPn 22-989-463-6089 e final requests: busily final accounts believe a
-14299 Customer#000014299 400968.37509999995 6595.97 RUSSIA 7lFczTya0iM1bhEWT 32-156-618-1224 carefully regular requests. quickly ironic accounts against the ru
+14299 Customer#000014299 400968.3751 6595.97 RUSSIA 7lFczTya0iM1bhEWT 32-156-618-1224 carefully regular requests. quickly ironic accounts against the ru
623 Customer#000000623 399883.42569999996 7887.6 INDONESIA HXiFb9oWlgqZXrJPUCEJ6zZIPxAM4m6 19-113-202-7085 requests. dolphins above the busily regular dependencies cajole after
-9151 Customer#000009151 396562.02950000006 5691.95 IRAQ 7gIdRdaxB91EVdyx8DyPjShpMD 21-834-147-4906 ajole fluffily. furiously regular accounts are special, silent account
-14819 Customer#000014819 396271.1036 7308.39 FRANCE w8StIbymUXmLCcUag6sx6LUIp8E3pA,Ux 16-769-398-7926 ss, final asymptotes use furiously slyly ironic dependencies. special, express dugouts according to the dep
+9151 Customer#000009151 396562.0295 5691.95 IRAQ 7gIdRdaxB91EVdyx8DyPjShpMD 21-834-147-4906 ajole fluffily. furiously regular accounts are special, silent account
+14819 Customer#000014819 396271.10360000003 7308.39 FRANCE w8StIbymUXmLCcUag6sx6LUIp8E3pA,Ux 16-769-398-7926 ss, final asymptotes use furiously slyly ironic dependencies. special, express dugouts according to the dep
13478 Customer#000013478 395513.13580000005 -778.11 KENYA 9VIsvIeZrJpC6OOdYheMC2vdtq8Ai0Rt 24-983-202-8240 r theodolites. slyly unusual pinto beans sleep fluffily against the asymptotes. quickly r
diff --git a/regression-test/suites/variant_github_events_p0_new/load.groovy b/regression-test/suites/variant_github_events_new_p2/load.groovy
similarity index 98%
rename from regression-test/suites/variant_github_events_p0_new/load.groovy
rename to regression-test/suites/variant_github_events_new_p2/load.groovy
index 4d8d304aeb1..cc2af4542c9 100644
--- a/regression-test/suites/variant_github_events_p0_new/load.groovy
+++ b/regression-test/suites/variant_github_events_new_p2/load.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("regression_test_variant_github_events_p0", "nonConcurrent"){
+suite("regression_test_variant_github_events_p2", "nonConcurrent,p2"){
def backendId_to_backendIP = [:]
def backendId_to_backendHttpPort = [:]
getBackendIpHttpPort(backendId_to_backendIP, backendId_to_backendHttpPort);
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/affinityByIssuesAndPRs1.sql b/regression-test/suites/variant_github_events_new_p2/sql/affinityByIssuesAndPRs1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/affinityByIssuesAndPRs1.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/affinityByIssuesAndPRs1.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/affinityByIssuesAndPRs2.sql b/regression-test/suites/variant_github_events_new_p2/sql/affinityByIssuesAndPRs2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/affinityByIssuesAndPRs2.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/affinityByIssuesAndPRs2.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/authorsWithTheMostPushes.sql b/regression-test/suites/variant_github_events_new_p2/sql/authorsWithTheMostPushes.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/authorsWithTheMostPushes.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/authorsWithTheMostPushes.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/countingStar1.sql b/regression-test/suites/variant_github_events_new_p2/sql/countingStar1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/countingStar1.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/countingStar1.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/countingStar2.sql b/regression-test/suites/variant_github_events_new_p2/sql/countingStar2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/countingStar2.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/countingStar2.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/countingStar3.sql b/regression-test/suites/variant_github_events_new_p2/sql/countingStar3.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/countingStar3.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/countingStar3.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/distributionOfRepositoriesByStarCount.sql b/regression-test/suites/variant_github_events_new_p2/sql/distributionOfRepositoriesByStarCount.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/distributionOfRepositoriesByStarCount.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/distributionOfRepositoriesByStarCount.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/githubRoulette.sql b/regression-test/suites/variant_github_events_new_p2/sql/githubRoulette.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/githubRoulette.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/githubRoulette.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/howHasTheListOfTopRepositoriesChangedOverTheYears1.sql b/regression-test/suites/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/howHasTheListOfTopRepositoriesChangedOverTheYears1.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears1.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/howHasTheListOfTopRepositoriesChangedOverTheYears2.sql b/regression-test/suites/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/howHasTheListOfTopRepositoriesChangedOverTheYears2.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears2.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/howHasTheListOfTopRepositoriesChangedOverTheYears3.sql b/regression-test/suites/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears3.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/howHasTheListOfTopRepositoriesChangedOverTheYears3.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears3.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/howHasTheListOfTopRepositoriesChangedOverTheYears4.sql b/regression-test/suites/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears4.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/howHasTheListOfTopRepositoriesChangedOverTheYears4.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears4.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/howHasTheListOfTopRepositoriesChangedOverTheYears5.sql b/regression-test/suites/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears5.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/howHasTheListOfTopRepositoriesChangedOverTheYears5.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears5.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/howHasTheListOfTopRepositoriesChangedOverTheYears6.sql b/regression-test/suites/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears6.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/howHasTheListOfTopRepositoriesChangedOverTheYears6.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears6.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/howHasTheListOfTopRepositoriesChangedOverTheYears7.sql b/regression-test/suites/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears7.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/howHasTheListOfTopRepositoriesChangedOverTheYears7.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears7.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/howHasTheTotalNumberOfStarsChangedOverTime.sql b/regression-test/suites/variant_github_events_new_p2/sql/howHasTheTotalNumberOfStarsChangedOverTime.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/howHasTheTotalNumberOfStarsChangedOverTime.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/howHasTheTotalNumberOfStarsChangedOverTime.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/issuesWithTheMostComments1.sql b/regression-test/suites/variant_github_events_new_p2/sql/issuesWithTheMostComments1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/issuesWithTheMostComments1.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/issuesWithTheMostComments1.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/issuesWithTheMostComments2.sql b/regression-test/suites/variant_github_events_new_p2/sql/issuesWithTheMostComments2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/issuesWithTheMostComments2.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/issuesWithTheMostComments2.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/issuesWithTheMostComments3.sql b/regression-test/suites/variant_github_events_new_p2/sql/issuesWithTheMostComments3.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/issuesWithTheMostComments3.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/issuesWithTheMostComments3.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/issuesWithTheMostComments4.sql b/regression-test/suites/variant_github_events_new_p2/sql/issuesWithTheMostComments4.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/issuesWithTheMostComments4.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/issuesWithTheMostComments4.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/issuesWithTheMostComments5.sql b/regression-test/suites/variant_github_events_new_p2/sql/issuesWithTheMostComments5.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/issuesWithTheMostComments5.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/issuesWithTheMostComments5.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/issuesWithTheMostComments6.sql b/regression-test/suites/variant_github_events_new_p2/sql/issuesWithTheMostComments6.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/issuesWithTheMostComments6.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/issuesWithTheMostComments6.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/issuesWithTheMostComments7.sql b/regression-test/suites/variant_github_events_new_p2/sql/issuesWithTheMostComments7.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/issuesWithTheMostComments7.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/issuesWithTheMostComments7.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/issuesWithTheMostComments8.sql b/regression-test/suites/variant_github_events_new_p2/sql/issuesWithTheMostComments8.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/issuesWithTheMostComments8.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/issuesWithTheMostComments8.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/mostForkedRepositories.sql b/regression-test/suites/variant_github_events_new_p2/sql/mostForkedRepositories.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/mostForkedRepositories.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/mostForkedRepositories.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/mostPopularCommentsOnGithub.sql b/regression-test/suites/variant_github_events_new_p2/sql/mostPopularCommentsOnGithub.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/mostPopularCommentsOnGithub.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/mostPopularCommentsOnGithub.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/organizationsByTheNumberOfRepositories.sql b/regression-test/suites/variant_github_events_new_p2/sql/organizationsByTheNumberOfRepositories.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/organizationsByTheNumberOfRepositories.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/organizationsByTheNumberOfRepositories.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/organizationsByTheNumberOfStars.sql b/regression-test/suites/variant_github_events_new_p2/sql/organizationsByTheNumberOfStars.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/organizationsByTheNumberOfStars.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/organizationsByTheNumberOfStars.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/organizationsByTheSizeOfCommunity.sql b/regression-test/suites/variant_github_events_new_p2/sql/organizationsByTheSizeOfCommunity.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/organizationsByTheSizeOfCommunity.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/organizationsByTheSizeOfCommunity.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/proportionsBetweenStarsAndForks1.sql b/regression-test/suites/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/proportionsBetweenStarsAndForks1.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks1.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/proportionsBetweenStarsAndForks2.sql b/regression-test/suites/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/proportionsBetweenStarsAndForks2.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks2.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/proportionsBetweenStarsAndForks3.sql b/regression-test/suites/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks3.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/proportionsBetweenStarsAndForks3.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks3.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/proportionsBetweenStarsAndForks4.sql b/regression-test/suites/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks4.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/proportionsBetweenStarsAndForks4.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks4.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/proportionsBetweenStarsAndForks5.sql b/regression-test/suites/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks5.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/proportionsBetweenStarsAndForks5.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks5.sql
diff --git a/regression-test/suites/variant_github_events_p0/repositoriesByAmountOfModifiedCode.sql b/regression-test/suites/variant_github_events_new_p2/sql/repositoriesByAmountOfModifiedCode.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/repositoriesByAmountOfModifiedCode.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/repositoriesByAmountOfModifiedCode.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/repositoriesByTheNumberOfPushes.sql b/regression-test/suites/variant_github_events_new_p2/sql/repositoriesByTheNumberOfPushes.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/repositoriesByTheNumberOfPushes.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/repositoriesByTheNumberOfPushes.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithClickhouse_related_comments1.sql b/regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithClickhouse_related_comments1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithClickhouse_related_comments1.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithClickhouse_related_comments1.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithClickhouse_related_comments2.sql b/regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithClickhouse_related_comments2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithClickhouse_related_comments2.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithClickhouse_related_comments2.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithDoris_related_comments1.sql b/regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithDoris_related_comments1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithDoris_related_comments1.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithDoris_related_comments1.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithDoris_related_comments2.sql b/regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithDoris_related_comments2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithDoris_related_comments2.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithDoris_related_comments2.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheHighestGrowthYoY.sql b/regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheHighestGrowthYoY.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheHighestGrowthYoY.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheHighestGrowthYoY.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheMaximumAmountOfIssues1.sql b/regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfIssues1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheMaximumAmountOfIssues1.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfIssues1.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheMaximumAmountOfIssues2.sql b/regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfIssues2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheMaximumAmountOfIssues2.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfIssues2.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheMaximumAmountOfIssues3.sql b/regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfIssues3.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheMaximumAmountOfIssues3.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfIssues3.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheMaximumAmountOfIssues4.sql b/regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfIssues4.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheMaximumAmountOfIssues4.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfIssues4.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheMaximumAmountOfPullRequests1.sql b/regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfPullRequests1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheMaximumAmountOfPullRequests1.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfPullRequests1.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheMaximumAmountOfPullRequests2.sql b/regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfPullRequests2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheMaximumAmountOfPullRequests2.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfPullRequests2.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheMaximumNumberOfAcceptedInvitations.sql b/regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheMaximumNumberOfAcceptedInvitations.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheMaximumNumberOfAcceptedInvitations.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheMaximumNumberOfAcceptedInvitations.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheMostPeopleWhoHavePushAccess1.sql b/regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheMostPeopleWhoHavePushAccess1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheMostPeopleWhoHavePushAccess1.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheMostPeopleWhoHavePushAccess1.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheMostPeopleWhoHavePushAccess2.sql b/regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheMostPeopleWhoHavePushAccess2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheMostPeopleWhoHavePushAccess2.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheMostPeopleWhoHavePushAccess2.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheMostPeopleWhoHavePushAccess3.sql b/regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheMostPeopleWhoHavePushAccess3.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheMostPeopleWhoHavePushAccess3.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheMostPeopleWhoHavePushAccess3.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheMostStarsOverOneDay1.sql b/regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheMostStarsOverOneDay1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheMostStarsOverOneDay1.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheMostStarsOverOneDay1.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheMostStarsOverOneDay2.sql b/regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheMostStarsOverOneDay2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheMostStarsOverOneDay2.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheMostStarsOverOneDay2.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheMostStarsOverOneDay3.sql b/regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheMostStarsOverOneDay3.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheMostStarsOverOneDay3.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheMostStarsOverOneDay3.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheMostSteadyGrowthOverTime.sql b/regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheMostSteadyGrowthOverTime.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheMostSteadyGrowthOverTime.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheMostSteadyGrowthOverTime.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheWorstStagnation_order.sql b/regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheWorstStagnation_order.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/repositoriesWithTheWorstStagnation_order.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/repositoriesWithTheWorstStagnation_order.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/repositoryAffinityList1.sql b/regression-test/suites/variant_github_events_new_p2/sql/repositoryAffinityList1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/repositoryAffinityList1.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/repositoryAffinityList1.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/repositoryAffinityList2.sql b/regression-test/suites/variant_github_events_new_p2/sql/repositoryAffinityList2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/repositoryAffinityList2.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/repositoryAffinityList2.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/starsFromHeavyGithubUsers1.sql b/regression-test/suites/variant_github_events_new_p2/sql/starsFromHeavyGithubUsers1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/starsFromHeavyGithubUsers1.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/starsFromHeavyGithubUsers1.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/starsFromHeavyGithubUsers2.sql b/regression-test/suites/variant_github_events_new_p2/sql/starsFromHeavyGithubUsers2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/starsFromHeavyGithubUsers2.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/starsFromHeavyGithubUsers2.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/test_distinct_streaming_agg.sql b/regression-test/suites/variant_github_events_new_p2/sql/test_distinct_streaming_agg.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/test_distinct_streaming_agg.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/test_distinct_streaming_agg.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/theLongestRepositoryNames1.sql b/regression-test/suites/variant_github_events_new_p2/sql/theLongestRepositoryNames1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/theLongestRepositoryNames1.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/theLongestRepositoryNames1.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/theLongestRepositoryNames2.sql b/regression-test/suites/variant_github_events_new_p2/sql/theLongestRepositoryNames2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/theLongestRepositoryNames2.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/theLongestRepositoryNames2.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/theMostToughCodeReviews.sql b/regression-test/suites/variant_github_events_new_p2/sql/theMostToughCodeReviews.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/theMostToughCodeReviews.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/theMostToughCodeReviews.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/theTotalNumberOfRepositoriesOnGithub.sql b/regression-test/suites/variant_github_events_new_p2/sql/theTotalNumberOfRepositoriesOnGithub.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/theTotalNumberOfRepositoriesOnGithub.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/theTotalNumberOfRepositoriesOnGithub.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/theTotalNumberOfUsersOnGithub1.sql b/regression-test/suites/variant_github_events_new_p2/sql/theTotalNumberOfUsersOnGithub1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/theTotalNumberOfUsersOnGithub1.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/theTotalNumberOfUsersOnGithub1.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/theTotalNumberOfUsersOnGithub2.sql b/regression-test/suites/variant_github_events_new_p2/sql/theTotalNumberOfUsersOnGithub2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/theTotalNumberOfUsersOnGithub2.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/theTotalNumberOfUsersOnGithub2.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/theTotalNumberOfUsersOnGithub3.sql b/regression-test/suites/variant_github_events_new_p2/sql/theTotalNumberOfUsersOnGithub3.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/theTotalNumberOfUsersOnGithub3.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/theTotalNumberOfUsersOnGithub3.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/theTotalNumberOfUsersOnGithub4.sql b/regression-test/suites/variant_github_events_new_p2/sql/theTotalNumberOfUsersOnGithub4.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/theTotalNumberOfUsersOnGithub4.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/theTotalNumberOfUsersOnGithub4.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/topLabels1.sql b/regression-test/suites/variant_github_events_new_p2/sql/topLabels1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/topLabels1.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/topLabels1.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/topLabels2.sql b/regression-test/suites/variant_github_events_new_p2/sql/topLabels2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/topLabels2.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/topLabels2.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/topLabels3.sql b/regression-test/suites/variant_github_events_new_p2/sql/topLabels3.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/topLabels3.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/topLabels3.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/topRepositoriesByStars.sql b/regression-test/suites/variant_github_events_new_p2/sql/topRepositoriesByStars.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/topRepositoriesByStars.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/topRepositoriesByStars.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/whatIsTheBestDayOfTheWeekToCatchAStar.sql b/regression-test/suites/variant_github_events_new_p2/sql/whatIsTheBestDayOfTheWeekToCatchAStar.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/whatIsTheBestDayOfTheWeekToCatchAStar.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/whatIsTheBestDayOfTheWeekToCatchAStar.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/whoAreAllThosePeopleGivingStars1.sql b/regression-test/suites/variant_github_events_new_p2/sql/whoAreAllThosePeopleGivingStars1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/whoAreAllThosePeopleGivingStars1.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/whoAreAllThosePeopleGivingStars1.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/whoAreAllThosePeopleGivingStars2.sql b/regression-test/suites/variant_github_events_new_p2/sql/whoAreAllThosePeopleGivingStars2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/whoAreAllThosePeopleGivingStars2.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/whoAreAllThosePeopleGivingStars2.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/whoAreAllThosePeopleGivingStars3.sql b/regression-test/suites/variant_github_events_new_p2/sql/whoAreAllThosePeopleGivingStars3.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/whoAreAllThosePeopleGivingStars3.sql
rename to regression-test/suites/variant_github_events_new_p2/sql/whoAreAllThosePeopleGivingStars3.sql
diff --git a/regression-test/suites/variant_github_events_p0/affinityByIssuesAndPRs1.sql b/regression-test/suites/variant_github_events_p2/affinityByIssuesAndPRs1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/affinityByIssuesAndPRs1.sql
rename to regression-test/suites/variant_github_events_p2/affinityByIssuesAndPRs1.sql
diff --git a/regression-test/suites/variant_github_events_p0/affinityByIssuesAndPRs2.sql b/regression-test/suites/variant_github_events_p2/affinityByIssuesAndPRs2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/affinityByIssuesAndPRs2.sql
rename to regression-test/suites/variant_github_events_p2/affinityByIssuesAndPRs2.sql
diff --git a/regression-test/suites/variant_github_events_p0/authorsWithTheMostPushes.sql b/regression-test/suites/variant_github_events_p2/authorsWithTheMostPushes.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/authorsWithTheMostPushes.sql
rename to regression-test/suites/variant_github_events_p2/authorsWithTheMostPushes.sql
diff --git a/regression-test/suites/variant_github_events_p0/countingStar1.sql b/regression-test/suites/variant_github_events_p2/countingStar1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/countingStar1.sql
rename to regression-test/suites/variant_github_events_p2/countingStar1.sql
diff --git a/regression-test/suites/variant_github_events_p0/countingStar2.sql b/regression-test/suites/variant_github_events_p2/countingStar2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/countingStar2.sql
rename to regression-test/suites/variant_github_events_p2/countingStar2.sql
diff --git a/regression-test/suites/variant_github_events_p0/countingStar3.sql b/regression-test/suites/variant_github_events_p2/countingStar3.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/countingStar3.sql
rename to regression-test/suites/variant_github_events_p2/countingStar3.sql
diff --git a/regression-test/suites/variant_github_events_p0/distributionOfRepositoriesByStarCount.sql b/regression-test/suites/variant_github_events_p2/distributionOfRepositoriesByStarCount.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/distributionOfRepositoriesByStarCount.sql
rename to regression-test/suites/variant_github_events_p2/distributionOfRepositoriesByStarCount.sql
diff --git a/regression-test/suites/variant_github_events_p0/githubRoulette.sql b/regression-test/suites/variant_github_events_p2/githubRoulette.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/githubRoulette.sql
rename to regression-test/suites/variant_github_events_p2/githubRoulette.sql
diff --git a/regression-test/suites/variant_github_events_p0/howHasTheListOfTopRepositoriesChangedOverTheYears1.sql b/regression-test/suites/variant_github_events_p2/howHasTheListOfTopRepositoriesChangedOverTheYears1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/howHasTheListOfTopRepositoriesChangedOverTheYears1.sql
rename to regression-test/suites/variant_github_events_p2/howHasTheListOfTopRepositoriesChangedOverTheYears1.sql
diff --git a/regression-test/suites/variant_github_events_p0/howHasTheListOfTopRepositoriesChangedOverTheYears2.sql b/regression-test/suites/variant_github_events_p2/howHasTheListOfTopRepositoriesChangedOverTheYears2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/howHasTheListOfTopRepositoriesChangedOverTheYears2.sql
rename to regression-test/suites/variant_github_events_p2/howHasTheListOfTopRepositoriesChangedOverTheYears2.sql
diff --git a/regression-test/suites/variant_github_events_p0/howHasTheListOfTopRepositoriesChangedOverTheYears3.sql b/regression-test/suites/variant_github_events_p2/howHasTheListOfTopRepositoriesChangedOverTheYears3.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/howHasTheListOfTopRepositoriesChangedOverTheYears3.sql
rename to regression-test/suites/variant_github_events_p2/howHasTheListOfTopRepositoriesChangedOverTheYears3.sql
diff --git a/regression-test/suites/variant_github_events_p0/howHasTheListOfTopRepositoriesChangedOverTheYears4.sql b/regression-test/suites/variant_github_events_p2/howHasTheListOfTopRepositoriesChangedOverTheYears4.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/howHasTheListOfTopRepositoriesChangedOverTheYears4.sql
rename to regression-test/suites/variant_github_events_p2/howHasTheListOfTopRepositoriesChangedOverTheYears4.sql
diff --git a/regression-test/suites/variant_github_events_p0/howHasTheListOfTopRepositoriesChangedOverTheYears5.sql b/regression-test/suites/variant_github_events_p2/howHasTheListOfTopRepositoriesChangedOverTheYears5.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/howHasTheListOfTopRepositoriesChangedOverTheYears5.sql
rename to regression-test/suites/variant_github_events_p2/howHasTheListOfTopRepositoriesChangedOverTheYears5.sql
diff --git a/regression-test/suites/variant_github_events_p0/howHasTheListOfTopRepositoriesChangedOverTheYears6.sql b/regression-test/suites/variant_github_events_p2/howHasTheListOfTopRepositoriesChangedOverTheYears6.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/howHasTheListOfTopRepositoriesChangedOverTheYears6.sql
rename to regression-test/suites/variant_github_events_p2/howHasTheListOfTopRepositoriesChangedOverTheYears6.sql
diff --git a/regression-test/suites/variant_github_events_p0/howHasTheListOfTopRepositoriesChangedOverTheYears7.sql b/regression-test/suites/variant_github_events_p2/howHasTheListOfTopRepositoriesChangedOverTheYears7.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/howHasTheListOfTopRepositoriesChangedOverTheYears7.sql
rename to regression-test/suites/variant_github_events_p2/howHasTheListOfTopRepositoriesChangedOverTheYears7.sql
diff --git a/regression-test/suites/variant_github_events_p0/howHasTheTotalNumberOfStarsChangedOverTime.sql b/regression-test/suites/variant_github_events_p2/howHasTheTotalNumberOfStarsChangedOverTime.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/howHasTheTotalNumberOfStarsChangedOverTime.sql
rename to regression-test/suites/variant_github_events_p2/howHasTheTotalNumberOfStarsChangedOverTime.sql
diff --git a/regression-test/suites/variant_github_events_p0/issuesWithTheMostComments1.sql b/regression-test/suites/variant_github_events_p2/issuesWithTheMostComments1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/issuesWithTheMostComments1.sql
rename to regression-test/suites/variant_github_events_p2/issuesWithTheMostComments1.sql
diff --git a/regression-test/suites/variant_github_events_p0/issuesWithTheMostComments2.sql b/regression-test/suites/variant_github_events_p2/issuesWithTheMostComments2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/issuesWithTheMostComments2.sql
rename to regression-test/suites/variant_github_events_p2/issuesWithTheMostComments2.sql
diff --git a/regression-test/suites/variant_github_events_p0/issuesWithTheMostComments3.sql b/regression-test/suites/variant_github_events_p2/issuesWithTheMostComments3.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/issuesWithTheMostComments3.sql
rename to regression-test/suites/variant_github_events_p2/issuesWithTheMostComments3.sql
diff --git a/regression-test/suites/variant_github_events_p0/issuesWithTheMostComments4.sql b/regression-test/suites/variant_github_events_p2/issuesWithTheMostComments4.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/issuesWithTheMostComments4.sql
rename to regression-test/suites/variant_github_events_p2/issuesWithTheMostComments4.sql
diff --git a/regression-test/suites/variant_github_events_p0/issuesWithTheMostComments5.sql b/regression-test/suites/variant_github_events_p2/issuesWithTheMostComments5.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/issuesWithTheMostComments5.sql
rename to regression-test/suites/variant_github_events_p2/issuesWithTheMostComments5.sql
diff --git a/regression-test/suites/variant_github_events_p0/issuesWithTheMostComments6.sql b/regression-test/suites/variant_github_events_p2/issuesWithTheMostComments6.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/issuesWithTheMostComments6.sql
rename to regression-test/suites/variant_github_events_p2/issuesWithTheMostComments6.sql
diff --git a/regression-test/suites/variant_github_events_p0/issuesWithTheMostComments7.sql b/regression-test/suites/variant_github_events_p2/issuesWithTheMostComments7.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/issuesWithTheMostComments7.sql
rename to regression-test/suites/variant_github_events_p2/issuesWithTheMostComments7.sql
diff --git a/regression-test/suites/variant_github_events_p0/issuesWithTheMostComments8.sql b/regression-test/suites/variant_github_events_p2/issuesWithTheMostComments8.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/issuesWithTheMostComments8.sql
rename to regression-test/suites/variant_github_events_p2/issuesWithTheMostComments8.sql
diff --git a/regression-test/suites/variant_github_events_p0/load.groovy b/regression-test/suites/variant_github_events_p2/load.groovy
similarity index 99%
rename from regression-test/suites/variant_github_events_p0/load.groovy
rename to regression-test/suites/variant_github_events_p2/load.groovy
index 8159a5752e5..c5d693eabb6 100644
--- a/regression-test/suites/variant_github_events_p0/load.groovy
+++ b/regression-test/suites/variant_github_events_p2/load.groovy
@@ -17,7 +17,7 @@
import org.codehaus.groovy.runtime.IOGroovyMethods
-suite("regression_test_variant_github_events_p0", "nonConcurrent"){
+suite("regression_test_variant_github_events_p2", "nonConcurrent,p2"){
// prepare test table
def timeout = 300000
def delta_time = 1000
diff --git a/regression-test/suites/variant_github_events_p0/mostForkedRepositories.sql b/regression-test/suites/variant_github_events_p2/mostForkedRepositories.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/mostForkedRepositories.sql
rename to regression-test/suites/variant_github_events_p2/mostForkedRepositories.sql
diff --git a/regression-test/suites/variant_github_events_p0/mostPopularCommentsOnGithub.sql b/regression-test/suites/variant_github_events_p2/mostPopularCommentsOnGithub.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/mostPopularCommentsOnGithub.sql
rename to regression-test/suites/variant_github_events_p2/mostPopularCommentsOnGithub.sql
diff --git a/regression-test/suites/variant_github_events_p0/organizationsByTheNumberOfRepositories.sql b/regression-test/suites/variant_github_events_p2/organizationsByTheNumberOfRepositories.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/organizationsByTheNumberOfRepositories.sql
rename to regression-test/suites/variant_github_events_p2/organizationsByTheNumberOfRepositories.sql
diff --git a/regression-test/suites/variant_github_events_p0/organizationsByTheNumberOfStars.sql b/regression-test/suites/variant_github_events_p2/organizationsByTheNumberOfStars.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/organizationsByTheNumberOfStars.sql
rename to regression-test/suites/variant_github_events_p2/organizationsByTheNumberOfStars.sql
diff --git a/regression-test/suites/variant_github_events_p0/organizationsByTheSizeOfCommunity.sql b/regression-test/suites/variant_github_events_p2/organizationsByTheSizeOfCommunity.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/organizationsByTheSizeOfCommunity.sql
rename to regression-test/suites/variant_github_events_p2/organizationsByTheSizeOfCommunity.sql
diff --git a/regression-test/suites/variant_github_events_p0/proportionsBetweenStarsAndForks1.sql b/regression-test/suites/variant_github_events_p2/proportionsBetweenStarsAndForks1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/proportionsBetweenStarsAndForks1.sql
rename to regression-test/suites/variant_github_events_p2/proportionsBetweenStarsAndForks1.sql
diff --git a/regression-test/suites/variant_github_events_p0/proportionsBetweenStarsAndForks2.sql b/regression-test/suites/variant_github_events_p2/proportionsBetweenStarsAndForks2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/proportionsBetweenStarsAndForks2.sql
rename to regression-test/suites/variant_github_events_p2/proportionsBetweenStarsAndForks2.sql
diff --git a/regression-test/suites/variant_github_events_p0/proportionsBetweenStarsAndForks3.sql b/regression-test/suites/variant_github_events_p2/proportionsBetweenStarsAndForks3.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/proportionsBetweenStarsAndForks3.sql
rename to regression-test/suites/variant_github_events_p2/proportionsBetweenStarsAndForks3.sql
diff --git a/regression-test/suites/variant_github_events_p0/proportionsBetweenStarsAndForks4.sql b/regression-test/suites/variant_github_events_p2/proportionsBetweenStarsAndForks4.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/proportionsBetweenStarsAndForks4.sql
rename to regression-test/suites/variant_github_events_p2/proportionsBetweenStarsAndForks4.sql
diff --git a/regression-test/suites/variant_github_events_p0/proportionsBetweenStarsAndForks5.sql b/regression-test/suites/variant_github_events_p2/proportionsBetweenStarsAndForks5.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/proportionsBetweenStarsAndForks5.sql
rename to regression-test/suites/variant_github_events_p2/proportionsBetweenStarsAndForks5.sql
diff --git a/regression-test/suites/variant_github_events_p0_new/sql/repositoriesByAmountOfModifiedCode.sql b/regression-test/suites/variant_github_events_p2/repositoriesByAmountOfModifiedCode.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0_new/sql/repositoriesByAmountOfModifiedCode.sql
rename to regression-test/suites/variant_github_events_p2/repositoriesByAmountOfModifiedCode.sql
diff --git a/regression-test/suites/variant_github_events_p0/repositoriesByTheNumberOfPushes.sql b/regression-test/suites/variant_github_events_p2/repositoriesByTheNumberOfPushes.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/repositoriesByTheNumberOfPushes.sql
rename to regression-test/suites/variant_github_events_p2/repositoriesByTheNumberOfPushes.sql
diff --git a/regression-test/suites/variant_github_events_p0/repositoriesWithClickhouse_related_comments1.sql b/regression-test/suites/variant_github_events_p2/repositoriesWithClickhouse_related_comments1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/repositoriesWithClickhouse_related_comments1.sql
rename to regression-test/suites/variant_github_events_p2/repositoriesWithClickhouse_related_comments1.sql
diff --git a/regression-test/suites/variant_github_events_p0/repositoriesWithClickhouse_related_comments2.sql b/regression-test/suites/variant_github_events_p2/repositoriesWithClickhouse_related_comments2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/repositoriesWithClickhouse_related_comments2.sql
rename to regression-test/suites/variant_github_events_p2/repositoriesWithClickhouse_related_comments2.sql
diff --git a/regression-test/suites/variant_github_events_p0/repositoriesWithDoris_related_comments1.sql b/regression-test/suites/variant_github_events_p2/repositoriesWithDoris_related_comments1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/repositoriesWithDoris_related_comments1.sql
rename to regression-test/suites/variant_github_events_p2/repositoriesWithDoris_related_comments1.sql
diff --git a/regression-test/suites/variant_github_events_p0/repositoriesWithDoris_related_comments2.sql b/regression-test/suites/variant_github_events_p2/repositoriesWithDoris_related_comments2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/repositoriesWithDoris_related_comments2.sql
rename to regression-test/suites/variant_github_events_p2/repositoriesWithDoris_related_comments2.sql
diff --git a/regression-test/suites/variant_github_events_p0/repositoriesWithTheHighestGrowthYoY.sql b/regression-test/suites/variant_github_events_p2/repositoriesWithTheHighestGrowthYoY.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/repositoriesWithTheHighestGrowthYoY.sql
rename to regression-test/suites/variant_github_events_p2/repositoriesWithTheHighestGrowthYoY.sql
diff --git a/regression-test/suites/variant_github_events_p0/repositoriesWithTheMaximumAmountOfIssues1.sql b/regression-test/suites/variant_github_events_p2/repositoriesWithTheMaximumAmountOfIssues1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/repositoriesWithTheMaximumAmountOfIssues1.sql
rename to regression-test/suites/variant_github_events_p2/repositoriesWithTheMaximumAmountOfIssues1.sql
diff --git a/regression-test/suites/variant_github_events_p0/repositoriesWithTheMaximumAmountOfIssues2.sql b/regression-test/suites/variant_github_events_p2/repositoriesWithTheMaximumAmountOfIssues2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/repositoriesWithTheMaximumAmountOfIssues2.sql
rename to regression-test/suites/variant_github_events_p2/repositoriesWithTheMaximumAmountOfIssues2.sql
diff --git a/regression-test/suites/variant_github_events_p0/repositoriesWithTheMaximumAmountOfIssues3.sql b/regression-test/suites/variant_github_events_p2/repositoriesWithTheMaximumAmountOfIssues3.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/repositoriesWithTheMaximumAmountOfIssues3.sql
rename to regression-test/suites/variant_github_events_p2/repositoriesWithTheMaximumAmountOfIssues3.sql
diff --git a/regression-test/suites/variant_github_events_p0/repositoriesWithTheMaximumAmountOfIssues4.sql b/regression-test/suites/variant_github_events_p2/repositoriesWithTheMaximumAmountOfIssues4.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/repositoriesWithTheMaximumAmountOfIssues4.sql
rename to regression-test/suites/variant_github_events_p2/repositoriesWithTheMaximumAmountOfIssues4.sql
diff --git a/regression-test/suites/variant_github_events_p0/repositoriesWithTheMaximumAmountOfPullRequests1.sql b/regression-test/suites/variant_github_events_p2/repositoriesWithTheMaximumAmountOfPullRequests1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/repositoriesWithTheMaximumAmountOfPullRequests1.sql
rename to regression-test/suites/variant_github_events_p2/repositoriesWithTheMaximumAmountOfPullRequests1.sql
diff --git a/regression-test/suites/variant_github_events_p0/repositoriesWithTheMaximumAmountOfPullRequests2.sql b/regression-test/suites/variant_github_events_p2/repositoriesWithTheMaximumAmountOfPullRequests2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/repositoriesWithTheMaximumAmountOfPullRequests2.sql
rename to regression-test/suites/variant_github_events_p2/repositoriesWithTheMaximumAmountOfPullRequests2.sql
diff --git a/regression-test/suites/variant_github_events_p0/repositoriesWithTheMaximumNumberOfAcceptedInvitations.sql b/regression-test/suites/variant_github_events_p2/repositoriesWithTheMaximumNumberOfAcceptedInvitations.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/repositoriesWithTheMaximumNumberOfAcceptedInvitations.sql
rename to regression-test/suites/variant_github_events_p2/repositoriesWithTheMaximumNumberOfAcceptedInvitations.sql
diff --git a/regression-test/suites/variant_github_events_p0/repositoriesWithTheMostPeopleWhoHavePushAccess1.sql b/regression-test/suites/variant_github_events_p2/repositoriesWithTheMostPeopleWhoHavePushAccess1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/repositoriesWithTheMostPeopleWhoHavePushAccess1.sql
rename to regression-test/suites/variant_github_events_p2/repositoriesWithTheMostPeopleWhoHavePushAccess1.sql
diff --git a/regression-test/suites/variant_github_events_p0/repositoriesWithTheMostPeopleWhoHavePushAccess2.sql b/regression-test/suites/variant_github_events_p2/repositoriesWithTheMostPeopleWhoHavePushAccess2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/repositoriesWithTheMostPeopleWhoHavePushAccess2.sql
rename to regression-test/suites/variant_github_events_p2/repositoriesWithTheMostPeopleWhoHavePushAccess2.sql
diff --git a/regression-test/suites/variant_github_events_p0/repositoriesWithTheMostPeopleWhoHavePushAccess3.sql b/regression-test/suites/variant_github_events_p2/repositoriesWithTheMostPeopleWhoHavePushAccess3.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/repositoriesWithTheMostPeopleWhoHavePushAccess3.sql
rename to regression-test/suites/variant_github_events_p2/repositoriesWithTheMostPeopleWhoHavePushAccess3.sql
diff --git a/regression-test/suites/variant_github_events_p0/repositoriesWithTheMostStarsOverOneDay1.sql b/regression-test/suites/variant_github_events_p2/repositoriesWithTheMostStarsOverOneDay1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/repositoriesWithTheMostStarsOverOneDay1.sql
rename to regression-test/suites/variant_github_events_p2/repositoriesWithTheMostStarsOverOneDay1.sql
diff --git a/regression-test/suites/variant_github_events_p0/repositoriesWithTheMostStarsOverOneDay2.sql b/regression-test/suites/variant_github_events_p2/repositoriesWithTheMostStarsOverOneDay2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/repositoriesWithTheMostStarsOverOneDay2.sql
rename to regression-test/suites/variant_github_events_p2/repositoriesWithTheMostStarsOverOneDay2.sql
diff --git a/regression-test/suites/variant_github_events_p0/repositoriesWithTheMostStarsOverOneDay3.sql b/regression-test/suites/variant_github_events_p2/repositoriesWithTheMostStarsOverOneDay3.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/repositoriesWithTheMostStarsOverOneDay3.sql
rename to regression-test/suites/variant_github_events_p2/repositoriesWithTheMostStarsOverOneDay3.sql
diff --git a/regression-test/suites/variant_github_events_p0/repositoriesWithTheMostSteadyGrowthOverTime.sql b/regression-test/suites/variant_github_events_p2/repositoriesWithTheMostSteadyGrowthOverTime.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/repositoriesWithTheMostSteadyGrowthOverTime.sql
rename to regression-test/suites/variant_github_events_p2/repositoriesWithTheMostSteadyGrowthOverTime.sql
diff --git a/regression-test/suites/variant_github_events_p0/repositoriesWithTheWorstStagnation_order.sql b/regression-test/suites/variant_github_events_p2/repositoriesWithTheWorstStagnation_order.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/repositoriesWithTheWorstStagnation_order.sql
rename to regression-test/suites/variant_github_events_p2/repositoriesWithTheWorstStagnation_order.sql
diff --git a/regression-test/suites/variant_github_events_p0/repositoryAffinityList1.sql b/regression-test/suites/variant_github_events_p2/repositoryAffinityList1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/repositoryAffinityList1.sql
rename to regression-test/suites/variant_github_events_p2/repositoryAffinityList1.sql
diff --git a/regression-test/suites/variant_github_events_p0/repositoryAffinityList2.sql b/regression-test/suites/variant_github_events_p2/repositoryAffinityList2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/repositoryAffinityList2.sql
rename to regression-test/suites/variant_github_events_p2/repositoryAffinityList2.sql
diff --git a/regression-test/suites/variant_github_events_p0/starsFromHeavyGithubUsers1.sql b/regression-test/suites/variant_github_events_p2/starsFromHeavyGithubUsers1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/starsFromHeavyGithubUsers1.sql
rename to regression-test/suites/variant_github_events_p2/starsFromHeavyGithubUsers1.sql
diff --git a/regression-test/suites/variant_github_events_p0/starsFromHeavyGithubUsers2.sql b/regression-test/suites/variant_github_events_p2/starsFromHeavyGithubUsers2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/starsFromHeavyGithubUsers2.sql
rename to regression-test/suites/variant_github_events_p2/starsFromHeavyGithubUsers2.sql
diff --git a/regression-test/suites/variant_github_events_p0/theLongestRepositoryNames1.sql b/regression-test/suites/variant_github_events_p2/theLongestRepositoryNames1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/theLongestRepositoryNames1.sql
rename to regression-test/suites/variant_github_events_p2/theLongestRepositoryNames1.sql
diff --git a/regression-test/suites/variant_github_events_p0/theLongestRepositoryNames2.sql b/regression-test/suites/variant_github_events_p2/theLongestRepositoryNames2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/theLongestRepositoryNames2.sql
rename to regression-test/suites/variant_github_events_p2/theLongestRepositoryNames2.sql
diff --git a/regression-test/suites/variant_github_events_p0/theMostToughCodeReviews.sql b/regression-test/suites/variant_github_events_p2/theMostToughCodeReviews.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/theMostToughCodeReviews.sql
rename to regression-test/suites/variant_github_events_p2/theMostToughCodeReviews.sql
diff --git a/regression-test/suites/variant_github_events_p0/theTotalNumberOfRepositoriesOnGithub.sql b/regression-test/suites/variant_github_events_p2/theTotalNumberOfRepositoriesOnGithub.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/theTotalNumberOfRepositoriesOnGithub.sql
rename to regression-test/suites/variant_github_events_p2/theTotalNumberOfRepositoriesOnGithub.sql
diff --git a/regression-test/suites/variant_github_events_p0/theTotalNumberOfUsersOnGithub1.sql b/regression-test/suites/variant_github_events_p2/theTotalNumberOfUsersOnGithub1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/theTotalNumberOfUsersOnGithub1.sql
rename to regression-test/suites/variant_github_events_p2/theTotalNumberOfUsersOnGithub1.sql
diff --git a/regression-test/suites/variant_github_events_p0/theTotalNumberOfUsersOnGithub2.sql b/regression-test/suites/variant_github_events_p2/theTotalNumberOfUsersOnGithub2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/theTotalNumberOfUsersOnGithub2.sql
rename to regression-test/suites/variant_github_events_p2/theTotalNumberOfUsersOnGithub2.sql
diff --git a/regression-test/suites/variant_github_events_p0/theTotalNumberOfUsersOnGithub3.sql b/regression-test/suites/variant_github_events_p2/theTotalNumberOfUsersOnGithub3.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/theTotalNumberOfUsersOnGithub3.sql
rename to regression-test/suites/variant_github_events_p2/theTotalNumberOfUsersOnGithub3.sql
diff --git a/regression-test/suites/variant_github_events_p0/theTotalNumberOfUsersOnGithub4.sql b/regression-test/suites/variant_github_events_p2/theTotalNumberOfUsersOnGithub4.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/theTotalNumberOfUsersOnGithub4.sql
rename to regression-test/suites/variant_github_events_p2/theTotalNumberOfUsersOnGithub4.sql
diff --git a/regression-test/suites/variant_github_events_p0/topLabels1.sql b/regression-test/suites/variant_github_events_p2/topLabels1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/topLabels1.sql
rename to regression-test/suites/variant_github_events_p2/topLabels1.sql
diff --git a/regression-test/suites/variant_github_events_p0/topLabels2.sql b/regression-test/suites/variant_github_events_p2/topLabels2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/topLabels2.sql
rename to regression-test/suites/variant_github_events_p2/topLabels2.sql
diff --git a/regression-test/suites/variant_github_events_p0/topLabels3.sql b/regression-test/suites/variant_github_events_p2/topLabels3.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/topLabels3.sql
rename to regression-test/suites/variant_github_events_p2/topLabels3.sql
diff --git a/regression-test/suites/variant_github_events_p0/topRepositoriesByStars.sql b/regression-test/suites/variant_github_events_p2/topRepositoriesByStars.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/topRepositoriesByStars.sql
rename to regression-test/suites/variant_github_events_p2/topRepositoriesByStars.sql
diff --git a/regression-test/suites/variant_github_events_p0/whatIsTheBestDayOfTheWeekToCatchAStar.sql b/regression-test/suites/variant_github_events_p2/whatIsTheBestDayOfTheWeekToCatchAStar.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/whatIsTheBestDayOfTheWeekToCatchAStar.sql
rename to regression-test/suites/variant_github_events_p2/whatIsTheBestDayOfTheWeekToCatchAStar.sql
diff --git a/regression-test/suites/variant_github_events_p0/whoAreAllThosePeopleGivingStars1.sql b/regression-test/suites/variant_github_events_p2/whoAreAllThosePeopleGivingStars1.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/whoAreAllThosePeopleGivingStars1.sql
rename to regression-test/suites/variant_github_events_p2/whoAreAllThosePeopleGivingStars1.sql
diff --git a/regression-test/suites/variant_github_events_p0/whoAreAllThosePeopleGivingStars2.sql b/regression-test/suites/variant_github_events_p2/whoAreAllThosePeopleGivingStars2.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/whoAreAllThosePeopleGivingStars2.sql
rename to regression-test/suites/variant_github_events_p2/whoAreAllThosePeopleGivingStars2.sql
diff --git a/regression-test/suites/variant_github_events_p0/whoAreAllThosePeopleGivingStars3.sql b/regression-test/suites/variant_github_events_p2/whoAreAllThosePeopleGivingStars3.sql
similarity index 100%
rename from regression-test/suites/variant_github_events_p0/whoAreAllThosePeopleGivingStars3.sql
rename to regression-test/suites/variant_github_events_p2/whoAreAllThosePeopleGivingStars3.sql
diff --git a/regression-test/suites/variant_log_data_p2/load.groovy b/regression-test/suites/variant_log_data_p2/load.groovy
new file mode 100644
index 00000000000..cbb45c46e21
--- /dev/null
+++ b/regression-test/suites/variant_log_data_p2/load.groovy
@@ -0,0 +1,98 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements. See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership. The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+suite("regression_test_variant_logdata", "nonConcurrent,p2"){
+ def set_be_config = { key, value ->
+ String backend_id;
+ def backendId_to_backendIP = [:]
+ def backendId_to_backendHttpPort = [:]
+ getBackendIpHttpPort(backendId_to_backendIP, backendId_to_backendHttpPort);
+
+ backend_id = backendId_to_backendIP.keySet()[0]
+ def (code, out, err) = update_be_config(backendId_to_backendIP.get(backend_id), backendId_to_backendHttpPort.get(backend_id), key, value)
+ logger.info("update config: code=" + code + ", out=" + out + ", err=" + err)
+ }
+ def load_json_data = {table_name, file_name ->
+ // load the json data
+ streamLoad {
+ table "${table_name}"
+
+ // set http request header params
+ set 'read_json_by_line', 'true'
+ set 'format', 'json'
+ set 'max_filter_ratio', '0.1'
+ set 'memtable_on_sink_node', 'true'
+ file file_name // import json file
+ time 10000 // limit inflight 10s
+
+ // if declared a check callback, the default check condition will ignore.
+ // So you must check all condition
+
+ check { result, exception, startTime, endTime ->
+ if (exception != null) {
+ throw exception
+ }
+ logger.info("Stream load ${file_name} result: ${result}".toString())
+ def json = parseJson(result)
+ assertEquals("success", json.Status.toLowerCase())
+ // assertEquals(json.NumberTotalRows, json.NumberLoadedRows + json.NumberUnselectedRows)
+ assertTrue(json.NumberLoadedRows > 0 && json.LoadBytes > 0)
+ }
+ }
+ }
+
+ def create_table = { table_name, key_type="DUPLICATE", buckets=(new Random().nextInt(15) + 1).toString() ->
+ sql "DROP TABLE IF EXISTS ${table_name}"
+ sql """
+ CREATE TABLE IF NOT EXISTS ${table_name} (
+ k bigint,
+ v variant
+ )
+ ${key_type} KEY(`k`)
+ DISTRIBUTED BY HASH(k) BUCKETS ${buckets}
+ properties("replication_num" = "1", "disable_auto_compaction" = "false");
+ """
+ }
+ // 12. streamload remote file
+ table_name = "logdata"
+ create_table.call(table_name, "DUPLICATE", "4")
+ // sql "set enable_two_phase_read_opt = false;"
+ // no sparse columns
+ set_be_config.call("variant_ratio_of_defaults_as_sparse_column", "1.0")
+ load_json_data.call(table_name, """${getS3Url() + '/load/logdata.json'}""")
+ qt_sql_32 """ select json_extract(v, "\$.json.parseFailed") from logdata where json_extract(v, "\$.json.parseFailed") != 'null' order by k limit 1;"""
+ qt_sql_32_1 """select cast(v['json']['parseFailed'] as string) from logdata where cast(v['json']['parseFailed'] as string) is not null and k = 162 limit 1;"""
+ sql "truncate table ${table_name}"
+
+ // 0.95 default ratio
+ set_be_config.call("variant_ratio_of_defaults_as_sparse_column", "0.95")
+ load_json_data.call(table_name, """${getS3Url() + '/load/logdata.json'}""")
+ qt_sql_33 """ select json_extract(v,"\$.json.parseFailed") from logdata where json_extract(v,"\$.json.parseFailed") != 'null' order by k limit 1;"""
+ qt_sql_33_1 """select cast(v['json']['parseFailed'] as string) from logdata where cast(v['json']['parseFailed'] as string) is not null and k = 162 limit 1;"""
+ sql "truncate table ${table_name}"
+
+ // always sparse column
+ set_be_config.call("variant_ratio_of_defaults_as_sparse_column", "0.95")
+ load_json_data.call(table_name, """${getS3Url() + '/load/logdata.json'}""")
+ qt_sql_34 """ select json_extract(v, "\$.json.parseFailed") from logdata where json_extract(v,"\$.json.parseFailed") != 'null' order by k limit 1;"""
+ sql "truncate table ${table_name}"
+ qt_sql_35 """select json_extract(v,"\$.json.parseFailed") from logdata where k = 162 and json_extract(v,"\$.json.parseFailed") != 'null';"""
+ qt_sql_35_1 """select cast(v['json']['parseFailed'] as string) from logdata where cast(v['json']['parseFailed'] as string) is not null and k = 162 limit 1;"""
+ // TODO add test case that some certain columns are materialized in some file while others are not materilized(sparse)
+ // unique table
+ set_be_config.call("variant_ratio_of_defaults_as_sparse_column", "1")
+}
\ No newline at end of file
diff --git a/regression-test/suites/variant_p0/compaction_sparse_column.groovy b/regression-test/suites/variant_p0/compaction_sparse_column.groovy
index be3c003d1c8..57e6e6ef963 100644
--- a/regression-test/suites/variant_p0/compaction_sparse_column.groovy
+++ b/regression-test/suites/variant_p0/compaction_sparse_column.groovy
@@ -47,6 +47,7 @@ suite("test_compaction_sparse_column", "nonConcurrent") {
}
set_be_config.call("variant_ratio_of_defaults_as_sparse_column", "0.95")
+ set_be_config.call("write_buffer_size", "10240")
sql """ DROP TABLE IF EXISTS ${tableName} """
sql """
@@ -169,5 +170,7 @@ suite("test_compaction_sparse_column", "nonConcurrent") {
qt_select_all """SELECT k, v['a'], v['b'], v['xxxx'], v['point'], v['ddddd'] from ${tableName} where (cast(v['point'] as int) = 1);"""
} finally {
// try_sql("DROP TABLE IF EXISTS ${tableName}")
+ set_be_config.call("write_buffer_size", "209715200")
+ set_be_config.call("variant_ratio_of_defaults_as_sparse_column", "1")
}
}
diff --git a/regression-test/suites/variant_p0/load.groovy b/regression-test/suites/variant_p0/load.groovy
index c84620a3d91..2b9ec514031 100644
--- a/regression-test/suites/variant_p0/load.groovy
+++ b/regression-test/suites/variant_p0/load.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("regression_test_variant", "nonConcurrent"){
+suite("regression_test_variant", "p0"){
def load_json_data = {table_name, file_name ->
// load the json data
@@ -78,7 +78,6 @@ suite("regression_test_variant", "nonConcurrent"){
sql "set enable_fallback_to_original_planner=false"
try {
- set_be_config.call("variant_ratio_of_defaults_as_sparse_column", "0.95")
def key_types = ["DUPLICATE", "UNIQUE"]
for (int i = 0; i < key_types.size(); i++) {
def table_name = "simple_variant_${key_types[i]}"
@@ -268,35 +267,6 @@ suite("regression_test_variant", "nonConcurrent"){
qt_sql_31 """ select v from sparse_columns where json_extract(v, "\$") != "{}" order by cast(v as string) limit 10"""
sql "truncate table sparse_columns"
- // 12. streamload remote file
- table_name = "logdata"
- create_table.call(table_name, "DUPLICATE", "4")
- // sql "set enable_two_phase_read_opt = false;"
- // no sparse columns
- set_be_config.call("variant_ratio_of_defaults_as_sparse_column", "1.0")
- load_json_data.call(table_name, """${getS3Url() + '/load/logdata.json'}""")
- qt_sql_32 """ select json_extract(v, "\$.json.parseFailed") from logdata where json_extract(v, "\$.json.parseFailed") != 'null' order by k limit 1;"""
- qt_sql_32_1 """select cast(v['json']['parseFailed'] as string) from logdata where cast(v['json']['parseFailed'] as string) is not null and k = 162 limit 1;"""
- sql "truncate table ${table_name}"
-
- // 0.95 default ratio
- set_be_config.call("variant_ratio_of_defaults_as_sparse_column", "0.95")
- load_json_data.call(table_name, """${getS3Url() + '/load/logdata.json'}""")
- qt_sql_33 """ select json_extract(v,"\$.json.parseFailed") from logdata where json_extract(v,"\$.json.parseFailed") != 'null' order by k limit 1;"""
- qt_sql_33_1 """select cast(v['json']['parseFailed'] as string) from logdata where cast(v['json']['parseFailed'] as string) is not null and k = 162 limit 1;"""
- sql "truncate table ${table_name}"
-
- // always sparse column
- set_be_config.call("variant_ratio_of_defaults_as_sparse_column", "0.95")
- load_json_data.call(table_name, """${getS3Url() + '/load/logdata.json'}""")
- qt_sql_34 """ select json_extract(v, "\$.json.parseFailed") from logdata where json_extract(v,"\$.json.parseFailed") != 'null' order by k limit 1;"""
- sql "truncate table ${table_name}"
- qt_sql_35 """select json_extract(v,"\$.json.parseFailed") from logdata where k = 162 and json_extract(v,"\$.json.parseFailed") != 'null';"""
- qt_sql_35_1 """select cast(v['json']['parseFailed'] as string) from logdata where cast(v['json']['parseFailed'] as string) is not null and k = 162 limit 1;"""
-
- // TODO add test case that some certain columns are materialized in some file while others are not materilized(sparse)
- // unique table
- set_be_config.call("variant_ratio_of_defaults_as_sparse_column", "0.95")
table_name = "github_events"
sql """DROP TABLE IF EXISTS ${table_name}"""
sql """
@@ -345,13 +315,11 @@ suite("regression_test_variant", "nonConcurrent"){
// sql "select * from ${table_name}"
// test all sparse columns
- set_be_config.call("variant_ratio_of_defaults_as_sparse_column", "0.95")
table_name = "all_sparse_columns"
create_table.call(table_name, "DUPLICATE", "1")
sql """insert into ${table_name} values (1, '{"a" : 1}'), (1, '{"a": "1"}')"""
sql """insert into ${table_name} values (1, '{"a" : 1}'), (1, '{"a": "2"}')"""
qt_sql_37 "select * from ${table_name} order by k, cast(v as string)"
- set_be_config.call("variant_ratio_of_defaults_as_sparse_column", "0.95")
// test mow with delete
table_name = "variant_mow"
@@ -372,12 +340,10 @@ suite("regression_test_variant", "nonConcurrent"){
qt_sql_38 "select * from ${table_name} order by k limit 10"
// read text from sparse col
- set_be_config.call("variant_ratio_of_defaults_as_sparse_column", "0.95")
sql """insert into sparse_columns select 0, '{"a": 1123, "b" : [123, {"xx" : 1}], "c" : {"c" : 456, "d" : null, "e" : 7.111}, "zzz" : null, "oooo" : {"akakaka" : null, "xxxx" : {"xxx" : 123}}}' as json_str
union all select 0, '{"a" : 1234, "xxxx" : "kaana", "ddd" : {"aaa" : 123, "mxmxm" : [456, "789"]}}' as json_str from numbers("number" = "4096") limit 4096 ;"""
qt_sql_31 """select cast(v['xxxx'] as string) from sparse_columns where cast(v['xxxx'] as string) != 'null' order by k limit 1;"""
sql "truncate table sparse_columns"
- set_be_config.call("variant_ratio_of_defaults_as_sparse_column", "0.95")
// test cast
table_name = "variant_cast"
@@ -460,6 +426,7 @@ suite("regression_test_variant", "nonConcurrent"){
"""
exception("errCode = 2, detailMessage = Variant type should not be used in key")
}
+ sql "DROP TABLE IF EXISTS var_as_key"
sql """
CREATE TABLE `var_as_key` (
`k` int NULL,
@@ -476,7 +443,5 @@ suite("regression_test_variant", "nonConcurrent"){
} finally {
// reset flags
- set_be_config.call("variant_ratio_of_defaults_as_sparse_column", "0.95")
- set_be_config.call("variant_max_merged_tablet_schema_size", "2048")
}
}
diff --git a/regression-test/suites/variant_p0/mtmv.groovy b/regression-test/suites/variant_p0/mtmv.groovy
index e411df243ad..616316ad00f 100644
--- a/regression-test/suites/variant_p0/mtmv.groovy
+++ b/regression-test/suites/variant_p0/mtmv.groovy
@@ -88,7 +88,7 @@ suite("regression_test_variant_mtmv"){
CREATE MATERIALIZED VIEW mv2
BUILD IMMEDIATE REFRESH AUTO ON MANUAL DISTRIBUTED BY RANDOM BUCKETS 2
PROPERTIES ('replication_num' = '1')
- as SELECT id, cast(actor['id'] as bigint), payload FROM github_events_mtmv limit 1024;
+ as SELECT id, cast(actor['id'] as bigint) FROM github_events_mtmv limit 1024;
"""
def job_name_2 = getJobName(db, "mv2")
waitingMTMVTaskFinished(job_name_2)
diff --git a/regression-test/suites/variant_p2/load.groovy b/regression-test/suites/variant_p2/load.groovy
index 9fd511d58dd..62ba69b3a9d 100644
--- a/regression-test/suites/variant_p2/load.groovy
+++ b/regression-test/suites/variant_p2/load.groovy
@@ -17,7 +17,7 @@
import java.util.concurrent.Executors
import java.util.concurrent.TimeUnit
-suite("github_event_advance_p2", "variant_type,p2"){
+suite("load_p2", "variant_type,p2"){
def load_json_data = {table_name, file_name ->
// load the json data
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org