This is an automated email from the ASF dual-hosted git repository.
eldenmoon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 175fce097fb [test](variant) Increase compaction timeout for variant
test cases (#59856)
175fce097fb is described below
commit 175fce097fbbd513c03ea2449052ae78393f510d
Author: Gary <[email protected]>
AuthorDate: Thu Jan 15 11:14:06 2026 +0800
[test](variant) Increase compaction timeout for variant test cases (#59856)
1. Increase trigger_and_wait_compaction timeout for variant test cases
(300s -> 30min)
2. mv variant_github_events_new_p0 to variant_github_events_new_p2
---
.../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
.../sql/howHasTheListOfTopRepositoriesChangedOverTheYears1.out | 0
.../sql/howHasTheListOfTopRepositoriesChangedOverTheYears2.out | 0
.../sql/howHasTheListOfTopRepositoriesChangedOverTheYears3.out | 0
.../sql/howHasTheListOfTopRepositoriesChangedOverTheYears4.out | 0
.../sql/howHasTheListOfTopRepositoriesChangedOverTheYears5.out | 0
.../sql/howHasTheListOfTopRepositoriesChangedOverTheYears6.out | 0
.../sql/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
.../sql/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
.../sql/repositoriesWithClickhouse_related_comments1.out | 0
.../sql/repositoriesWithClickhouse_related_comments2.out | 0
.../sql/repositoriesWithDoris_related_comments1.out | 0
.../sql/repositoriesWithDoris_related_comments2.out | 0
.../sql/repositoriesWithTheHighestGrowthYoY.out | 0
.../sql/repositoriesWithTheMaximumAmountOfIssues1.out | 0
.../sql/repositoriesWithTheMaximumAmountOfIssues2.out | 0
.../sql/repositoriesWithTheMaximumAmountOfIssues3.out | 0
.../sql/repositoriesWithTheMaximumAmountOfIssues4.out | 0
.../sql/repositoriesWithTheMaximumAmountOfPullRequests1.out | 0
.../sql/repositoriesWithTheMaximumAmountOfPullRequests2.out | 0
.../repositoriesWithTheMaximumNumberOfAcceptedInvitations.out | 0
.../sql/repositoriesWithTheMostPeopleWhoHavePushAccess1.out | 0
.../sql/repositoriesWithTheMostStarsOverOneDay1.out | 0
.../sql/repositoriesWithTheMostSteadyGrowthOverTime.out | 0
.../sql/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
.../load.groovy | 4 ++--
.../suites/variant_github_events_nonConcurrent_p2/load.groovy | 2 +-
regression-test/suites/variant_p0/agg.groovy | 4 ++--
.../suites/variant_p0/compaction/test_compaction.groovy | 2 +-
.../ext_meta/test_variant_external_meta_concurrent.groovy | 2 +-
.../ext_meta/test_variant_external_meta_edge_cases.groovy | 4 ++--
.../ext_meta/test_variant_external_meta_integration.groovy | 4 ++--
.../ext_meta/test_variant_external_meta_with_sparse.groovy | 10 +++++-----
regression-test/suites/variant_p0/load.groovy | 2 +-
regression-test/suites/variant_p0/nested.groovy | 6 +++---
regression-test/suites/variant_p0/nested/load.groovy | 4 ++--
.../suites/variant_p0/nested/nested_in_top_array.groovy | 2 +-
regression-test/suites/variant_p0/nested2.groovy | 4 ++--
regression-test/suites/variant_p0/predefine/load.groovy | 2 +-
regression-test/suites/variant_p0/predefine/multi_var.groovy | 6 +++---
.../variant_p0/predefine/predefined_typed_to_sparse.groovy | 4 ++--
.../predefine/test_all_prdefine_type_to_sparse.groovy | 2 +-
.../suites/variant_p0/predefine/test_custom_analyzer.groovy | 2 +-
.../variant_p0/predefine/test_multi_index_nonCurrent.groovy | 6 +++---
.../predefine/test_prdefine_typed_column_sparse_column.groovy | 2 +-
.../suites/variant_p0/predefine/test_predefine_pattern.groovy | 4 ++--
.../variant_p0/predefine/test_predefine_type_index.groovy | 4 ++--
.../predefine/test_predefine_type_multi_index.groovy | 2 +-
.../predefine/test_types_with_indexes_profile.groovy | 4 ++--
.../predefine/test_variant_compaction_with_sparse_limit.groovy | 4 ++--
.../predefine/variant_different_max_subcolumns_count.groovy | 8 ++++----
.../suites/variant_p0/predefine/variant_with_mow.groovy | 2 +-
regression-test/suites/variant_p0/query_subcolumns.groovy | 2 +-
.../suites/variant_p0/schema_change/schema_change.groovy | 2 +-
.../schema_change/test_add_multi_var_mulit_indexes.groovy | 2 +-
.../variant_p0/schema_change/test_alter_add_drop_column.groovy | 2 +-
.../variant_p0/test_variant_compaction_empty_path_bug.groovy | 2 +-
regression-test/suites/variant_p0/variant_with_mow.groovy | 2 +-
regression-test/suites/variant_p0/with_index/var_index.groovy | 6 +++---
.../variant_p1/compaction/compaction_sparse_column.groovy | 2 +-
.../variant_p1/compaction/test_compaction_extract_root.groovy | 2 +-
regression-test/suites/variant_p1/predefine/load.groovy | 2 +-
105 files changed, 63 insertions(+), 63 deletions(-)
diff --git a/regression-test/data/variant_github_events_new_p0/load.out
b/regression-test/data/variant_github_events_new_p2/load.out
similarity index 100%
rename from regression-test/data/variant_github_events_new_p0/load.out
rename to regression-test/data/variant_github_events_new_p2/load.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/affinityByIssuesAndPRs1.out
rename to
regression-test/data/variant_github_events_new_p2/sql/affinityByIssuesAndPRs1.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/affinityByIssuesAndPRs2.out
rename to
regression-test/data/variant_github_events_new_p2/sql/affinityByIssuesAndPRs2.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/authorsWithTheMostPushes.out
rename to
regression-test/data/variant_github_events_new_p2/sql/authorsWithTheMostPushes.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/countingStar1.out
rename to
regression-test/data/variant_github_events_new_p2/sql/countingStar1.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/countingStar2.out
rename to
regression-test/data/variant_github_events_new_p2/sql/countingStar2.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/countingStar3.out
rename to
regression-test/data/variant_github_events_new_p2/sql/countingStar3.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/distributionOfRepositoriesByStarCount.out
rename to
regression-test/data/variant_github_events_new_p2/sql/distributionOfRepositoriesByStarCount.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/githubRoulette.out
rename to
regression-test/data/variant_github_events_new_p2/sql/githubRoulette.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/howHasTheListOfTopRepositoriesChangedOverTheYears1.out
rename to
regression-test/data/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears1.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/howHasTheListOfTopRepositoriesChangedOverTheYears2.out
rename to
regression-test/data/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears2.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/howHasTheListOfTopRepositoriesChangedOverTheYears3.out
rename to
regression-test/data/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears3.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/howHasTheListOfTopRepositoriesChangedOverTheYears4.out
rename to
regression-test/data/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears4.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/howHasTheListOfTopRepositoriesChangedOverTheYears5.out
rename to
regression-test/data/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears5.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/howHasTheListOfTopRepositoriesChangedOverTheYears6.out
rename to
regression-test/data/variant_github_events_new_p2/sql/howHasTheListOfTopRepositoriesChangedOverTheYears6.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/howHasTheTotalNumberOfStarsChangedOverTime.out
rename to
regression-test/data/variant_github_events_new_p2/sql/howHasTheTotalNumberOfStarsChangedOverTime.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/issuesWithTheMostComments1.out
rename to
regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments1.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/issuesWithTheMostComments2.out
rename to
regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments2.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/issuesWithTheMostComments3.out
rename to
regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments3.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/issuesWithTheMostComments4.out
rename to
regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments4.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/issuesWithTheMostComments5.out
rename to
regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments5.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/issuesWithTheMostComments6.out
rename to
regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments6.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/issuesWithTheMostComments7.out
rename to
regression-test/data/variant_github_events_new_p2/sql/issuesWithTheMostComments7.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/mostForkedRepositories.out
rename to
regression-test/data/variant_github_events_new_p2/sql/mostForkedRepositories.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/mostPopularCommentsOnGithub.out
rename to
regression-test/data/variant_github_events_new_p2/sql/mostPopularCommentsOnGithub.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/organizationsByTheNumberOfRepositories.out
rename to
regression-test/data/variant_github_events_new_p2/sql/organizationsByTheNumberOfRepositories.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/organizationsByTheNumberOfStars.out
rename to
regression-test/data/variant_github_events_new_p2/sql/organizationsByTheNumberOfStars.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/proportionsBetweenStarsAndForks1.out
rename to
regression-test/data/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks1.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/proportionsBetweenStarsAndForks2.out
rename to
regression-test/data/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks2.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/proportionsBetweenStarsAndForks3.out
rename to
regression-test/data/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks3.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/proportionsBetweenStarsAndForks4.out
rename to
regression-test/data/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks4.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/proportionsBetweenStarsAndForks5.out
rename to
regression-test/data/variant_github_events_new_p2/sql/proportionsBetweenStarsAndForks5.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/repositoriesByAmountOfModifiedCode.out
rename to
regression-test/data/variant_github_events_new_p2/sql/repositoriesByAmountOfModifiedCode.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/repositoriesByTheNumberOfPushes.out
rename to
regression-test/data/variant_github_events_new_p2/sql/repositoriesByTheNumberOfPushes.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/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_new_p0/sql/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_new_p0/sql/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_new_p0/sql/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_new_p0/sql/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_new_p0/sql/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_new_p0/sql/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_new_p0/sql/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_new_p0/sql/repositoriesWithTheHighestGrowthYoY.out
rename to
regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheHighestGrowthYoY.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/repositoriesWithTheMaximumAmountOfIssues1.out
rename to
regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfIssues1.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/repositoriesWithTheMaximumAmountOfIssues2.out
rename to
regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfIssues2.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/repositoriesWithTheMaximumAmountOfIssues3.out
rename to
regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfIssues3.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/repositoriesWithTheMaximumAmountOfIssues4.out
rename to
regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfIssues4.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/repositoriesWithTheMaximumAmountOfPullRequests1.out
rename to
regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfPullRequests1.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/repositoriesWithTheMaximumAmountOfPullRequests2.out
rename to
regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumAmountOfPullRequests2.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/repositoriesWithTheMaximumNumberOfAcceptedInvitations.out
rename to
regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMaximumNumberOfAcceptedInvitations.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/repositoriesWithTheMostPeopleWhoHavePushAccess1.out
rename to
regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMostPeopleWhoHavePushAccess1.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/repositoriesWithTheMostStarsOverOneDay1.out
rename to
regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMostStarsOverOneDay1.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/repositoriesWithTheMostSteadyGrowthOverTime.out
rename to
regression-test/data/variant_github_events_new_p2/sql/repositoriesWithTheMostSteadyGrowthOverTime.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/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_new_p0/sql/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_new_p0/sql/repositoryAffinityList1.out
rename to
regression-test/data/variant_github_events_new_p2/sql/repositoryAffinityList1.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/repositoryAffinityList2.out
rename to
regression-test/data/variant_github_events_new_p2/sql/repositoryAffinityList2.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/starsFromHeavyGithubUsers1.out
rename to
regression-test/data/variant_github_events_new_p2/sql/starsFromHeavyGithubUsers1.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/starsFromHeavyGithubUsers2.out
rename to
regression-test/data/variant_github_events_new_p2/sql/starsFromHeavyGithubUsers2.out
diff --git
a/regression-test/data/variant_github_events_new_p0/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_new_p0/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_new_p0/sql/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_new_p0/sql/theLongestRepositoryNames1.out
rename to
regression-test/data/variant_github_events_new_p2/sql/theLongestRepositoryNames1.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/theLongestRepositoryNames2.out
rename to
regression-test/data/variant_github_events_new_p2/sql/theLongestRepositoryNames2.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/theMostToughCodeReviews.out
rename to
regression-test/data/variant_github_events_new_p2/sql/theMostToughCodeReviews.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/theTotalNumberOfRepositoriesOnGithub.out
rename to
regression-test/data/variant_github_events_new_p2/sql/theTotalNumberOfRepositoriesOnGithub.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/theTotalNumberOfUsersOnGithub1.out
rename to
regression-test/data/variant_github_events_new_p2/sql/theTotalNumberOfUsersOnGithub1.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/theTotalNumberOfUsersOnGithub2.out
rename to
regression-test/data/variant_github_events_new_p2/sql/theTotalNumberOfUsersOnGithub2.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/theTotalNumberOfUsersOnGithub3.out
rename to
regression-test/data/variant_github_events_new_p2/sql/theTotalNumberOfUsersOnGithub3.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/theTotalNumberOfUsersOnGithub4.out
rename to
regression-test/data/variant_github_events_new_p2/sql/theTotalNumberOfUsersOnGithub4.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/topRepositoriesByStars.out
rename to
regression-test/data/variant_github_events_new_p2/sql/topRepositoriesByStars.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/whatIsTheBestDayOfTheWeekToCatchAStar.out
rename to
regression-test/data/variant_github_events_new_p2/sql/whatIsTheBestDayOfTheWeekToCatchAStar.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/whoAreAllThosePeopleGivingStars1.out
rename to
regression-test/data/variant_github_events_new_p2/sql/whoAreAllThosePeopleGivingStars1.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/whoAreAllThosePeopleGivingStars2.out
rename to
regression-test/data/variant_github_events_new_p2/sql/whoAreAllThosePeopleGivingStars2.out
diff --git
a/regression-test/data/variant_github_events_new_p0/sql/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_new_p0/sql/whoAreAllThosePeopleGivingStars3.out
rename to
regression-test/data/variant_github_events_new_p2/sql/whoAreAllThosePeopleGivingStars3.out
diff --git a/regression-test/suites/variant_github_events_new_p0/load.groovy
b/regression-test/suites/variant_github_events_new_p2/load.groovy
similarity index 98%
rename from regression-test/suites/variant_github_events_new_p0/load.groovy
rename to regression-test/suites/variant_github_events_new_p2/load.groovy
index 6ce128c4ee5..5fd5a120d8f 100644
--- a/regression-test/suites/variant_github_events_new_p0/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", "p0"){
+suite("regression_test_variant_github_events_p2", "p2"){
def load_json_data = {table_name, file_name ->
// load the json data
streamLoad {
@@ -147,7 +147,7 @@ suite("regression_test_variant_github_events_p0", "p0"){
qt_sql_select_count """ select count(*) from github_events_2; """
- trigger_and_wait_compaction("github_events", "full", 1200) // 20min
compaction
+ trigger_and_wait_compaction("github_events", "full", 1800) // 30min
compaction
// query and filterd by inverted index
if (!enable_typed_paths_to_sparse) {
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 1374160f32a..1ba42bfb5e5 100644
--- a/regression-test/suites/variant_github_events_nonConcurrent_p2/load.groovy
+++ b/regression-test/suites/variant_github_events_nonConcurrent_p2/load.groovy
@@ -121,7 +121,7 @@ suite("regression_test_variant_github_events_p2",
"nonConcurrent,p2"){
def tablets = sql_return_maparray """ show tablets from github_events; """
// trigger compactions for all tablets in github_events
- trigger_and_wait_compaction("github_events", "full")
+ trigger_and_wait_compaction("github_events", "full", 1800)
sql """set enable_match_without_inverted_index = false"""
sql """ set enable_common_expr_pushdown = true """
diff --git a/regression-test/suites/variant_p0/agg.groovy
b/regression-test/suites/variant_p0/agg.groovy
index cec9d0ba520..ca7b9942744 100644
--- a/regression-test/suites/variant_p0/agg.groovy
+++ b/regression-test/suites/variant_p0/agg.groovy
@@ -53,7 +53,7 @@ suite("regression_test_variant_agg"){
qt_sql6 "select cast(v['b'] as string) from var_agg where cast(v['b'] as
string) is not null and length(v['b']) >4 order by k, cast(v['b'] as
string) "
qt_sql7 "select * from var_agg where cast(v['b'] as string) is not null
and length(v['b']) >4 order by k, cast(v['b'] as string) "
qt_sql8 "select * from var_agg order by 1, cast(2 as string), 3"
- trigger_and_wait_compaction("var_agg", "cumulative")
+ trigger_and_wait_compaction("var_agg", "cumulative", 1800)
sql "alter table var_agg drop column s"
sql """insert into var_agg select 5, '{"a" : 1234, "xxxx" : "fffff",
"point" : 42000}' as json_str
union all select 5, '{"a": 1123}' as json_str union all select *,
'{"a": 11245, "x" : 42005}' as json_str from numbers("number" = "1024") limit
1024;"""
@@ -65,7 +65,7 @@ suite("regression_test_variant_agg"){
union all select 5, '{"a": 1123}' as json_str union all select *,
'{"a": 11245, "e" : [123456]}' as json_str from numbers("number" = "1024")
limit 1024;"""
sql """insert into var_agg select 5, '{"a" : 1234, "xxxx" : "fffff",
"point" : 42000}' as json_str
union all select 5, '{"a": 1123}' as json_str union all select *,
'{"a": 11245, "f" : ["123456"]}' as json_str from numbers("number" = "1024")
limit 1024;"""
- trigger_and_wait_compaction("var_agg", "cumulative")
+ trigger_and_wait_compaction("var_agg", "cumulative", 1800)
qt_sql9 "select * from var_agg order by cast(2 as string), 3, 1 limit 10"
qt_sql9 "select * from var_agg where k > 1024 order by cast(2 as string),
3, 1 limit 10"
}
\ No newline at end of file
diff --git
a/regression-test/suites/variant_p0/compaction/test_compaction.groovy
b/regression-test/suites/variant_p0/compaction/test_compaction.groovy
index 082c2c30b56..478cda24341 100644
--- a/regression-test/suites/variant_p0/compaction/test_compaction.groovy
+++ b/regression-test/suites/variant_p0/compaction/test_compaction.groovy
@@ -89,7 +89,7 @@ suite("test_compaction_variant") {
def tablets = sql_return_maparray """ show tablets from
${tableName}; """
// trigger compactions for all tablets in ${tableName}
- trigger_and_wait_compaction(tableName, "cumulative")
+ trigger_and_wait_compaction(tableName, "cumulative", 1800)
int rowCount = 0
for (def tablet in tablets) {
diff --git
a/regression-test/suites/variant_p0/ext_meta/test_variant_external_meta_concurrent.groovy
b/regression-test/suites/variant_p0/ext_meta/test_variant_external_meta_concurrent.groovy
index 8ba7c427d35..a07871b1c5f 100644
---
a/regression-test/suites/variant_p0/ext_meta/test_variant_external_meta_concurrent.groovy
+++
b/regression-test/suites/variant_p0/ext_meta/test_variant_external_meta_concurrent.groovy
@@ -234,7 +234,7 @@ suite("test_variant_external_meta_concurrent",
"nonConcurrent") {
// Compaction thread
threads.add(Thread.start {
try {
- trigger_and_wait_compaction("test_compaction_stress", "full")
+ trigger_and_wait_compaction("test_compaction_stress", "full", 1800)
results.add([type: 'compaction', success: true])
} catch (Exception e) {
results.add([type: 'compaction', success: false, error: e.message])
diff --git
a/regression-test/suites/variant_p0/ext_meta/test_variant_external_meta_edge_cases.groovy
b/regression-test/suites/variant_p0/ext_meta/test_variant_external_meta_edge_cases.groovy
index 029200519e9..b01509e7371 100644
---
a/regression-test/suites/variant_p0/ext_meta/test_variant_external_meta_edge_cases.groovy
+++
b/regression-test/suites/variant_p0/ext_meta/test_variant_external_meta_edge_cases.groovy
@@ -111,7 +111,7 @@ suite("test_variant_external_meta_edge_cases",
"nonConcurrent") {
qt_mixed_5 "select k, v['e'] from test_mixed_format where cast(v['e'] as
int) is not null order by k"
// Trigger compaction and verify
- trigger_and_wait_compaction("test_mixed_format", "full")
+ trigger_and_wait_compaction("test_mixed_format", "full", 1800)
qt_mixed_after_compact_1 "select k, v['a'] from test_mixed_format order by
k"
qt_mixed_after_compact_2 "select count(distinct k) from test_mixed_format"
@@ -274,7 +274,7 @@ suite("test_variant_external_meta_edge_cases",
"nonConcurrent") {
qt_toggle_3 "select k, v['c'] from test_config_toggle where cast(v['c'] as
int) is not null order by k"
// Compact and verify
- trigger_and_wait_compaction("test_config_toggle", "full")
+ trigger_and_wait_compaction("test_config_toggle", "full", 1800)
qt_toggle_after_compact_1 "select k, v['a'] from test_config_toggle order
by k"
qt_toggle_after_compact_2 "select k, v['b'] from test_config_toggle where
cast(v['b'] as int) is not null order by k"
diff --git
a/regression-test/suites/variant_p0/ext_meta/test_variant_external_meta_integration.groovy
b/regression-test/suites/variant_p0/ext_meta/test_variant_external_meta_integration.groovy
index fa68799b041..52e3f4d3208 100644
---
a/regression-test/suites/variant_p0/ext_meta/test_variant_external_meta_integration.groovy
+++
b/regression-test/suites/variant_p0/ext_meta/test_variant_external_meta_integration.groovy
@@ -56,7 +56,7 @@ suite("test_variant_external_meta_integration",
"nonConcurrent") {
qt_inverted_3 "select k, v['age'] from test_inverted_index_extracted where
cast(v['age'] as int) > 25 order by k"
// After compaction, inverted index should still work
- trigger_and_wait_compaction("test_inverted_index_extracted", "full")
+ trigger_and_wait_compaction("test_inverted_index_extracted", "full", 1800)
qt_inverted_after_compact_1 "select k, v['name'] from
test_inverted_index_extracted where v['name'] match 'Smith' order by k"
qt_inverted_after_compact_2 "select count(*) from
test_inverted_index_extracted where v['name'] match 'Johnson'"
@@ -106,7 +106,7 @@ suite("test_variant_external_meta_integration",
"nonConcurrent") {
qt_multi_var_3 "select k, v2['y'] from test_multiple_variants where
cast(v2['y'] as int) is not null order by k"
qt_multi_var_4 "select k, v1['d'], v2['w'] from test_multiple_variants
where cast(v1['d'] as int) is not null order by k"
- trigger_and_wait_compaction("test_multiple_variants", "full")
+ trigger_and_wait_compaction("test_multiple_variants", "full", 1800)
qt_multi_var_after_compact_1 "select k, v1['a'], v2['x'] from
test_multiple_variants order by k"
qt_multi_var_after_compact_2 "select count(*) from test_multiple_variants"
diff --git
a/regression-test/suites/variant_p0/ext_meta/test_variant_external_meta_with_sparse.groovy
b/regression-test/suites/variant_p0/ext_meta/test_variant_external_meta_with_sparse.groovy
index 676366758b1..7e2f8e3b78c 100644
---
a/regression-test/suites/variant_p0/ext_meta/test_variant_external_meta_with_sparse.groovy
+++
b/regression-test/suites/variant_p0/ext_meta/test_variant_external_meta_with_sparse.groovy
@@ -58,7 +58,7 @@ suite("test_variant_external_meta_with_sparse",
"nonConcurrent") {
qt_sparse_7 "select k, v['g'] from test_sparse_embedded where cast(v['g']
as int) is not null order by k"
// Compaction should handle both extracted and sparse columns correctly
- trigger_and_wait_compaction("test_sparse_embedded", "full")
+ trigger_and_wait_compaction("test_sparse_embedded", "full", 1800)
qt_sparse_after_compact_1 "select k, v['a'] from test_sparse_embedded
order by k"
qt_sparse_after_compact_2 "select k, v['d'] from test_sparse_embedded
where cast(v['d'] as int) is not null order by k"
@@ -97,7 +97,7 @@ suite("test_variant_external_meta_with_sparse",
"nonConcurrent") {
qt_bucket_5 "select count(*) from test_bucket_sparse"
// Compact and verify buckets are handled correctly
- trigger_and_wait_compaction("test_bucket_sparse", "full")
+ trigger_and_wait_compaction("test_bucket_sparse", "full", 1800)
qt_bucket_after_compact_1 "select k, v['extracted_1'] from
test_bucket_sparse order by k"
qt_bucket_after_compact_2 "select k, v['sparse_0_0'] from
test_bucket_sparse where cast(v['sparse_0_0'] as int) is not null order by k"
@@ -158,7 +158,7 @@ suite("test_variant_external_meta_with_sparse",
"nonConcurrent") {
qt_threshold_5 "select k, v['field_e'] from test_extraction_threshold
where cast(v['field_e'] as int) is not null order by k"
// After compaction, schema should be merged correctly
- trigger_and_wait_compaction("test_extraction_threshold", "full")
+ trigger_and_wait_compaction("test_extraction_threshold", "full", 1800)
qt_threshold_after_compact_1 "select k, v['field_a'] from
test_extraction_threshold order by k"
qt_threshold_after_compact_2 "select k, v['field_d'] from
test_extraction_threshold where cast(v['field_d'] as int) is not null order by
k"
@@ -194,7 +194,7 @@ suite("test_variant_external_meta_with_sparse",
"nonConcurrent") {
qt_toggle_sparse_6 "select k, v['f'] from test_sparse_config_toggle where
cast(v['f'] as int) is not null order by k"
// Compact
- trigger_and_wait_compaction("test_sparse_config_toggle", "full")
+ trigger_and_wait_compaction("test_sparse_config_toggle", "full", 1800)
qt_toggle_sparse_after_compact_1 "select k, v['a'] from
test_sparse_config_toggle order by k"
qt_toggle_sparse_after_compact_2 "select k, v['d'] from
test_sparse_config_toggle where cast(v['d'] as int) is not null order by k"
@@ -232,7 +232,7 @@ suite("test_variant_external_meta_with_sparse",
"nonConcurrent") {
qt_high_cardinality_4 "select count(*) from test_high_cardinality_sparse"
// Compaction with high cardinality sparse columns
- trigger_and_wait_compaction("test_high_cardinality_sparse", "full")
+ trigger_and_wait_compaction("test_high_cardinality_sparse", "full", 1800)
qt_high_cardinality_after_compact_1 "select k, v['common'] from
test_high_cardinality_sparse order by k limit 5"
qt_high_cardinality_after_compact_2 "select count(*) from
test_high_cardinality_sparse"
diff --git a/regression-test/suites/variant_p0/load.groovy
b/regression-test/suites/variant_p0/load.groovy
index f5cd6e77a34..85a46362f98 100644
--- a/regression-test/suites/variant_p0/load.groovy
+++ b/regression-test/suites/variant_p0/load.groovy
@@ -252,7 +252,7 @@ suite("regression_test_variant", "p0"){
sql """insert into ${table_name} values (9, '{"a" : [123, {"a" :
1}]}')"""
sql """insert into ${table_name} values (10, '{"a" : [{"a" : 1},
123]}')"""
sql "select v['a'] from ${table_name} order by k"
- trigger_and_wait_compaction(table_name, "full")
+ trigger_and_wait_compaction(table_name, "full", 1800)
qt_sql_29 "select cast(v['a'] as string) from ${table_name} order by k"
// b? 7.111 [123,{"xx":1}] {"b":{"c":456,"e":7.111}} 456
qt_sql_30 "select v['b']['e'], v['a'], v['b'], v['b']['c'] from
jsonb_values where cast(v['b']['e'] as double) > 1;"
diff --git a/regression-test/suites/variant_p0/nested.groovy
b/regression-test/suites/variant_p0/nested.groovy
index 047de391ca0..320e5800f18 100644
--- a/regression-test/suites/variant_p0/nested.groovy
+++ b/regression-test/suites/variant_p0/nested.groovy
@@ -77,14 +77,14 @@ suite("regression_test_variant_nested", "p0"){
sql """insert into var_nested values (${i}, '{"nested${i}" :
{"nested": [{"yyyxxxx" : "11111"},{"ax1111" : "1111"},{"axxxb": 100, "xxxy111":
111}, {"ddsss":1024, "aaa" : "11"}, {"xx" : 10}]}, "not nested" : 1024, "not
nested2" : {"llll" : 123}}');"""
}
- trigger_and_wait_compaction("var_nested", "full")
+ trigger_and_wait_compaction("var_nested", "full", 1800)
qt_sql """
select * from var_nested order by k limit 101
"""
sql """INSERT INTO var_nested SELECT *, '{"k1":1, "k2": "some", "k3" :
[1234], "k4" : 1.10000, "k5" : [[123]], "nested1" : {"nested2" : [{"a" : 10,
"b" : 1.1, "c" : "1111"}]}}' FROM numbers("number" = "1000") where number > 200
limit 100;"""
sql """INSERT INTO var_nested SELECT *, '{"k2":1, "k3": "nice", "k4" :
[1234], "k5" : 1.10000, "k6" : [[123]], "nested2" : {"nested1" : [{"a" : 10,
"b" : 1.1, "c" : "1111"}]}}' FROM numbers("number" = "5013") where number >=
400 limit 1024;"""
- trigger_and_wait_compaction("var_nested", "full")
+ trigger_and_wait_compaction("var_nested", "full", 1800)
qt_sql """select
/*+SET_VAR(batch_size=1024,broker_load_batch_size=16352,disable_streaming_preaggregations=true,enable_distinct_streaming_aggregation=true,parallel_fragment_exec_
parallel_pipeline_task_num=7,profile_level=1,enable_pipeline_engine=true,enable_parallel_scan=false,parallel_scan_max_scanners_count=16
@@ -101,7 +101,7 @@
parallel_pipeline_task_num=7,profile_level=1,enable_pipeline_engine=true,enable_
// type change case
sql """INSERT INTO var_nested SELECT *, '{"k1":"1", "k2": 1.1, "k3" :
[1234.0], "k4" : 1.10000, "k5" : [["123"]], "nested1" : {"nested2" : [{"a" :
"10", "b" : "1.1", "c" : 1111.111}]}}' FROM numbers("number" = "8000") where
number > 7000 limit 100;"""
qt_sql """select * from var_nested where v['k2'] = 'what' and
array_contains(cast(v['nested1']['nested2']['a'] as array<tinyint>), 10) order
by k limit 1;"""
- trigger_and_wait_compaction("var_nested", "full")
+ trigger_and_wait_compaction("var_nested", "full", 1800)
qt_sql """select * from var_nested where v['k2'] = 'nested' and
array_contains(cast(v['nested1']['nested2']['a'] as array<tinyint>), 10) order
by k limit 1;"""
sql """select * from var_nested where v['k2'] = 'some' or v['k3'] =
'nice' limit 100;"""
diff --git a/regression-test/suites/variant_p0/nested/load.groovy
b/regression-test/suites/variant_p0/nested/load.groovy
index 7bc7d841239..f1c5b6121d0 100644
--- a/regression-test/suites/variant_p0/nested/load.groovy
+++ b/regression-test/suites/variant_p0/nested/load.groovy
@@ -146,7 +146,7 @@
// sql_test_cast_to_array(table_name_1)
// sql_test_cast_to_scalar(table_name_1)
// // trigger and wait compaction
-// trigger_and_wait_compaction("${table_name_1}", "full")
+// trigger_and_wait_compaction("${table_name_1}", "full", 1800)
// sql_select_batch(table_name_1)
// sql_test_cast_to_array(table_name_1)
// sql_test_cast_to_scalar(table_name_1)
@@ -188,7 +188,7 @@
// sql_test_cast_to_array(table_name_1)
// sql_test_cast_to_scalar(table_name_1)
// // trigger and wait compaction
-// trigger_and_wait_compaction("${table_name_1}", "full")
+// trigger_and_wait_compaction("${table_name_1}", "full", 1800)
// sql_select_batch(table_name_1)
// sql_test_cast_to_array(table_name_1)
// sql_test_cast_to_scalar(table_name_1)
diff --git
a/regression-test/suites/variant_p0/nested/nested_in_top_array.groovy
b/regression-test/suites/variant_p0/nested/nested_in_top_array.groovy
index 09bffa8cd69..d640cdc6bbe 100644
--- a/regression-test/suites/variant_p0/nested/nested_in_top_array.groovy
+++ b/regression-test/suites/variant_p0/nested/nested_in_top_array.groovy
@@ -120,7 +120,7 @@ suite("nested_in_top_array", "p0"){
sql_test_cast_to_scalar(table_name)
// trigger and wait compaction
- trigger_and_wait_compaction("${table_name}", "full")
+ trigger_and_wait_compaction("${table_name}", "full", 1800)
sql_select_batch(table_name)
sql_test_cast_to_array(table_name)
sql_test_cast_to_scalar(table_name)
diff --git a/regression-test/suites/variant_p0/nested2.groovy
b/regression-test/suites/variant_p0/nested2.groovy
index 853234c7286..bf2a29709c8 100644
--- a/regression-test/suites/variant_p0/nested2.groovy
+++ b/regression-test/suites/variant_p0/nested2.groovy
@@ -108,7 +108,7 @@ suite("variant_nested_type_conflict", "p0"){
sql_test_cast_to_array()
// trigger and wait compaction
- trigger_and_wait_compaction("${table_name}", "full")
+ trigger_and_wait_compaction("${table_name}", "full", 1800)
// now select for a, b, c
sql_select_batch()
@@ -148,7 +148,7 @@ suite("variant_nested_type_conflict", "p0"){
sql_test_cast_to_array()
// trigger and wait compaction
- trigger_and_wait_compaction("${table_name}", "full")
+ trigger_and_wait_compaction("${table_name}", "full", 1800)
// now select for a, b, c
sql_select_batch()
diff --git a/regression-test/suites/variant_p0/predefine/load.groovy
b/regression-test/suites/variant_p0/predefine/load.groovy
index 3df4136568f..50640a1882a 100644
--- a/regression-test/suites/variant_p0/predefine/load.groovy
+++ b/regression-test/suites/variant_p0/predefine/load.groovy
@@ -247,7 +247,7 @@ suite("regression_test_variant_predefine_schema", "p0"){
sql """insert into test_predefine3 values (1, '{"auto_type" : 256}')"""
sql """insert into test_predefine3 values (1, '{"auto_type" : 12345}')"""
sql """insert into test_predefine3 values (1, '{"auto_type" : 1.0}')"""
- trigger_and_wait_compaction("test_predefine3", "full")
+ trigger_and_wait_compaction("test_predefine3", "full", 1800)
qt_sql """select variant_type(v) from test_predefine3"""
// test array
diff --git a/regression-test/suites/variant_p0/predefine/multi_var.groovy
b/regression-test/suites/variant_p0/predefine/multi_var.groovy
index 75b02032315..af39cdc0b36 100644
--- a/regression-test/suites/variant_p0/predefine/multi_var.groovy
+++ b/regression-test/suites/variant_p0/predefine/multi_var.groovy
@@ -31,7 +31,7 @@ suite("regression_test_variant_predefine_multi_var",
"variant_type"){
sql """INSERT INTO ${table_name} SELECT *, '{"k1":1, "k2": "hello world",
"k3" : [1234], "k4" : 1.10000, "k5" : [[123]]}' FROM numbers("number" =
"101")"""
sql """INSERT INTO ${table_name} SELECT *, '{"k7":123, "k8": "elden ring",
"k9" : 1.1112, "k10" : [1.12], "k11" : ["moon"]}' FROM numbers("number" =
"203") where number > 100"""
sql """INSERT INTO ${table_name} SELECT *, '{"k7":123, "k8": "elden ring",
"k9" : 1.1112, "k10" : [1.12], "k11" : ["moon"]}' FROM numbers("number" =
"411") where number > 200"""
- trigger_and_wait_compaction(table_name, "cumulative")
+ trigger_and_wait_compaction(table_name, "cumulative", 1800)
sql """alter table ${table_name} add column v2 variant<'k1' : int, 'k2' :
string, 'k3' : array<int>, 'k4' : double> default null"""
sql """INSERT INTO ${table_name} select k, v, cast(v as string) from
${table_name}"""
@@ -40,7 +40,7 @@ suite("regression_test_variant_predefine_multi_var",
"variant_type"){
sql "alter table ${table_name} add column ss string default null"
sql """INSERT INTO ${table_name} select k, v, cast(v as string), cast(v
as string), cast(v as string) from ${table_name}"""
sql """DELETE FROM ${table_name} where k = 1"""
- trigger_and_wait_compaction(table_name, "cumulative")
+ trigger_and_wait_compaction(table_name, "cumulative", 1800)
qt_sql """select cast(v["k1"] as tinyint), cast(v2["k2"] as text),
cast(v3["k3"] as string), cast(v["k7"] as tinyint), cast(v2["k8"] as text),
cast(v3["k9"] as double) from ${table_name} order by k, 1, 2, 3, 4, 5, 6 limit
10"""
qt_sql """select cast(v["k1"] as tinyint), cast(v2["k2"] as text),
cast(v3["k3"] as string), cast(v["k7"] as tinyint), cast(v2["k8"] as text),
cast(v3["k9"] as double) from ${table_name} where k > 200 order by k, 1, 2, 3,
4, 5, 6 limit 10"""
qt_sql """select cast(v["k1"] as tinyint), cast(v2["k2"] as text),
cast(v3["k3"] as string), cast(v["k7"] as tinyint), cast(v2["k8"] as text),
cast(v3["k9"] as double) from ${table_name} where k > 300 order by k, 1, 2, 3,
4, 5, 6 limit 10"""
@@ -49,5 +49,5 @@ suite("regression_test_variant_predefine_multi_var",
"variant_type"){
for (int i = 0; i < 20; i++) {
sql """insert into ${table_name} values (1, '{"a" : 1}', '{"a" : 1}',
'{"a" : 1}', '{"a" : 1}', '{"a" : 1}')"""
}
- trigger_and_wait_compaction(table_name, "cumulative")
+ trigger_and_wait_compaction(table_name, "cumulative", 1800)
}
\ No newline at end of file
diff --git
a/regression-test/suites/variant_p0/predefine/predefined_typed_to_sparse.groovy
b/regression-test/suites/variant_p0/predefine/predefined_typed_to_sparse.groovy
index cdd888ae0fc..aa0e3091223 100644
---
a/regression-test/suites/variant_p0/predefine/predefined_typed_to_sparse.groovy
+++
b/regression-test/suites/variant_p0/predefine/predefined_typed_to_sparse.groovy
@@ -126,7 +126,7 @@ suite("test_predefine_typed_to_sparse", "p0"){
qt_sql """ select * from ${tableName} order by id limit 10 """
- trigger_and_wait_compaction(tableName, "cumulative")
+ trigger_and_wait_compaction(tableName, "cumulative", 1800)
qt_sql """ select * from ${tableName} order by id limit 10"""
@@ -208,7 +208,7 @@ suite("test_predefine_typed_to_sparse", "p0"){
qt_sql """ select * from ${tableName} order by id limit 10 """
qt_sql """ select var['array_decimal_1'], var['array_ipv6_1'],
var['int_1'], var['int_nested'], var['string_1'], var['string_1_nested'],
var['decimal_1'], var['datetime_1'], var['datetimev2_1'], var['date_1'],
var['datev2_1'], var['ipv4_1'], var['ipv6_1'], var['largeint_1'], var['char_1']
from ${tableName} order by id """
- trigger_and_wait_compaction(tableName, "cumulative")
+ trigger_and_wait_compaction(tableName, "cumulative", 1800)
qt_sql """ select variant_type(var) from ${tableName} limit 1"""
qt_sql """ select * from ${tableName} order by id limit 10"""
diff --git
a/regression-test/suites/variant_p0/predefine/test_all_prdefine_type_to_sparse.groovy
b/regression-test/suites/variant_p0/predefine/test_all_prdefine_type_to_sparse.groovy
index f6be5bb8c5e..359dc3d6c8b 100644
---
a/regression-test/suites/variant_p0/predefine/test_all_prdefine_type_to_sparse.groovy
+++
b/regression-test/suites/variant_p0/predefine/test_all_prdefine_type_to_sparse.groovy
@@ -129,7 +129,7 @@ suite("test_all_prdefine_type_to_sparse", "p0"){
log.info("before_result: ${before_result}")
qt_sql_compaction_before """ desc ${tableName} """
- trigger_and_wait_compaction(tableName, "full")
+ trigger_and_wait_compaction(tableName, "full", 1800)
def after_result = sql """ select var from ${tableName} order by id """
log.info("after_result: ${after_result}")
diff --git
a/regression-test/suites/variant_p0/predefine/test_custom_analyzer.groovy
b/regression-test/suites/variant_p0/predefine/test_custom_analyzer.groovy
index 3acff0a7541..8d5b4f35c29 100644
--- a/regression-test/suites/variant_p0/predefine/test_custom_analyzer.groovy
+++ b/regression-test/suites/variant_p0/predefine/test_custom_analyzer.groovy
@@ -106,7 +106,7 @@ suite("test_variant_custom_analyzer", "p0") {
sql """ insert into ${indexTbName1} values(6, '{"ch" : "β-carbon
nitrid"}'); """
try {
- trigger_and_wait_compaction(indexTbName1, "full")
+ trigger_and_wait_compaction(indexTbName1, "full", 1800)
sql "sync"
sql """ set enable_common_expr_pushdown = true; """
diff --git
a/regression-test/suites/variant_p0/predefine/test_multi_index_nonCurrent.groovy
b/regression-test/suites/variant_p0/predefine/test_multi_index_nonCurrent.groovy
index 1b422fd244e..aaad756f166 100644
---
a/regression-test/suites/variant_p0/predefine/test_multi_index_nonCurrent.groovy
+++
b/regression-test/suites/variant_p0/predefine/test_multi_index_nonCurrent.groovy
@@ -65,7 +65,7 @@ suite("test_variant_multi_index_nonCurrent", "p0,
nonConcurrent") {
for (int i = 0; i < 10; i++) {
sql """insert into ${tableName} values(1, '{"string" : "hello",
"array_string" : ["hello"]}'), (2, '{"string" : "world", "array_string" :
["world"]}'), (3, '{"string" : "hello", "array_string" : ["hello"]}'), (4,
'{"string" : "world", "array_string" : ["world"]}'), (5, '{"string" : "hello",
"array_string" : ["hello"]}') """
}
- trigger_and_wait_compaction(tableName, "cumulative")
+ trigger_and_wait_compaction(tableName, "cumulative", 1800)
queryAndCheck("select count() from ${tableName} where var['string']
match_phrase 'hello'", 22)
queryAndCheck("select count() from ${tableName} where var['string'] =
'hello'", 22)
@@ -157,7 +157,7 @@ suite("test_variant_multi_index_nonCurrent", "p0,
nonConcurrent") {
(4, '{"string1" : "world",
"array_string" : ["world"], "string2" : "world"}'),
(5, '{"string1" : "hello",
"array_string" : ["hello"], "string2" : "hello"}') """
}
- trigger_and_wait_compaction(tableName, "cumulative")
+ trigger_and_wait_compaction(tableName, "cumulative", 1800)
queryAndCheck("select count() from ${tableName} where var['string1']
match_phrase 'hello'", 22)
queryAndCheck("select count() from ${tableName} where var['string1'] =
'hello'", 22)
@@ -397,7 +397,7 @@ suite("test_variant_multi_index_nonCurrent", "p0,
nonConcurrent") {
sql "set enable_two_phase_read_opt = false"
qt_sql "select * from ${tableName} order by id limit 10"
- trigger_and_wait_compaction(tableName, "cumulative")
+ trigger_and_wait_compaction(tableName, "cumulative", 1800)
sql "set enable_two_phase_read_opt = true"
qt_sql "select * from ${tableName} order by id limit 10"
qt_sql "select variant_type(var) from ${tableName} where id = 1"
diff --git
a/regression-test/suites/variant_p0/predefine/test_prdefine_typed_column_sparse_column.groovy
b/regression-test/suites/variant_p0/predefine/test_prdefine_typed_column_sparse_column.groovy
index 10f109782e0..4b01e2dae6f 100644
---
a/regression-test/suites/variant_p0/predefine/test_prdefine_typed_column_sparse_column.groovy
+++
b/regression-test/suites/variant_p0/predefine/test_prdefine_typed_column_sparse_column.groovy
@@ -39,7 +39,7 @@ suite("test_predefine_typed_sparse", "p0"){
qt_sql """ select variant_type(var) from ${tableName} order by id """
qt_sql """ select * from ${tableName} order by id """
- trigger_and_wait_compaction(tableName, "cumulative")
+ trigger_and_wait_compaction(tableName, "cumulative", 1800)
qt_sql """ select * from ${tableName} order by id """
qt_sql """ select variant_type(var) from ${tableName} order by id """
diff --git
a/regression-test/suites/variant_p0/predefine/test_predefine_pattern.groovy
b/regression-test/suites/variant_p0/predefine/test_predefine_pattern.groovy
index 382dd6c0e76..79e473fa871 100644
--- a/regression-test/suites/variant_p0/predefine/test_predefine_pattern.groovy
+++ b/regression-test/suites/variant_p0/predefine/test_predefine_pattern.groovy
@@ -54,7 +54,7 @@ suite("test_variant_predefine_base", "p0"){
qt_sql """ select count() from ${tableName} where cast(var['bxx'] as
string) match '789' """
- trigger_and_wait_compaction(tableName, "full")
+ trigger_and_wait_compaction(tableName, "full", 1800)
qt_sql """select * from ${tableName} order by id"""
qt_sql """ select variant_type(var) from base_match_name_variant_test
group by variant_type(var) """
@@ -96,7 +96,7 @@ suite("test_variant_predefine_base", "p0"){
qt_sql """ select count() from ${tableName} where cast(var['a']['bxc'] as
string) match '789' """
qt_sql """ select count() from ${tableName} where cast(var['a']['c2323'] as
string) match '789' """
- trigger_and_wait_compaction(tableName, "full")
+ trigger_and_wait_compaction(tableName, "full", 1800)
qt_sql """select * from ${tableName} order by id"""
qt_sql """ select variant_type(var) from base_match_name_variant_test
group by variant_type(var) """
diff --git
a/regression-test/suites/variant_p0/predefine/test_predefine_type_index.groovy
b/regression-test/suites/variant_p0/predefine/test_predefine_type_index.groovy
index 3f1f0dd6e68..667313f8f84 100644
---
a/regression-test/suites/variant_p0/predefine/test_predefine_type_index.groovy
+++
b/regression-test/suites/variant_p0/predefine/test_predefine_type_index.groovy
@@ -56,7 +56,7 @@ suite("test_variant_predefine_index_type", "p0"){
sql """ insert into ${tableName} values(1, '{"path" : {"int" : 123,
"decimal" : 123.123456789012, "string" : "hello"}}') """
}
- trigger_and_wait_compaction(tableName, "cumulative")
+ trigger_and_wait_compaction(tableName, "cumulative", 1800)
qt_sql """ select variant_type(var) from ${tableName} order by id """
qt_sql """select * from ${tableName} order by id"""
@@ -104,7 +104,7 @@ suite("test_variant_predefine_index_type", "p0"){
(10, '{"color":"Yellow","description":"Shiny yellow circular
badge","shape":"Wide Circle","tags":["shiny","plastic"]}');
"""
}
- trigger_and_wait_compaction(tableName, "cumulative")
+ trigger_and_wait_compaction(tableName, "cumulative", 1800)
sql "set enable_match_without_inverted_index = false"
qt_sql "select count() from objects where (overflow_properties['color']
MATCH_PHRASE 'Blue')"
qt_sql "select count() from objects where
(array_contains(cast(overflow_properties['tags'] as array<string>),
'plastic'))"
diff --git
a/regression-test/suites/variant_p0/predefine/test_predefine_type_multi_index.groovy
b/regression-test/suites/variant_p0/predefine/test_predefine_type_multi_index.groovy
index cf066d5a8ef..13b534c193a 100644
---
a/regression-test/suites/variant_p0/predefine/test_predefine_type_multi_index.groovy
+++
b/regression-test/suites/variant_p0/predefine/test_predefine_type_multi_index.groovy
@@ -51,7 +51,7 @@ suite("test_variant_predefine_type_multi_index", "p0"){
sql """ insert into ${tableName} values(1, '{"path" : {"int" : 123,
"decimal" : 123.123456789012, "string" : "hello"}}') """
}
- trigger_and_wait_compaction(tableName, "cumulative")
+ trigger_and_wait_compaction(tableName, "cumulative", 1800)
qt_sql """ select count() from ${tableName} where var['path']['string']
match 'hello' """
diff --git
a/regression-test/suites/variant_p0/predefine/test_types_with_indexes_profile.groovy
b/regression-test/suites/variant_p0/predefine/test_types_with_indexes_profile.groovy
index 2ecca0dcb9a..236ce0d56bd 100644
---
a/regression-test/suites/variant_p0/predefine/test_types_with_indexes_profile.groovy
+++
b/regression-test/suites/variant_p0/predefine/test_types_with_indexes_profile.groovy
@@ -183,7 +183,7 @@ suite("test_variant_predefine_types_with_indexes_profile",
"p0,nonConcurrent"){
sql "set enable_two_phase_read_opt = false"
qt_sql "select * from test_variant_predefine_types_with_indexes_profile
order by id limit 10"
- trigger_and_wait_compaction(tableName, "cumulative")
+ trigger_and_wait_compaction(tableName, "cumulative", 1800)
sql "set enable_two_phase_read_opt = true"
qt_sql "select * from test_variant_predefine_types_with_indexes_profile
order by id limit 10"
qt_sql "select variant_type(var) from
test_variant_predefine_types_with_indexes_profile where id = 1"
@@ -228,5 +228,5 @@ suite("test_variant_predefine_types_with_indexes_profile",
"p0,nonConcurrent"){
for (int i = 1; i < 10; i++) {
sql """insert into test_variant_predefine_types_with_indexes_profile
values (1, '{"a" : 123, "b" : 456, "d" : 789, "f" :
"12345678901234567890123456789012345678"}')"""
}
- trigger_and_wait_compaction(tableName, "full")
+ trigger_and_wait_compaction(tableName, "full", 1800)
}
\ No newline at end of file
diff --git
a/regression-test/suites/variant_p0/predefine/test_variant_compaction_with_sparse_limit.groovy
b/regression-test/suites/variant_p0/predefine/test_variant_compaction_with_sparse_limit.groovy
index 5b129ac1363..380752c28ef 100644
---
a/regression-test/suites/variant_p0/predefine/test_variant_compaction_with_sparse_limit.groovy
+++
b/regression-test/suites/variant_p0/predefine/test_variant_compaction_with_sparse_limit.groovy
@@ -92,7 +92,7 @@ suite("test_compaction_variant_predefine_with_sparse_limit",
"nonConcurrent") {
def tablets = sql_return_maparray """ show tablets from
${tableName}; """
// trigger compactions for all tablets in ${tableName}
- trigger_and_wait_compaction(tableName, "cumulative")
+ trigger_and_wait_compaction(tableName, "cumulative", 1800)
int rowCount = 0
for (def tablet in tablets) {
@@ -123,7 +123,7 @@
suite("test_compaction_variant_predefine_with_sparse_limit", "nonConcurrent") {
}
insert2.call();
insert2.call();
- trigger_and_wait_compaction(tableName, "cumulative")
+ trigger_and_wait_compaction(tableName, "cumulative", 1800)
sql "set topn_opt_limit_threshold = 1"
order_qt_select "select * from ${tableName} order by k, cast(v as
string) limit 5;"
sql "set topn_opt_limit_threshold = 10"
diff --git
a/regression-test/suites/variant_p0/predefine/variant_different_max_subcolumns_count.groovy
b/regression-test/suites/variant_p0/predefine/variant_different_max_subcolumns_count.groovy
index 4fd39346f02..b89478d55a2 100644
---
a/regression-test/suites/variant_p0/predefine/variant_different_max_subcolumns_count.groovy
+++
b/regression-test/suites/variant_p0/predefine/variant_different_max_subcolumns_count.groovy
@@ -36,7 +36,7 @@ suite("variant_different_max_subcolumns_count", "p0") {
sql """INSERT INTO ${table_name} values(5, '{"a": "5", "c": 5.5}')"""
qt_sql "select v['a'], v['b'], v['c'], * from ${table_name} order by k"
- trigger_and_wait_compaction(table_name, "full")
+ trigger_and_wait_compaction(table_name, "full", 1800)
qt_sql "select v['a'], v['b'], v['c'], * from ${table_name} order by k"
sql "DROP TABLE IF EXISTS ${table_name}"
@@ -64,7 +64,7 @@ suite("variant_different_max_subcolumns_count", "p0") {
qt_sql "select v['a'], v['b'], v['c'], v2['a'], v2['b'], v2['c'], v3['a'],
v3['b'], v3['c'], v4['a'], v4['b'], v4['c'], * from ${table_name} order by k"
- trigger_and_wait_compaction(table_name, "full")
+ trigger_and_wait_compaction(table_name, "full", 1800)
qt_sql "select v['a'], v['b'], v['c'], v2['a'], v2['b'], v2['c'], v3['a'],
v3['b'], v3['c'], v4['a'], v4['b'], v4['c'], * from ${table_name} order by k"
sql "DROP TABLE IF EXISTS ${table_name}"
@@ -90,7 +90,7 @@ suite("variant_different_max_subcolumns_count", "p0") {
qt_sql "select v['a'], v2['b'], v3['c'], v4['d'], v5['e'], v5['g'], * from
${table_name} order by k"
- trigger_and_wait_compaction(table_name, "full")
+ trigger_and_wait_compaction(table_name, "full", 1800)
qt_sql "select v['a'], v2['b'], v3['c'], v4['d'], v5['e'], v5['g'], * from
${table_name} order by k"
sql """ INSERT INTO ${table_name} values(4, '{"a": "1", "b": "hello", "c":
1.1, "d": 1.1, "e": "3", "f": "world", "g": 3.3, "h": 3.3}', '{"a": "1", "b":
"hello", "c": 1.1, "d": 1.1, "e": "3", "f": "world", "g": 3.3, "h": 3.3}',
'{"a": "1", "b": "hello", "c": 1.1, "d": 1.1, "e": "3", "f": "world", "g": 3.3,
"h": 3.3}', '{"a": "1", "b": "hello", "c": 1.1, "d": 1.1, "e": "3", "f":
"world", "g": 3.3, "h": 3.3}', '{"a": "1", "b": "hello", "c": 1.1, "d": 1.1,
"e": "3", "f": "world", "g": 3 [...]
@@ -100,7 +100,7 @@ suite("variant_different_max_subcolumns_count", "p0") {
qt_sql "select v['a'], v2['b'], v3['c'], v4['d'], v5['e'], v5['g'], * from
${table_name} order by k"
- trigger_and_wait_compaction(table_name, "full")
+ trigger_and_wait_compaction(table_name, "full", 1800)
qt_sql "select v['a'], v2['b'], v3['c'], v4['d'], v5['e'], v5['g'], * from
${table_name} order by k"
}
\ No newline at end of file
diff --git
a/regression-test/suites/variant_p0/predefine/variant_with_mow.groovy
b/regression-test/suites/variant_p0/predefine/variant_with_mow.groovy
index e13a3b2ec0e..540d613e6da 100644
--- a/regression-test/suites/variant_p0/predefine/variant_with_mow.groovy
+++ b/regression-test/suites/variant_p0/predefine/variant_with_mow.groovy
@@ -64,7 +64,7 @@ suite("variant_predefine_with_mow") {
sql """ insert into var_mow values(944935252, '2', 1, 1, 'TRUE',
1741682404960657985, 1741682404960657985, 0, '{"a": 49, "b": 59, "c": 69, "d":
79, "e": 89, "f": 99, "g": 109, "h": 119, "i": 129, "j": 139}'); """
sql """ insert into var_mow values(944935253, '2', 1, 1, 'TRUE',
1741682404960657985, 1741682404960657985, 0, '{"a": 50, "b": 60, "c": 70, "d":
80, "e": 90, "f": 100, "g": 110, "h": 120, "i": 130, "j": 140}'); """
- trigger_and_wait_compaction("var_mow", "full")
+ trigger_and_wait_compaction("var_mow", "full", 1800)
qt_sql """ select objectId from var_mow objects_alias where
objects_alias.portalid = 944935233 and objects_alias.objectTypeId = '2' limit
100 """
// topn two phase enabled
diff --git a/regression-test/suites/variant_p0/query_subcolumns.groovy
b/regression-test/suites/variant_p0/query_subcolumns.groovy
index 5590bcaab6a..12a595886f0 100644
--- a/regression-test/suites/variant_p0/query_subcolumns.groovy
+++ b/regression-test/suites/variant_p0/query_subcolumns.groovy
@@ -80,7 +80,7 @@ suite("regression_test_query_subcolumns", "nonConcurrent"){
// }
// triger compaction
- trigger_and_wait_compaction("query_subcolumns", "full")
+ trigger_and_wait_compaction("query_subcolumns", "full", 1800)
qt_sql "select v['a'] from query_subcolumns where cast(v['a'] as int)
is not null order by k"
qt_sql "select v['b'] from query_subcolumns where cast(v['b'] as int)
is not null order by k"
diff --git
a/regression-test/suites/variant_p0/schema_change/schema_change.groovy
b/regression-test/suites/variant_p0/schema_change/schema_change.groovy
index 1c370dbdf20..e144d2972d0 100644
--- a/regression-test/suites/variant_p0/schema_change/schema_change.groovy
+++ b/regression-test/suites/variant_p0/schema_change/schema_change.groovy
@@ -110,6 +110,6 @@ suite("regression_test_variant_schema_change",
"variant_type"){
sql """insert into t values (5, '{"a" : 1111.11111}')"""
sql """insert into t values (6, '{"a" : "11111"}')"""
sql """insert into t values (7, '{"a" : 11111.11111}')"""
- trigger_and_wait_compaction("t", "cumulative")
+ trigger_and_wait_compaction("t", "cumulative", 1800)
qt_sql "select * from t order by col0 limit 3"
}
\ No newline at end of file
diff --git
a/regression-test/suites/variant_p0/schema_change/test_add_multi_var_mulit_indexes.groovy
b/regression-test/suites/variant_p0/schema_change/test_add_multi_var_mulit_indexes.groovy
index 35e86f7076b..025fe9d1ccb 100644
---
a/regression-test/suites/variant_p0/schema_change/test_add_multi_var_mulit_indexes.groovy
+++
b/regression-test/suites/variant_p0/schema_change/test_add_multi_var_mulit_indexes.groovy
@@ -75,7 +75,7 @@ suite("regression_test_variant_add_multi_var_mulit_indexes",
"variant_type"){
sql """insert into ${table_name} values (4, '{"a" : 12345,"b" : 2}',
'{"a" : 56789,"b" : 2}', '{"a" : 12345,"b" : 3}')"""
- trigger_and_wait_compaction("${table_name}", "full")
+ trigger_and_wait_compaction("${table_name}", "full", 1800)
qt_sql "select * from ${table_name} order by k"
diff --git
a/regression-test/suites/variant_p0/schema_change/test_alter_add_drop_column.groovy
b/regression-test/suites/variant_p0/schema_change/test_alter_add_drop_column.groovy
index df2b3c46a60..fdc62ba3576 100644
---
a/regression-test/suites/variant_p0/schema_change/test_alter_add_drop_column.groovy
+++
b/regression-test/suites/variant_p0/schema_change/test_alter_add_drop_column.groovy
@@ -55,7 +55,7 @@ suite("regression_test_variant_add_drop_column",
"variant_type"){
def tablets = sql_return_maparray """ show tablets from ${table_name}; """
// trigger compactions for all tablets in ${tableName}
- trigger_and_wait_compaction(table_name, "cumulative")
+ trigger_and_wait_compaction(table_name, "cumulative", 1800)
qt_sql "select * from variant_add_drop_column order by k limit 10"
}
\ No newline at end of file
diff --git
a/regression-test/suites/variant_p0/test_variant_compaction_empty_path_bug.groovy
b/regression-test/suites/variant_p0/test_variant_compaction_empty_path_bug.groovy
index 66af55ac3b6..c9b3e056d4e 100644
---
a/regression-test/suites/variant_p0/test_variant_compaction_empty_path_bug.groovy
+++
b/regression-test/suites/variant_p0/test_variant_compaction_empty_path_bug.groovy
@@ -104,7 +104,7 @@ suite("test_variant_compaction_empty_path_bug",
"nonConcurrent") {
def tablets = sql_return_maparray "SHOW TABLETS FROM ${tableName}"
try {
- trigger_and_wait_compaction(tableName, "cumulative")
+ trigger_and_wait_compaction(tableName, "cumulative", 1800)
logger.info("Compaction completed successfully")
// Verify data after compaction
diff --git a/regression-test/suites/variant_p0/variant_with_mow.groovy
b/regression-test/suites/variant_p0/variant_with_mow.groovy
index d48882687dc..ad84594a2f3 100644
--- a/regression-test/suites/variant_p0/variant_with_mow.groovy
+++ b/regression-test/suites/variant_p0/variant_with_mow.groovy
@@ -62,7 +62,7 @@ suite("variant_with_mow") {
sql """ insert into var_mow values(944935252, '2', 1, 1, 'TRUE',
1741682404960657985, 1741682404960657985, 0, '{"a": 49, "b": 59, "c": 69, "d":
79, "e": 89, "f": 99, "g": 109, "h": 119, "i": 129, "j": 139}'); """
sql """ insert into var_mow values(944935253, '2', 1, 1, 'TRUE',
1741682404960657985, 1741682404960657985, 0, '{"a": 50, "b": 60, "c": 70, "d":
80, "e": 90, "f": 100, "g": 110, "h": 120, "i": 130, "j": 140}'); """
- trigger_and_wait_compaction("var_mow", "cumulative")
+ trigger_and_wait_compaction("var_mow", "cumulative", 1800)
qt_sql """ select objectId from var_mow objects_alias where
objects_alias.portalid = 944935233 and objects_alias.objectTypeId = '2' limit
100 """
}
\ No newline at end of file
diff --git a/regression-test/suites/variant_p0/with_index/var_index.groovy
b/regression-test/suites/variant_p0/with_index/var_index.groovy
index 5642ad111bf..8f973fac24b 100644
--- a/regression-test/suites/variant_p0/with_index/var_index.groovy
+++ b/regression-test/suites/variant_p0/with_index/var_index.groovy
@@ -35,7 +35,7 @@ suite("regression_test_variant_var_index", "p0,
nonConcurrent"){
sql """insert into var_index values(3, '{"a" : 18811, "b" : "hello
wworld", "c" : 11111}')"""
sql """insert into var_index values(4, '{"a" : 1234, "b" : "hello xxx
world", "c" : 8181111}')"""
qt_sql """select * from var_index where cast(v["a"] as smallint) > 123 and
cast(v["b"] as string) match 'hello' and cast(v["c"] as int) > 1024 order by
k"""
- trigger_and_wait_compaction(table_name, "full")
+ trigger_and_wait_compaction(table_name, "full", 1800)
sql """ set enable_common_expr_pushdown = true """
sql """set enable_match_without_inverted_index = false"""
qt_sql """select * from var_index where cast(v["a"] as smallint) > 123 and
cast(v["b"] as string) match 'hello' and cast(v["c"] as int) > 1024 order by
k"""
@@ -48,7 +48,7 @@ suite("regression_test_variant_var_index", "p0,
nonConcurrent"){
sql """insert into var_index values(8, '{"arr": [123]}')"""
sql """insert into var_index values(9, '{"timestamp": 17.0}'),(10,
'{"timestamp": "17.0"}')"""
sql """insert into var_index values(11, '{"nested": [{"a" : 1}]}'),(11,
'{"nested": [{"b" : "1024"}]}')"""
- trigger_and_wait_compaction(table_name, "full")
+ trigger_and_wait_compaction(table_name, "full", 1800)
qt_sql "select * from var_index order by k limit 15"
sql "DROP TABLE IF EXISTS var_index"
@@ -250,6 +250,6 @@ suite("regression_test_variant_var_index", "p0,
nonConcurrent"){
wait_for_latest_op_on_table_finish(table_name, timeout)
sql """ insert into ${table_name} values(2, '{"name": "李四", "age": 20}')
"""
sql """ select * from ${table_name} """
- trigger_and_wait_compaction(table_name, "full")
+ trigger_and_wait_compaction(table_name, "full", 1800)
assertEquals(0, get_indeces_count())
}
\ No newline at end of file
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 0e59421aaa1..b04eb17a8fe 100644
---
a/regression-test/suites/variant_p1/compaction/compaction_sparse_column.groovy
+++
b/regression-test/suites/variant_p1/compaction/compaction_sparse_column.groovy
@@ -164,7 +164,7 @@ suite("test_compaction_sparse_column", "p1") {
def tablets = sql_return_maparray """ show tablets from ${tableName};
"""
// trigger compactions for all tablets in ${tableName}
- trigger_and_wait_compaction(tableName, "cumulative")
+ trigger_and_wait_compaction(tableName, "cumulative", 1800)
qt_select_b """ SELECT count(cast(v['b'] as int)) FROM ${tableName};"""
qt_select_xxxx """ SELECT count(cast(v['xxxx'] as string)) FROM
${tableName};"""
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 6b71dc6abdb..2511f4583ec 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
@@ -68,7 +68,7 @@ suite("test_compaction_extract_root", "p1") {
def tablets = sql_return_maparray """ show tablets from ${tableName}; """
// trigger compactions for all tablets in ${tableName}
- trigger_and_wait_compaction(tableName, "cumulative")
+ trigger_and_wait_compaction(tableName, "cumulative", 1800)
// fix cast to string tobe {}
qt_select_b_3 """ SELECT count(cast(v['b'] as string)) FROM test_t where
cast(v['b'] as string) != '{}' """
diff --git a/regression-test/suites/variant_p1/predefine/load.groovy
b/regression-test/suites/variant_p1/predefine/load.groovy
index 0872d896680..c4d0c931e23 100644
--- a/regression-test/suites/variant_p1/predefine/load.groovy
+++ b/regression-test/suites/variant_p1/predefine/load.groovy
@@ -102,7 +102,7 @@ suite("test_predefine_type_multi_index", "p1"){
sql """ create table github_events_2 like github_events """
sql """ insert into github_events_2 select * from github_events """
- trigger_and_wait_compaction(table_name, "cumulative")
+ trigger_and_wait_compaction(table_name, "cumulative", 1800)
qt_sql """select cast(v["repo"]["name"] as string) from github_events
where v["repo"]["name"] match 'apache' order by 1 limit 10;"""
qt_sql """select cast(v["repo"]["name"] as string) from github_events
where cast(v["repo"]["name"] as string) match 'xpressengine/xe-core' order by 1
limit 10;"""
qt_sql """select cast(v["repo"]["name"] as string) from github_events
where cast(v["repo"]["name"] as string) = 'xpressengine/xe-core' order by 1
limit 10"""
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
