btree_gin: properly call DirectFunctionCall1()

bmomjian · bmomjian · commit 843cd0bfe624 · 2015-03-24T20:53:29.000-04:00
Previously we called DirectFunctionCall3() with dummy arguments.

Patch by Jon Nelson
diff --git a/contrib/btree_gin/btree_gin.c b/contrib/btree_gin/btree_gin.c
@@ -318,10 +318,7 @@ GIN_SUPPORT(macaddr, false, leftmostvalue_macaddr, macaddr_cmp)
 static Datum
 leftmostvalue_inet(void)
 {
-	return DirectFunctionCall3(inet_in,
-							   CStringGetDatum("0.0.0.0/0"),
-							   ObjectIdGetDatum(0),
-							   Int32GetDatum(-1));
+	return DirectFunctionCall1(inet_in, CStringGetDatum("0.0.0.0/0"));
 }
 GIN_SUPPORT(inet, true, leftmostvalue_inet, network_cmp)
 
@@ -346,20 +343,14 @@ GIN_SUPPORT(bytea, true, leftmostvalue_text, byteacmp)
 static Datum
 leftmostvalue_bit(void)
 {
-	return DirectFunctionCall3(bit_in,
-							   CStringGetDatum(""),
-							   ObjectIdGetDatum(0),
-							   Int32GetDatum(-1));
+	return DirectFunctionCall1(bit_in, CStringGetDatum(""));
 }
 GIN_SUPPORT(bit, true, leftmostvalue_bit, bitcmp)
 
 static Datum
 leftmostvalue_varbit(void)
 {
-	return DirectFunctionCall3(varbit_in,
-							   CStringGetDatum(""),
-							   ObjectIdGetDatum(0),
-							   Int32GetDatum(-1));
+	return DirectFunctionCall1(varbit_in, CStringGetDatum(""));
 }
 GIN_SUPPORT(varbit, true, leftmostvalue_varbit, bitcmp)
 

Original file line number	Diff line number	Diff line change
`@@ -318,10 +318,7 @@ GIN_SUPPORT(macaddr, false, leftmostvalue_macaddr, macaddr_cmp)`
`318`	`318`	`static Datum`
`319`	`319`	`leftmostvalue_inet(void)`
`320`	`320`	`{`
`321`		`- return DirectFunctionCall3(inet_in,`
`322`		`- CStringGetDatum("0.0.0.0/0"),`
`323`		`- ObjectIdGetDatum(0),`
`324`		`- Int32GetDatum(-1));`
	`321`	`+ return DirectFunctionCall1(inet_in, CStringGetDatum("0.0.0.0/0"));`
`325`	`322`	`}`
`326`	`323`	`GIN_SUPPORT(inet, true, leftmostvalue_inet, network_cmp)`
`327`	`324`
`@@ -346,20 +343,14 @@ GIN_SUPPORT(bytea, true, leftmostvalue_text, byteacmp)`
`346`	`343`	`static Datum`
`347`	`344`	`leftmostvalue_bit(void)`
`348`	`345`	`{`
`349`		`- return DirectFunctionCall3(bit_in,`
`350`		`- CStringGetDatum(""),`
`351`		`- ObjectIdGetDatum(0),`
`352`		`- Int32GetDatum(-1));`
	`346`	`+ return DirectFunctionCall1(bit_in, CStringGetDatum(""));`
`353`	`347`	`}`
`354`	`348`	`GIN_SUPPORT(bit, true, leftmostvalue_bit, bitcmp)`
`355`	`349`
`356`	`350`	`static Datum`
`357`	`351`	`leftmostvalue_varbit(void)`
`358`	`352`	`{`
`359`		`- return DirectFunctionCall3(varbit_in,`
`360`		`- CStringGetDatum(""),`
`361`		`- ObjectIdGetDatum(0),`
`362`		`- Int32GetDatum(-1));`
	`353`	`+ return DirectFunctionCall1(varbit_in, CStringGetDatum(""));`
`363`	`354`	`}`
`364`	`355`	`GIN_SUPPORT(varbit, true, leftmostvalue_varbit, bitcmp)`
`365`	`356`