[age] branch master updated: Patch to address PR 203 that appears to be inactive.

[jg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jgemignani pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/age.git


The following commit(s) were added to refs/heads/master by this push:
     new 0e96fbb  Patch to address PR 203 that appears to be inactive.
0e96fbb is described below

commit 0e96fbbf9d6cfb997b8d75da2c8dab1211915319
Author: John Gemignani <jr...@gmail.com>
AuthorDate: Wed Jan 4 16:21:02 2023 -0800

    Patch to address PR 203 that appears to be inactive.
    
    This patch is credited to deem0n (Dmitriy Dorofeev). Many thanks!
    
    Fixed a typo that causes a backup of a passed in variable to become
    indeterminate. This, in turn, caused the restoration of that variable
    to become indeterminate.
    
    Fixed a typo that caused the incorrect hash, label_name_graph_cache_hash,
    to be initialized instead of, label_oid_cache_hash.
    
    Added the ag_graph and ag_label tables to the pg_dump output.
---
 age--1.1.0.sql                     | 6 ++++++
 src/backend/executor/cypher_set.c  | 2 +-
 src/backend/utils/cache/ag_cache.c | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/age--1.1.0.sql b/age--1.1.0.sql
index a32d2b5..54f0f30 100644
--- a/age--1.1.0.sql
+++ b/age--1.1.0.sql
@@ -29,6 +29,9 @@ CREATE TABLE ag_graph (
   namespace regnamespace NOT NULL
 ) WITH (OIDS);
 
+-- include content of the ag_graph table into the pg_dump output
+SELECT pg_catalog.pg_extension_config_dump('ag_graph', '');
+
 CREATE UNIQUE INDEX ag_graph_oid_index ON ag_graph USING btree (oid);
 
 CREATE UNIQUE INDEX ag_graph_name_index ON ag_graph USING btree (name);
@@ -51,6 +54,9 @@ CREATE TABLE ag_label (
   seq_name name NOT NULL
 ) WITH (OIDS);
 
+-- include content of the ag_label table into the pg_dump output
+SELECT pg_catalog.pg_extension_config_dump('ag_label', '');
+
 CREATE UNIQUE INDEX ag_label_oid_index ON ag_label USING btree (oid);
 
 CREATE UNIQUE INDEX ag_label_name_graph_index
diff --git a/src/backend/executor/cypher_set.c b/src/backend/executor/cypher_set.c
index e095cb6..a765d12 100644
--- a/src/backend/executor/cypher_set.c
+++ b/src/backend/executor/cypher_set.c
@@ -117,7 +117,7 @@ static HeapTuple update_entity_tuple(ResultRelInfo *resultRelInfo,
     HTSU_Result update_result;
     Buffer buffer;
 
-    ResultRelInfo *saved_resultRelInfo = saved_resultRelInfo;;
+    ResultRelInfo *saved_resultRelInfo = estate->es_result_relation_info;
     estate->es_result_relation_info = resultRelInfo;
 
     lockmode = ExecUpdateLockMode(estate, resultRelInfo);
diff --git a/src/backend/utils/cache/ag_cache.c b/src/backend/utils/cache/ag_cache.c
index 95e5d0d..6501476 100644
--- a/src/backend/utils/cache/ag_cache.c
+++ b/src/backend/utils/cache/ag_cache.c
@@ -688,7 +688,7 @@ static void flush_label_oid_cache(void)
 {
     HASH_SEQ_STATUS hash_seq;
 
-    hash_seq_init(&hash_seq, label_name_graph_cache_hash);
+    hash_seq_init(&hash_seq, label_oid_cache_hash);
     for (;;)
     {
         label_cache_data *entry;