/contrib/btree_gist adjustments for new 'day' interval value.

bmomjian · bmomjian · commit a45f4c25335e · 2005-07-20T18:17:39.000Z
diff --git a/contrib/btree_gist/btree_interval.c b/contrib/btree_gist/btree_interval.c
@@ -89,7 +89,7 @@ intr2num(const Interval *i)
 	return (ret);
 }
 
-#define INTERVALSIZE 12
+#define INTERVALSIZE 16
 
 static const gbtree_ninfo tinfo =
 {
diff --git a/contrib/btree_gist/btree_time.c b/contrib/btree_gist/btree_time.c
@@ -221,15 +221,15 @@ gbt_time_penalty(PG_FUNCTION_ARGS)
 									 P_TimeADTGetDatum(origentry->upper)));
 
 	/* see interval_larger */
-	res = Max(intr->time + intr->month * (30 * 86400), 0);
+	res = Max(intr->time + intr->day * 86400 + intr->month * (30 * 86400), 0);
 
 	intr = DatumGetIntervalP(DirectFunctionCall2(
 												 time_mi_time,
 									   P_TimeADTGetDatum(origentry->lower),
 									  P_TimeADTGetDatum(newentry->lower)));
 
 	/* see interval_larger */
-	res += Max(intr->time + intr->month * (30 * 86400), 0);
+	res += Max(intr->time + intr->day * 86400 + intr->month * (30 * 86400), 0);
 
 	*result = 0.0;
 
@@ -240,7 +240,7 @@ gbt_time_penalty(PG_FUNCTION_ARGS)
 									   P_TimeADTGetDatum(origentry->upper),
 									 P_TimeADTGetDatum(origentry->lower)));
 		*result += FLT_MIN;
-		*result += (float) (res / ((double) (res + intr->time + intr->month * (30 * 86400))));
+		*result += (float) (res / ((double) (res + intr->time + intr->day * 86400 + intr->month * (30 * 86400))));
 		*result *= (FLT_MAX / (((GISTENTRY *) PG_GETARG_POINTER(0))->rel->rd_att->natts + 1));
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ intr2num(const Interval *i)`
`89`	`89`	`return (ret);`
`90`	`90`	`}`
`91`	`91`
`92`		`-#define INTERVALSIZE 12`
	`92`	`+#define INTERVALSIZE 16`
`93`	`93`
`94`	`94`	`static const gbtree_ninfo tinfo =`
`95`	`95`	`{`