Add caches for keys and ids

Author: ildus

jsonbc.c

@@ -1,4 +1,5 @@
 #include "jsonbc.h"
+#include "jsonbc_utils.h"
 
 #include "postgres.h"
 #include "fmgr.h"
@@ -53,8 +54,8 @@ static void memory_reset_callback(void *arg);
 static void encode_varbyte(uint32 val, unsigned char *ptr, int *len);
 static char *packJsonbValue(JsonbValue *val, int header_size, int *len);
 static void setup_guc_variables(void);
-static char *jsonbc_get_keys(Oid cmoptoid, uint32 *ids, int nkeys, size_t *buflen);
-static void jsonbc_get_key_ids(Oid cmoptoid, char *buf, int buflen, uint32 *idsbuf, int nkeys);
+static char *jsonbc_worker_get_keys(Oid cmoptoid, uint32 *ids, int nkeys, size_t *buflen);
+static void jsonbc_worker_get_key_ids(Oid cmoptoid, char *buf, int buflen, uint32 *idsbuf, int nkeys);
 static uint32 decode_varbyte(unsigned char *ptr);
 
 static size_t
@@ -336,7 +337,7 @@ jsonbc_communicate(shm_mq_iovec *iov, int iov_len,
 
 /* Get key IDs using workers */
 static void
-jsonbc_get_key_ids(Oid cmoptoid, char *buf, int buflen, uint32 *idsbuf, int nkeys)
+jsonbc_worker_get_key_ids(Oid cmoptoid, char *buf, int buflen, uint32 *idsbuf, int nkeys)
 {
 	JsonbcCommand		cmd = JSONBC_CMD_GET_IDS;
 	shm_mq_iovec		iov[4];
@@ -361,7 +362,7 @@ jsonbc_get_key_ids(Oid cmoptoid, char *buf, int buflen, uint32 *idsbuf, int nkey
 
 /* Get keys by their IDs using workers */
 static char *
-jsonbc_get_keys(Oid cmoptoid, uint32 *ids, int nkeys, size_t *buflen)
+jsonbc_worker_get_keys(Oid cmoptoid, uint32 *ids, int nkeys, size_t *buflen)
 {
 	JsonbcCommand		cmd = JSONBC_CMD_GET_KEYS;
 	shm_mq_iovec		iov[4];
@@ -606,7 +607,7 @@ jsonbc_compress(AttributeCompression *ac, const struct varlena *data)
 			Assert(offset == len);
 
 			/* retrieve or generate ids */
-			jsonbc_get_key_ids(ac->cmoptoid, buf, len, idsbuf, nkeys);
+			jsonbc_worker_get_key_ids(ac->cmoptoid, buf, len, idsbuf, nkeys);
 
 			/* replace the old keys with encoded ids */
 			for (i = 0; i < nkeys; i++)
@@ -690,7 +691,7 @@ jsonbc_decompress(AttributeCompression *ac, const struct varlena *data)
 			}
 
 			/* retrieve keys */
-			buf = jsonbc_get_keys(ac->cmoptoid, compression_buffers->idsbuf, nkeys, &buflen);
+			buf = jsonbc_worker_get_keys(ac->cmoptoid, compression_buffers->idsbuf, nkeys, &buflen);
 			if (buf == NULL)
 				elog(ERROR, "jsonbc: decompression error");
 

jsonbc.h

@@ -4,6 +4,7 @@
 #include <postgres.h>
 #include <semaphore.h>
 
+#include "nodes/pg_list.h"
 #include "port/atomics.h"
 #include "storage/proc.h"
 #include "storage/shm_mq.h"
@@ -41,13 +42,12 @@ typedef struct jsonbc_cached_cmopt
 	Oid		 cmoptoid;
 	HTAB	*key_cache;
 	HTAB	*id_cache;
-} jsonbc_cached_opt;
+} jsonbc_cached_cmopt;
 
 typedef struct jsonbc_cached_key
 {
 	uint32	 keyhash;
-	uint32	 pairslen;
-	jsonbc_pair	**pairs;	/* for hash collisions */
+	List	*pairs;
 } jsonbc_cached_key;
 
 typedef struct jsonbc_cached_id

jsonbc_utils.c

@@ -3,6 +3,8 @@
 
 #include "postgres.h"
 #include "nodes/execnodes.h"
+#include "nodes/makefuncs.h"
+#include "utils/rel.h"
 
 #if PG_VERSION_NUM == 110000
 struct shm_mq_alt
@@ -27,8 +29,6 @@ add_range_table_to_estate(EState *estate, Relation rel)
 	RangeTblEntry *rte = makeNode(RangeTblEntry);
 	char	   *refname = RelationGetRelationName(rel);
 
-	Assert(pstate != NULL);
-
 	rte->rtekind = RTE_RELATION;
 	rte->alias = NULL;
 	rte->relid = RelationGetRelid(rel);
@@ -74,11 +74,11 @@ add_range_table_to_estate(EState *estate, Relation rel)
  */
 uint32 qhashmurmur3_32(const void *data, size_t nbytes)
 {
-    int i;
-    uint32 k;
-    const int nblocks;
-    const uint32 *blocks;
-    const uint8 *tail;
+    int		i,
+			nblocks;
+    uint32	k;
+    uint32 *blocks;
+    uint8  *tail;
 
     const uint32 c1 = 0xcc9e2d51;
     const uint32 c2 = 0x1b873593;
@@ -88,8 +88,8 @@ uint32 qhashmurmur3_32(const void *data, size_t nbytes)
 	Assert(data != NULL && nbytes > 0);
 
     nblocks = nbytes / 4;
-    blocks = (const uint32 *) (data);
-    tail = (const uint8 *) (data + (nblocks * 4));
+    blocks = (uint32 *) (data);
+    tail = (uint8 *) ((char *) data + (nblocks * 4));
 
     for (i = 0; i < nblocks; i++)
 	{

jsonbc_utils.h

@@ -3,8 +3,10 @@
 
 #include "postgres.h"
 #include "nodes/execnodes.h"
+#include "nodes/parsenodes.h"
 
 extern RangeTblEntry * add_range_table_to_estate(EState *estate, Relation rel);
+extern uint32 qhashmurmur3_32(const void *data, size_t nbytes);
 extern void shm_mq_clean_receiver(shm_mq *mq);
 extern void shm_mq_clean_sender(shm_mq *mq);