Merge branch 'master' into stable

Author: za-arthur

.gitignore

@@ -41,3 +41,4 @@ lib*.pc
 /tmp_install/
 Dockerfile
 pg_variables--1.1.sql
+pg_variables--1.2.sql

.travis.yml

@@ -18,12 +18,13 @@ notifications:
         on_failure: always
 
 env:
-    - PG_VERSION=10 LEVEL=nightmare
-    - PG_VERSION=10 LEVEL=hardcore
+    - PG_VERSION=11 LEVEL=nightmare
+    - PG_VERSION=11 LEVEL=hardcore
+    - PG_VERSION=11
     - PG_VERSION=10
     - PG_VERSION=9.6
     - PG_VERSION=9.5
 
 matrix:
     allow_failures:
-        - env: PG_VERSION=10 LEVEL=nightmare
+        - env: PG_VERSION=11 LEVEL=nightmare

Makefile

@@ -4,8 +4,8 @@ MODULE_big = pg_variables
 OBJS = pg_variables.o pg_variables_record.o $(WIN32RES)
 
 EXTENSION = pg_variables
-EXTVERSION = 1.1
-DATA = pg_variables--1.0.sql pg_variables--1.0--1.1.sql
+EXTVERSION = 1.2
+DATA = pg_variables--1.0.sql pg_variables--1.0--1.1.sql pg_variables--1.1--1.2.sql
 DATA_built = $(EXTENSION)--$(EXTVERSION).sql
 
 PGFILEDESC = "pg_variables - sessional variables"

README.md

@@ -91,6 +91,13 @@ Function | Returns
 `pgv_set(package text, name text, value anynonarray, is_transactional bool default false)` | `void`
 `pgv_get(package text, name text, var_type anynonarray, strict bool default true)` | `anynonarray`
 
+## Array variables functions
+
+Function | Returns
+-------- | -------
+`pgv_set(package text, name text, value anyarray, is_transactional bool default false)` | `void`
+`pgv_get(package text, name text, var_type anyarray, strict bool default true)` | `anyarray`
+
 ## **Deprecated** scalar variables functions
 
 ### Integer variables
@@ -181,7 +188,7 @@ Note that **pgv_stats()** works only with the PostgreSQL 9.6 and newer.
 
 ## Examples
 
-It is easy to use functions to work with scalar variables:
+It is easy to use functions to work with scalar and array variables:
 
 ```sql
 SELECT pgv_set('vars', 'int1', 101);
@@ -196,6 +203,13 @@ SELECT SELECT pgv_get('vars', 'text1', NULL::text);
     pgv_get
 ---------------
  text variable
+
+SELECT pgv_set('vars', 'arr1', '{101,102}'::int[]);
+
+SELECT pgv_get('vars', 'arr1', NULL::int[]);
+  pgv_get
+-----------
+ {101,102}
 ```
 
 Let's assume we have a **tab** table:
@@ -246,6 +260,7 @@ You can list packages and variables:
 SELECT * FROM pgv_list() order by package, name;
  package | name  | is_transactional
 ---------+-------+------------------
+ vars    | arr1  | f
  vars    | int1  | f
  vars    | r1    | f
  vars    | text1 | f
@@ -257,7 +272,7 @@ And get used memory in bytes:
 SELECT * FROM pgv_stats() order by package;
  package | allocated_memory
 ---------+------------------
- vars    |            32768
+ vars    |            49152
 ```
 
 You can delete variables or whole packages:

expected/pg_variables_trans.out

@@ -1705,6 +1705,12 @@ SELECT pgv_free();
 
 (1 row)
 
+SELECT pgv_free(); -- Check sequential package removal in one subtransaction
+ pgv_free 
+----------
+ 
+(1 row)
+
 SELECT * FROM pgv_list() ORDER BY package, name;
  package | name | is_transactional 
 ---------+------+------------------
@@ -1838,3 +1844,19 @@ SELECT pgv_remove('vars');
 
 (1 row)
 
+-- REMOVED TRANSACTIONAL VARIABLE SHOULD BE NOT ACCESSIBLE THROUGH LastVariable
+SELECT pgv_insert('package', 'errs',row(n), true)
+FROM generate_series(1,5) AS gs(n) WHERE 1.0/(n-3)<>0;
+ERROR:  division by zero
+SELECT pgv_insert('package', 'errs',row(1), true);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+

pg_variables--1.1--1.2.sql

@@ -0,0 +1,16 @@
+/* contrib/pg_variables/pg_variables--1.1--1.2.sql */
+
+-- complain if script is sourced in psql, rather than via ALTER EXTENSION
+\echo Use "ALTER EXTENSION pg_variables UPDATE TO '1.2'" to load this file. \quit
+
+-- Functions to work with arrays
+
+CREATE FUNCTION pgv_set(package text, name text, value anyarray, is_transactional bool default false)
+RETURNS void
+AS 'MODULE_PATHNAME', 'variable_set_array'
+LANGUAGE C VOLATILE;
+
+CREATE FUNCTION pgv_get(package text, name text, var_type anyarray, strict bool default true)
+RETURNS anyarray
+AS 'MODULE_PATHNAME', 'variable_get_array'
+LANGUAGE C VOLATILE;

pg_variables.c

@@ -237,6 +237,7 @@ VARIABLE_GET_TEMPLATE(0, 1, 2, jsonb, JSONBOID)
 
 /* current API */
 VARIABLE_GET_TEMPLATE(0, 1, 3, any, get_fn_expr_argtype(fcinfo->flinfo, 2))
+VARIABLE_GET_TEMPLATE(0, 1, 3, array, get_fn_expr_argtype(fcinfo->flinfo, 2))
 
 
 #define VARIABLE_SET_TEMPLATE(type, typid) \
@@ -275,6 +276,7 @@ VARIABLE_SET_TEMPLATE(jsonb, JSONBOID)
 
 /* current API */
 VARIABLE_SET_TEMPLATE(any, get_fn_expr_argtype(fcinfo->flinfo, 2))
+VARIABLE_SET_TEMPLATE(array, get_fn_expr_argtype(fcinfo->flinfo, 2))
 
 
 Datum
@@ -916,7 +918,11 @@ removePackageInternal(Package *package)
 	TransObject *transObject;
 
 	/* All regular variables will be freed */
-	MemoryContextDelete(package->hctxRegular);
+	if (package->hctxRegular)
+	{
+		MemoryContextDelete(package->hctxRegular);
+		package->hctxRegular = NULL;
+	}
 
 	/* Add to changes list */
 	transObject = &package->transObject;
@@ -1247,32 +1253,25 @@ ensurePackagesHashExists(void)
 static void
 makePackHTAB(Package *package, bool is_trans)
 {
-	HASHCTL		ctl;
-	char		hash_name[BUFSIZ];
+	HASHCTL			ctl;
+	char			hash_name[BUFSIZ];
+	HTAB		  **htab;
+	MemoryContext  *context;
 
-	if (is_trans)
-		package->hctxTransact = AllocSetContextCreate(ModuleContext,
-													  PGV_MCXT_VARS,
-													  ALLOCSET_DEFAULT_SIZES);
-	else
-		package->hctxRegular = AllocSetContextCreate(ModuleContext,
-													 PGV_MCXT_VARS,
-													 ALLOCSET_DEFAULT_SIZES);
+	htab = is_trans ? &package->varHashTransact : &package->varHashRegular;
+	context = is_trans ? &package->hctxTransact : &package->hctxRegular;
+
+	*context = AllocSetContextCreate(ModuleContext, PGV_MCXT_VARS,
+									 ALLOCSET_DEFAULT_SIZES);
 
 	snprintf(hash_name, BUFSIZ, "%s variables hash for package \"%s\"",
 			 is_trans ? "Transactional" : "Regular", GetName(package));
 	ctl.keysize = NAMEDATALEN;
 	ctl.entrysize = sizeof(Variable);
-	ctl.hcxt = (is_trans ? package->hctxTransact : package->hctxRegular);
+	ctl.hcxt = *context;
 
-	if (is_trans)
-		package->varHashTransact = hash_create(hash_name,
-											   NUMVARIABLES, &ctl,
-											   HASH_ELEM | HASH_CONTEXT);
-	else
-		package->varHashRegular = hash_create(hash_name,
-											  NUMVARIABLES, &ctl,
-											  HASH_ELEM | HASH_CONTEXT);
+	*htab = hash_create(hash_name, NUMVARIABLES, &ctl,
+						HASH_ELEM | HASH_CONTEXT);
 }
 
 static Package *
@@ -1632,6 +1631,9 @@ removeObject(TransObject *object, TransObjectType type)
 
 	/* Remove object from hash table */
 	hash_search(hash, object->name, HASH_REMOVE, &found);
+
+	LastPackage = NULL;
+	LastVariable = NULL;
 }
 
 /*

pg_variables.control

@@ -1,5 +1,5 @@
 # pg_variables extension
 comment = 'session variables with various types'
-default_version = '1.1'
+default_version = '1.2'
 module_pathname = '$libdir/pg_variables'
 relocatable = true

pg_variables_record.c

@@ -101,7 +101,13 @@ init_record(RecordVar *record, TupleDesc tupdesc, Variable *variable)
 		variable->package->hctxTransact :
 		variable->package->hctxRegular;
 
-#if PG_VERSION_NUM >= 110000
+#if PG_VERSION_NUM >= 120000
+	record->hctx = AllocSetContextCreateInternal(topctx,
+												 hash_name,
+												 ALLOCSET_DEFAULT_MINSIZE,
+												 ALLOCSET_DEFAULT_INITSIZE,
+												 ALLOCSET_DEFAULT_MAXSIZE);
+#elif PG_VERSION_NUM >= 110000
 	record->hctx = AllocSetContextCreateExtended(topctx,
 												 hash_name,
 												 ALLOCSET_DEFAULT_MINSIZE,

sql/pg_variables_any.sql

@@ -139,6 +139,26 @@ SELECT pgv_get('vars', 'd1', NULL::jsonb);
 SELECT pgv_set('vars', 'jNULL', NULL::jsonb);
 SELECT pgv_get('vars', 'jNULL', NULL::jsonb);
 
+-- Array variables
+SELECT pgv_set('vars', 'arr1', '{1, 2, null}'::int[]);
+SELECT pgv_set('vars', 'arr2', '{"bar", "balance", "active"}'::text[]);
+SELECT pgv_set('vars2', 'j1', '{1, 2, null}'::int[]);
+
+SELECT pgv_get('vars', 'arr1', NULL::int[]);
+SELECT pgv_get('vars', 'arr2', NULL::int[]);
+SELECT pgv_set('vars', 'arr1', '{"bar", "balance", "active"}'::text[]);
+SELECT pgv_set('vars', 'arr1', '{3, 4, 5}'::int[]);
+SELECT pgv_get('vars', 'arr1', NULL::int[]);
+
+SELECT pgv_get('vars', 'arr3', NULL::int[]);
+SELECT pgv_get('vars', 'arr3', NULL::int[], false);
+SELECT pgv_exists('vars', 'arr3');
+SELECT pgv_exists('vars', 'arr1');
+SELECT pgv_get('vars2', 'j1', NULL::int[]);
+
+SELECT pgv_set('vars', 'arrNULL', NULL::int[]);
+SELECT pgv_get('vars', 'arrNULL', NULL::int[]);
+
 -- Manipulate variables
 SELECT * FROM pgv_list() order by package, name;
 

sql/pg_variables_trans.sql

@@ -425,6 +425,7 @@ SELECT pgv_set('vars', 'regular', 'regular variable exists'::text);
 SELECT pgv_set('vars', 'trans1', 'trans1 variable exists'::text, true);
 BEGIN;
 SELECT pgv_free();
+SELECT pgv_free(); -- Check sequential package removal in one subtransaction
 SELECT * FROM pgv_list() ORDER BY package, name;
 SELECT pgv_set('vars', 'trans2', 'trans2 variable exists'::text, true);
 SELECT * FROM pgv_list() ORDER BY package, name;
@@ -460,3 +461,10 @@ SELECT pgv_set('vars', 'trans1', 'package restored'::text, true);
 SELECT * FROM pgv_list() ORDER BY package, name;
 COMMIT;
 SELECT pgv_remove('vars');
+
+-- REMOVED TRANSACTIONAL VARIABLE SHOULD BE NOT ACCESSIBLE THROUGH LastVariable
+SELECT pgv_insert('package', 'errs',row(n), true)
+FROM generate_series(1,5) AS gs(n) WHERE 1.0/(n-3)<>0;
+SELECT pgv_insert('package', 'errs',row(1), true);
+
+SELECT pgv_free();