Merge pull request #54 from estebanzimanyi/develop

Implement duration and timespan functions wrt Issue #50
MobilityDB · Feb 23, 2021 · d91cf0e · d91cf0e
2 parents 2f49504 + b595490
commit d91cf0e
Show file tree

Hide file tree

Showing 139 changed files with 1,287 additions and 719 deletions.
diff --git a/include/doublen.h b/include/doublen.h
@@ -1,7 +1,4 @@
 /*****************************************************************************
- *
- * doublen.h
- * Internal types used for the average and centroid temporal aggregates.
  *
  * This MobilityDB code is provided under The PostgreSQL License.
  *
@@ -27,6 +24,12 @@
  *
  *****************************************************************************/
 
+/**
+ * @file doublen.h
+ * Internal types used in particular for computing the average and centroid
+ * temporal aggregates.
+ */
+
 #ifndef __DOUBLEN_H__
 #define __DOUBLEN_H__
 

diff --git a/include/lifting.h b/include/lifting.h
@@ -1,7 +1,4 @@
 /*****************************************************************************
- *
- * lifting.c
- * Generic functions for lifting functions and operators on temporal types.
  *
  * This MobilityDB code is provided under The PostgreSQL License.
  *
@@ -27,6 +24,11 @@
  *
  *****************************************************************************/
 
+/**
+ * @file lifting.c
+ * Generic functions for lifting functions and operators on temporal types.
+ */
+
 #ifndef __LIFTING_H__
 #define __LIFTING_H__
 

diff --git a/include/oidcache.h b/include/oidcache.h
@@ -1,7 +1,4 @@
 /*****************************************************************************
- *
- * oidcache.h
- * Functions for building a cache of type and operator Oids.
  *
  * This MobilityDB code is provided under The PostgreSQL License.
  *
@@ -27,6 +24,11 @@
  *
  *****************************************************************************/
 
+/**
+ * @file oidcache.h
+ * Functions for building a cache of type and operator Oids.
+ */
+
 #ifndef OIDCACHE_H
 #define OIDCACHE_H
 

diff --git a/include/period.h b/include/period.h
@@ -1,7 +1,4 @@
 /*****************************************************************************
- *
- * period.h
- * Basic routines for timestamptz periods
  *
  * This MobilityDB code is provided under The PostgreSQL License.
  *
@@ -29,6 +26,12 @@
  *
  *****************************************************************************/
 
+/**
+ * @file period.h
+ * Basic routines for time periods composed of two `TimestampTz` values and
+ * two Boolean values stating whether the bounds are inclusive or not.
+ */
+
 #ifndef __PERIOD_H__
 #define __PERIOD_H__
 
@@ -79,7 +82,7 @@ extern void period_shift_tscale(Period *result, const Interval *start,
 
 /* period -> interval */
 
-extern Datum period_timespan(PG_FUNCTION_ARGS);
+extern Datum period_duration(PG_FUNCTION_ARGS);
 
 /* Functions for defining B-tree index */
 
@@ -109,7 +112,7 @@ extern void period_set(Period *p, TimestampTz lower, TimestampTz upper,
   bool lower_inc, bool upper_inc);
 extern Period *period_copy(const Period *p);
 extern float8 period_to_secs(TimestampTz t1, TimestampTz t2);
-extern Interval *period_timespan_internal(const Period *p);
+extern Interval *period_duration_internal(const Period *p);
 extern Period **periodarr_normalize(Period **periods, int count, int *newcount);
 extern Period *period_super_union(const Period *p1, const Period *p2);
 extern void period_expand(Period *p1, const Period *p2);

diff --git a/include/periodset.h b/include/periodset.h
@@ -1,7 +1,4 @@
 /*****************************************************************************
- *
- * periodset.c
- * Basic functions for set of periods.
  *
  * This MobilityDB code is provided under The PostgreSQL License.
  *
@@ -27,6 +24,11 @@
  *
  *****************************************************************************/
 
+/**
+ * @file periodset.c
+ * Basic functions for set of disjoint periods.
+ */
+
 #ifndef __PERIODSET_H__
 #define __PERIODSET_H__
 
@@ -76,6 +78,7 @@ extern PeriodSet *timestampset_to_periodset_internal(const TimestampSet *ts);
 
 extern Datum periodset_mem_size(PG_FUNCTION_ARGS);
 extern Datum periodset_timespan(PG_FUNCTION_ARGS);
+extern Datum periodset_duration(PG_FUNCTION_ARGS);
 extern Datum periodset_num_periods(PG_FUNCTION_ARGS);
 extern Datum periodset_start_period(PG_FUNCTION_ARGS);
 extern Datum periodset_end_period(PG_FUNCTION_ARGS);

diff --git a/include/rangetypes_ext.h b/include/rangetypes_ext.h
@@ -1,7 +1,4 @@
 /*****************************************************************************
- *
- * rangetypes_ext.h
- * Extension of operators for range types.
  *
  * This MobilityDB code is provided under The PostgreSQL License.
  *
@@ -27,6 +24,11 @@
  *
  *****************************************************************************/
 
+/**
+ * @file rangetypes_ext.h
+ * Extended operators for range types.
+ */
+
 #ifndef __RANGETYPES_EXT_H__
 #define __RANGETYPES_EXT_H__
 

diff --git a/include/tbool_boolops.h b/include/tbool_boolops.h
@@ -1,7 +1,4 @@
 /*****************************************************************************
- *
- * tbool_boolops.h
- * Temporal Boolean operators (and, or, not).
  *
  * This MobilityDB code is provided under The PostgreSQL License.
  *
@@ -27,6 +24,11 @@
  *
  *****************************************************************************/
 
+/**
+ * @file tbool_boolops.h
+ * Temporal Boolean operators (and, or, not).
+ */
+
 #ifndef __TBOOL_BOOLOPS_H__
 #define __TBOOL_BOOLOPS_H__
 

diff --git a/include/tbox.h b/include/tbox.h
@@ -1,7 +1,4 @@
 /*****************************************************************************
- *
- * tbox.h
- * Functions for temporal bounding boxes.
  *
  * This MobilityDB code is provided under The PostgreSQL License.
  *
@@ -29,6 +26,11 @@
  *
  *****************************************************************************/
 
+/**
+ * @file tbox.h
+ * Functions for temporal bounding boxes.
+ */
+
 #ifndef __TBOX_H__
 #define __TBOX_H__
 

diff --git a/include/temporal.h b/include/temporal.h
@@ -1,7 +1,4 @@
 /*****************************************************************************
- *
- * temporal.h
- * Basic functions for temporal types of any subtype.
  *
  * This MobilityDB code is provided under The PostgreSQL License.
  *
@@ -27,6 +24,11 @@
  *
  *****************************************************************************/
 
+/**
+ * @file temporal.h
+ * Basic functions for temporal types of any subtype.
+ */
+
 #ifndef __TEMPORAL_H__
 #define __TEMPORAL_H__
 
@@ -88,6 +90,9 @@
 #define BBOX_TEST_NO    false
 
 /** Symbolic constants for the make functions */
+#define MERGE           true
+#define MERGE_NO        false
+
 #define NORMALIZE       true
 #define NORMALIZE_NO    false
 
@@ -486,7 +491,7 @@ extern void ensure_increasing_timestamps(const TInstant *inst1,
   const TInstant *inst2, bool strict);
 extern void ensure_same_overlapping_value(const TInstant *inst1,
   const TInstant *inst2);
-extern void ensure_valid_tinstantarr(TInstant **instants, int count);
+extern void ensure_valid_tinstantarr(TInstant **instants, int count, bool merge);
 extern void ensure_valid_tsequencearr(TSequence **sequences, int count);
 
 /* Input/output functions */

diff --git a/include/temporal_aggfuncs.h b/include/temporal_aggfuncs.h
@@ -1,7 +1,4 @@
 /*****************************************************************************
- *
- * temporal_aggfuncs.h
- * Temporal aggregate functions
  *
  * This MobilityDB code is provided under The PostgreSQL License.
  *
@@ -27,6 +24,11 @@
  *
  *****************************************************************************/
 
+/**
+ * @file temporal_aggfuncs.h
+ * Temporal aggregate functions
+ */
+
 #ifndef __TEMPORAL_AGGFUNCS_H__
 #define __TEMPORAL_AGGFUNCS_H__
 

diff --git a/include/temporal_analyze.h b/include/temporal_analyze.h
@@ -1,7 +1,4 @@
 /*****************************************************************************
- *
- * temporal_analyze.h
- * Functions for gathering statistics from temporal alphanumeric columns
  *
  * This MobilityDB code is provided under The PostgreSQL License.
  *
@@ -25,8 +22,13 @@
  * AN "AS IS" BASIS, AND UNIVERSITE LIBRE DE BRUXELLES HAS NO OBLIGATIONS TO 
  * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. 
  *
- *-------------------------------------------------------------------------
+ *****************************************************************************/
+
+/**
+ * @file temporal_analyze.h
+ * Functions for gathering statistics from temporal alphanumeric columns
  */
+
 #ifndef __TEMPORAL_ANALYZE_H__
 #define __TEMPORAL_ANALYZE_H__
 

diff --git a/include/temporal_boxops.h b/include/temporal_boxops.h
@@ -1,7 +1,4 @@
 /*****************************************************************************
- *
- * temporal_boxops.h
- * Bounding box operators for temporal types.
  *
  * This MobilityDB code is provided under The PostgreSQL License.
  *
@@ -27,6 +24,11 @@
  *
  *****************************************************************************/
 
+/**
+ * @file temporal_boxops.h
+ * Bounding box operators for temporal types.
+ */
+
 #ifndef __TEMPORAL_BOXOPS_H__
 #define __TEMPORAL_BOXOPS_H__
 

diff --git a/include/temporal_compops.h b/include/temporal_compops.h
@@ -1,7 +1,4 @@
 /*****************************************************************************
- *
- * temporal_compops.h
- * Temporal comparison operators (=, <>, <, >, <=, >=).
  *
  * This MobilityDB code is provided under The PostgreSQL License.
  *
@@ -27,6 +24,11 @@
  *
  *****************************************************************************/
 
+/**
+ * @file temporal_compops.h
+ * Temporal comparison operators (=, <>, <, >, <=, >=).
+ */
+
 #ifndef __TEMPORAL_COMPOPS_H__
 #define __TEMPORAL_COMPOPS_H__
 

diff --git a/include/temporal_gist.h b/include/temporal_gist.h
@@ -1,7 +1,4 @@
 /*****************************************************************************
- *
- * temporal_gist.c
- * Quad-tree SP-GiST index for temporal boolean and temporal text types.
  *
  * This MobilityDB code is provided under The PostgreSQL License.
  *
@@ -27,6 +24,11 @@
  *
  *****************************************************************************/
 
+/**
+ * @file temporal_gist.h
+ * Quad-tree SP-GiST index for temporal boolean and temporal text types.
+ */
+
 #ifndef __TEMPORAL_GIST_H__
 #define __TEMPORAL_GIST_H__
 

diff --git a/include/temporal_parser.h b/include/temporal_parser.h
@@ -1,7 +1,4 @@
 /*****************************************************************************
- *
- * temporal_parser.h
- * Functions for parsing temporal types.
  *
  * This MobilityDB code is provided under The PostgreSQL License.
  *
@@ -27,6 +24,11 @@
  *
  *****************************************************************************/
 
+/**
+ * @file temporal_parser.h
+ * Functions for parsing temporal types.
+ */
+
 #ifndef __TEMPORAL_PARSER_H__
 #define __TEMPORAL_PARSER_H__
 

diff --git a/include/temporal_posops.h b/include/temporal_posops.h
@@ -1,7 +1,4 @@
 /*****************************************************************************
- *
- * temporal_posops.h
- * Relative position operators for temporal types.
  *
  * This MobilityDB code is provided under The PostgreSQL License.
  *
@@ -27,6 +24,11 @@
  *
  *****************************************************************************/
 
+/**
+ * @file temporal_posops.h
+ * Relative position operators for temporal types.
+ */
+
 #ifndef __TEMPORAL_POSOPS_H__
 #define __TEMPORAL_POSOPS_H__
 

diff --git a/include/temporal_selfuncs.h b/include/temporal_selfuncs.h
@@ -1,7 +1,4 @@
 /*****************************************************************************
- *
- * temporal_selfuncs.h
- * Selectivity functions for the temporal types
  *
  * This MobilityDB code is provided under The PostgreSQL License.
  *
@@ -27,6 +24,11 @@
  *
  *****************************************************************************/
 
+/**
+ * @file temporal_selfuncs.h
+ * Selectivity functions for temporal types
+ */
+
 #ifndef __TEMPORAL_SELFUNCS_H__
 #define __TEMPORAL_SELFUNCS_H__