Master PG12 TEST

.github/workflows/go-driver.yml

@@ -2,10 +2,10 @@ name: Go Driver Tests
 
 on:
   push:
-    branches: [ "master", "PG11" ]
+    branches: [ "master", "PG12" ]
 
   pull_request:
-    branches: [ "master", "PG11" ]
+    branches: [ "master", "PG12" ]
 
 jobs:
   build:
@@ -17,7 +17,7 @@ jobs:
     defaults:
       run:
         working-directory: drivers/golang/age/
-  
+
     steps:
     - uses: actions/checkout@v3
 
@@ -26,17 +26,17 @@ jobs:
         if [[ "$GITHUB_EVENT_NAME" == "push" ]]; then
           if [[ "$GITHUB_REF" == "refs/heads/master" ]]; then
             echo "TAG=latest" >> $GITHUB_ENV
-          elif [[ "$GITHUB_REF" == "refs/heads/PG11" ]]; then
-            echo "TAG=PG11_latest" >> $GITHUB_ENV
+          elif [[ "$GITHUB_REF" == "refs/heads/PG12" ]]; then
+            echo "TAG=PG12_latest" >> $GITHUB_ENV
           fi
         elif [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
           if [[ "$GITHUB_BASE_REF" == "master" ]]; then
             echo "TAG=latest" >> $GITHUB_ENV
-          elif [[ "$GITHUB_BASE_REF" == "PG11" ]]; then
-            echo "TAG=PG11_latest" >> $GITHUB_ENV
+          elif [[ "$GITHUB_BASE_REF" == "PG12" ]]; then
+            echo "TAG=PG12_latest" >> $GITHUB_ENV
           fi
         fi
-      
+
     - name: Run apache/age docker image
       run: |
         export TAG=$TAG
@@ -46,12 +46,12 @@ jobs:
       uses: actions/setup-go@v3
       with:
         go-version: ${{ matrix.go-version }}
-    
+
     - name: Generate
       run: go generate ./../...
 
     - name: Build
       run: go build -v ./...
 
     - name: Test
-      run: go test . -v
+      run: go test . -v

.github/workflows/installcheck.yml

@@ -0,0 +1,52 @@
+name: PG12 Regression
+
+on:
+  push:
+    branches: [ 'PG12' ]
+  pull_request:
+    branches: [ 'PG12' ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - 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_12_STABLE | awk '{print $1}')" >> $GITHUB_ENV
+
+      - name: Cache PostgreSQL 12
+        uses: actions/cache@v3
+        id: pg12cache
+        with:
+          path: ~/pg12
+          key: ${{ runner.os }}-v1-pg12-${{ env.PG_COMMIT_HASH }}
+
+      - name: Install PostgreSQL 12
+        if: steps.pg12cache.outputs.cache-hit != 'true'
+        run: |
+          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/pg12/bin/pg_config install -j$(nproc)
+
+      - name: Regression tests
+        id: regression_tests
+        run: |
+          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: |
+          echo "Dump section begin."
+          cat $HOME/work/age/age/regress/regression.diffs
+          echo "Dump section end."
+          exit 1

.github/workflows/jdbc-driver.yaml

@@ -2,22 +2,21 @@ name: JDBC Driver Tests
 
 on:
   push:
-    branches: [ "master", "PG11" ]
-      
+    branches: [ "master", "PG12" ]
+
   pull_request:
-    branches: [ "master", "PG11" ]
+    branches: [ "master", "PG12" ]
 
 jobs:
   build:
     runs-on: ubuntu-latest
-
     defaults:
       run:
         working-directory: drivers/jdbc
 
     steps:
     - uses: actions/checkout@v3
-    
+
     - name: Set up Java
       uses: actions/setup-java@v3
       with:
@@ -29,18 +28,18 @@ jobs:
         if [[ "$GITHUB_EVENT_NAME" == "push" ]]; then
           if [[ "$GITHUB_REF" == "refs/heads/master" ]]; then
             echo "TAG=latest" >> $GITHUB_ENV
-          elif [[ "$GITHUB_REF" == "refs/heads/PG11" ]]; then
-            echo "TAG=PG11_latest" >> $GITHUB_ENV
+          elif [[ "$GITHUB_REF" == "refs/heads/PG12" ]]; then
+            echo "TAG=PG12_latest" >> $GITHUB_ENV
           fi
         elif [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
           if [[ "$GITHUB_BASE_REF" == "master" ]]; then
             echo "TAG=latest" >> $GITHUB_ENV
-          elif [[ "$GITHUB_BASE_REF" == "PG11" ]]; then
-            echo "TAG=PG11_latest" >> $GITHUB_ENV
+          elif [[ "$GITHUB_BASE_REF" == "PG12" ]]; then
+            echo "TAG=PG12_latest" >> $GITHUB_ENV
           fi
         fi
 
     - name: Build and Test
       run: |
         export TAG=$TAG
-        gradle build
+        gradle build

.github/workflows/nodejs-driver.yaml

@@ -2,10 +2,10 @@ name: Nodejs Driver Tests
 
 on:
   push:
-    branches: [ "master", "PG11" ]
+    branches: [ "master", "PG12" ]
 
   pull_request:
-    branches: [ "master", "PG11" ]
+    branches: [ "master", "PG12" ]
 
 jobs:
   build:
@@ -14,26 +14,26 @@ jobs:
     defaults:
       run:
         working-directory: drivers/nodejs/
-  
+
     steps:
     - uses: actions/checkout@v3
-    
+
     - name: Set tag based on branch
       run: |
         if [[ "$GITHUB_EVENT_NAME" == "push" ]]; then
           if [[ "$GITHUB_REF" == "refs/heads/master" ]]; then
             echo "TAG=latest" >> $GITHUB_ENV
-          elif [[ "$GITHUB_REF" == "refs/heads/PG11" ]]; then
-            echo "TAG=PG11_latest" >> $GITHUB_ENV
+          elif [[ "$GITHUB_REF" == "refs/heads/PG12" ]]; then
+            echo "TAG=PG12_latest" >> $GITHUB_ENV
           fi
         elif [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
           if [[ "$GITHUB_BASE_REF" == "master" ]]; then
             echo "TAG=latest" >> $GITHUB_ENV
-          elif [[ "$GITHUB_BASE_REF" == "PG11" ]]; then
-            echo "TAG=PG11_latest" >> $GITHUB_ENV
+          elif [[ "$GITHUB_BASE_REF" == "PG12" ]]; then
+            echo "TAG=PG12_latest" >> $GITHUB_ENV
           fi
         fi
-      
+
     - name: Run apache/age docker image
       run: |
         export TAG=$TAG
@@ -51,4 +51,4 @@ jobs:
       run: npm run build
 
     - name: Test
-      run: npm test
+      run: npm test

.github/workflows/python-driver.yaml

@@ -2,10 +2,10 @@ name: Python Driver Tests
 
 on:
   push:
-    branches: [ "master", "PG11" ]
-      
+    branches: [ "master", "PG12" ]
+
   pull_request:
-    branches: [ "master", "PG11" ]
+    branches: [ "master", "PG12" ]
 
 jobs:
   build:
@@ -14,26 +14,26 @@ jobs:
     defaults:
       run:
         working-directory: drivers/python
-  
+
     steps:
     - uses: actions/checkout@v3
-    
+
     - name: Set tag based on branch
       run: |
         if [[ "$GITHUB_EVENT_NAME" == "push" ]]; then
           if [[ "$GITHUB_REF" == "refs/heads/master" ]]; then
             echo "TAG=latest" >> $GITHUB_ENV
-          elif [[ "$GITHUB_REF" == "refs/heads/PG11" ]]; then
-            echo "TAG=PG11_latest" >> $GITHUB_ENV
+          elif [[ "$GITHUB_REF" == "refs/heads/PG12" ]]; then
+            echo "TAG=PG12_latest" >> $GITHUB_ENV
           fi
         elif [[ "$GITHUB_EVENT_NAME" == "pull_request" ]]; then
           if [[ "$GITHUB_BASE_REF" == "master" ]]; then
             echo "TAG=latest" >> $GITHUB_ENV
-          elif [[ "$GITHUB_BASE_REF" == "PG11" ]]; then
-            echo "TAG=PG11_latest" >> $GITHUB_ENV
+          elif [[ "$GITHUB_BASE_REF" == "PG12" ]]; then
+            echo "TAG=PG12_latest" >> $GITHUB_ENV
           fi
         fi
-      
+
     - name: Run apache/age docker image
       run: |
         export TAG=$TAG

.gitignore

@@ -1,9 +1,8 @@
 *.o
 *.so
-.gitignore
 build.sh
 .idea
 .deps
 .DS_Store
 *.tokens
-*.interp
+*.interp

CONTRIBUTING.md

@@ -20,7 +20,7 @@ We strongly recommend you to subscribe the mailing lists, join the Apache AGE Di
 
 ## Pull Requests
 
-Changes to AGE source code are proposed, reviewed, and committed via GitHub pull requests (described in Code Convention). Pull requests are a great way to get your ideas into this repository. Anyone can view and comment on active changes here. Reviewing others' changes are a good way to learn how the change process works and gain exposure to activity in various parts of the code. You can help by reviewing the changes, asking questions, or pointing out issues as simple as typos.
+Changes to AGE source code are proposed, reviewed, and committed via Github pull requests (described in Code Convention). Pull requests are a great way to get your ideas into this repository. Anyone can view and comment on active changes here. Reviewing others' changes are a good way to learn how the change process works and gain exposure to activity in various parts of the code. You can help by reviewing the changes, asking questions, or pointing out issues as simple as typos.
 
 ## Documentation Changes
 

Dockerfile

@@ -16,18 +16,17 @@
 # limitations under the License.
 #
 
+FROM postgres:12
 
-FROM postgres:11-buster
-
-RUN apt-get update 
+RUN apt-get update
 RUN apt-get install --assume-yes --no-install-recommends --no-install-suggests \
   bison \
   build-essential \
   flex \
-  postgresql-server-dev-11 
+  postgresql-server-dev-12
 
-COPY . /age 
-RUN cd /age && make install 
+COPY . /age
+RUN cd /age && make install
 
 COPY docker-entrypoint-initdb.d/00-create-extension-age.sql /docker-entrypoint-initdb.d/00-create-extension-age.sql
 

META.json

@@ -0,0 +1,45 @@
+{
+   "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",
+   "maintainer": [
+      "[email protected]"
+   ],
+   "license": "apache_2_0",
+   "provides": {
+      "ApacheAGE": {
+         "abstract": "Apache AGE is a PostgreSQL Extension that provides graph database functionality",
+         "file": "age--1.1.0.sql",
+         "docfile": "README.md",
+         "version": "1.1.0"
+      }
+   },
+   "prereqs": {
+      "runtime": {
+         "requires": {
+            "PostgreSQL": "12.0.0"
+         }
+      }
+   },
+   "resources": {
+      "homepage": "https://github.com/apache/age/tree/AGE_PG12.1.0_ALPHA",
+      "bugtracker": {
+         "web": "https://github.com/apache/age/issues"
+      },
+      "repository": {
+        "url":  "https://github.com/apache/age.git",
+        "web":  "https://github.com/apache/age",
+        "type": "git"
+      }
+   },
+   "generated_by": "[email protected]",
+   "meta-spec": {
+      "version": "1.0.0",
+      "url": "http://pgxn.org/meta/spec.txt"
+   },
+   "tags": [
+      "graphdb",
+      "graph-database"
+   ]
+}

Makefile

@@ -108,15 +108,23 @@ ag_regress_dir = $(srcdir)/regress
 REGRESS_OPTS = --load-extension=age --inputdir=$(ag_regress_dir) --outputdir=$(ag_regress_dir) --temp-instance=$(ag_regress_dir)/instance --port=61958 --encoding=UTF-8
 
 ag_regress_out = instance/ log/ results/ regression.*
-EXTRA_CLEAN = $(addprefix $(ag_regress_dir)/, $(ag_regress_out)) src/backend/parser/cypher_gram.c src/include/parser/cypher_gram_def.h
+EXTRA_CLEAN = $(addprefix $(ag_regress_dir)/, $(ag_regress_out)) src/backend/parser/cypher_gram.c src/include/parser/cypher_gram_def.h src/include/parser/cypher_kwlist_d.h
+
+GEN_KEYWORDLIST = $(PERL) -I ./tools/ ./tools/gen_keywordlist.pl
+GEN_KEYWORDLIST_DEPS = ./tools/gen_keywordlist.pl tools/PerfectHash.pm
 
 ag_include_dir = $(srcdir)/src/include
 PG_CPPFLAGS = -I$(ag_include_dir) -I$(ag_include_dir)/parser
 
-PG_CONFIG = pg_config
+PG_CONFIG ?= pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 
+src/backend/parser/cypher_keywords.o: src/include/parser/cypher_kwlist_d.h
+
+src/include/parser/cypher_kwlist_d.h: src/include/parser/cypher_kwlist.h $(GEN_KEYWORDLIST_DEPS)
+	$(GEN_KEYWORDLIST) --extern --varname CypherKeyword --output src/include/parser $<
+
 src/include/parser/cypher_gram_def.h: src/backend/parser/cypher_gram.c
 
 src/backend/parser/cypher_gram.c: BISONFLAGS += --defines=src/include/parser/cypher_gram_def.h

NOTICE

@@ -1,5 +1,5 @@
 Apache AGE
-Copyright 2022 The Apache Software Foundation.
+Copyright 2023 The Apache Software Foundation.
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).