This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 74d0ec93b31 branch-3.1: [chore](regression-test) remove
variant_ratio_of_defaults_as_sparse_column in test cases #52413 (#52416)
74d0ec93b31 is described below
commit 74d0ec93b317c65de2edd4475713daf289fb4ec0
Author: lihangyu <[email protected]>
AuthorDate: Wed Jul 2 10:27:58 2025 +0800
branch-3.1: [chore](regression-test) remove
variant_ratio_of_defaults_as_sparse_column in test cases #52413 (#52416)
cherry-pick from #52413
---
be/src/vec/columns/column_object.cpp | 2 -
.../load.out | Bin
.../sql/affinityByIssuesAndPRs1.out | Bin
.../sql/affinityByIssuesAndPRs2.out | Bin
.../sql/authorsWithTheMostPushes.out | Bin
.../sql/countingStar1.out | Bin
.../sql/countingStar2.out | Bin
.../sql/countingStar3.out | Bin
.../sql/distributionOfRepositoriesByStarCount.out | Bin
.../sql/githubRoulette.out | Bin
...heListOfTopRepositoriesChangedOverTheYears1.out | Bin
...heListOfTopRepositoriesChangedOverTheYears2.out | Bin
...heListOfTopRepositoriesChangedOverTheYears3.out | Bin
...heListOfTopRepositoriesChangedOverTheYears4.out | Bin
...heListOfTopRepositoriesChangedOverTheYears5.out | Bin
...heListOfTopRepositoriesChangedOverTheYears6.out | Bin
.../howHasTheTotalNumberOfStarsChangedOverTime.out | Bin
.../sql/issuesWithTheMostComments1.out | Bin
.../sql/issuesWithTheMostComments2.out | Bin
.../sql/issuesWithTheMostComments3.out | Bin
.../sql/issuesWithTheMostComments4.out | Bin
.../sql/issuesWithTheMostComments5.out | Bin
.../sql/issuesWithTheMostComments6.out | Bin
.../sql/issuesWithTheMostComments7.out | Bin
.../sql/mostForkedRepositories.out | Bin
.../sql/mostPopularCommentsOnGithub.out | Bin
.../sql/organizationsByTheNumberOfRepositories.out | Bin
.../sql/organizationsByTheNumberOfStars.out | Bin
.../sql/proportionsBetweenStarsAndForks1.out | Bin
.../sql/proportionsBetweenStarsAndForks2.out | Bin
.../sql/proportionsBetweenStarsAndForks3.out | Bin
.../sql/proportionsBetweenStarsAndForks4.out | Bin
.../sql/proportionsBetweenStarsAndForks5.out | Bin
.../sql/repositoriesByAmountOfModifiedCode.out | Bin
.../sql/repositoriesByTheNumberOfPushes.out | Bin
...epositoriesWithClickhouse_related_comments1.out | Bin
...epositoriesWithClickhouse_related_comments2.out | Bin
.../repositoriesWithDoris_related_comments1.out | Bin
.../repositoriesWithDoris_related_comments2.out | Bin
.../sql/repositoriesWithTheHighestGrowthYoY.out | Bin
.../repositoriesWithTheMaximumAmountOfIssues1.out | Bin
.../repositoriesWithTheMaximumAmountOfIssues2.out | Bin
.../repositoriesWithTheMaximumAmountOfIssues3.out | Bin
.../repositoriesWithTheMaximumAmountOfIssues4.out | Bin
...sitoriesWithTheMaximumAmountOfPullRequests1.out | Bin
...sitoriesWithTheMaximumAmountOfPullRequests2.out | Bin
...esWithTheMaximumNumberOfAcceptedInvitations.out | Bin
...sitoriesWithTheMostPeopleWhoHavePushAccess1.out | Bin
.../repositoriesWithTheMostStarsOverOneDay1.out | Bin
...repositoriesWithTheMostSteadyGrowthOverTime.out | Bin
.../repositoriesWithTheWorstStagnation_order.out | Bin
.../sql/repositoryAffinityList1.out | Bin
.../sql/repositoryAffinityList2.out | Bin
.../sql/starsFromHeavyGithubUsers1.out | Bin
.../sql/starsFromHeavyGithubUsers2.out | Bin
.../sql/test_distinct_streaming_agg.out | Bin
.../sql/theLongestRepositoryNames1.out | Bin
.../sql/theLongestRepositoryNames2.out | Bin
.../sql/theMostToughCodeReviews.out | Bin
.../sql/theTotalNumberOfRepositoriesOnGithub.out | Bin
.../sql/theTotalNumberOfUsersOnGithub1.out | Bin
.../sql/theTotalNumberOfUsersOnGithub2.out | Bin
.../sql/theTotalNumberOfUsersOnGithub3.out | Bin
.../sql/theTotalNumberOfUsersOnGithub4.out | Bin
.../sql/topRepositoriesByStars.out | Bin
.../sql/whatIsTheBestDayOfTheWeekToCatchAStar.out | Bin
.../sql/whoAreAllThosePeopleGivingStars1.out | Bin
.../sql/whoAreAllThosePeopleGivingStars2.out | Bin
.../sql/whoAreAllThosePeopleGivingStars3.out | Bin
.../compaction/test_compaction_extract_root.out | Bin 266 -> 266 bytes
.../load.groovy | 13 +-----
.../load.groovy | 1 -
.../suites/variant_log_data_p2/load.groovy | 14 ------
regression-test/suites/variant_p0/desc.groovy | 6 +--
.../suites/variant_p0/with_index/load.groovy | 2 +-
.../compaction/compaction_sparse_column.groovy | 38 ++++------------
.../compaction/test_compaction_extract_root.groovy | 50 ++-------------------
regression-test/suites/variant_p2/load.groovy | 15 -------
78 files changed, 16 insertions(+), 125 deletions(-)
diff --git a/be/src/vec/columns/column_object.cpp
b/be/src/vec/columns/column_object.cpp
index fedb15ded8b..79380b413f0 100644
--- a/be/src/vec/columns/column_object.cpp
+++ b/be/src/vec/columns/column_object.cpp
@@ -1501,7 +1501,6 @@ void ColumnObject::serialize_one_row_to_string(int row,
std::string* output) con
write_buffer.commit();
auto str_ref = tmp_col->get_data_at(0);
*output = std::string(str_ref.data, str_ref.size);
- return;
}
void ColumnObject::serialize_one_row_to_string(int row, BufferWritable&
output) const {
@@ -1510,7 +1509,6 @@ void ColumnObject::serialize_one_row_to_string(int row,
BufferWritable& output)
return;
}
serialize_one_row_to_json_format(row, output, nullptr);
- return;
}
/// Struct that represents elements of the JSON path.
diff --git a/regression-test/data/variant_github_events_new_p2/load.out
b/regression-test/data/variant_github_events_new_p0/load.out
similarity index 100%
rename from regression-test/data/variant_github_events_new_p2/load.out
rename to regression-test/data/variant_github_events_new_p0/load.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/affinityByIssuesAndPRs1.out
b/regression-test/data/variant_github_events_new_p0/sql/affinityByIssuesAndPRs1.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/affinityByIssuesAndPRs1.out
rename to
regression-test/data/variant_github_events_new_p0/sql/affinityByIssuesAndPRs1.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/affinityByIssuesAndPRs2.out
b/regression-test/data/variant_github_events_new_p0/sql/affinityByIssuesAndPRs2.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/affinityByIssuesAndPRs2.out
rename to
regression-test/data/variant_github_events_new_p0/sql/affinityByIssuesAndPRs2.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/authorsWithTheMostPushes.out
b/regression-test/data/variant_github_events_new_p0/sql/authorsWithTheMostPushes.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/authorsWithTheMostPushes.out
rename to
regression-test/data/variant_github_events_new_p0/sql/authorsWithTheMostPushes.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/countingStar1.out
b/regression-test/data/variant_github_events_new_p0/sql/countingStar1.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/countingStar1.out
rename to
regression-test/data/variant_github_events_new_p0/sql/countingStar1.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/countingStar2.out
b/regression-test/data/variant_github_events_new_p0/sql/countingStar2.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/countingStar2.out
rename to
regression-test/data/variant_github_events_new_p0/sql/countingStar2.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/countingStar3.out
b/regression-test/data/variant_github_events_new_p0/sql/countingStar3.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/countingStar3.out
rename to
regression-test/data/variant_github_events_new_p0/sql/countingStar3.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/distributionOfRepositoriesByStarCount.out
b/regression-test/data/variant_github_events_new_p0/sql/distributionOfRepositoriesByStarCount.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/distributionOfRepositoriesByStarCount.out
rename to
regression-test/data/variant_github_events_new_p0/sql/distributionOfRepositoriesByStarCount.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/githubRoulette.out
b/regression-test/data/variant_github_events_new_p0/sql/githubRoulette.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/githubRoulette.out
rename to
regression-test/data/variant_github_events_new_p0/sql/githubRoulette.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears1.out
b/regression-test/data/variant_github_events_new_p0/sql/howHasTheListOfTopRepositoriesChangedOverTheYears1.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears1.out
rename to
regression-test/data/variant_github_events_new_p0/sql/howHasTheListOfTopRepositoriesChangedOverTheYears1.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears2.out
b/regression-test/data/variant_github_events_new_p0/sql/howHasTheListOfTopRepositoriesChangedOverTheYears2.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears2.out
rename to
regression-test/data/variant_github_events_new_p0/sql/howHasTheListOfTopRepositoriesChangedOverTheYears2.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears3.out
b/regression-test/data/variant_github_events_new_p0/sql/howHasTheListOfTopRepositoriesChangedOverTheYears3.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears3.out
rename to
regression-test/data/variant_github_events_new_p0/sql/howHasTheListOfTopRepositoriesChangedOverTheYears3.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears4.out
b/regression-test/data/variant_github_events_new_p0/sql/howHasTheListOfTopRepositoriesChangedOverTheYears4.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears4.out
rename to
regression-test/data/variant_github_events_new_p0/sql/howHasTheListOfTopRepositoriesChangedOverTheYears4.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears5.out
b/regression-test/data/variant_github_events_new_p0/sql/howHasTheListOfTopRepositoriesChangedOverTheYears5.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears5.out
rename to
regression-test/data/variant_github_events_new_p0/sql/howHasTheListOfTopRepositoriesChangedOverTheYears5.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears6.out
b/regression-test/data/variant_github_events_new_p0/sql/howHasTheListOfTopRepositoriesChangedOverTheYears6.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears6.out
rename to
regression-test/data/variant_github_events_new_p0/sql/howHasTheListOfTopRepositoriesChangedOverTheYears6.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/howHasTheTotalNumberOfStarsChangedOverTime.out
b/regression-test/data/variant_github_events_new_p0/sql/howHasTheTotalNumberOfStarsChangedOverTime.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/howHasTheTotalNumberOfStarsChangedOverTime.out
rename to
regression-test/data/variant_github_events_new_p0/sql/howHasTheTotalNumberOfStarsChangedOverTime.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments1.out
b/regression-test/data/variant_github_events_new_p0/sql/issuesWithTheMostComments1.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments1.out
rename to
regression-test/data/variant_github_events_new_p0/sql/issuesWithTheMostComments1.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments2.out
b/regression-test/data/variant_github_events_new_p0/sql/issuesWithTheMostComments2.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments2.out
rename to
regression-test/data/variant_github_events_new_p0/sql/issuesWithTheMostComments2.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments3.out
b/regression-test/data/variant_github_events_new_p0/sql/issuesWithTheMostComments3.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments3.out
rename to
regression-test/data/variant_github_events_new_p0/sql/issuesWithTheMostComments3.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments4.out
b/regression-test/data/variant_github_events_new_p0/sql/issuesWithTheMostComments4.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments4.out
rename to
regression-test/data/variant_github_events_new_p0/sql/issuesWithTheMostComments4.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments5.out
b/regression-test/data/variant_github_events_new_p0/sql/issuesWithTheMostComments5.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments5.out
rename to
regression-test/data/variant_github_events_new_p0/sql/issuesWithTheMostComments5.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments6.out
b/regression-test/data/variant_github_events_new_p0/sql/issuesWithTheMostComments6.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments6.out
rename to
regression-test/data/variant_github_events_new_p0/sql/issuesWithTheMostComments6.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments7.out
b/regression-test/data/variant_github_events_new_p0/sql/issuesWithTheMostComments7.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments7.out
rename to
regression-test/data/variant_github_events_new_p0/sql/issuesWithTheMostComments7.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/mostForkedRepositories.out
b/regression-test/data/variant_github_events_new_p0/sql/mostForkedRepositories.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/mostForkedRepositories.out
rename to
regression-test/data/variant_github_events_new_p0/sql/mostForkedRepositories.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/mostPopularCommentsOnGithub.out
b/regression-test/data/variant_github_events_new_p0/sql/mostPopularCommentsOnGithub.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/mostPopularCommentsOnGithub.out
rename to
regression-test/data/variant_github_events_new_p0/sql/mostPopularCommentsOnGithub.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/organizationsByTheNumberOfRepositories.out
b/regression-test/data/variant_github_events_new_p0/sql/organizationsByTheNumberOfRepositories.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/organizationsByTheNumberOfRepositories.out
rename to
regression-test/data/variant_github_events_new_p0/sql/organizationsByTheNumberOfRepositories.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/organizationsByTheNumberOfStars.out
b/regression-test/data/variant_github_events_new_p0/sql/organizationsByTheNumberOfStars.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/organizationsByTheNumberOfStars.out
rename to
regression-test/data/variant_github_events_new_p0/sql/organizationsByTheNumberOfStars.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks1.out
b/regression-test/data/variant_github_events_new_p0/sql/proportionsBetweenStarsAndForks1.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks1.out
rename to
regression-test/data/variant_github_events_new_p0/sql/proportionsBetweenStarsAndForks1.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks2.out
b/regression-test/data/variant_github_events_new_p0/sql/proportionsBetweenStarsAndForks2.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks2.out
rename to
regression-test/data/variant_github_events_new_p0/sql/proportionsBetweenStarsAndForks2.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks3.out
b/regression-test/data/variant_github_events_new_p0/sql/proportionsBetweenStarsAndForks3.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks3.out
rename to
regression-test/data/variant_github_events_new_p0/sql/proportionsBetweenStarsAndForks3.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks4.out
b/regression-test/data/variant_github_events_new_p0/sql/proportionsBetweenStarsAndForks4.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks4.out
rename to
regression-test/data/variant_github_events_new_p0/sql/proportionsBetweenStarsAndForks4.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks5.out
b/regression-test/data/variant_github_events_new_p0/sql/proportionsBetweenStarsAndForks5.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks5.out
rename to
regression-test/data/variant_github_events_new_p0/sql/proportionsBetweenStarsAndForks5.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/repositoriesByAmountOfModifiedCode.out
b/regression-test/data/variant_github_events_new_p0/sql/repositoriesByAmountOfModifiedCode.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/repositoriesByAmountOfModifiedCode.out
rename to
regression-test/data/variant_github_events_new_p0/sql/repositoriesByAmountOfModifiedCode.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/repositoriesByTheNumberOfPushes.out
b/regression-test/data/variant_github_events_new_p0/sql/repositoriesByTheNumberOfPushes.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/repositoriesByTheNumberOfPushes.out
rename to
regression-test/data/variant_github_events_new_p0/sql/repositoriesByTheNumberOfPushes.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithClickhouse_related_comments1.out
b/regression-test/data/variant_github_events_new_p0/sql/repositoriesWithClickhouse_related_comments1.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/repositoriesWithClickhouse_related_comments1.out
rename to
regression-test/data/variant_github_events_new_p0/sql/repositoriesWithClickhouse_related_comments1.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithClickhouse_related_comments2.out
b/regression-test/data/variant_github_events_new_p0/sql/repositoriesWithClickhouse_related_comments2.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/repositoriesWithClickhouse_related_comments2.out
rename to
regression-test/data/variant_github_events_new_p0/sql/repositoriesWithClickhouse_related_comments2.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithDoris_related_comments1.out
b/regression-test/data/variant_github_events_new_p0/sql/repositoriesWithDoris_related_comments1.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/repositoriesWithDoris_related_comments1.out
rename to
regression-test/data/variant_github_events_new_p0/sql/repositoriesWithDoris_related_comments1.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithDoris_related_comments2.out
b/regression-test/data/variant_github_events_new_p0/sql/repositoriesWithDoris_related_comments2.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/repositoriesWithDoris_related_comments2.out
rename to
regression-test/data/variant_github_events_new_p0/sql/repositoriesWithDoris_related_comments2.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheHighestGrowthYoY.out
b/regression-test/data/variant_github_events_new_p0/sql/repositoriesWithTheHighestGrowthYoY.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheHighestGrowthYoY.out
rename to
regression-test/data/variant_github_events_new_p0/sql/repositoriesWithTheHighestGrowthYoY.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfIssues1.out
b/regression-test/data/variant_github_events_new_p0/sql/repositoriesWithTheMaximumAmountOfIssues1.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfIssues1.out
rename to
regression-test/data/variant_github_events_new_p0/sql/repositoriesWithTheMaximumAmountOfIssues1.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfIssues2.out
b/regression-test/data/variant_github_events_new_p0/sql/repositoriesWithTheMaximumAmountOfIssues2.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfIssues2.out
rename to
regression-test/data/variant_github_events_new_p0/sql/repositoriesWithTheMaximumAmountOfIssues2.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfIssues3.out
b/regression-test/data/variant_github_events_new_p0/sql/repositoriesWithTheMaximumAmountOfIssues3.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfIssues3.out
rename to
regression-test/data/variant_github_events_new_p0/sql/repositoriesWithTheMaximumAmountOfIssues3.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfIssues4.out
b/regression-test/data/variant_github_events_new_p0/sql/repositoriesWithTheMaximumAmountOfIssues4.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfIssues4.out
rename to
regression-test/data/variant_github_events_new_p0/sql/repositoriesWithTheMaximumAmountOfIssues4.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfPullRequests1.out
b/regression-test/data/variant_github_events_new_p0/sql/repositoriesWithTheMaximumAmountOfPullRequests1.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfPullRequests1.out
rename to
regression-test/data/variant_github_events_new_p0/sql/repositoriesWithTheMaximumAmountOfPullRequests1.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfPullRequests2.out
b/regression-test/data/variant_github_events_new_p0/sql/repositoriesWithTheMaximumAmountOfPullRequests2.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfPullRequests2.out
rename to
regression-test/data/variant_github_events_new_p0/sql/repositoriesWithTheMaximumAmountOfPullRequests2.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumNumberOfAcceptedInvitations.out
b/regression-test/data/variant_github_events_new_p0/sql/repositoriesWithTheMaximumNumberOfAcceptedInvitations.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumNumberOfAcceptedInvitations.out
rename to
regression-test/data/variant_github_events_new_p0/sql/repositoriesWithTheMaximumNumberOfAcceptedInvitations.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMostPeopleWhoHavePushAccess1.out
b/regression-test/data/variant_github_events_new_p0/sql/repositoriesWithTheMostPeopleWhoHavePushAccess1.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMostPeopleWhoHavePushAccess1.out
rename to
regression-test/data/variant_github_events_new_p0/sql/repositoriesWithTheMostPeopleWhoHavePushAccess1.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMostStarsOverOneDay1.out
b/regression-test/data/variant_github_events_new_p0/sql/repositoriesWithTheMostStarsOverOneDay1.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMostStarsOverOneDay1.out
rename to
regression-test/data/variant_github_events_new_p0/sql/repositoriesWithTheMostStarsOverOneDay1.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMostSteadyGrowthOverTime.out
b/regression-test/data/variant_github_events_new_p0/sql/repositoriesWithTheMostSteadyGrowthOverTime.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMostSteadyGrowthOverTime.out
rename to
regression-test/data/variant_github_events_new_p0/sql/repositoriesWithTheMostSteadyGrowthOverTime.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheWorstStagnation_order.out
b/regression-test/data/variant_github_events_new_p0/sql/repositoriesWithTheWorstStagnation_order.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheWorstStagnation_order.out
rename to
regression-test/data/variant_github_events_new_p0/sql/repositoriesWithTheWorstStagnation_order.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/repositoryAffinityList1.out
b/regression-test/data/variant_github_events_new_p0/sql/repositoryAffinityList1.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/repositoryAffinityList1.out
rename to
regression-test/data/variant_github_events_new_p0/sql/repositoryAffinityList1.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/repositoryAffinityList2.out
b/regression-test/data/variant_github_events_new_p0/sql/repositoryAffinityList2.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/repositoryAffinityList2.out
rename to
regression-test/data/variant_github_events_new_p0/sql/repositoryAffinityList2.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/starsFromHeavyGithubUsers1.out
b/regression-test/data/variant_github_events_new_p0/sql/starsFromHeavyGithubUsers1.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/starsFromHeavyGithubUsers1.out
rename to
regression-test/data/variant_github_events_new_p0/sql/starsFromHeavyGithubUsers1.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/starsFromHeavyGithubUsers2.out
b/regression-test/data/variant_github_events_new_p0/sql/starsFromHeavyGithubUsers2.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/starsFromHeavyGithubUsers2.out
rename to
regression-test/data/variant_github_events_new_p0/sql/starsFromHeavyGithubUsers2.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/test_distinct_streaming_agg.out
b/regression-test/data/variant_github_events_new_p0/sql/test_distinct_streaming_agg.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/test_distinct_streaming_agg.out
rename to
regression-test/data/variant_github_events_new_p0/sql/test_distinct_streaming_agg.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/theLongestRepositoryNames1.out
b/regression-test/data/variant_github_events_new_p0/sql/theLongestRepositoryNames1.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/theLongestRepositoryNames1.out
rename to
regression-test/data/variant_github_events_new_p0/sql/theLongestRepositoryNames1.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/theLongestRepositoryNames2.out
b/regression-test/data/variant_github_events_new_p0/sql/theLongestRepositoryNames2.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/theLongestRepositoryNames2.out
rename to
regression-test/data/variant_github_events_new_p0/sql/theLongestRepositoryNames2.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/theMostToughCodeReviews.out
b/regression-test/data/variant_github_events_new_p0/sql/theMostToughCodeReviews.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/theMostToughCodeReviews.out
rename to
regression-test/data/variant_github_events_new_p0/sql/theMostToughCodeReviews.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/theTotalNumberOfRepositoriesOnGithub.out
b/regression-test/data/variant_github_events_new_p0/sql/theTotalNumberOfRepositoriesOnGithub.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/theTotalNumberOfRepositoriesOnGithub.out
rename to
regression-test/data/variant_github_events_new_p0/sql/theTotalNumberOfRepositoriesOnGithub.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/theTotalNumberOfUsersOnGithub1.out
b/regression-test/data/variant_github_events_new_p0/sql/theTotalNumberOfUsersOnGithub1.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/theTotalNumberOfUsersOnGithub1.out
rename to
regression-test/data/variant_github_events_new_p0/sql/theTotalNumberOfUsersOnGithub1.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/theTotalNumberOfUsersOnGithub2.out
b/regression-test/data/variant_github_events_new_p0/sql/theTotalNumberOfUsersOnGithub2.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/theTotalNumberOfUsersOnGithub2.out
rename to
regression-test/data/variant_github_events_new_p0/sql/theTotalNumberOfUsersOnGithub2.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/theTotalNumberOfUsersOnGithub3.out
b/regression-test/data/variant_github_events_new_p0/sql/theTotalNumberOfUsersOnGithub3.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/theTotalNumberOfUsersOnGithub3.out
rename to
regression-test/data/variant_github_events_new_p0/sql/theTotalNumberOfUsersOnGithub3.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/theTotalNumberOfUsersOnGithub4.out
b/regression-test/data/variant_github_events_new_p0/sql/theTotalNumberOfUsersOnGithub4.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/theTotalNumberOfUsersOnGithub4.out
rename to
regression-test/data/variant_github_events_new_p0/sql/theTotalNumberOfUsersOnGithub4.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/topRepositoriesByStars.out
b/regression-test/data/variant_github_events_new_p0/sql/topRepositoriesByStars.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/topRepositoriesByStars.out
rename to
regression-test/data/variant_github_events_new_p0/sql/topRepositoriesByStars.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/whatIsTheBestDayOfTheWeekToCatchAStar.out
b/regression-test/data/variant_github_events_new_p0/sql/whatIsTheBestDayOfTheWeekToCatchAStar.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/whatIsTheBestDayOfTheWeekToCatchAStar.out
rename to
regression-test/data/variant_github_events_new_p0/sql/whatIsTheBestDayOfTheWeekToCatchAStar.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/whoAreAllThosePeopleGivingStars1.out
b/regression-test/data/variant_github_events_new_p0/sql/whoAreAllThosePeopleGivingStars1.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/whoAreAllThosePeopleGivingStars1.out
rename to
regression-test/data/variant_github_events_new_p0/sql/whoAreAllThosePeopleGivingStars1.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/whoAreAllThosePeopleGivingStars2.out
b/regression-test/data/variant_github_events_new_p0/sql/whoAreAllThosePeopleGivingStars2.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/whoAreAllThosePeopleGivingStars2.out
rename to
regression-test/data/variant_github_events_new_p0/sql/whoAreAllThosePeopleGivingStars2.out
diff --git
a/regression-test/data/variant_github_events_new_p2/sql/whoAreAllThosePeopleGivingStars3.out
b/regression-test/data/variant_github_events_new_p0/sql/whoAreAllThosePeopleGivingStars3.out
similarity index 100%
rename from
regression-test/data/variant_github_events_new_p2/sql/whoAreAllThosePeopleGivingStars3.out
rename to
regression-test/data/variant_github_events_new_p0/sql/whoAreAllThosePeopleGivingStars3.out
diff --git
a/regression-test/data/variant_p1/compaction/test_compaction_extract_root.out
b/regression-test/data/variant_p1/compaction/test_compaction_extract_root.out
index ed982672fa5..7b881949167 100644
Binary files
a/regression-test/data/variant_p1/compaction/test_compaction_extract_root.out
and
b/regression-test/data/variant_p1/compaction/test_compaction_extract_root.out
differ
diff --git a/regression-test/suites/variant_github_events_new_p2/load.groovy
b/regression-test/suites/variant_github_events_new_p0/load.groovy
similarity index 93%
rename from regression-test/suites/variant_github_events_new_p2/load.groovy
rename to regression-test/suites/variant_github_events_new_p0/load.groovy
index 3732a3e201a..9a67162ea57 100644
--- a/regression-test/suites/variant_github_events_new_p2/load.groovy
+++ b/regression-test/suites/variant_github_events_new_p0/load.groovy
@@ -15,16 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("regression_test_variant_github_events_p2", "nonConcurrent,p2"){
- def backendId_to_backendIP = [:]
- def backendId_to_backendHttpPort = [:]
- getBackendIpHttpPort(backendId_to_backendIP, backendId_to_backendHttpPort);
- def set_be_config = { key, value ->
- for (String backend_id: backendId_to_backendIP.keySet()) {
- 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)
- }
- }
+suite("regression_test_variant_github_events_p0", "p0"){
def load_json_data = {table_name, file_name ->
// load the json data
streamLoad {
@@ -59,7 +50,7 @@ suite("regression_test_variant_github_events_p2",
"nonConcurrent,p2"){
sql """
CREATE TABLE IF NOT EXISTS ${table_name} (
k bigint,
- v variant,
+ v variant<'payload.pull_request.head.repo.topics' : array<text>>,
INDEX idx_var(v) USING INVERTED COMMENT ''
)
DUPLICATE KEY(`k`)
diff --git
a/regression-test/suites/variant_github_events_nonConcurrent_p2/load.groovy
b/regression-test/suites/variant_github_events_nonConcurrent_p2/load.groovy
index 6e41a53a668..48cb2ebf14d 100644
--- a/regression-test/suites/variant_github_events_nonConcurrent_p2/load.groovy
+++ b/regression-test/suites/variant_github_events_nonConcurrent_p2/load.groovy
@@ -81,7 +81,6 @@ suite("regression_test_variant_github_events_p2",
"nonConcurrent,p2"){
DISTRIBUTED BY HASH(k) BUCKETS 4
properties("replication_num" = "1", "disable_auto_compaction" =
"true", "variant_enable_flatten_nested" = "true",
"inverted_index_storage_format"= "v2", "variant_max_subcolumns_count" =
"${rand_subcolumns_count}");
"""
-
// 2015
load_json_data.call(table_name, """${getS3Url() +
'/regression/gharchive.m/2015-01-01-0.json'}""")
load_json_data.call(table_name, """${getS3Url() +
'/regression/gharchive.m/2015-01-01-1.json'}""")
diff --git a/regression-test/suites/variant_log_data_p2/load.groovy
b/regression-test/suites/variant_log_data_p2/load.groovy
index aa512d745de..152723f24cc 100644
--- a/regression-test/suites/variant_log_data_p2/load.groovy
+++ b/regression-test/suites/variant_log_data_p2/load.groovy
@@ -16,16 +16,6 @@
// 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 {
@@ -72,21 +62,18 @@ suite("regression_test_variant_logdata",
"nonConcurrent,p2"){
create_table.call(table_name, "DUPLICATE", "4")
// sql "set enable_two_phase_read_opt = false;"
// no sparse columns
-
load_json_data.call(table_name, """${getS3Url() +
'/regression/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
-
load_json_data.call(table_name, """${getS3Url() +
'/regression/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
-
load_json_data.call(table_name, """${getS3Url() +
'/regression/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}"
@@ -94,5 +81,4 @@ suite("regression_test_variant_logdata", "nonConcurrent,p2"){
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
-
}
\ No newline at end of file
diff --git a/regression-test/suites/variant_p0/desc.groovy
b/regression-test/suites/variant_p0/desc.groovy
index bc3a90f4b8c..eb77a25881d 100644
--- a/regression-test/suites/variant_p0/desc.groovy
+++ b/regression-test/suites/variant_p0/desc.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("regression_test_variant_desc", "nonConcurrent"){
+suite("regression_test_variant_desc", "p0"){
// if (isCloudMode()) {
// return
// }
@@ -101,7 +101,6 @@ suite("regression_test_variant_desc", "nonConcurrent"){
// sparse columns
def table_name = "sparse_columns"
create_table table_name
-
sql """set describe_extend_variant_column = true"""
sql """insert into sparse_columns select 0, '{"a": 11245, "b" : [123,
{"xx" : 1}], "c" : {"c" : 456, "d" : null, "e" : 7.111}}' as json_str
union all select 0, '{"a": 1123}' as json_str union all select 0,
'{"a" : 1234, "xxxx" : "kaana"}' as json_str from numbers("number" = "4096")
limit 4096 ;"""
@@ -119,7 +118,6 @@ suite("regression_test_variant_desc", "nonConcurrent"){
table_name = "no_sparse_columns"
create_table.call(table_name, "4")
sql "set enable_two_phase_read_opt = false;"
-
sql """insert into ${table_name} select 0, '{"a": 11245, "b" : [123,
{"xx" : 1}], "c" : {"c" : 456, "d" : null, "e" : 7.111}}' as json_str
union all select 0, '{"a": 1123}' as json_str union all select 0,
'{"a" : 1234, "xxxx" : "kaana"}' as json_str from numbers("number" = "4096")
limit 4096 ;"""
sql "select * from no_sparse_columns limit 1"
@@ -130,7 +128,6 @@ suite("regression_test_variant_desc", "nonConcurrent"){
table_name = "partition_data"
create_table_partition.call(table_name, "4")
sql "set enable_two_phase_read_opt = false;"
-
sql """insert into ${table_name} select 2500, '{"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 2500, '{"a" : 1234, "xxxx" : "kaana", "ddd" :
{"aaa" : 123, "mxmxm" : [456, "789"]}}' as json_str from numbers("number" =
"4096") limit 4096 ;"""
sql """insert into ${table_name} select 45000, '{"a": 11245, "b" :
[123, {"xx" : 1}], "c" : {"c" : 456, "d" : null, "e" : 7.111}}' as json_str
@@ -278,6 +275,5 @@ suite("regression_test_variant_desc", "nonConcurrent"){
sql "desc large_tablets"
} finally {
// reset flags
-
}
}
diff --git a/regression-test/suites/variant_p0/with_index/load.groovy
b/regression-test/suites/variant_p0/with_index/load.groovy
index 57a6a7b4c38..dcfdc7ebccc 100644
--- a/regression-test/suites/variant_p0/with_index/load.groovy
+++ b/regression-test/suites/variant_p0/with_index/load.groovy
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
-suite("regression_test_variant_with_index"){
+suite("regression_test_variant_with_index", "p0"){
def timeout = 60000
def delta_time = 1000
def alter_res = "null"
diff --git
a/regression-test/suites/variant_p1/compaction/compaction_sparse_column.groovy
b/regression-test/suites/variant_p1/compaction/compaction_sparse_column.groovy
index 916ea61b127..b77db0226a8 100644
---
a/regression-test/suites/variant_p1/compaction/compaction_sparse_column.groovy
+++
b/regression-test/suites/variant_p1/compaction/compaction_sparse_column.groovy
@@ -18,7 +18,7 @@
import org.codehaus.groovy.runtime.IOGroovyMethods
import org.awaitility.Awaitility
-suite("test_compaction_sparse_column", "p1,nonConcurrent") {
+suite("test_compaction_sparse_column", "p1") {
def tableName = "test_compaction"
String backend_id;
def backendId_to_backendIP = [:]
@@ -46,8 +46,6 @@ suite("test_compaction_sparse_column", "p1,nonConcurrent") {
}
try {
- set_be_config.call("write_buffer_size", "10240")
-
sql """ DROP TABLE IF EXISTS ${tableName} """
sql """
CREATE TABLE ${tableName} (
@@ -162,30 +160,14 @@ suite("test_compaction_sparse_column",
"p1,nonConcurrent") {
qt_select_5_1_bfcompact """ SELECT count(cast(v['b'] as int)) FROM
${tableName} where cast(v['b'] as int) = 42004;"""
qt_select_6_1_bfcompact """ SELECT count(cast(v['b'] as int)) FROM
${tableName} where cast(v['b'] as int) = 42005;"""
qt_select_all_bfcompact """SELECT k, v['a'], v['b'], v['xxxx'],
v['point'], v['ddddd'] from ${tableName} where (cast(v['point'] as int) = 1);"""
-
-
GetDebugPoint().enableDebugPointForAllBEs("variant_column_writer_impl._get_subcolumn_paths_from_stats",
[stats: "24588,12292,12291,3",subcolumns:"a,b,xxxx"])
- triger_compaction.call()
- /**
- variant_statistics {
- subcolumn_non_null_size {
- key: "a"
- value: 24588
- }
- subcolumn_non_null_size {
- key: "b"
- value: 12292
- }
- subcolumn_non_null_size {
- key: "point"
- value: 3
- }
- subcolumn_non_null_size {
- key: "xxxx"
- value: 12291
- }
- */
- qt_select_b """ SELECT count(cast(v['b'] as string)) FROM
${tableName};"""
+
//TabletId,ReplicaId,BackendId,SchemaHash,Version,LstSuccessVersion,LstFailedVersion,LstFailedTime,LocalDataSize,RemoteDataSize,RowCount,State,LstConsistencyCheckTime,CheckVersion,VersionCount,PathHash,MetaUrl,CompactionStatus
+ def tablets = sql_return_maparray """ show tablets from ${tableName};
"""
+
+ // trigger compactions for all tablets in ${tableName}
+ trigger_and_wait_compaction(tableName, "cumulative")
+
+ qt_select_b """ SELECT count(cast(v['b'] as int)) FROM ${tableName};"""
qt_select_xxxx """ SELECT count(cast(v['xxxx'] as string)) FROM
${tableName};"""
qt_select_point """ SELECT count(cast(v['point'] as bigint)) FROM
${tableName};"""
qt_select_1 """ SELECT count(cast(v['xxxx'] as string)) FROM
${tableName} where cast(v['xxxx'] as string) = 'aaaaa';"""
@@ -212,9 +194,5 @@ suite("test_compaction_sparse_column", "p1,nonConcurrent") {
qt_sql """select v['aa'] from ${tableName}"""
qt_sql """select v['1'] from ${tableName}"""
} finally {
- // try_sql("DROP TABLE IF EXISTS ${tableName}")
-
GetDebugPoint().disableDebugPointForAllBEs("variant_column_writer_impl._get_subcolumn_paths_from_stats")
- set_be_config.call("write_buffer_size", "209715200")
- // set_be_config.call("variant_max_subcolumns_count", "5")
}
}
diff --git
a/regression-test/suites/variant_p1/compaction/test_compaction_extract_root.groovy
b/regression-test/suites/variant_p1/compaction/test_compaction_extract_root.groovy
index 7c4f26f7417..7d9c5eee668 100644
---
a/regression-test/suites/variant_p1/compaction/test_compaction_extract_root.groovy
+++
b/regression-test/suites/variant_p1/compaction/test_compaction_extract_root.groovy
@@ -17,34 +17,8 @@
import org.codehaus.groovy.runtime.IOGroovyMethods
-suite("test_compaction_extract_root", "p1,nonConcurrent") {
+suite("test_compaction_extract_root", "p1") {
def tableName = "test_t"
-
- def backendId_to_backendIP = [:]
- def backendId_to_backendHttpPort = [:]
- getBackendIpHttpPort(backendId_to_backendIP, backendId_to_backendHttpPort);
- def set_be_config = { key, value ->
- for (String backend_id: backendId_to_backendIP.keySet()) {
- 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)
- }
- }
- String backend_id;
- backend_id = backendId_to_backendIP.keySet()[0]
- def (code, out, err) =
show_be_config(backendId_to_backendIP.get(backend_id),
backendId_to_backendHttpPort.get(backend_id))
- logger.info("Show config: code=" + code + ", out=" + out + ", err=" + err)
- assertEquals(code, 0)
- def configList = parseJson(out.trim())
- assert configList instanceof List
-
- boolean disableAutoCompaction = true
- for (Object ele in (List) configList) {
- assert ele instanceof List<String>
- if (((List<String>) ele)[0] == "disable_auto_compaction") {
- disableAutoCompaction = Boolean.parseBoolean(((List<String>)
ele)[2])
- }
- }
-
sql """ DROP TABLE IF EXISTS ${tableName} """
sql """
CREATE TABLE ${tableName} (
@@ -59,8 +33,6 @@ suite("test_compaction_extract_root", "p1,nonConcurrent") {
);
"""
- set_be_config.call("enable_vertical_segment_writer", "true")
-
sql """insert into ${tableName} select 0, '{"a": 11245, "b" : {"state" :
"open", "code" : 2}}' as json_str
union all select 8, '{"a": 1123}' as json_str union all select 0,
'{"a" : 1234, "xxxx" : "aaaaa"}' as json_str from numbers("number" = "4096")
limit 4096 ;"""
@@ -96,27 +68,13 @@ suite("test_compaction_extract_root", "p1,nonConcurrent") {
def tablets = sql_return_maparray """ show tablets from ${tableName}; """
// trigger compactions for all tablets in ${tableName}
- trigger_and_wait_compaction(tableName, "cumulative")
-
- int rowCount = 0
- for (def tablet in tablets) {
- String tablet_id = tablet.TabletId
- (code, out, err) = curl("GET", tablet.CompactionStatus)
- logger.info("Show tablets status: code=" + code + ", out=" + out + ",
err=" + err)
- assertEquals(code, 0)
- def tabletJson = parseJson(out.trim())
- assert tabletJson.rowsets instanceof List
- for (String rowset in (List<String>) tabletJson.rowsets) {
- rowCount += Integer.parseInt(rowset.split(" ")[1])
- }
- }
- assert (rowCount <= 8)
+ trigger_and_wait_compaction(tableName, "full")
+
// fix cast to string tobe {}
- qt_select_b_3 """ SELECT count(cast(v['b'] as string)) FROM test_t"""
+ qt_select_b_3 """ SELECT count(cast(v['b'] as string)) FROM test_t where
cast(v['b'] as string) != '{}' """
qt_select_b_4 """ SELECT count(cast(v['b'] as int)) FROM test_t"""
// TODO, sparse columns with v['b'] will not be merged in
hierachical_data_reader with sparse columns
// qt_select_b_5 """ select v['b'] from test_t where cast(v['b'] as
string) != '42005' and cast(v['b'] as string) != '42004' and cast(v['b'] as
string) != '42003' order by cast(v['b'] as string); """
qt_select_1 """select v['b'] from test_t where k = 0 and cast(v['a'] as
int) = 11245;"""
-
}
diff --git a/regression-test/suites/variant_p2/load.groovy
b/regression-test/suites/variant_p2/load.groovy
index 0b9b6784c8d..4475951571f 100644
--- a/regression-test/suites/variant_p2/load.groovy
+++ b/regression-test/suites/variant_p2/load.groovy
@@ -69,19 +69,6 @@ suite("load_p2", "variant_type,p2"){
"""
}
- def backendId_to_backendIP = [:]
- def backendId_to_backendHttpPort = [:]
- getBackendIpHttpPort(backendId_to_backendIP, backendId_to_backendHttpPort);
-
- def set_be_config = { key, value ->
- for (String backend_id: backendId_to_backendIP.keySet()) {
- 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)
- }
- }
- set_be_config.call("string_type_length_soft_limit_bytes", "10485760")
-
-
// Configuration for the number of threads
def numberOfThreads = 10 // Set this to your desired number of threads
@@ -90,7 +77,6 @@ suite("load_p2", "variant_type,p2"){
try {
def table_name = "github_events"
-
def s3load_paral_wait = {tbl, fmt, path, paral ->
String ak = getS3AK()
String sk = getS3SK()
@@ -178,6 +164,5 @@ suite("load_p2", "variant_type,p2"){
qt_sql("select count() from github_events")
} finally {
// reset flags
-
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
