Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[fix](nereids)column name should be case insensitive when selecting mv #33002

Merged
merged 2 commits into from
Mar 29, 2024
Merged

[fix](nereids)column name should be case insensitive when selecting mv #33002

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
26cc152
[fix](nereids)column name should be case insensitive when selecting mv
starocean999 Mar 28, 2024
d4992e1
update case
starocean999 Mar 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions ...n/java/org/apache/doris/nereids/rules/rewrite/mv/AbstractSelectMaterializedIndexRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,8 +219,10 @@ protected static List<MaterializedIndex> matchPrefixMost(
Set<Expression> predicates,
Map<ExprId, String> exprIdToName) {
Map<Boolean, Set<String>> split = filterCanUsePrefixIndexAndSplitByEquality(predicates, exprIdToName);
Set<String> equalColNames = split.getOrDefault(true, ImmutableSet.of());
Set<String> nonEqualColNames = split.getOrDefault(false, ImmutableSet.of());
Set<String> equalColNames = split.getOrDefault(true, ImmutableSet.of()).stream()
.map(String::toLowerCase).collect(Collectors.toSet());
Set<String> nonEqualColNames = split.getOrDefault(false, ImmutableSet.of()).stream()
.map(String::toLowerCase).collect(Collectors.toSet());

if (!(equalColNames.isEmpty() && nonEqualColNames.isEmpty())) {
List<MaterializedIndex> matchingResult = matchKeyPrefixMost(scan.getTable(), candidate,
Expand Down Expand Up @@ -358,9 +360,9 @@ private static int indexKeyPrefixMatchCount(
Set<String> nonEqualColNames) {
int matchCount = 0;
for (Column column : table.getSchemaByIndexId(index.getId())) {
if (equalColNames.contains(normalizeName(column.getNameWithoutMvPrefix()))) {
if (equalColNames.contains(normalizeName(column.getNameWithoutMvPrefix().toLowerCase()))) {
matchCount++;
} else if (nonEqualColNames.contains(normalizeName(column.getNameWithoutMvPrefix()))) {
} else if (nonEqualColNames.contains(normalizeName(column.getNameWithoutMvPrefix().toLowerCase()))) {
// un-equivalence predicate's columns can match only first column in index.
matchCount++;
break;
Expand Down
169 changes: 169 additions & 0 deletions regression-test/suites/nereids_p0/test_mv_select.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,173 @@ suite("test_mv_select") {
group by Uid;""")
contains "mv_test_table_t"
}

sql """drop table if exists SkuUniqDailyCounter"""
sql """CREATE TABLE `SkuUniqDailyCounter` (
`ProductId` bigint(20) NOT NULL,
`DateCode` int(11) NOT NULL,
`BrandCid` bigint(20) NOT NULL,
`ShopId` varchar(30) NOT NULL,
`BigCid` int(11) REPLACE NULL,
`FirstCid` int(11) REPLACE NULL,
`SecondCid` int(11) REPLACE NULL,
`ThirdCid` int(11) REPLACE NULL,
`FourthCid` int(11) REPLACE NULL,
`Price` int(11) REPLACE NULL,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It’s best to simplify the case and do some desensitization

`CosRatio` int(11) REPLACE NULL,
`PmtOrders` int(11) REPLACE NULL,
`PmtViews` int(11) REPLACE NULL,
`PmtUsers` int(11) REPLACE NULL,
`VideoPrice` int(11) REPLACE NULL,
`LivePrice` int(11) REPLACE NULL,
`LiveSales` int(11) REPLACE NULL,
`LiveOrders` int(11) REPLACE NULL,
`LiveGmv` bigint(20) REPLACE NULL,
`VideoSales` int(11) REPLACE NULL,
`VideoGmv` bigint(20) REPLACE NULL,
`SubtractSales` int(11) REPLACE NULL,
`SubtractGmv` bigint(20) REPLACE NULL,
`FinalSales` int(11) REPLACE NULL,
`FinalGmv` bigint(20) REPLACE NULL,
`RoomIds` bitmap BITMAP_UNION NOT NULL,
`LiveUids` bitmap BITMAP_UNION NOT NULL,
`VideoAwemeIds` bitmap BITMAP_UNION NOT NULL,
`VideoUids` bitmap BITMAP_UNION NOT NULL,
`Uids` bitmap BITMAP_UNION NOT NULL,
`PlayCount` bigint(20) REPLACE NULL,
`LikeCount` bigint(20) REPLACE NULL,
`SelfViews` int(11) REPLACE NULL,
`FinalViews` int(11) REPLACE NULL,
`SelfSales` int(11) REPLACE NULL,
`LiveUsers` bigint(20) REPLACE NULL,
`LivePriceArray` bitmap BITMAP_UNION NOT NULL,
`VideoPriceArray` bitmap BITMAP_UNION NOT NULL,
`NearlyLivePrice` int(11) REPLACE NULL,
`NearlyVideoPrice` int(11) REPLACE NULL,
`NaturalSales` int(11) REPLACE NULL,
`NaturalGmv` bigint(20) REPLACE NULL,
INDEX idx_shopid (`ShopId`) USING BITMAP COMMENT ''
) ENGINE=OLAP
AGGREGATE KEY(`ProductId`, `DateCode`, `BrandCid`, `ShopId`)
COMMENT 'OLAP'
DISTRIBUTED BY HASH(`ProductId`) BUCKETS 8
PROPERTIES (
"replication_allocation" = "tag.location.default: 1",
"is_being_synced" = "false",
"storage_format" = "V2",
"light_schema_change" = "true",
"disable_auto_compaction" = "false",
"enable_single_replica_compaction" = "false"
);"""
def delta_time = 1000
def wait_for_latest_op_on_table_finish = { table_name, OpTimeout ->
for(int t = delta_time; t <= OpTimeout; t += delta_time){
alter_res = sql """SHOW ALTER TABLE COLUMN WHERE TableName = "${table_name}" ORDER BY CreateTime DESC LIMIT 1;"""
alter_res = alter_res.toString()
if(alter_res.contains("FINISHED")) {
sleep(10000) // wait change table state to normal
logger.info(table_name + " latest alter job finished, detail: " + alter_res)
break
}
useTime = t
sleep(delta_time)
}
assertTrue(useTime <= OpTimeout, "wait_for_latest_op_on_table_finish timeout")
}
sql """ALTER TABLE SkuUniqDailyCounter
ADD ROLLUP rollup_index_shopid(ShopId,
DateCode,
ProductId,
BrandCid,
BigCid,
FirstCid,
SecondCid,
ThirdCid,
FourthCid,
Price,
CosRatio,
PmtOrders,
PmtViews,
PmtUsers,
VideoPrice,
LivePrice,
LiveSales,
LiveOrders,
LiveGmv,
VideoSales,
VideoGmv,
SubtractSales,
SubtractGmv,
FinalSales,
FinalGmv,
RoomIds,
LiveUids,
VideoAwemeIds,
VideoUids,
Uids,
PlayCount,
LikeCount,
SelfViews,
FinalViews,
SelfSales,
LiveUsers,
LivePriceArray,
VideoPriceArray,
NearlyLivePrice,
NearlyVideoPrice,
NaturalSales,
NaturalGmv
); """
wait_for_latest_op_on_table_finish("SkuUniqDailyCounter",60000);
sql """ALTER TABLE SkuUniqDailyCounter
ADD ROLLUP rollup_index_brandcid(BrandCid,
DateCode,
ProductId,
ShopId,
BigCid,
FirstCid,
SecondCid,
ThirdCid,
FourthCid,
Price,
CosRatio,
PmtOrders,
PmtViews,
PmtUsers,
VideoPrice,
LivePrice,
LiveSales,
LiveOrders,
LiveGmv,
VideoSales,
VideoGmv,
SubtractSales,
SubtractGmv,
FinalSales,
FinalGmv,
RoomIds,
LiveUids,
VideoAwemeIds,
VideoUids,
Uids,
PlayCount,
LikeCount,
SelfViews,
FinalViews,
SelfSales,
LiveUsers,
LivePriceArray,
VideoPriceArray,
NearlyLivePrice,
NearlyVideoPrice,
NaturalSales,
NaturalGmv
);"""
wait_for_latest_op_on_table_finish("SkuUniqDailyCounter",60000);

explain {
sql ("""select ProductId,sum(FinalSales) Sales,Sum(FinalGmv) Gmv ,SUM(NaturalSales) NaturalSales,sum(NaturalGmv) NaturalGmv ,BITMAP_UNION_COUNT(Uids) as Users from SkuUniqDailyCounter where BrandCid=742502946 and DateCode >=20240315 and DateCode <= 20240328 Group by ProductId order by Gmv DESC LIMIT 10;""")
contains "rollup_index_brandcid"
}

}
Loading