Skip to content

Commit 2e001be

Browse files
Carlos-Chong200Carlos-Chong200
committed
add oracle style sys_guid function support
1 parent 3ffef63 commit 2e001be

File tree

6 files changed

+58
-4
lines changed

6 files changed

+58
-4
lines changed

‎GNUmakefile.in‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ subdir =
88
top_builddir = .
99
include $(top_builddir)/src/Makefile.global
1010

11-
$(call recurse,all install,src config contrib/ivorysql_ora contrib/ora_btree_gist contrib/ora_btree_gin)
11+
$(call recurse,all install,src config contrib/ivorysql_ora contrib/uuid-ossp contrib/ora_btree_gist contrib/ora_btree_gin)
1212

1313
docs:
1414
$(MAKE) -C doc all
@@ -45,7 +45,7 @@ $(call recurse,coverage,doc src config contrib)
4545

4646
# clean, distclean, etc should apply to contrib too, even though
4747
# it's not built by default
48-
$(call recurse,clean,doc contrib contrib/ivorysql_ora contrib/ora_btree_gist contrib/ora_btree_gin src config)
48+
$(call recurse,clean,doc contrib contrib/ivorysql_ora contrib/uuid-ossp contrib/ora_btree_gist contrib/ora_btree_gin src config)
4949
clean:
5050
rm -rf tmp_install/ portlock/
5151
# Garbage from autoconf:
@@ -95,7 +95,7 @@ GNUmakefile: GNUmakefile.in $(top_builddir)/config.status
9595

9696
$(call recurse,oracle-pg-check-world,src/test,oracle-pg-check)
9797
#add oracle regression
98-
$(call recurse,oracle-check-world,src/oracle_test src/pl src/interfaces/ecpg src/interfaces/libpq/ivytest contrib contrib/ivorysql_ora contrib/ora_btree_gist contrib/ora_btree_gin src/bin,oracle-check)
98+
$(call recurse,oracle-check-world,src/oracle_test src/pl src/interfaces/ecpg contrib contrib/ivorysql_ora contrib/uuid-ossp contrib/ora_btree_gist contrib/ora_btree_gin src/bin,oracle-check)
9999
$(call recurse,oracle-checkprep, src/oracle_test src/pl src/interfaces/ecpg contrib src/bin)
100100

101101
$(call recurse,oracle-installcheck-world,src/oracle_test src/pl src/interfaces/ecpg contrib src/bin,oracle-installcheck)

‎contrib/ivorysql_ora/preload_ora_misc.sql‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,8 @@ CREATE TYPE sys.urowid AS(rowoid OID, rowno bigint);
1313

1414
CREATE CAST (sys.rowid AS sys.urowid) WITH INOUT AS IMPLICIT;
1515
CREATE CAST (sys.urowid AS sys.rowid) WITH INOUT AS IMPLICIT;
16+
17+
--
18+
-- Plugin uuid-ossp
19+
--
20+
CREATE EXTENSION IF NOT EXISTS "uuid-ossp";

‎contrib/uuid-ossp/sql/ivy_uuid_ossp.sql‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,3 +79,5 @@ SELECT uuid_version_bits(uuid_generate_v4()),
7979
uuid_reserved_bits(uuid_generate_v4());
8080

8181
SELECT uuid_generate_v4() <> uuid_generate_v4();
82+
83+
SELECT sys_guid() <> sys_guid();

‎contrib/uuid-ossp/uuid-ossp--1.0--1.1.sql‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,8 @@ ALTER FUNCTION uuid_generate_v1mc() PARALLEL SAFE;
1313
ALTER FUNCTION uuid_generate_v3(uuid, text) PARALLEL SAFE;
1414
ALTER FUNCTION uuid_generate_v4() PARALLEL SAFE;
1515
ALTER FUNCTION uuid_generate_v5(uuid, text) PARALLEL SAFE;
16+
17+
CREATE OR REPLACE FUNCTION pg_catalog.sys_guid()
18+
RETURNS bytea
19+
AS 'MODULE_PATHNAME', 'ora_sys_guid'
20+
VOLATILE STRICT LANGUAGE C;

‎contrib/uuid-ossp/uuid-ossp--1.1.sql‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,8 @@ CREATE FUNCTION uuid_generate_v5(namespace uuid, name text)
5252
RETURNS uuid
5353
AS 'MODULE_PATHNAME', 'uuid_generate_v5'
5454
IMMUTABLE STRICT LANGUAGE C PARALLEL SAFE;
55+
56+
CREATE OR REPLACE FUNCTION pg_catalog.sys_guid()
57+
RETURNS bytea
58+
AS 'MODULE_PATHNAME', 'ora_sys_guid'
59+
VOLATILE STRICT LANGUAGE C;

‎contrib/uuid-ossp/uuid-ossp.c‎

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,9 @@ do { \
102102

103103
#endif /* !HAVE_UUID_OSSP */
104104

105+
/** The byte length of the value returned by ora_sys_guid **/
106+
#define SYS_GUID_LENGTH 16
107+
105108
PG_MODULE_MAGIC;
106109

107110
PG_FUNCTION_INFO_V1(uuid_nil);
@@ -115,7 +118,7 @@ PG_FUNCTION_INFO_V1(uuid_generate_v1mc);
115118
PG_FUNCTION_INFO_V1(uuid_generate_v3);
116119
PG_FUNCTION_INFO_V1(uuid_generate_v4);
117120
PG_FUNCTION_INFO_V1(uuid_generate_v5);
118-
121+
PG_FUNCTION_INFO_V1(ora_sys_guid);
119122
#ifdef HAVE_UUID_OSSP
120123

121124
static void
@@ -550,3 +553,37 @@ uuid_generate_v5(PG_FUNCTION_ARGS)
550553
VARDATA_ANY(name), VARSIZE_ANY_EXHDR(name));
551554
#endif
552555
}
556+
557+
558+
Datum
559+
ora_sys_guid(PG_FUNCTION_ARGS)
560+
{
561+
bytea *result;
562+
result = (bytea *)palloc(VARHDRSZ + SYS_GUID_LENGTH);
563+
SET_VARSIZE(result, VARHDRSZ + SYS_GUID_LENGTH);
564+
565+
#ifdef HAVE_UUID_OSSP
566+
uuid_t *uuid;
567+
uuid_rc_t rc;
568+
uuid = get_cached_uuid_t(0);
569+
rc = uuid_make(uuid, UUID_MAKE_V4, NULL, NULL);
570+
if (rc != UUID_RC_OK) {
571+
pguuid_complain(rc);
572+
}
573+
memcpy(VARDATA(result), (unsigned char *)uuid, SYS_GUID_LENGTH);
574+
575+
#elif defined(HAVE_UUID_E2FS)
576+
uuid_t uu;
577+
uuid_generate_random(uu);
578+
memcpy(VARDATA(result), uu, SYS_GUID_LENGTH);
579+
580+
#else
581+
int i;
582+
unsigned char byte_array[SYS_GUID_LENGTH];
583+
for (i = 0; i < SYS_GUID_LENGTH; i++) {
584+
byte_array[i] = (unsigned char)arc4random();
585+
}
586+
memcpy(VARDATA(result), byte_array, SYS_GUID_LENGTH);
587+
#endif
588+
PG_RETURN_BYTEA_P(result);
589+
}

0 commit comments

Comments
 (0)