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.

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

[nereids] fix stats error when using dateTime type filter #27571

Merged
merged 2 commits into from
Nov 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
import org.apache.doris.common.Config;
import org.apache.doris.nereids.types.coercion.DateLikeType;

import java.time.DateTimeException;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;

/**
* Datetime type in Nereids.
*/
Expand Down Expand Up @@ -55,4 +59,21 @@ public boolean equals(Object o) {
public int width() {
return WIDTH;
}

@Override
public double rangeLength(double high, double low) {
if (high == low) {
return 0;
}
if (Double.isInfinite(high) || Double.isInfinite(low)) {
return Double.POSITIVE_INFINITY;
}
try {
LocalDateTime to = toLocalDateTime(high);
LocalDateTime from = toLocalDateTime(low);
return ChronoUnit.SECONDS.between(from, to);
} catch (DateTimeException e) {
return Double.POSITIVE_INFINITY;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@

import com.google.common.base.Preconditions;

import java.time.DateTimeException;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.util.Objects;

/**
Expand Down Expand Up @@ -126,4 +129,21 @@ public int width() {
public int getScale() {
return scale;
}

@Override
public double rangeLength(double high, double low) {
if (high == low) {
return 0;
}
if (Double.isInfinite(high) || Double.isInfinite(low)) {
return Double.POSITIVE_INFINITY;
}
try {
LocalDateTime to = toLocalDateTime(high);
LocalDateTime from = toLocalDateTime(low);
return ChronoUnit.SECONDS.between(from, to);
} catch (DateTimeException e) {
return Double.POSITIVE_INFINITY;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
import org.apache.doris.common.Config;
import org.apache.doris.nereids.types.coercion.DateLikeType;

import java.time.DateTimeException;
import java.time.LocalDate;
import java.time.temporal.ChronoUnit;

/**
* Date type in Nereids.
*/
Expand Down Expand Up @@ -50,5 +54,22 @@ public Type toCatalogDataType() {
public int width() {
return WIDTH;
}

@Override
public double rangeLength(double high, double low) {
if (high == low) {
return 0;
}
if (Double.isInfinite(high) || Double.isInfinite(low)) {
return Double.POSITIVE_INFINITY;
}
try {
LocalDate to = toLocalDate(high);
LocalDate from = toLocalDate(low);
return ChronoUnit.DAYS.between(from, to);
} catch (DateTimeException e) {
return Double.POSITIVE_INFINITY;
}
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
import org.apache.doris.catalog.Type;
import org.apache.doris.nereids.types.coercion.DateLikeType;

import java.time.DateTimeException;
import java.time.LocalDate;
import java.time.temporal.ChronoUnit;

/**
* Date type in Nereids.
*/
Expand All @@ -41,5 +45,22 @@ public Type toCatalogDataType() {
public int width() {
return WIDTH;
}

@Override
public double rangeLength(double high, double low) {
if (high == low) {
return 0;
}
if (Double.isInfinite(high) || Double.isInfinite(low)) {
return Double.POSITIVE_INFINITY;
}
try {
LocalDate to = toLocalDate(high);
LocalDate from = toLocalDate(low);
return ChronoUnit.DAYS.between(from, to);
} catch (DateTimeException e) {
return Double.POSITIVE_INFINITY;
}
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@
import org.apache.doris.nereids.types.DateType;
import org.apache.doris.nereids.types.DateV2Type;

import java.time.DateTimeException;
import java.time.LocalDate;
import java.time.temporal.ChronoUnit;
import java.time.LocalDateTime;

/**
* date like type.
*/
public abstract class DateLikeType extends PrimitiveType {
private LocalDate toLocalDate(double d) {

protected LocalDate toLocalDate(double d) {
// d = (year * 10000 + month * 100 + day) * 1000000L;
int date = (int) (d / 1000000);
int day = date % 100;
Expand All @@ -44,21 +44,18 @@ private LocalDate toLocalDate(double d) {
return LocalDate.of(year, month, day);
}

@Override
public double rangeLength(double high, double low) {
if (high == low) {
return 0;
}
if (Double.isInfinite(high) || Double.isInfinite(low)) {
return Double.POSITIVE_INFINITY;
}
try {
LocalDate to = toLocalDate(high);
LocalDate from = toLocalDate(low);
return ChronoUnit.DAYS.between(from, to);
} catch (DateTimeException e) {
return Double.POSITIVE_INFINITY;
}
protected LocalDateTime toLocalDateTime(double d) {
// d = (year * 10000 + month * 100 + day) * 1000000L + time
// time = (hour * 10000 + minute * 100 + second);
int date = (int) (d / 1000000);
int day = date % 100;
int month = (date / 100) % 100;
int year = date / 10000;
int time = (int) (d % 1000000);
int second = time % 100;
int minute = (time / 100) % 100;
int hour = time / 10000;
return LocalDateTime.of(year, month, day, hour, minute, second);
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
// Licensed to the Apache Software Foundation (ASF) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The ASF licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

suite("test_datetime_filter_stats0") {
sql "SET enable_nereids_planner=true"
sql "SET enable_fallback_to_original_planner=false"

sql "DROP TABLE IF EXISTS test_datetime_filter_stats0"
sql """ CREATE TABLE `test_datetime_filter_stats0` (
`id` int(11),
`is_delete` int,
`company_id` int,
`book_time` DATETIMEV2
)ENGINE=OLAP
unique key (id)
distributed by hash(id) buckets 10
properties(
"replication_allocation" = "tag.location.default: 1"
);"""

sql """ alter table test_datetime_filter_stats0 modify column id set stats('row_count'='52899687', 'ndv'='52899687', 'num_nulls'='0', 'min_value'='1', 'max_value'='52899687', 'data_size'='4'); """
sql """ alter table test_datetime_filter_stats0 modify column book_time set stats('row_count'='52899687', 'ndv'='23622730', 'num_nulls'='0', 'min_value'='2002-01-01 00:45:39', 'max_value'='2027-09-25 23:03:00', 'data_size'='10'); """
sql """ alter table test_datetime_filter_stats0 modify column is_delete set stats('row_count'='52899687', 'ndv'='2', 'num_nulls'='0', 'min_value'='0', 'max_value'='1', 'data_size'='4'); """
sql """ alter table test_datetime_filter_stats0 modify column company_id set stats('row_count'='52899687', 'ndv'='7559', 'num_nulls'='0', 'min_value'='2', 'max_value'='876981', 'data_size'='4'); """

explain {
sql("physical plan select count(1) from test_datetime_filter_stats0 o where o.book_time >= '2020-03-01 00:00:00.0' and o.book_time <= '2020-03-01 23:59:59.0';");
notContains"stats=2.24"
}

explain {
sql("physical plan select count(1) from test_datetime_filter_stats0 o where o.book_time >= '2020-03-01 00:00:00.0' and o.book_time <= '2020-03-01 00:00:01.0';");
notContains"stats=2.24"
}
}
Loading