Support madlib2 for lighting.

Fix SEGFAULT memory bugs

There're weird SEGFAULT bug due to custom allocation erroneously paired with std::free (should be custom free) and we're unable to solve them. This is a workaround.

Author: zhangwenchao-123

methods/kmeans/src/pg_gp/kmeans.c

@@ -87,7 +87,7 @@ compute_metric(PGFunction inMetricFn, MemoryContext inMemContext, Datum inVec1,
      * in execUtils.c
      */
 
-#if GP_VERSION_NUM >= 70000
+#if defined(IS_CLOUDBERRY) || GP_VERSION_NUM >= 70000
     if(inMemContext->mem_allocated > 50000)
 #else
     if(inMemContext->allBytesAlloc - inMemContext->allBytesFreed > 50000)

requirements.txt

@@ -9,3 +9,6 @@ postgres:
 
 greenplum:
     name:   Greenplum DB
+
+cloudberry:
+    name:   Cloudberry DB

src/config/Ports.yml

@@ -64,7 +64,7 @@
 for port in ports:
     portid_list.append(port)
 
-SUPPORTED_PORTS = ('postgres', 'greenplum')
+SUPPORTED_PORTS = ('postgres', 'greenplum', 'cloudberry')
 
 # Global variables
 portid = None       # Target port ID (eg: pg90, gp40)
@@ -189,7 +189,8 @@ def _run_m4_and_append(schema, maddir_mod_py, module, sqlfile,
                   '-I' + maddir_madpack,
                   sqlfile]
         if ( (portid == 'postgres') &
-             (is_rev_gte(get_rev_num(dbver), get_rev_num('14.0'))) ):
+             (is_rev_gte(get_rev_num(dbver), get_rev_num('14.0'))) or
+             (portid == 'cloudberry') ):
             m4args = ['m4',
                   '-P',
                   '-DMADLIB_SCHEMA=' + schema,
@@ -370,7 +371,7 @@ def _check_db_port(portid):
         if portid == 'postgres':
             if row[0]['version'].lower().find('greenplum') < 0:
                 return True
-        elif portid == 'greenplum':
+        elif portid == 'greenplum' or portid == 'cloudberry':
             return True
     return False
 # ------------------------------------------------------------------------------
@@ -1240,6 +1241,7 @@ def create_install_madlib_sqlfile(args, madpack_cmd):
 def get_madlib_function_drop_str(schema):
 
     if ((portid == 'greenplum' and is_rev_gte(get_rev_num(dbver), get_rev_num('7.0'))) or
+        (portid == 'cloudberry') or
         (portid == 'postgres')):
         case_str = """
         CASE p.prokind
@@ -1344,14 +1346,14 @@ def set_dynamic_library_path_in_database(dbver_split, madlib_library_path):
                 (portid == 'postgres' and is_rev_gte(dbver_split, get_rev_num('13.0')))):
                 libdir = libdir.decode()
 
-            libdir = libdir.strip()+'/postgresql'
+            libdir = str(libdir.strip(), encoding='utf-8')+'/postgresql'
             paths.append(libdir)
 
         paths.append(madlib_library_path)
         dynamic_library_path = ':'.join(paths)
 
-        if portid == 'greenplum':
-            if is_rev_gte(dbver_split, get_rev_num('6.0')):
+        if portid == 'greenplum' or portid == 'cloudberry':
+            if is_rev_gte(dbver_split, get_rev_num('6.0')) or portid == 'cloudberry':
                 ret = os.system('gpconfig -c dynamic_library_path -v \'{0}\''.format(dynamic_library_path))
             else:
                 ret = os.system('gpconfig -c dynamic_library_path -v \'\\{0}\''.format(dynamic_library_path))
@@ -1482,6 +1484,9 @@ def main(argv):
                 else:
                     # only need the first two digits for <= 4.3.4
                     dbver = '.'.join(map(str, dbver_split[:2]))
+            elif portid == 'cloudberry':
+                # Assume Cloudberry will stick to semantic versioning
+                dbver = str(dbver_split[0])
             elif portid == 'postgres':
                 if is_rev_gte(dbver_split, get_rev_num('10.0')):
                     # Postgres starting 10.0 uses semantic versioning. Hence,

src/madpack/madpack.py

@@ -189,6 +189,8 @@ def get_dbver(con_args, portid):
             # for Greenplum the 3rd digit is necessary to differentiate
             # 4.3.5+ from versions < 4.3.5
             match = re.search("Greenplum[a-zA-Z\s]*(\d+\.\d+\.\d+)", versionStr)
+        elif portid == 'cloudberry':
+            match = re.search("Cloudberry[a-zA-Z\s]*(\d+\.\d+\.\d+)", versionStr)
         return None if match is None else match.group(1)
     except Exception:
         error_(this, "Failed reading database version", True)

src/madpack/utilities.py

@@ -1,2 +1,3 @@
 add_subdirectory(postgres)
 add_subdirectory(greenplum)
+add_subdirectory(cloudberry)

src/ports/CMakeLists.txt

@@ -0,0 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+add_current_cloudberry_version()

src/ports/cloudberry/2/CMakeLists.txt

@@ -0,0 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+add_current_cloudberry_version()