Merge branch 'documentation' into jarodwen/doc/beta_sync
diff --git a/asterix-doc/src/site/markdown/aql/allens.md b/asterix-doc/src/site/markdown/aql/allens.md
index e4d83f0..49d6064 100644
--- a/asterix-doc/src/site/markdown/aql/allens.md
+++ b/asterix-doc/src/site/markdown/aql/allens.md
@@ -59,13 +59,13 @@
{ "meets": true, "metby": true }
-### interval-overlaps, interval-overlapped-by, interval-overlapping ###
+### interval-overlaps, interval-overlapped-by, overlap ###
* Syntax:
interval-overlaps(interval1, interval2)
interval-overlapped-by(interval1, interval2)
- interval-overlaping(interval1, interval2)
+ overlap(interval1, interval2)
* These functions check whether two intervals overlap with each other.
* Arguments:
@@ -84,7 +84,7 @@
AND interval1.end > interval2.end
AND interval2.end > interval1.start
- `interval-overlapping(interval1, interval2)` is trun if
+ `overlap(interval1, interval2)` is trun if
(interval2.start >= interval1.start
AND interval2.start < interval1.end)
@@ -94,7 +94,7 @@
For all these functions, if any of the two inputs is `null`, `null` is returned.
- Note that `interval-overlaps` and `interval-overlapped-by` are following the Allen's relations on the definition of overlap. `interval-overlapping` is a syntax sugar for the case that the intersect of two intervals is not empty.
+ Note that `interval-overlaps` and `interval-overlapped-by` are following the Allen's relations on the definition of overlap. `overlap` is a syntax sugar for the case that the intersect of two intervals is not empty.
* Examples:
@@ -102,7 +102,7 @@
let $itv2 := interval-from-date("2004-05-01", "2012-09-09")
let $itv3 := interval-from-date("2006-08-01", "2007-03-01")
let $itv4 := interval-from-date("2004-09-10", "2006-12-31")
- return {"interval-overlaps": interval-overlaps($itv1, $itv2), "interval-overlapped-by": interval-overlapped-by($itv3, $itv4), "interval-overlapping-1": interval-overlapping($itv1, $itv2), "interval-overlapping-2": interval-overlapping($itv3, $itv4)}
+ return {"interval-overlaps": interval-overlaps($itv1, $itv2), "interval-overlapped-by": interval-overlapped-by($itv3, $itv4), "interval-overlapping-1": overlap($itv1, $itv2), "interval-overlapping-2": overlap($itv3, $itv4)}
* The expected result is:
diff --git a/asterix-doc/src/site/markdown/aql/functions.md b/asterix-doc/src/site/markdown/aql/functions.md
index 7b2fb03..1cda336 100644
--- a/asterix-doc/src/site/markdown/aql/functions.md
+++ b/asterix-doc/src/site/markdown/aql/functions.md
@@ -1515,10 +1515,10 @@
{ "datetime-interval": interval-datetime("2012-01-01T04:23:34.456Z, 2013-04-01T15:34:45.567Z") }
-### get-year/month/day/hour/minute/second/millisecond ###
+### year/month/day/hour/minute/second/millisecond ###
* Syntax:
- get-year/month/day/hour/minute/second/millisecond(temporal_expression)
+ year/month/day/hour/minute/second/millisecond(temporal_expression)
* Accessors for accessing fields in a temporal value
* Arguments:
@@ -1533,7 +1533,7 @@
let $c3 := time("12:23:34.930+07:00")
let $c4 := duration("P3Y73M632DT49H743M3948.94S")
- return {"year": get-year($c1), "month": get-month($c2), "day": get-day($c1), "hour": get-hour($c3), "min": get-minute($c4), "second": get-second($c2), "ms": get-millisecond($c4)}
+ return {"year": year($c1), "month": month($c2), "day": day($c1), "hour": hour($c3), "min": minute($c4), "second": second($c2), "ms": millisecond($c4)}
* The expected result is: