Skip to content

Commit

Permalink
Merge branch 'timeinterval ' into cran-0.10.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@krlmlr
krlmlr committed May 1, 2024
2 parents af6ea83 + 8f96698 commit ac19ecb
Show file tree
Hide file tree
Showing 7 changed files with 126 additions and 118 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: duckdb
Title: DBI Package for the DuckDB Database Management System
Version: 0.10.2
Version: 0.10.2.9000
Authors@R: c(
person("Hannes", "Mühleisen", , "hannes@cwi.nl", role = "aut",
comment = c(ORCID = "0000-0001-8552-0029")),
Expand Down
5 changes: 5 additions & 0 deletions NEWS.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
<!-- NEWS.md is maintained by https://fledge.cynkra.com, contributors should not edit this file -->

# duckdb 0.10.2.9000

- Merge branch 'cran-0.10.2'.


# duckdb 0.10.2

## Features
Expand Down
9 changes: 7 additions & 2 deletions R/dbQuoteLiteral__duckdb_connection.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,13 @@ dbQuoteLiteral__duckdb_connection <- function(conn, x, ...) {
return(SQL(character()))
}

out <- callNextMethod()
return(SQL(paste0(out, "::time")))
units(x) <- "secs"
value <- round(as.numeric(x) * 1000000)
value[!is.finite(x)] <- NA

out <- paste0("to_microseconds(", formatC(value, format = "f", digits = 0), ")")
out[is.na(value)] <- "NULL"
return(SQL(out))
}

if (is.list(x)) {
Expand Down
60 changes: 30 additions & 30 deletions src/include/typesr.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@ enum class RTypeId {
DATE,
DATE_INTEGER,
TIMESTAMP,
TIME_SECONDS,
TIME_MINUTES,
TIME_HOURS,
TIME_DAYS,
TIME_WEEKS,
TIME_SECONDS_INTEGER,
TIME_MINUTES_INTEGER,
TIME_HOURS_INTEGER,
TIME_DAYS_INTEGER,
TIME_WEEKS_INTEGER,
INTERVAL_SECONDS,
INTERVAL_MINUTES,
INTERVAL_HOURS,
INTERVAL_DAYS,
INTERVAL_WEEKS,
INTERVAL_SECONDS_INTEGER,
INTERVAL_MINUTES_INTEGER,
INTERVAL_HOURS_INTEGER,
INTERVAL_DAYS_INTEGER,
INTERVAL_WEEKS_INTEGER,
INTEGER64,
LIST_OF_NULLS,
BLOB,
Expand Down Expand Up @@ -80,16 +80,16 @@ struct RType {
static constexpr const RTypeId DATE = RTypeId::DATE;
static constexpr const RTypeId DATE_INTEGER = RTypeId::DATE_INTEGER;
static constexpr const RTypeId TIMESTAMP = RTypeId::TIMESTAMP;
static constexpr const RTypeId TIME_SECONDS = RTypeId::TIME_SECONDS;
static constexpr const RTypeId TIME_MINUTES = RTypeId::TIME_MINUTES;
static constexpr const RTypeId TIME_HOURS = RTypeId::TIME_HOURS;
static constexpr const RTypeId TIME_DAYS = RTypeId::TIME_DAYS;
static constexpr const RTypeId TIME_WEEKS = RTypeId::TIME_WEEKS;
static constexpr const RTypeId TIME_SECONDS_INTEGER = RTypeId::TIME_SECONDS_INTEGER;
static constexpr const RTypeId TIME_MINUTES_INTEGER = RTypeId::TIME_MINUTES_INTEGER;
static constexpr const RTypeId TIME_HOURS_INTEGER = RTypeId::TIME_HOURS_INTEGER;
static constexpr const RTypeId TIME_DAYS_INTEGER = RTypeId::TIME_DAYS_INTEGER;
static constexpr const RTypeId TIME_WEEKS_INTEGER = RTypeId::TIME_WEEKS_INTEGER;
static constexpr const RTypeId INTERVAL_SECONDS = RTypeId::INTERVAL_SECONDS;
static constexpr const RTypeId INTERVAL_MINUTES = RTypeId::INTERVAL_MINUTES;
static constexpr const RTypeId INTERVAL_HOURS = RTypeId::INTERVAL_HOURS;
static constexpr const RTypeId INTERVAL_DAYS = RTypeId::INTERVAL_DAYS;
static constexpr const RTypeId INTERVAL_WEEKS = RTypeId::INTERVAL_WEEKS;
static constexpr const RTypeId INTERVAL_SECONDS_INTEGER = RTypeId::INTERVAL_SECONDS_INTEGER;
static constexpr const RTypeId INTERVAL_MINUTES_INTEGER = RTypeId::INTERVAL_MINUTES_INTEGER;
static constexpr const RTypeId INTERVAL_HOURS_INTEGER = RTypeId::INTERVAL_HOURS_INTEGER;
static constexpr const RTypeId INTERVAL_DAYS_INTEGER = RTypeId::INTERVAL_DAYS_INTEGER;
static constexpr const RTypeId INTERVAL_WEEKS_INTEGER = RTypeId::INTERVAL_WEEKS_INTEGER;
static constexpr const RTypeId INTEGER64 = RTypeId::INTEGER64;
static constexpr const RTypeId LIST_OF_NULLS = RTypeId::LIST_OF_NULLS;
static constexpr const RTypeId BLOB = RTypeId::BLOB;
Expand Down Expand Up @@ -153,24 +153,24 @@ struct RTimestampType : public RDoubleType {
static timestamp_t Convert(double val);
};

struct RTimeSecondsType : public RDoubleType {
static dtime_t Convert(double val);
struct RIntervalSecondsType : public RDoubleType {
static interval_t Convert(double val);
};

struct RTimeMinutesType : public RDoubleType {
static dtime_t Convert(double val);
struct RIntervalMinutesType : public RDoubleType {
static interval_t Convert(double val);
};

struct RTimeHoursType : public RDoubleType {
static dtime_t Convert(double val);
struct RIntervalHoursType : public RDoubleType {
static interval_t Convert(double val);
};

struct RTimeDaysType : public RDoubleType {
static dtime_t Convert(double val);
struct RIntervalDaysType : public RDoubleType {
static interval_t Convert(double val);
};

struct RTimeWeeksType : public RDoubleType {
static dtime_t Convert(double val);
struct RIntervalWeeksType : public RDoubleType {
static interval_t Convert(double val);
};

struct RIntegerType {
Expand Down
61 changes: 30 additions & 31 deletions src/scan.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,17 @@ data_ptr_t GetColDataPtr(const RType &rtype, SEXP coldata) {
return (data_ptr_t)DATAPTR_RO(coldata);
case RType::TIMESTAMP:
return (data_ptr_t)NUMERIC_POINTER(coldata);
case RType::TIME_SECONDS:
case RType::TIME_MINUTES:
case RType::TIME_HOURS:
case RType::TIME_DAYS:
case RType::TIME_WEEKS:
case RType::INTERVAL_SECONDS:
case RType::INTERVAL_MINUTES:
case RType::INTERVAL_HOURS:
case RType::INTERVAL_DAYS:
case RType::INTERVAL_WEEKS:
return (data_ptr_t)NUMERIC_POINTER(coldata);
case RType::TIME_SECONDS_INTEGER:
case RType::TIME_MINUTES_INTEGER:
case RType::TIME_HOURS_INTEGER:
case RType::TIME_DAYS_INTEGER:
case RType::TIME_WEEKS_INTEGER:
case RType::INTERVAL_SECONDS_INTEGER:
case RType::INTERVAL_MINUTES_INTEGER:
case RType::INTERVAL_HOURS_INTEGER:
case RType::INTERVAL_DAYS_INTEGER:
case RType::INTERVAL_WEEKS_INTEGER:
return (data_ptr_t)INTEGER_POINTER(coldata);
case RType::DATE:
if (!IS_NUMERIC(coldata)) {
Expand Down Expand Up @@ -181,54 +181,54 @@ void AppendAnyColumnSegment(const RType &rtype, bool experimental, data_ptr_t co
AppendColumnSegment<double, timestamp_t, RTimestampType>(data_ptr, sexp_offset, v, this_count);
break;
}
case RType::TIME_SECONDS: {
case RType::INTERVAL_SECONDS: {
auto data_ptr = (double *)coldata_ptr;
AppendColumnSegment<double, dtime_t, RTimeSecondsType>(data_ptr, sexp_offset, v, this_count);
AppendColumnSegment<double, interval_t, RIntervalSecondsType>(data_ptr, sexp_offset, v, this_count);
break;
}
case RType::TIME_MINUTES: {
case RType::INTERVAL_MINUTES: {
auto data_ptr = (double *)coldata_ptr;
AppendColumnSegment<double, dtime_t, RTimeMinutesType>(data_ptr, sexp_offset, v, this_count);
AppendColumnSegment<double, interval_t, RIntervalMinutesType>(data_ptr, sexp_offset, v, this_count);
break;
}
case RType::TIME_HOURS: {
case RType::INTERVAL_HOURS: {
auto data_ptr = (double *)coldata_ptr;
AppendColumnSegment<double, dtime_t, RTimeHoursType>(data_ptr, sexp_offset, v, this_count);
AppendColumnSegment<double, interval_t, RIntervalHoursType>(data_ptr, sexp_offset, v, this_count);
break;
}
case RType::TIME_DAYS: {
case RType::INTERVAL_DAYS: {
auto data_ptr = (double *)coldata_ptr;
AppendColumnSegment<double, dtime_t, RTimeDaysType>(data_ptr, sexp_offset, v, this_count);
AppendColumnSegment<double, interval_t, RIntervalDaysType>(data_ptr, sexp_offset, v, this_count);
break;
}
case RType::TIME_WEEKS: {
case RType::INTERVAL_WEEKS: {
auto data_ptr = (double *)coldata_ptr;
AppendColumnSegment<double, dtime_t, RTimeWeeksType>(data_ptr, sexp_offset, v, this_count);
AppendColumnSegment<double, interval_t, RIntervalWeeksType>(data_ptr, sexp_offset, v, this_count);
break;
}
case RType::TIME_SECONDS_INTEGER: {
case RType::INTERVAL_SECONDS_INTEGER: {
auto data_ptr = (int *)coldata_ptr;
AppendColumnSegment<int, dtime_t, RTimeSecondsType>(data_ptr, sexp_offset, v, this_count);
AppendColumnSegment<int, interval_t, RIntervalSecondsType>(data_ptr, sexp_offset, v, this_count);
break;
}
case RType::TIME_MINUTES_INTEGER: {
case RType::INTERVAL_MINUTES_INTEGER: {
auto data_ptr = (int *)coldata_ptr;
AppendColumnSegment<int, dtime_t, RTimeMinutesType>(data_ptr, sexp_offset, v, this_count);
AppendColumnSegment<int, interval_t, RIntervalMinutesType>(data_ptr, sexp_offset, v, this_count);
break;
}
case RType::TIME_HOURS_INTEGER: {
case RType::INTERVAL_HOURS_INTEGER: {
auto data_ptr = (int *)coldata_ptr;
AppendColumnSegment<int, dtime_t, RTimeHoursType>(data_ptr, sexp_offset, v, this_count);
AppendColumnSegment<int, interval_t, RIntervalHoursType>(data_ptr, sexp_offset, v, this_count);
break;
}
case RType::TIME_DAYS_INTEGER: {
case RType::INTERVAL_DAYS_INTEGER: {
auto data_ptr = (int *)coldata_ptr;
AppendColumnSegment<int, dtime_t, RTimeDaysType>(data_ptr, sexp_offset, v, this_count);
AppendColumnSegment<int, interval_t, RIntervalDaysType>(data_ptr, sexp_offset, v, this_count);
break;
}
case RType::TIME_WEEKS_INTEGER: {
case RType::INTERVAL_WEEKS_INTEGER: {
auto data_ptr = (int *)coldata_ptr;
AppendColumnSegment<int, dtime_t, RTimeWeeksType>(data_ptr, sexp_offset, v, this_count);
AppendColumnSegment<int, interval_t, RIntervalWeeksType>(data_ptr, sexp_offset, v, this_count);
break;
}
case RType::DATE: {
Expand Down Expand Up @@ -405,7 +405,6 @@ static void DataFrameScanFunc(ClientContext &context, TableFunctionInput &data,
auto rtype = bind_data.rtypes[src_df_col_idx];
AppendAnyColumnSegment(rtype, bind_data.experimental, coldata_ptr, sexp_offset, v, this_count);
}

operator_data.position += this_count;
}

Expand Down
63 changes: 31 additions & 32 deletions src/types.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,15 @@ RType RApiTypes::DetectRType(SEXP v, bool integer64) {
}
SEXP units0 = STRING_ELT(units, 0);
if (units0 == RStrings::get().secs) {
return RType::TIME_SECONDS;
return RType::INTERVAL_SECONDS;
} else if (units0 == RStrings::get().mins) {
return RType::TIME_MINUTES;
return RType::INTERVAL_MINUTES;
} else if (units0 == RStrings::get().hours) {
return RType::TIME_HOURS;
return RType::INTERVAL_HOURS;
} else if (units0 == RStrings::get().days) {
return RType::TIME_DAYS;
return RType::INTERVAL_DAYS;
} else if (units0 == RStrings::get().weeks) {
return RType::TIME_WEEKS;
return RType::INTERVAL_WEEKS;
} else {
return RType::UNKNOWN;
}
Expand All @@ -118,15 +118,15 @@ RType RApiTypes::DetectRType(SEXP v, bool integer64) {
}
SEXP units0 = STRING_ELT(units, 0);
if (units0 == RStrings::get().secs) {
return RType::TIME_SECONDS_INTEGER;
return RType::INTERVAL_SECONDS_INTEGER;
} else if (units0 == RStrings::get().mins) {
return RType::TIME_MINUTES_INTEGER;
return RType::INTERVAL_MINUTES_INTEGER;
} else if (units0 == RStrings::get().hours) {
return RType::TIME_HOURS_INTEGER;
return RType::INTERVAL_HOURS_INTEGER;
} else if (units0 == RStrings::get().days) {
return RType::TIME_DAYS_INTEGER;
return RType::INTERVAL_DAYS_INTEGER;
} else if (units0 == RStrings::get().weeks) {
return RType::TIME_WEEKS_INTEGER;
return RType::INTERVAL_WEEKS_INTEGER;
} else {
return RType::UNKNOWN;
}
Expand Down Expand Up @@ -223,18 +223,17 @@ LogicalType RApiTypes::LogicalTypeFromRType(const RType &rtype, bool experimenta
break;
case RType::TIMESTAMP:
return LogicalType::TIMESTAMP;
case RType::TIME_SECONDS:
case RType::TIME_MINUTES:
case RType::TIME_HOURS:
case RType::TIME_DAYS:
case RType::TIME_WEEKS:
return LogicalType::TIME;
case RType::TIME_SECONDS_INTEGER:
case RType::TIME_MINUTES_INTEGER:
case RType::TIME_HOURS_INTEGER:
case RType::TIME_DAYS_INTEGER:
case RType::TIME_WEEKS_INTEGER:
return LogicalType::TIME;
case RType::INTERVAL_SECONDS:
case RType::INTERVAL_MINUTES:
case RType::INTERVAL_HOURS:
case RType::INTERVAL_DAYS:
case RType::INTERVAL_WEEKS:
case RType::INTERVAL_SECONDS_INTEGER:
case RType::INTERVAL_MINUTES_INTEGER:
case RType::INTERVAL_HOURS_INTEGER:
case RType::INTERVAL_DAYS_INTEGER:
case RType::INTERVAL_WEEKS_INTEGER:
return LogicalType::INTERVAL;
case RType::DATE:
return LogicalType::DATE;
case RType::DATE_INTEGER:
Expand Down Expand Up @@ -332,24 +331,24 @@ timestamp_t RTimestampType::Convert(double val) {
return Timestamp::FromEpochMicroSeconds(round(val * Interval::MICROS_PER_SEC));
}

dtime_t RTimeSecondsType::Convert(double val) {
return dtime_t(int64_t(val * Interval::MICROS_PER_SEC));
interval_t RIntervalSecondsType::Convert(double val) {
return Interval::FromMicro(int64_t(round(val * Interval::MICROS_PER_SEC)));
}

dtime_t RTimeMinutesType::Convert(double val) {
return dtime_t(int64_t(val * Interval::MICROS_PER_MINUTE));
interval_t RIntervalMinutesType::Convert(double val) {
return Interval::FromMicro(int64_t(round(val * Interval::MICROS_PER_MINUTE)));
}

dtime_t RTimeHoursType::Convert(double val) {
return dtime_t(int64_t(val * Interval::MICROS_PER_HOUR));
interval_t RIntervalHoursType::Convert(double val) {
return Interval::FromMicro(int64_t(round(val * Interval::MICROS_PER_HOUR)));
}

dtime_t RTimeDaysType::Convert(double val) {
return dtime_t(int64_t(val * Interval::MICROS_PER_DAY));
interval_t RIntervalDaysType::Convert(double val) {
return Interval::FromMicro(int64_t(round(val * Interval::MICROS_PER_DAY)));
}

dtime_t RTimeWeeksType::Convert(double val) {
return dtime_t(int64_t(val * (Interval::MICROS_PER_DAY * Interval::DAYS_PER_WEEK)));
interval_t RIntervalWeeksType::Convert(double val) {
return Interval::FromMicro(int64_t(round(val * (Interval::MICROS_PER_DAY * Interval::DAYS_PER_WEEK))));
}

bool RIntegerType::IsNull(int val) {
Expand Down
Loading

0 comments on commit ac19ecb

Please sign in to comment.