NotificationsYou must be signed in to change notification settings
Fork28
Star153

Commit0050c0a

committed

revert sort order for timestamp to make fast <=| instead of |=>

1 parent4576208 commit0050c0aCopy full SHA for 0050c0a

File tree

3 files changed

+35

-14

lines changed

3 files changed

+35

-14

lines changed

`‎rum--1.0.sql‎`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,11 @@ CREATE OPERATOR \|=> (`
`104`	`104`
`105`	`105`	`-- timestamp operator class`
`106`	`106`
	`107`	`+CREATEFUNCTIONrum_timestamp_cmp(timestamp,timestamp)`
	`108`	`+RETURNSint`
	`109`	`+AS'MODULE_PATHNAME'`
	`110`	`+LANGUAGE C STRICT IMMUTABLE;`
	`111`	`+`
`107`	`112`	`CREATEFUNCTIONrum_timestamp_extract_value(timestamp,internal,internal,internal,internal)`
`108`	`113`	`RETURNS internal`
`109`	`114`	`AS'MODULE_PATHNAME'`
`@@ -138,7 +143,7 @@ AS`
`138`	`143`	`OPERATOR4>=,`
`139`	`144`	`OPERATOR5>,`
`140`	`145`	`--support`
`141`		`-FUNCTION1timestamp_cmp(timestamp,timestamp),`
	`146`	`+FUNCTION1rum_timestamp_cmp(timestamp,timestamp),`
`142`	`147`	`FUNCTION2 rum_timestamp_extract_value(timestamp,internal,internal,internal,internal),`
`143`	`148`	`FUNCTION3 rum_timestamp_extract_query(timestamp,internal,smallint,internal,internal,internal,internal),`
`144`	`149`	`FUNCTION4 rum_timestamp_consistent(internal,smallint,timestamp,int,internal,internal,internal,internal),`

`‎rum.h‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -975,6 +975,6 @@ extern Datum FunctionCall10Coll(FmgrInfo *flinfo, Oid collation,`
`975`	`975`	`Datumarg6,Datumarg7,Datumarg8,`
`976`	`976`	`Datumarg9,Datumarg10);`
`977`	`977`
`978`		`-#defineFROM_STRATEGY(22)`
	`978`	`+#defineFROM_STRATEGY(21)`
`979`	`979`
`980`	`980`	`#endif/* __RUM_H__ */`

`‎rum_timestamp.c‎`

Lines changed: 28 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -54,14 +54,16 @@ rum_timestamp_extract_query(PG_FUNCTION_ARGS)`
`54`	`54`
`55`	`55`	`switch (strategy)`
`56`	`56`	`{`
`57`		`-caseBTLessStrategyNumber:`
`58`		`-caseBTLessEqualStrategyNumber:`
`59`		`-entries[0]=TimestampGetDatum(DT_NOBEGIN);/* leftmost */`
`60`		`-*ptr_partialmatch= true;`
`61`		`-break;`
`62`	`57`	`caseBTGreaterEqualStrategyNumber:`
`63`	`58`	`caseBTGreaterStrategyNumber:`
	`59`	`+entries[0]=TimestampGetDatum(DT_NOEND);/* leftmost */`
`64`	`60`	`*ptr_partialmatch= true;`
	`61`	`+break;`
	`62`	`+`
	`63`	`+caseBTLessStrategyNumber:`
	`64`	`+caseBTLessEqualStrategyNumber:`
	`65`	`+*ptr_partialmatch= true;`
	`66`	`+`
`65`	`67`	`caseBTEqualStrategyNumber:`
`66`	`68`	`caseRUM_TMST_DISTANCE:`
`67`	`69`	`caseRUM_TMST_LEFT_DISTANCE:`
`@@ -75,6 +77,20 @@ rum_timestamp_extract_query(PG_FUNCTION_ARGS)`
`75`	`77`	`PG_RETURN_POINTER(entries);`
`76`	`78`	`}`
`77`	`79`
	`80`	`+PG_FUNCTION_INFO_V1(rum_timestamp_cmp);`
	`81`	`+Datum`
	`82`	`+rum_timestamp_cmp(PG_FUNCTION_ARGS)`
	`83`	`+{`
	`84`	`+Datuma=PG_GETARG_DATUM(0);`
	`85`	`+Datumb=PG_GETARG_DATUM(1);`
	`86`	`+int32cmp;`
	`87`	`+`
	`88`	`+cmp=-DatumGetInt32(DirectFunctionCall2Coll(timestamp_cmp,`
	`89`	`+PG_GET_COLLATION(),`
	`90`	`+a,b));`
	`91`	`+PG_RETURN_INT32(cmp);`
	`92`	`+}`
	`93`	`+`
`78`	`94`	`PG_FUNCTION_INFO_V1(rum_timestamp_compare_prefix);`
`79`	`95`	`Datum`
`80`	`96`	`rum_timestamp_compare_prefix(PG_FUNCTION_ARGS)`
`@@ -85,22 +101,22 @@ rum_timestamp_compare_prefix(PG_FUNCTION_ARGS)`
`85`	`101`	`int32res,`
`86`	`102`	`cmp;`
`87`	`103`
`88`		`-cmp=DatumGetInt32(DirectFunctionCall2Coll(timestamp_cmp,`
	`104`	`+cmp=DatumGetInt32(DirectFunctionCall2Coll(rum_timestamp_cmp,`
`89`	`105`	`PG_GET_COLLATION(),`
`90`		`- (data->strategy==BTLessStrategyNumber\|\|`
`91`		`-data->strategy==BTLessEqualStrategyNumber)`
	`106`	`+ (data->strategy==BTGreaterStrategyNumber\|\|`
	`107`	`+data->strategy==BTGreaterEqualStrategyNumber)`
`92`	`108`	`?data->datum :a,b));`
`93`	`109`
`94`	`110`	`switch (data->strategy)`
`95`	`111`	`{`
`96`		`-caseBTLessStrategyNumber:`
	`112`	`+caseBTGreaterStrategyNumber:`
`97`	`113`	`/* If original datum > indexed one then return match */`
`98`	`114`	`if (cmp>0)`
`99`	`115`	`res=0;`
`100`	`116`	`else`
`101`	`117`	`res=1;`
`102`	`118`	`break;`
`103`		`-caseBTLessEqualStrategyNumber:`
	`119`	`+caseBTGreaterEqualStrategyNumber:`
`104`	`120`	`/* The same except equality */`
`105`	`121`	`if (cmp >=0)`
`106`	`122`	`res=0;`
`@@ -113,14 +129,14 @@ rum_timestamp_compare_prefix(PG_FUNCTION_ARGS)`
`113`	`129`	`else`
`114`	`130`	`res=0;`
`115`	`131`	`break;`
`116`		`-caseBTGreaterEqualStrategyNumber:`
	`132`	`+caseBTLessEqualStrategyNumber:`
`117`	`133`	`/* If original datum <= indexed one then return match */`
`118`	`134`	`if (cmp <=0)`
`119`	`135`	`res=0;`
`120`	`136`	`else`
`121`	`137`	`res=1;`
`122`	`138`	`break;`
`123`		`-caseBTGreaterStrategyNumber:`
	`139`	`+caseBTLessStrategyNumber:`
`124`	`140`	`/* If original datum <= indexed one then return match */`
`125`	`141`	`/* If original datum == indexed one then continue scan */`
`126`	`142`	`if (cmp<0)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit0050c0a

File tree

3 files changed

3 files changed

`‎rum--1.0.sql‎`

`‎rum.h‎`

`‎rum_timestamp.c‎`

0 commit comments