Post merge corrections and modifications

On branch master_PG12 modified the following files -

    modified:   src/backend/executor/cypher_set.c
    modified:   src/backend/parser/cypher_clause.c
    modified:   src/backend/utils/adt/agtype.c
    modified:   src/backend/utils/adt/graphid.c
    modified:   age--1.3.0.sql
    modified:   regress/expected/catalog.out
    modified:   regress/sql/catalog.sql
    modified:   src/backend/nodes/cypher_readfuncs.c
    modified:   src/include/nodes/cypher_nodes.h

These files were modified from specifying PG12 to
specifying the master. Mostly related to the CI flow -

    modified:   .github/workflows/installcheck.yaml
    modified:   META.json
    modified:   drivers/docker-compose.yml
    modified:   drivers/jdbc/lib/src/test/java/org/apache/age/jdbc/BaseDockerizedTest.java

Author: jrgemignani

.github/workflows/installcheck.yaml

@@ -2,47 +2,47 @@ name: Build / Regression
 
 on:
   push:
-    branches: [ 'master', 'PG11' ]
+    branches: [ 'master', 'PG12' ]
   pull_request:
-    branches: [ 'master', 'PG11' ]
+    branches: [ 'master', 'PG12' ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Get latest commit id of PostgreSQL 11
+      - name: Get latest commit id of PostgreSQL 12
         run: |
-          echo "PG_COMMIT_HASH=$(git ls-remote git://git.postgresql.org/git/postgresql.git refs/heads/REL_11_STABLE | awk '{print $1}')" >> $GITHUB_ENV
+          echo "PG_COMMIT_HASH=$(git ls-remote git://git.postgresql.org/git/postgresql.git refs/heads/REL_12_STABLE | awk '{print $1}')" >> $GITHUB_ENV
 
-      - name: Cache PostgreSQL 11
+      - name: Cache PostgreSQL 12
         uses: actions/cache@v3
-        id: pg11cache
+        id: pg12cache
         with:
-          path: ~/pg11
-          key: ${{ runner.os }}-v1-pg11-${{ env.PG_COMMIT_HASH }}
+          path: ~/pg12
+          key: ${{ runner.os }}-v1-pg12-${{ env.PG_COMMIT_HASH }}
 
-      - name: Install PostgreSQL 11
-        if: steps.pg11cache.outputs.cache-hit != 'true'
+      - name: Install PostgreSQL 12
+        if: steps.pg12cache.outputs.cache-hit != 'true'
         run: |
-          git clone --depth 1 --branch REL_11_STABLE git://git.postgresql.org/git/postgresql.git ~/pg11source
-          cd ~/pg11source
-          ./configure --prefix=$HOME/pg11 CFLAGS="-std=gnu99 -ggdb -O0" --enable-cassert
+          git clone --depth 1 --branch REL_12_STABLE git://git.postgresql.org/git/postgresql.git ~/pg12source
+          cd ~/pg12source
+          ./configure --prefix=$HOME/pg12 CFLAGS="-std=gnu99 -ggdb -O0" --enable-cassert
           make install -j$(nproc) > /dev/null
 
       - uses: actions/checkout@v3
 
       - name: Build
         id: build
         run: |
-          make PG_CONFIG=$HOME/pg11/bin/pg_config install -j$(nproc)
+          make PG_CONFIG=$HOME/pg12/bin/pg_config install -j$(nproc)
 
       - name: Regression tests
         id: regression_tests
         run: |
-          make PG_CONFIG=$HOME/pg11/bin/pg_config installcheck
+          make PG_CONFIG=$HOME/pg12/bin/pg_config installcheck
         continue-on-error: true
-          
+
       - name: Dump regression test errors
         if: steps.regression_tests.outcome != 'success'
         run: |

META.json

@@ -2,17 +2,17 @@
    "name": "ApacheAGE",
    "abstract": "Apache AGE is a PostgreSQL Extension that provides graph database functionality",
    "description": "Apache AGE is a PostgreSQL Extension that provides graph database functionality. AGE is an acronym for A Graph Extension, and is inspired by Bitnine's fork of PostgreSQL 10, AgensGraph, which is a multi-model database. The goal of the project is to create single storage that can handle both relational and graph model data so that users can use standard ANSI SQL along with openCypher, the Graph query language. A graph consists of a set of vertices (also called nodes) and edges, where each individual vertex and edge possesses a map of properties. A vertex is the basic object of a graph, that can exist independently of everything else in the graph. An edge creates a directed connection between two vertices. A graph database is simply composed of vertices and edges. This type of database is useful when the meaning is in the relationships between the data. Relational databases can easily handle direct relationships, but indirect relationships are more difficult to deal with in relational databases. A graph database stores relationship information as a first-class entity. Apache AGE gives you the best of both worlds, simultaneously.",
-   "version": "1.1.0",
+   "version": "1.3.0",
    "maintainer": [
       "users@age.apache.org"
    ],
    "license": "apache_2_0",
    "provides": {
       "ApacheAGE": {
          "abstract": "Apache AGE is a PostgreSQL Extension that provides graph database functionality",
-         "file": "age--1.1.0.sql",
+         "file": "age--1.3.0.sql",
          "docfile": "README.md",
-         "version": "1.1.0"
+         "version": "1.3.0"
       }
    },
    "prereqs": {
@@ -23,7 +23,7 @@
       }
    },
    "resources": {
-      "homepage": "https://github.com/apache/age/tree/AGE_PG12.1.0_ALPHA",
+      "homepage": "https://github.com/apache/age/tree/master",
       "bugtracker": {
          "web": "https://github.com/apache/age/issues"
       },

age--1.3.0.sql

@@ -24,7 +24,6 @@
 -- catalog tables
 --
 
-
 CREATE TABLE ag_graph (
   graphid oid NOT NULL,
   name name NOT NULL,
@@ -48,7 +47,6 @@ CREATE DOMAIN label_id AS int NOT NULL CHECK (VALUE > 0 AND VALUE <= 65535);
 CREATE DOMAIN label_kind AS "char" NOT NULL CHECK (VALUE = 'v' OR VALUE = 'e');
 
 CREATE TABLE ag_label (
-
   name name NOT NULL,
   graph oid NOT NULL,
   id label_id,

drivers/docker-compose.yml

@@ -1,7 +1,7 @@
 version: "3.3"
 services:
   db:
-    image: apache/age:PG12_latest
+    image: apache/age:${TAG}
     environment:
       - POSTGRES_USER=postgres
       - POSTGRES_PASSWORD=agens

drivers/jdbc/lib/src/test/java/org/apache/age/jdbc/BaseDockerizedTest.java

@@ -56,7 +56,7 @@ public void beforeAll() throws Exception {
             imageTag = "latest";
         }
         agensGraphContainer = new GenericContainer<>(DockerImageName
-            .parse("apache/age:PG12_latest"))
+            .parse("apache/age:" + imageTag))
             .withEnv("POSTGRES_PASSWORD", CORRECT_DB_PASSWORDS)
             .withExposedPorts(5432);
         agensGraphContainer.start();

regress/expected/catalog.out

@@ -28,10 +28,10 @@ NOTICE:  graph "graph" has been created
 
 (1 row)
 
-SELECT * FROM ag_graph WHERE name = 'graph';
- graphid | name  | namespace 
----------+-------+-----------
-   17639 | graph | graph
+SELECT name, namespace FROM ag_graph WHERE name = 'graph';
+ name  | namespace 
+-------+-----------
+ graph | graph
 (1 row)
 
 -- create a label to test drop_label()

regress/sql/catalog.sql

@@ -25,7 +25,7 @@ SET search_path TO ag_catalog;
 --
 
 SELECT create_graph('graph');
-SELECT * FROM ag_graph WHERE name = 'graph';
+SELECT name, namespace FROM ag_graph WHERE name = 'graph';
 
 -- create a label to test drop_label()
 SELECT * FROM cypher('graph', $$CREATE (:l)$$) AS r(a agtype);

src/backend/executor/cypher_set.c

@@ -139,9 +139,7 @@ static HeapTuple update_entity_tuple(ResultRelInfo *resultRelInfo,
 
         result = table_tuple_update(resultRelInfo->ri_RelationDesc,
                                     &tuple->t_self, elemTupleSlot,
-                                    cid,
-                                    //estate->es_output_cid,
-                                    estate->es_snapshot,// NULL,
+                                    cid, estate->es_snapshot,
                                     estate->es_crosscheck_snapshot,
                                     true /* wait for commit */ ,
                                     &hufd, &lockmode, &update_indexes);

src/backend/nodes/cypher_readfuncs.c

@@ -186,8 +186,8 @@ void read_cypher_create_target_nodes(struct ExtensibleNode *node)
     READ_LOCALS(cypher_create_target_nodes);
 
     READ_NODE_FIELD(paths);
-    READ_INT_FIELD(flags);
-    READ_INT_FIELD(graph_oid);
+    READ_UINT_FIELD(flags);
+    READ_UINT_FIELD(graph_oid);
 }
 
 /*
@@ -212,7 +212,7 @@ void read_cypher_target_node(struct ExtensibleNode *node)
     READ_LOCALS(cypher_target_node);
 
     READ_CHAR_FIELD(type);
-    READ_INT_FIELD(flags);
+    READ_UINT_FIELD(flags);
     READ_ENUM_FIELD(dir, cypher_rel_dir);
     READ_NODE_FIELD(id_expr);
     READ_NODE_FIELD(id_expr_state);
@@ -236,7 +236,7 @@ void read_cypher_update_information(struct ExtensibleNode *node)
     READ_LOCALS(cypher_update_information);
 
     READ_NODE_FIELD(set_items);
-    READ_INT_FIELD(flags);
+    READ_UINT_FIELD(flags);
     READ_INT_FIELD(tuple_position);
     READ_STRING_FIELD(graph_name);
     READ_STRING_FIELD(clause_name);
@@ -268,9 +268,9 @@ void read_cypher_delete_information(struct ExtensibleNode *node)
     READ_LOCALS(cypher_delete_information);
 
     READ_NODE_FIELD(delete_items);
-    READ_INT_FIELD(flags);
+    READ_UINT_FIELD(flags);
     READ_STRING_FIELD(graph_name);
-    READ_INT_FIELD(graph_oid);
+    READ_UINT_FIELD(graph_oid);
     READ_BOOL_FIELD(detach);
 }
 
@@ -294,7 +294,7 @@ void read_cypher_merge_information(struct ExtensibleNode *node)
 {
     READ_LOCALS(cypher_merge_information);
 
-    READ_INT_FIELD(flags);
+    READ_UINT_FIELD(flags);
     READ_UINT_FIELD(graph_oid);
     READ_INT_FIELD(merge_function_attr);
     READ_NODE_FIELD(path);

src/backend/parser/cypher_clause.c

@@ -279,15 +279,15 @@ static cypher_target_node *get_referenced_variable(ParseState *pstate,
 
 //call...[yield]
 static Query *transform_cypher_call_stmt(cypher_parsestate *cpstate,
-                                      cypher_clause *clause);
+                                         cypher_clause *clause);
 static Query *transform_cypher_call_subquery(cypher_parsestate *cpstate,
-                                          cypher_clause *clause);
+                                             cypher_clause *clause);
 
 //call...[yield]
 static Query *transform_cypher_call_stmt(cypher_parsestate *cpstate,
-                                      cypher_clause *clause);
+                                         cypher_clause *clause);
 static Query *transform_cypher_call_subquery(cypher_parsestate *cpstate,
-                                          cypher_clause *clause);
+                                             cypher_clause *clause);
 
 // transform
 #define PREV_CYPHER_CLAUSE_ALIAS AGE_DEFAULT_ALIAS_PREFIX"previous_cypher_clause"