Skip to content

Commit

Permalink
Added timestamp/date diff; improve timestamp/date add/sub;
Browse files Browse the repository at this point in the history
  • Loading branch information
xmnlab committed Apr 20, 2018
1 parent 716494e commit 228a8f5
Show file tree
Hide file tree
Showing 2 changed files with 82 additions and 35 deletions.
4 changes: 3 additions & 1 deletion ibis/mapd/README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -243,9 +243,10 @@ and use the `to_interval` method:
.. code-block:: Sql
SELECT "arr_timestamp" + INTERVAL '1' YEAR AS tmp
SELECT TIMESTAMPADD(YEAR, 1, "arr_timestamp") AS tmp
FROM mapd.flights_2008_10k
Another way to use intervals is using `ibis.interval(years=1)`

**Extract date/time**

Expand Down Expand Up @@ -308,6 +309,7 @@ The date part operators allowed are: YEAR or Y, QUARTER or Q, MONTH or M,
DAY or D, HOUR or h, MINUTE or m, SECOND or s, WEEK, MILLENNIUM, CENTURY,
DECADE, QUARTERDAY


String operations
-----------------

Expand Down
113 changes: 79 additions & 34 deletions ibis/mapd/operations.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,24 +158,13 @@ def formatter(translator, expr):
return formatter


def timestamp_binary_infix_op(func_name, infix_sym):
def timestamp_binary_infix_op(func_name, infix_sym, timestamp_code):
def formatter(translator, expr):
op = expr.op()

arg, unit = op.args[0], op.args[1]
arg_ = _parenthesize(translator, arg)

timestamp_code = {
'Y': 'YEAR',
'M': 'MONTH',
'D': 'DAY',
'W': 'WEEK',
'Q': 'QUARTER',
'h': 'HOUR',
'm': 'MINUTE',
's': 'SECOND',
}

if unit.upper() in [u.upper() for u in timestamp_code.keys()]:
converter = timestamp_code[unit].upper()
elif unit.upper() in [u.upper() for u in _timestamp_units.values()]:
Expand Down Expand Up @@ -388,7 +377,7 @@ def _interval_format(translator, expr):
raise com.UnsupportedOperationError(
"MapD doesn't support subsecond interval resolutions")

return 'INTERVAL {} {}'.format(expr.op().value, dtype.resolution.upper())
return '{1}, (sign){0}'.format(expr.op().value, dtype.resolution.upper())


def _interval_from_integer(translator, expr):
Expand All @@ -408,17 +397,49 @@ def _timestamp_op(func, op_sign='+'):
def _formatter(translator, expr):
op = expr.op()
left, right = op.args

formatted_left = translator.translate(left)
formatted_right = translator.translate(right)

if isinstance(left, ir.DateValue):
formatted_left = 'CAST({} as timestamp)'.format(formatted_left)

return '{}({}, {})'.format(
func, formatted_right.replace('(sign)', op_sign),
func,
formatted_right.replace('(sign)', op_sign),
formatted_left
)

return _formatter


def _timestamp_diff(sql_func, timestamp_code):
def _formatter(translator, expr):
op = expr.op()
left, right, unit = op.args

formatted_left = translator.translate(left)
formatted_right = translator.translate(right)

formatted_unit = timestamp_code[unit]

if isinstance(left, ir.DateValue):
formatted_left = 'CAST({} as timestamp)'.format(formatted_left)

if isinstance(right, ir.DateValue):
formatted_right = 'CAST({} as timestamp)'.format(formatted_right)

return '{}({}, {}, {})'.format(
sql_func,
formatted_unit,
formatted_left,
formatted_right
)

_formatter.__name__ = 'diff'
return _formatter


def _set_literal_format(translator, expr):
value_type = expr.type().value_type

Expand Down Expand Up @@ -758,6 +779,26 @@ class Conv_4326_900913_Y(ops.UnaryOp):
))


class TimestampDiff(ops.ValueOp):
left = ops.Arg(rlz.timestamp)
right = ops.Arg(rlz.timestamp)
unit = ops.Arg(rlz.isin(_timestamp_units))
output_type = rlz.shape_like('left', ops.dt.int32)

def __init__(self, left, right, unit):
super(TimestampDiff, self).__init__(left, right, unit)


class DateDiff(ops.ValueOp):
left = ops.Arg(rlz.date)
right = ops.Arg(rlz.date)
unit = ops.Arg(rlz.isin(_timestamp_units))
output_type = rlz.shape_like('left', ops.dt.int32)

def __init__(self, left, right, unit):
super(DateDiff, self).__init__(left, right, unit)


class TimestampExtract(ops.TimestampUnaryOp):
unit = ops.Arg(rlz.isin(_timestamp_units))
output_type = rlz.shape_like('arg', ops.dt.int32)
Expand Down Expand Up @@ -884,19 +925,23 @@ class ByteLength(ops.StringLength):

_interval_dateadd = [
'YEAR', 'QUARTER', 'MONTH', 'DAYOFYEAR', 'DAY', 'WEEK', 'WEEKDAY', 'HOUR',
'MINUTE', 'SECOND', 'MILLISECOND'
'MINUTE', 'SECOND', 'MILLISECOND'
]
_interval_datepart = [
'YEAR', 'QUARTER', 'MONTH', 'DAYOFYEAR', 'DAY', 'WEEK', 'WEEKDAY', 'HOUR',
'MINUTE', 'SECOND', 'MILLISECOND'
'MINUTE', 'SECOND', 'MILLISECOND'
]


class TimestampAdd(ops.TimestampUnaryOp):
"""Truncates x to y decimal places"""
unit = ops.Arg(rlz.isin(_interval_datepart))
output_type = rlz.shape_like('left', ops.dt.float)

timestamp_code = {
'Y': 'YEAR',
'M': 'MONTH',
'D': 'DAY',
'W': 'WEEK',
'Q': 'QUARTER',
'h': 'HOUR',
'm': 'MINUTE',
's': 'SECOND',
}

_date_ops = {
ops.Date: unary('toDate'),
Expand All @@ -912,22 +957,21 @@ class TimestampAdd(ops.TimestampUnaryOp):
ops.ExtractMinute: _extract_field('MINUTE'),
ops.ExtractSecond: _extract_field('SECOND'),

TimestampExtract: timestamp_binary_infix_op('EXTRACT', 'FROM'),
TimestampExtract: timestamp_binary_infix_op(
'EXTRACT', 'FROM', timestamp_code=timestamp_code
),

ops.IntervalAdd: _interval_from_integer,
ops.IntervalFromInteger: _interval_from_integer,

ops.DateAdd: _timestamp_op('DATEADD'),
ops.DateSub: _timestamp_op('DATEADD', '-'),
ops.DateDiff: _timestamp_op('DATEDIFF'),
ops.DateAdd: _timestamp_op('TIMESTAMPADD'),
ops.DateSub: _timestamp_op('TIMESTAMPADD', '-'),
# ops.DateDiff: _timestamp_op('DATEDIFF'),
TimestampDiff: _timestamp_diff('TIMESTAMPDIFF', timestamp_code),
ops.TimestampAdd: _timestamp_op('TIMESTAMPADD'),
ops.TimestampSub: _timestamp_op('TIMESTAMPADD', '-'),
ops.TimestampDiff: _timestamp_op('TIMESTAMPDIFF'),
ops.TimestampFromUNIX: _timestamp_from_unix,
TimestampAdd: (
lambda field, value, unit:
'TIMESTAMPADD({}, {}, {}) '.format(value, unit)
)
DateDiff: _timestamp_diff('TIMESTAMPDIFF', timestamp_code),
# ops.TimestampDiff: _timestamp_op('TIMESTAMPDIFF', diff=True),
}


Expand Down Expand Up @@ -1026,7 +1070,9 @@ def f(_klass):
Return a lambda function that return to_expr() result from the
custom classes.
"""
return lambda *args, **kwargs: _klass(*args, **kwargs).to_expr()
def _f(*args, **kwargs):
return _klass(*args, **kwargs).to_expr()
return _f
# assign new function to the defined DataType
setattr(
dtype, func_name, f(klass)
Expand All @@ -1045,7 +1091,6 @@ def f(_klass):
# date/time/timestamp operations
assign_functions_to_dtype(ir.TimestampColumn, _date_ops, forced=True)
assign_functions_to_dtype(ir.DateColumn, _date_ops, forced=True)
# assign_functions_to_dtype(ir.DateColumn, _date_ops, forced=True)

_add_method(ir.TimestampColumn, TimestampTruncate, 'truncate')
_add_method(ir.DateColumn, DateTruncate, 'truncate')
Expand Down

0 comments on commit 228a8f5

Please sign in to comment.