Patch to AGE for PG12 to remove incubating

This is a patch to remove the word incubate from AGE for PG12
apache · Oct 22, 2022 · 5d86c95 · 5d86c95
1 parent a20169e
commit 5d86c95
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 46 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
-# Contributing to Apache Incubator AGE
+# Contributing to Apache AGE
 
 First off, thank you for considering contributing.
 
@@ -12,4 +12,4 @@ Thank you for raising issues.
 
 ## Pull Requests
 
-Pull requests are a great way to get your ideas into this repository. Check out our list of good [first issues](https://github.com/apache/incubator-age/labels/good%20first%20issue)
+Pull requests are a great way to get your ideas into this repository. Check out our list of good [first issues](https://github.com/apache/age/labels/good%20first%20issue)
diff --git a/DISCLAIMER b/DISCLAIMER
diff --git a/drivers/golang/README.md b/drivers/golang/README.md
@@ -1,4 +1,4 @@
-# incubator-age AGType parser and driver support for Golang 
+# age AGType parser and driver support for Golang 
 
 AGType parser and driver support for [Apache AGE](https://age.apache.org/), graph extention for PostgreSQL.
 
@@ -13,20 +13,20 @@ AGType parser and driver support for [Apache AGE](https://age.apache.org/), grap
 
 ### Go get  
 ``` 
-go get github.com/apache/incubator-age/drivers/golang
+go get github.com/apache/age/drivers/golang
 ```
 ### gomod
 ``` 
-require  github.com/apache/incubator-age/drivers/golang {version}
+require  github.com/apache/age/drivers/golang {version}
 ```
 
 
-Check [latest version](https://github.com/apache/incubator-age/releases)
+Check [latest version](https://github.com/apache/age/releases)
 
 ### For more information about [Apache AGE](https://age.apache.org/)
-* Apache Incubator Age : https://age.apache.org/
-* Github : https://github.com/apache/incubator-age
-* Document : https://age.incubator.apache.org/docs/
+* Apache Age : https://age.apache.org/
+* Github : https://github.com/apache/age
+* Document : https://age.apache.org/docs/
 
 ### Check AGE loaded on your PostgreSQL
 Connect to your containerized Postgres instance and then run the following commands:
@@ -38,9 +38,9 @@ SET search_path = ag_catalog, "$user", public;
 ```
 
 ### Test
-Check out and rewrite DSN in incubator-age/drivers/golang/age/age_test.go
+Check out and rewrite DSN in age/drivers/golang/age/age_test.go
 ```
-cd incubator-age/drivers/golang/age
+cd age/drivers/golang/age
 go test . -v
 
 ```
@@ -56,4 +56,4 @@ go test . -v
 
 
 ### License
-Apache-2.0 License
+Apache-2.0 License
diff --git a/drivers/golang/age/builder.go b/drivers/golang/age/builder.go
@@ -26,7 +26,7 @@ import (
 	"strings"
 
 	"github.com/antlr/antlr4/runtime/Go/antlr"
-	"github.com/apache/incubator-age/drivers/golang/parser"
+	"github.com/apache/age/drivers/golang/parser"
 )
 
 const MaxUint = ^uint(0)

diff --git a/drivers/golang/age/mapper.go b/drivers/golang/age/mapper.go
@@ -24,7 +24,7 @@ import (
 	"strings"
 
 	"github.com/antlr/antlr4/runtime/Go/antlr"
-	"github.com/apache/incubator-age/drivers/golang/parser"
+	"github.com/apache/age/drivers/golang/parser"
 )
 
 type AGMapper struct {

diff --git a/drivers/golang/go.mod b/drivers/golang/go.mod
@@ -17,12 +17,12 @@
 //  * under the License.
 //  */
 
-module github.com/apache/incubator-age/drivers/golang
+module github.com/apache/age/drivers/golang
 
 go 1.16
 
 require (
-	github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210521184019-c5ad59b459ec
+	github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20221020221120-327014a2b522
 	github.com/lib/pq v1.10.2
 	github.com/stretchr/testify v1.7.0
 )
diff --git a/drivers/golang/samples/age_wrapper_sample.go b/drivers/golang/samples/age_wrapper_sample.go
@@ -21,7 +21,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/apache/incubator-age/drivers/golang/age"
+	"github.com/apache/age/drivers/golang/age"
 )
 
 // Do cypher query to AGE with Age API

diff --git a/drivers/golang/samples/sql_api_sample.go b/drivers/golang/samples/sql_api_sample.go
@@ -22,7 +22,7 @@ import (
 	"database/sql"
 	"fmt"
 
-	"github.com/apache/incubator-age/drivers/golang/age"
+	"github.com/apache/age/drivers/golang/age"
 )
 
 // Do cypher query to AGE with database/sql Tx API transaction conrol

diff --git a/drivers/python/README.md b/drivers/python/README.md
@@ -1,4 +1,4 @@
-# incubator-age AGType parser and driver support for Python 
+# AGE AGType parser and driver support for Python
 AGType parser and driver support for [Apache AGE](https://age.apache.org/), graph extention for PostgreSQL.
 
 ### Features
@@ -22,25 +22,25 @@ python -m unittest -v test_agtypes.py
 ```
 
 ### Build from source
-``` 
-git clone https://github.com/apache/incubator-age.git
-cd incubator-age/dirivers/python
+```
+git clone https://github.com/apache/age.git
+cd age/drivers/python
 
 python setup.py install
 
 ```
 
 ### Install from PyPi
 
-``` 
+```
 pip install apache-age-python
 
 ```
 
 ### For more information about [Apache AGE](https://age.apache.org/)
-* Apache Incubator Age : https://age.apache.org/
-* Github : https://github.com/apache/incubator-age
-* Document : https://age.incubator.apache.org/docs/
+* Apache Age : https://age.apache.org/
+* Github : https://github.com/apache/age
+* Document : https://age.apache.org/age-manual/master/index.html
 * apache-age-python GitHub : https://github.com/rhizome-ai/apache-age-python
 
 ### Check AGE loaded on your PostgreSQL
@@ -58,4 +58,4 @@ SET search_path = ag_catalog, "$user", public;
 * Agtype converting samples: [Agtype Sample](samples/apache-age-agtypes.ipynb) in Samples.
 
 ### License
-Apache-2.0 License
+Apache-2.0 License
diff --git a/drivers/python/setup.py b/drivers/python/setup.py
@@ -20,14 +20,14 @@
     long_description = fh.read()
 
 setup(
-    name             = 'incubator-age',
+    name             = 'age',
     version          = VERSION.VERSION,
     description      = 'Python driver support for Apache AGE',
     long_description=long_description,
     long_description_content_type="text/markdown",
     author           = 'rhizome',
     author_email     = '[email protected]',
-    url              = 'https://github.com/apache/incubator-age',
+    url              = 'https://github.com/apache/age',
     license          = 'Apache2.0',
     install_requires = [ 'psycopg2', 'antlr4-python3-runtime' ],
     packages         = ['age', 'age.gen'],
@@ -38,4 +38,4 @@
     classifiers      = [
         'Programming Language :: Python :: 3.9'
     ]
-)
+)
diff --git a/src/include/utils/ag_load.h b/src/include/utils/ag_load.h
@@ -17,8 +17,8 @@
  * under the License.
  */
 
-#ifndef INCUBATOR_AGE_AG_LOAD_H
-#define INCUBATOR_AGE_AG_LOAD_H
+#ifndef AGE_AG_LOAD_H
+#define AGE_AG_LOAD_H
 
 #include "postgres.h"
 
@@ -57,4 +57,4 @@
 #include "utils/graphid.h"
 
 
-#endif //INCUBATOR_AGE_AG_LOAD_H
+#endif //AGE_AG_LOAD_H
diff --git a/src/include/utils/load/age_load.h b/src/include/utils/load/age_load.h
@@ -54,8 +54,8 @@
 #include "utils/agtype.h"
 #include "utils/graphid.h"
 
-#ifndef INCUBATOR_AGE_ENTITY_CREATOR_H
-#define INCUBATOR_AGE_ENTITY_CREATOR_H
+#ifndef AGE_ENTITY_CREATOR_H
+#define AGE_ENTITY_CREATOR_H
 
 agtype* create_agtype_from_list(char **header, char **fields,
                                 size_t fields_len, int64 vertex_id);
@@ -67,4 +67,4 @@ void insert_edge_simple(Oid graph_oid, char *label_name, graphid edge_id,
                         graphid start_id, graphid end_id,
                         agtype* end_properties);
 
-#endif //INCUBATOR_AGE_ENTITY_CREATOR_H
+#endif //AGE_ENTITY_CREATOR_H