projects
/
smlar.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from:
8d02df1
)
Fix compiler warnings
master
author
Teodor Sigaev
<teodor@sigaev.ru>
Mon, 8 Nov 2021 11:49:14 +0000
(14:49 +0300)
committer
Teodor Sigaev
<teodor@sigaev.ru>
Mon, 8 Nov 2021 11:49:14 +0000
(14:49 +0300)
75 files changed:
expected/bit.out
patch
|
blob
|
history
expected/bytea.out
patch
|
blob
|
history
expected/char.out
patch
|
blob
|
history
expected/cidr.out
patch
|
blob
|
history
expected/composite_int4.out
patch
|
blob
|
history
expected/composite_text.out
patch
|
blob
|
history
expected/date.out
patch
|
blob
|
history
expected/float4.out
patch
|
blob
|
history
expected/float8.out
patch
|
blob
|
history
expected/inet.out
patch
|
blob
|
history
expected/int2.out
patch
|
blob
|
history
expected/int4.out
patch
|
blob
|
history
expected/int4g.out
patch
|
blob
|
history
expected/int4i.out
patch
|
blob
|
history
expected/int8.out
patch
|
blob
|
history
expected/int8g.out
patch
|
blob
|
history
expected/int8i.out
patch
|
blob
|
history
expected/interval.out
patch
|
blob
|
history
expected/intervalg.out
patch
|
blob
|
history
expected/intervali.out
patch
|
blob
|
history
expected/macaddr.out
patch
|
blob
|
history
expected/money.out
patch
|
blob
|
history
expected/numeric.out
patch
|
blob
|
history
expected/oid.out
patch
|
blob
|
history
expected/smlar.out
patch
|
blob
|
history
expected/text.out
patch
|
blob
|
history
expected/textg.out
patch
|
blob
|
history
expected/texti.out
patch
|
blob
|
history
expected/time.out
patch
|
blob
|
history
expected/timestamp.out
patch
|
blob
|
history
expected/timestamptz.out
patch
|
blob
|
history
expected/timetz.out
patch
|
blob
|
history
expected/varbit.out
patch
|
blob
|
history
expected/varchar.out
patch
|
blob
|
history
smlar.c
patch
|
blob
|
history
smlar.h
patch
|
blob
|
history
smlar_gin.c
patch
|
blob
|
history
smlar_gist.c
patch
|
blob
|
history
sql/bit.sql
patch
|
blob
|
history
sql/bytea.sql
patch
|
blob
|
history
sql/char.sql
patch
|
blob
|
history
sql/cidr.sql
patch
|
blob
|
history
sql/composite_int4.sql
patch
|
blob
|
history
sql/composite_text.sql
patch
|
blob
|
history
sql/date.sql
patch
|
blob
|
history
sql/float4.sql
patch
|
blob
|
history
sql/float8.sql
patch
|
blob
|
history
sql/inet.sql
patch
|
blob
|
history
sql/int2.sql
patch
|
blob
|
history
sql/int4.sql
patch
|
blob
|
history
sql/int4g.sql
patch
|
blob
|
history
sql/int4i.sql
patch
|
blob
|
history
sql/int8.sql
patch
|
blob
|
history
sql/int8g.sql
patch
|
blob
|
history
sql/int8i.sql
patch
|
blob
|
history
sql/int8n.sql
patch
|
blob
|
history
sql/interval.sql
patch
|
blob
|
history
sql/intervalg.sql
patch
|
blob
|
history
sql/intervali.sql
patch
|
blob
|
history
sql/intervaln.sql
patch
|
blob
|
history
sql/macaddr.sql
patch
|
blob
|
history
sql/money.sql
patch
|
blob
|
history
sql/numeric.sql
patch
|
blob
|
history
sql/oid.sql
patch
|
blob
|
history
sql/smlar.sql
patch
|
blob
|
history
sql/text.sql
patch
|
blob
|
history
sql/textg.sql
patch
|
blob
|
history
sql/texti.sql
patch
|
blob
|
history
sql/textn.sql
patch
|
blob
|
history
sql/time.sql
patch
|
blob
|
history
sql/timestamp.sql
patch
|
blob
|
history
sql/timestamptz.sql
patch
|
blob
|
history
sql/timetz.sql
patch
|
blob
|
history
sql/varbit.sql
patch
|
blob
|
history
sql/varchar.sql
patch
|
blob
|
history
diff --git
a/expected/bit.out
b/expected/bit.out
index
980cbaf
..
fff8c6e
100644
(file)
--- a/
expected/bit.out
+++ b/
expected/bit.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
diff --git
a/expected/bytea.out
b/expected/bytea.out
index
6e98885
..
2c3d4c9
100644
(file)
--- a/
expected/bytea.out
+++ b/
expected/bytea.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
diff --git
a/expected/char.out
b/expected/char.out
index
b754250
..
af7e037
100644
(file)
--- a/
expected/char.out
+++ b/
expected/char.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
diff --git
a/expected/cidr.out
b/expected/cidr.out
index
38d1ad4
..
0313210
100644
(file)
--- a/
expected/cidr.out
+++ b/
expected/cidr.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
diff --git
a/expected/composite_int4.out
b/expected/composite_int4.out
index
fc1d243
..
1a46c08
100644
(file)
--- a/
expected/composite_int4.out
+++ b/
expected/composite_int4.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
diff --git
a/expected/composite_text.out
b/expected/composite_text.out
index
0b77edc
..
4824934
100644
(file)
--- a/
expected/composite_text.out
+++ b/
expected/composite_text.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
diff --git
a/expected/date.out
b/expected/date.out
index
10b7fe3
..
8801337
100644
(file)
--- a/
expected/date.out
+++ b/
expected/date.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
diff --git
a/expected/float4.out
b/expected/float4.out
index
70eb507
..
f44cc0d
100644
(file)
--- a/
expected/float4.out
+++ b/
expected/float4.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
diff --git
a/expected/float8.out
b/expected/float8.out
index
4a9286f
..
bff792c
100644
(file)
--- a/
expected/float8.out
+++ b/
expected/float8.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
diff --git
a/expected/inet.out
b/expected/inet.out
index
7bde3d8
..
b7d47d0
100644
(file)
--- a/
expected/inet.out
+++ b/
expected/inet.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
diff --git
a/expected/int2.out
b/expected/int2.out
index
8c43891
..
ed54190
100644
(file)
--- a/
expected/int2.out
+++ b/
expected/int2.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
diff --git
a/expected/int4.out
b/expected/int4.out
index
1f69657
..
90f28ab
100644
(file)
--- a/
expected/int4.out
+++ b/
expected/int4.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
diff --git
a/expected/int4g.out
b/expected/int4g.out
index
fd234b5
..
433fcd7
100644
(file)
--- a/
expected/int4g.out
+++ b/
expected/int4g.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.3);
set_smlar_limit
-----------------
SELECT set_smlar_limit(0.3);
set_smlar_limit
-----------------
diff --git
a/expected/int4i.out
b/expected/int4i.out
index
81e8284
..
92a8246
100644
(file)
--- a/
expected/int4i.out
+++ b/
expected/int4i.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(5.0);
set_smlar_limit
-----------------
SELECT set_smlar_limit(5.0);
set_smlar_limit
-----------------
diff --git
a/expected/int8.out
b/expected/int8.out
index
ee943d2
..
7fdaebe
100644
(file)
--- a/
expected/int8.out
+++ b/
expected/int8.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
diff --git
a/expected/int8g.out
b/expected/int8g.out
index
432fa35
..
b38ba2c
100644
(file)
--- a/
expected/int8g.out
+++ b/
expected/int8g.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.3);
set_smlar_limit
-----------------
SELECT set_smlar_limit(0.3);
set_smlar_limit
-----------------
diff --git
a/expected/int8i.out
b/expected/int8i.out
index
9ffcc4d
..
201cf63
100644
(file)
--- a/
expected/int8i.out
+++ b/
expected/int8i.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(5.0);
set_smlar_limit
-----------------
SELECT set_smlar_limit(5.0);
set_smlar_limit
-----------------
diff --git
a/expected/interval.out
b/expected/interval.out
index
a8bd2bd
..
1d33b6e
100644
(file)
--- a/
expected/interval.out
+++ b/
expected/interval.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
diff --git
a/expected/intervalg.out
b/expected/intervalg.out
index
6731e3c
..
7122a90
100644
(file)
--- a/
expected/intervalg.out
+++ b/
expected/intervalg.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.3);
set_smlar_limit
-----------------
SELECT set_smlar_limit(0.3);
set_smlar_limit
-----------------
diff --git
a/expected/intervali.out
b/expected/intervali.out
index
9d34998
..
fd1f5b8
100644
(file)
--- a/
expected/intervali.out
+++ b/
expected/intervali.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(5.0);
set_smlar_limit
-----------------
SELECT set_smlar_limit(5.0);
set_smlar_limit
-----------------
diff --git
a/expected/macaddr.out
b/expected/macaddr.out
index
9397042
..
14cac5f
100644
(file)
--- a/
expected/macaddr.out
+++ b/
expected/macaddr.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
diff --git
a/expected/money.out
b/expected/money.out
index
c04d690
..
d3f4ae1
100644
(file)
--- a/
expected/money.out
+++ b/
expected/money.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
diff --git
a/expected/numeric.out
b/expected/numeric.out
index
84eb7ee
..
cf8882f
100644
(file)
--- a/
expected/numeric.out
+++ b/
expected/numeric.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
diff --git
a/expected/oid.out
b/expected/oid.out
index
c76ce6f
..
ac67cf7
100644
(file)
--- a/
expected/oid.out
+++ b/
expected/oid.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
diff --git
a/expected/smlar.out
b/expected/smlar.out
index
2a34641
..
5dac034
100644
(file)
--- a/
expected/smlar.out
+++ b/
expected/smlar.out
@@
-1,4
+1,5
@@
CREATE EXTENSION smlar;
CREATE EXTENSION smlar;
+set extra_float_digits =0;
--sanity check
SELECT
opc.opcname,
--sanity check
SELECT
opc.opcname,
diff --git
a/expected/text.out
b/expected/text.out
index
622a89e
..
56cbd36
100644
(file)
--- a/
expected/text.out
+++ b/
expected/text.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
diff --git
a/expected/textg.out
b/expected/textg.out
index
a48cb24
..
38fc578
100644
(file)
--- a/
expected/textg.out
+++ b/
expected/textg.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.3);
set_smlar_limit
-----------------
SELECT set_smlar_limit(0.3);
set_smlar_limit
-----------------
diff --git
a/expected/texti.out
b/expected/texti.out
index
751d140
..
b52ff23
100644
(file)
--- a/
expected/texti.out
+++ b/
expected/texti.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(5.0);
set_smlar_limit
-----------------
SELECT set_smlar_limit(5.0);
set_smlar_limit
-----------------
diff --git
a/expected/time.out
b/expected/time.out
index
2fe47ed
..
e724702
100644
(file)
--- a/
expected/time.out
+++ b/
expected/time.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
diff --git
a/expected/timestamp.out
b/expected/timestamp.out
index
72ab686
..
3ef57c2
100644
(file)
--- a/
expected/timestamp.out
+++ b/
expected/timestamp.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
diff --git
a/expected/timestamptz.out
b/expected/timestamptz.out
index
a73c451
..
a5dc890
100644
(file)
--- a/
expected/timestamptz.out
+++ b/
expected/timestamptz.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
diff --git
a/expected/timetz.out
b/expected/timetz.out
index
cd5191d
..
d0fa0e9
100644
(file)
--- a/
expected/timetz.out
+++ b/
expected/timetz.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
diff --git
a/expected/varbit.out
b/expected/varbit.out
index
06332ab
..
6f614d8
100644
(file)
--- a/
expected/varbit.out
+++ b/
expected/varbit.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
diff --git
a/expected/varchar.out
b/expected/varchar.out
index
9fab6c4
..
f74b110
100644
(file)
--- a/
expected/varchar.out
+++ b/
expected/varchar.out
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
SELECT set_smlar_limit(0.6);
set_smlar_limit
-----------------
diff --git
a/smlar.c
b/smlar.c
index
5cbe5c2
..
ca0651f
100644
(file)
--- a/
smlar.c
+++ b/
smlar.c
@@
-16,7
+16,9
@@
#include "utils/fmgroids.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
#include "utils/fmgroids.h"
#include "utils/lsyscache.h"
#include "utils/memutils.h"
+#if (PG_VERSION_NUM < 120000)
#include "utils/tqual.h"
#include "utils/tqual.h"
+#endif
#include "utils/syscache.h"
#include "utils/typcache.h"
#include "utils/syscache.h"
#include "utils/typcache.h"
@@
-28,6
+30,11
@@
PG_MODULE_MAGIC;
#define SNAPSHOT SnapshotNow
#endif
#define SNAPSHOT SnapshotNow
#endif
+#if PG_VERSION_NUM >= 130000
+#define heap_open(r, l) table_open((r), (l))
+#define heap_close(r, l) table_close((r), (l))
+#endif
+
static Oid
getDefaultOpclass(Oid amoid, Oid typid)
{
static Oid
getDefaultOpclass(Oid amoid, Oid typid)
{
@@
-56,7
+63,11
@@
getDefaultOpclass(Oid amoid, Oid typid)
{
if ( OidIsValid(opclassOid) )
elog(ERROR, "Ambiguous opclass for type %u (access method %u)", typid, amoid);
{
if ( OidIsValid(opclassOid) )
elog(ERROR, "Ambiguous opclass for type %u (access method %u)", typid, amoid);
+#if (PG_VERSION_NUM >= 120000)
+ opclassOid = opclass->oid;
+#else
opclassOid = HeapTupleGetOid(tuple);
opclassOid = HeapTupleGetOid(tuple);
+#endif
}
}
}
}
@@
-91,9
+102,14
@@
getAMProc(Oid amoid, Oid typid)
/*
* Search binary-coercible type
*/
/*
* Search binary-coercible type
*/
+#ifdef SearchSysCacheList1
+ catlist = SearchSysCacheList1(CASTSOURCETARGET,
+ ObjectIdGetDatum(typid));
+#else
catlist = SearchSysCacheList(CASTSOURCETARGET, 1,
ObjectIdGetDatum(typid),
0, 0, 0);
catlist = SearchSysCacheList(CASTSOURCETARGET, 1,
ObjectIdGetDatum(typid),
0, 0, 0);
+#endif
for (i = 0; i < catlist->n_members; i++)
{
for (i = 0; i < catlist->n_members; i++)
{
@@
-171,6
+187,10
@@
getAMProc(Oid amoid, Oid typid)
static ProcTypeInfo *cacheProcs = NULL;
static int nCacheProcs = 0;
static ProcTypeInfo *cacheProcs = NULL;
static int nCacheProcs = 0;
+#ifndef TupleDescAttr
+#define TupleDescAttr(tupdesc, i) ((tupdesc)->attrs[(i)])
+#endif
+
static ProcTypeInfo
fillProcs(Oid typid)
{
static ProcTypeInfo
fillProcs(Oid typid)
{
@@
-192,7
+212,7
@@
fillProcs(Oid typid)
if (tupdesc->natts != 2)
elog(ERROR,"Composite type has wrong number of fields");
if (tupdesc->natts != 2)
elog(ERROR,"Composite type has wrong number of fields");
- if (
tupdesc->attrs[1]
->atttypid != FLOAT4OID)
+ if (
TupleDescAttr(tupdesc, 1)
->atttypid != FLOAT4OID)
elog(ERROR,"Second field of composite type is not float4");
oldcontext = MemoryContextSwitchTo(TopMemoryContext);
elog(ERROR,"Second field of composite type is not float4");
oldcontext = MemoryContextSwitchTo(TopMemoryContext);
@@
-201,8
+221,10
@@
fillProcs(Oid typid)
ReleaseTupleDesc(tupdesc);
ReleaseTupleDesc(tupdesc);
- info->cmpFuncOid = getAMProc(BTREE_AM_OID, info->tupDesc->attrs[0]->atttypid);
- info->hashFuncOid = getAMProc(HASH_AM_OID, info->tupDesc->attrs[0]->atttypid);
+ info->cmpFuncOid = getAMProc(BTREE_AM_OID,
+ TupleDescAttr(info->tupDesc, 0)->atttypid);
+ info->hashFuncOid = getAMProc(HASH_AM_OID,
+ TupleDescAttr(info->tupDesc, 0)->atttypid);
}
else
{
}
else
{
@@
-504,6
+526,7
@@
Array2SimpleArrayU(ProcTypeInfo info, ArrayType *a, void *cache)
{
case TF_LOG:
s->df[i] = (1.0 + log( s->df[i] ));
{
case TF_LOG:
s->df[i] = (1.0 + log( s->df[i] ));
+ /* FALLTHROUGH */
case TF_N:
s->df[i] *= stat->idf;
break;
case TF_N:
s->df[i] *= stat->idf;
break;
diff --git
a/smlar.h
b/smlar.h
index
6cd5a27
..
6410326
100644
(file)
--- a/
smlar.h
+++ b/
smlar.h
@@
-6,6
+6,8
@@
#include "access/tupdesc.h"
#include "catalog/pg_collation.h"
#include "access/tupdesc.h"
#include "catalog/pg_collation.h"
+#include <math.h>
+
typedef struct ProcTypeInfoData *ProcTypeInfo;
typedef struct ProcTypeInfoData {
typedef struct ProcTypeInfoData *ProcTypeInfo;
typedef struct ProcTypeInfoData {
diff --git
a/smlar_gin.c
b/smlar_gin.c
index
ec095f6
..
4164fa4
100644
(file)
--- a/
smlar_gin.c
+++ b/
smlar_gin.c
@@
-5,7
+5,11
@@
#include "fmgr.h"
#include "access/gin.h"
#include "access/skey.h"
#include "fmgr.h"
#include "access/gin.h"
#include "access/skey.h"
+#if PG_VERSION_NUM < 130000
#include "access/tuptoaster.h"
#include "access/tuptoaster.h"
+#else
+#include "access/heaptoast.h"
+#endif
PG_FUNCTION_INFO_V1(smlararrayextract);
Datum smlararrayextract(PG_FUNCTION_ARGS);
PG_FUNCTION_INFO_V1(smlararrayextract);
Datum smlararrayextract(PG_FUNCTION_ARGS);
diff --git
a/smlar_gist.c
b/smlar_gist.c
index
382b932
..
480d744
100644
(file)
--- a/
smlar_gist.c
+++ b/
smlar_gist.c
@@
-3,7
+3,11
@@
#include "fmgr.h"
#include "access/gist.h"
#include "access/skey.h"
#include "fmgr.h"
#include "access/gist.h"
#include "access/skey.h"
+#if PG_VERSION_NUM < 130000
#include "access/tuptoaster.h"
#include "access/tuptoaster.h"
+#else
+#include "access/heaptoast.h"
+#endif
#include "utils/memutils.h"
typedef struct SmlSign {
#include "utils/memutils.h"
typedef struct SmlSign {
@@
-164,7
+168,9
@@
Array2HashedArray(ProcTypeInfo info, ArrayType *a)
ptr = GETARR(sign);
for(i=0;i<s->nelems;i++)
ptr = GETARR(sign);
for(i=0;i<s->nelems;i++)
- ptr[i] = DatumGetUInt32( FunctionCall1( &s->info->hashFunc, s->elems[i] ) );
+ ptr[i] = DatumGetUInt32(FunctionCall1Coll(&s->info->hashFunc,
+ DEFAULT_COLLATION_OID,
+ s->elems[i]));
/*
* there is a collision of hash-function; len is always equal or less than
/*
* there is a collision of hash-function; len is always equal or less than
@@
-239,8
+245,13
@@
getHashedCache(void *cache)
getFmgrInfoHash(stat->info);
for(i=0;i<stat->nelems;i++)
{
getFmgrInfoHash(stat->info);
for(i=0;i<stat->nelems;i++)
{
- uint32 hash = DatumGetUInt32( FunctionCall1( &stat->info->hashFunc, stat->elems[i].datum ) );
- int index = HASHVAL(hash);
+ uint32 hash;
+ int index;
+
+ hash = DatumGetUInt32(FunctionCall1Coll(&stat->info->hashFunc,
+ DEFAULT_COLLATION_OID,
+ stat->elems[i].datum));
+ index = HASHVAL(hash);
stat->helems[i].hash = hash;
stat->helems[i].idfMin = stat->helems[i].idfMax = stat->elems[i].idf;
stat->helems[i].hash = hash;
stat->helems[i].idfMin = stat->helems[i].idfMax = stat->elems[i].idf;
@@
-296,7
+307,9
@@
fillHashVal(void *cache, SimpleArray *a)
getFmgrInfoHash(a->info);
for(i=0;i<a->nelems;i++)
getFmgrInfoHash(a->info);
for(i=0;i<a->nelems;i++)
- a->hash[i] = DatumGetUInt32( FunctionCall1( &a->info->hashFunc, a->elems[i] ) );
+ a->hash[i] = DatumGetUInt32(FunctionCall1Coll(&a->info->hashFunc,
+ DEFAULT_COLLATION_OID,
+ a->elems[i]));
}
}
@@
-380,7
+393,7
@@
gsmlsign_compress(PG_FUNCTION_ARGS)
retval = (GISTENTRY *) palloc(sizeof(GISTENTRY));
gistentryinit(*retval, PointerGetDatum(sign),
entry->rel, entry->page,
retval = (GISTENTRY *) palloc(sizeof(GISTENTRY));
gistentryinit(*retval, PointerGetDatum(sign),
entry->rel, entry->page,
- entry->offset,
FALSE
);
+ entry->offset,
false
);
}
else if ( ISSIGNKEY(DatumGetPointer(entry->key)) &&
!ISALLTRUE(DatumGetPointer(entry->key)) )
}
else if ( ISSIGNKEY(DatumGetPointer(entry->key)) &&
!ISALLTRUE(DatumGetPointer(entry->key)) )
@@
-404,7
+417,7
@@
gsmlsign_compress(PG_FUNCTION_ARGS)
gistentryinit(*retval, PointerGetDatum(sign),
entry->rel, entry->page,
gistentryinit(*retval, PointerGetDatum(sign),
entry->rel, entry->page,
- entry->offset,
FALSE
);
+ entry->offset,
false
);
}
}
}
}
@@
-425,7
+438,7
@@
gsmlsign_decompress(PG_FUNCTION_ARGS)
gistentryinit(*retval, PointerGetDatum(key),
entry->rel, entry->page,
gistentryinit(*retval, PointerGetDatum(key),
entry->rel, entry->page,
- entry->offset,
FALSE
);
+ entry->offset,
false
);
PG_RETURN_POINTER(retval);
}
PG_RETURN_POINTER(retval);
}
diff --git
a/sql/bit.sql
b/sql/bit.sql
index
028268a
..
1669561
100644
(file)
--- a/
sql/bit.sql
+++ b/
sql/bit.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
SELECT
SELECT set_smlar_limit(0.6);
SELECT
diff --git
a/sql/bytea.sql
b/sql/bytea.sql
index
e86d6cb
..
952aa74
100644
(file)
--- a/
sql/bytea.sql
+++ b/
sql/bytea.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
SELECT
SELECT set_smlar_limit(0.6);
SELECT
diff --git
a/sql/char.sql
b/sql/char.sql
index
9a39f66
..
b557da9
100644
(file)
--- a/
sql/char.sql
+++ b/
sql/char.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
SELECT
SELECT set_smlar_limit(0.6);
SELECT
diff --git
a/sql/cidr.sql
b/sql/cidr.sql
index
afe69d4
..
d8ff861
100644
(file)
--- a/
sql/cidr.sql
+++ b/
sql/cidr.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
SELECT
SELECT set_smlar_limit(0.6);
SELECT
diff --git
a/sql/composite_int4.sql
b/sql/composite_int4.sql
index
0ba908f
..
aab069b
100644
(file)
--- a/
sql/composite_int4.sql
+++ b/
sql/composite_int4.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
CREATE TYPE cint AS (id int, w float4);
SELECT set_smlar_limit(0.6);
CREATE TYPE cint AS (id int, w float4);
diff --git
a/sql/composite_text.sql
b/sql/composite_text.sql
index
6c0b85d
..
2f41ff8
100644
(file)
--- a/
sql/composite_text.sql
+++ b/
sql/composite_text.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
CREATE TYPE ctext AS (id text, w float4);
SELECT set_smlar_limit(0.6);
CREATE TYPE ctext AS (id text, w float4);
diff --git
a/sql/date.sql
b/sql/date.sql
index
8643579
..
219122c
100644
(file)
--- a/
sql/date.sql
+++ b/
sql/date.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
SELECT
SELECT set_smlar_limit(0.6);
SELECT
diff --git
a/sql/float4.sql
b/sql/float4.sql
index
53668e9
..
09343c4
100644
(file)
--- a/
sql/float4.sql
+++ b/
sql/float4.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
SELECT
SELECT set_smlar_limit(0.6);
SELECT
diff --git
a/sql/float8.sql
b/sql/float8.sql
index
3841941
..
3753a42
100644
(file)
--- a/
sql/float8.sql
+++ b/
sql/float8.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
SELECT
SELECT set_smlar_limit(0.6);
SELECT
diff --git
a/sql/inet.sql
b/sql/inet.sql
index
22febf6
..
7aaa2f1
100644
(file)
--- a/
sql/inet.sql
+++ b/
sql/inet.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
SELECT
SELECT set_smlar_limit(0.6);
SELECT
diff --git
a/sql/int2.sql
b/sql/int2.sql
index
c55464d
..
e3e913c
100644
(file)
--- a/
sql/int2.sql
+++ b/
sql/int2.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
SELECT
SELECT set_smlar_limit(0.6);
SELECT
diff --git
a/sql/int4.sql
b/sql/int4.sql
index
2b16272
..
4a31600
100644
(file)
--- a/
sql/int4.sql
+++ b/
sql/int4.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
SELECT
SELECT set_smlar_limit(0.6);
SELECT
diff --git
a/sql/int4g.sql
b/sql/int4g.sql
index
982ce4d
..
e7d4f09
100644
(file)
--- a/
sql/int4g.sql
+++ b/
sql/int4g.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.3);
SET smlar.type = "tfidf";
SELECT set_smlar_limit(0.3);
SET smlar.type = "tfidf";
diff --git
a/sql/int4i.sql
b/sql/int4i.sql
index
58e9b0d
..
7a9d58d
100644
(file)
--- a/
sql/int4i.sql
+++ b/
sql/int4i.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(5.0);
SET smlar.type='overlap';
SELECT set_smlar_limit(5.0);
SET smlar.type='overlap';
diff --git
a/sql/int8.sql
b/sql/int8.sql
index
9b3e2be
..
8ea868c
100644
(file)
--- a/
sql/int8.sql
+++ b/
sql/int8.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
SELECT
SELECT set_smlar_limit(0.6);
SELECT
diff --git
a/sql/int8g.sql
b/sql/int8g.sql
index
4449e32
..
f7262ef
100644
(file)
--- a/
sql/int8g.sql
+++ b/
sql/int8g.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.3);
SET smlar.type = "tfidf";
SELECT set_smlar_limit(0.3);
SET smlar.type = "tfidf";
diff --git
a/sql/int8i.sql
b/sql/int8i.sql
index
ad458e4
..
b74a464
100644
(file)
--- a/
sql/int8i.sql
+++ b/
sql/int8i.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(5.0);
SET smlar.type='overlap';
SELECT set_smlar_limit(5.0);
SET smlar.type='overlap';
diff --git
a/sql/int8n.sql
b/sql/int8n.sql
index
81144c9
..
957288e
100644
(file)
--- a/
sql/int8n.sql
+++ b/
sql/int8n.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.8);
DROP INDEX idx_test_int8;
SELECT set_smlar_limit(0.8);
DROP INDEX idx_test_int8;
diff --git
a/sql/interval.sql
b/sql/interval.sql
index
7b45c95
..
8611a7c
100644
(file)
--- a/
sql/interval.sql
+++ b/
sql/interval.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
SELECT
SELECT set_smlar_limit(0.6);
SELECT
diff --git
a/sql/intervalg.sql
b/sql/intervalg.sql
index
5bc25ca
..
f41394b
100644
(file)
--- a/
sql/intervalg.sql
+++ b/
sql/intervalg.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.3);
SET smlar.type = "tfidf";
SELECT set_smlar_limit(0.3);
SET smlar.type = "tfidf";
diff --git
a/sql/intervali.sql
b/sql/intervali.sql
index
2287d1a
..
335ab36
100644
(file)
--- a/
sql/intervali.sql
+++ b/
sql/intervali.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(5.0);
SET smlar.type='overlap';
SELECT set_smlar_limit(5.0);
SET smlar.type='overlap';
diff --git
a/sql/intervaln.sql
b/sql/intervaln.sql
index
f36759d
..
2e03e0d
100644
(file)
--- a/
sql/intervaln.sql
+++ b/
sql/intervaln.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.8);
DROP INDEX idx_test_interval;
SELECT set_smlar_limit(0.8);
DROP INDEX idx_test_interval;
diff --git
a/sql/macaddr.sql
b/sql/macaddr.sql
index
92492c8
..
9b36359
100644
(file)
--- a/
sql/macaddr.sql
+++ b/
sql/macaddr.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
SELECT
SELECT set_smlar_limit(0.6);
SELECT
diff --git
a/sql/money.sql
b/sql/money.sql
index
43ea5ae
..
f280e0b
100644
(file)
--- a/
sql/money.sql
+++ b/
sql/money.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
SELECT
SELECT set_smlar_limit(0.6);
SELECT
diff --git
a/sql/numeric.sql
b/sql/numeric.sql
index
5b54b2d
..
04626f0
100644
(file)
--- a/
sql/numeric.sql
+++ b/
sql/numeric.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
SELECT
SELECT set_smlar_limit(0.6);
SELECT
diff --git
a/sql/oid.sql
b/sql/oid.sql
index
2436a32
..
3c3d5ae
100644
(file)
--- a/
sql/oid.sql
+++ b/
sql/oid.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
SELECT
SELECT set_smlar_limit(0.6);
SELECT
diff --git
a/sql/smlar.sql
b/sql/smlar.sql
index
da93dfe
..
c498675
100644
(file)
--- a/
sql/smlar.sql
+++ b/
sql/smlar.sql
@@
-1,4
+1,5
@@
CREATE EXTENSION smlar;
CREATE EXTENSION smlar;
+set extra_float_digits =0;
--sanity check
SELECT
--sanity check
SELECT
diff --git
a/sql/text.sql
b/sql/text.sql
index
98cac43
..
c160920
100644
(file)
--- a/
sql/text.sql
+++ b/
sql/text.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
SELECT
SELECT set_smlar_limit(0.6);
SELECT
diff --git
a/sql/textg.sql
b/sql/textg.sql
index
c937a5b
..
e8d2575
100644
(file)
--- a/
sql/textg.sql
+++ b/
sql/textg.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.3);
SET smlar.type = "tfidf";
SELECT set_smlar_limit(0.3);
SET smlar.type = "tfidf";
diff --git
a/sql/texti.sql
b/sql/texti.sql
index
ea974b7
..
96833e6
100644
(file)
--- a/
sql/texti.sql
+++ b/
sql/texti.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(5.0);
SET smlar.type='overlap';
SELECT set_smlar_limit(5.0);
SET smlar.type='overlap';
diff --git
a/sql/textn.sql
b/sql/textn.sql
index
dd6e65e
..
b3f1ae8
100644
(file)
--- a/
sql/textn.sql
+++ b/
sql/textn.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.8);
DROP INDEX idx_test_text;
SELECT set_smlar_limit(0.8);
DROP INDEX idx_test_text;
diff --git
a/sql/time.sql
b/sql/time.sql
index
81360e7
..
9218a59
100644
(file)
--- a/
sql/time.sql
+++ b/
sql/time.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
SELECT
SELECT set_smlar_limit(0.6);
SELECT
diff --git
a/sql/timestamp.sql
b/sql/timestamp.sql
index
f85a310
..
736e0b8
100644
(file)
--- a/
sql/timestamp.sql
+++ b/
sql/timestamp.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
SELECT
SELECT set_smlar_limit(0.6);
SELECT
diff --git
a/sql/timestamptz.sql
b/sql/timestamptz.sql
index
8e9081f
..
e2a8687
100644
(file)
--- a/
sql/timestamptz.sql
+++ b/
sql/timestamptz.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
SELECT
SELECT set_smlar_limit(0.6);
SELECT
diff --git
a/sql/timetz.sql
b/sql/timetz.sql
index
c3e18f3
..
8d47bab
100644
(file)
--- a/
sql/timetz.sql
+++ b/
sql/timetz.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
SELECT
SELECT set_smlar_limit(0.6);
SELECT
diff --git
a/sql/varbit.sql
b/sql/varbit.sql
index
23c3b5c
..
4389dfe
100644
(file)
--- a/
sql/varbit.sql
+++ b/
sql/varbit.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
SELECT
SELECT set_smlar_limit(0.6);
SELECT
diff --git
a/sql/varchar.sql
b/sql/varchar.sql
index
fe6c720
..
9faaf32
100644
(file)
--- a/
sql/varchar.sql
+++ b/
sql/varchar.sql
@@
-1,3
+1,4
@@
+set extra_float_digits =0;
SELECT set_smlar_limit(0.6);
SELECT
SELECT set_smlar_limit(0.6);
SELECT