Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .cloudberry-db.spec
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Summary: A High Performance Massively Parallel Data Warehouse

Group: Applications/Databases
License: Apache License Version 2.0
URL: http://www.hashdata.cn
URL: http://www.cloudberrydb.org
Source0: bin_cbdb.tar.gz
Prefix: %{cbdb_install_prefix}
AutoReqProv: no
Expand Down
44 changes: 22 additions & 22 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for Cloudberry Database 1.0.0.
#
# Report bugs to <support@greenplum.org>.
# Report bugs to <info@cloudberrydb.org>.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
Expand Down Expand Up @@ -269,7 +269,7 @@ fi
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
else
$as_echo "$0: Please tell bug-autoconf@gnu.org and
$0: support@greenplum.org about your system, including any
$0: info@cloudberrydb.org about your system, including any
$0: error possibly output before this message. Then install
$0: a modern shell, or manually run the script under such a
$0: shell if you do have one."
Expand Down Expand Up @@ -584,8 +584,8 @@ PACKAGE_NAME='Cloudberry Database'
PACKAGE_TARNAME='cloudberry-database'
PACKAGE_VERSION='1.0.0'
PACKAGE_STRING='Cloudberry Database 1.0.0'
PACKAGE_BUGREPORT='support@greenplum.org'
PACKAGE_URL='https://www.greenplum.org/'
PACKAGE_BUGREPORT='info@cloudberrydb.org'
PACKAGE_URL='https://www.cloudberrydb.org/'

ac_unique_file="src/backend/access/common/heaptuple.c"
ac_default_prefix=/usr/local/cbdb
Expand Down Expand Up @@ -1603,8 +1603,8 @@ Optional Features:
--enable-depend turn on automatic dependency tracking
--enable-cassert enable assertion checks (for debugging)
--disable-orca disable ORCA optimizer
--enable-catalog-ext enable Cloudberry catalog extension
--enable-mapreduce enable Cloudberry Mapreduce support
--enable-catalog-ext enable CloudberryDB catalog extension
--enable-mapreduce enable CloudberryDB Mapreduce support
--enable-gpcloud enable gpcloud support
--enable-external-fts enable external fts support
--enable-ic-proxy enable interconnect proxy mode (requires libuv
Expand Down Expand Up @@ -1709,8 +1709,8 @@ Some influential environment variables:
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.

Report bugs to <support@greenplum.org>.
Cloudberry Database home page: <https://www.greenplum.org/>.
Report bugs to <info@cloudberrydb.org>.
Cloudberry Database home page: <https://www.cloudberrydb.org/>.
_ACEOF
ac_status=$?
fi
Expand Down Expand Up @@ -2019,7 +2019,7 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
( $as_echo "## ------------------------------------ ##
## Report this to support@greenplum.org ##
## Report this to info@cloudberrydb.org ##
## ------------------------------------ ##"
) | sed "s/^/$as_me: WARNING: /" >&2
;;
Expand Down Expand Up @@ -3094,7 +3094,7 @@ PostgreSQL has apparently not been ported to your platform yet.
To try a manual configuration, look into the src/template directory
for a similar platform and use the '--with-template=' option.

Please also contact <support@greenplum.org> to see about
Please also contact <info@cloudberrydb.org> to see about
rectifying this. Include the above 'checking host system type...'
line.
*******************************************************************
Expand Down Expand Up @@ -8338,8 +8338,8 @@ else
fi


{ $as_echo "$as_me:${as_lineno-$LINENO}: result: checking whether to build with Cloudberry catalog extension... $enable_catalog_ext" >&5
$as_echo "checking whether to build with Cloudberry catalog extension ... $enable_catalog_ext" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: checking whether to build with CloudberryDB catalog extension... $enable_catalog_ext" >&5
$as_echo "checking whether to build with CloudberryDB catalog extension ... $enable_catalog_ext" >&6; }

#
# --enable-mapreduce enables GPMapreduce support
Expand Down Expand Up @@ -8369,8 +8369,8 @@ else
fi


{ $as_echo "$as_me:${as_lineno-$LINENO}: result: checking whether to build with Cloudberry Mapreduce... $enable_mapreduce" >&5
$as_echo "checking whether to build with Cloudberry Mapreduce... $enable_mapreduce" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: checking whether to build with CloudberryDB Mapreduce... $enable_mapreduce" >&5
$as_echo "checking whether to build with CloudberryDB Mapreduce... $enable_mapreduce" >&6; }


#
Expand Down Expand Up @@ -11717,10 +11717,10 @@ else
break 2
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
*** The installed version of Flex, $pgac_candidate, is too old to use with Cloudberry DB.
*** The installed version of Flex, $pgac_candidate, is too old to use with CloudberryDB.
*** Flex version 2.5.4 or later is required, but this is $pgac_flex_version." >&5
$as_echo "$as_me: WARNING:
*** The installed version of Flex, $pgac_candidate, is too old to use with Cloudberry DB.
*** The installed version of Flex, $pgac_candidate, is too old to use with CloudberryDB.
*** Flex version 2.5.4 or later is required, but this is $pgac_flex_version." >&2;}
fi
fi
Expand Down Expand Up @@ -16821,7 +16821,7 @@ fi

if test "$enable_mapreduce" = yes; then
if test "$with_perl" = no; then
as_fn_error $? "Cloudberry Mapreduce requires Perl, reconfigure with --with-perl" "$LINENO" 5
as_fn_error $? "CloudberryDB Mapreduce requires Perl, reconfigure with --with-perl" "$LINENO" 5
fi
for ac_header in yaml.h
do :
Expand All @@ -16832,7 +16832,7 @@ if test "x$ac_cv_header_yaml_h" = xyes; then :
_ACEOF

else
as_fn_error $? "header file <yaml.h> is required for Cloudberry Mapreduce" "$LINENO" 5
as_fn_error $? "header file <yaml.h> is required for CloudberryDB Mapreduce" "$LINENO" 5
fi

done
Expand Down Expand Up @@ -18435,7 +18435,7 @@ _ACEOF

else

as_fn_error $? "getifaddrs and inet_ntop are required for Cloudberry" "$LINENO" 5
as_fn_error $? "getifaddrs and inet_ntop are required for CloudberryDB" "$LINENO" 5

fi
done
Expand Down Expand Up @@ -22774,7 +22774,7 @@ fi
BLD_ARCH=`echo $BLD_ARCH`


# Get the Cloudberry version string from VERSION
# Get the CloudberryDB version string from VERSION

GP_VERSION_LONG=`bash ./getversion`

Expand Down Expand Up @@ -23501,8 +23501,8 @@ $config_links
Configuration commands:
$config_commands

Report bugs to <support@greenplum.org>.
Cloudberry Database home page: <https://www.greenplum.org/>."
Report bugs to <info@cloudberrydb.org>.
Cloudberry Database home page: <https://www.cloudberrydb.org/>."

_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
dnl The PACKAGE_VERSION from upstream PostgreSQL is maintained in the
dnl PG_PACKAGE_VERSION variable, when merging make sure to update this
dnl variable with the merge conflict from the AC_INIT() statement.
AC_INIT([Cloudberry Database], [1.0.0], [support@greenplum.org], [], [https://www.greenplum.org/])
AC_INIT([Cloudberry Database], [1.0.0], [info@cloudberrydb.org], [], [https://www.cloudberrydb.org/])
[PG_PACKAGE_VERSION=14.4]
AC_SUBST(PG_PACKAGE_VERSION)

Expand Down
4 changes: 2 additions & 2 deletions contrib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ subdir = contrib
top_builddir = ..
include $(top_builddir)/src/Makefile.global

# Cloudberry specific changes to the targetlist:
# Cloudberry Database specific changes to the targetlist:
# tsearch2 and postgres_fdw are currently disabled due to test failures.
# cube and the related earthdistance are disabled since GPDB define CUBE
# as a keyword. lo is disabled since large objects aren't supported.
Expand Down Expand Up @@ -54,7 +54,7 @@ SUBDIRS = \
unaccent \
vacuumlo

# Cloudberry-specific additions (to ease merge pain).
# CloudberryDB-specific additions (to ease merge pain).
SUBDIRS += \
formatter \
formatter_fixedwidth \
Expand Down
2 changes: 1 addition & 1 deletion contrib/file_fdw/input/gp_file_fdw.source
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--
-- Test foreign-data wrapper file_fdw. Cloudberry MPP specific
-- Test foreign-data wrapper file_fdw. Cloudberry Database MPP specific
--

-- Clean up in case a prior regression run failed
Expand Down
2 changes: 1 addition & 1 deletion contrib/file_fdw/output/gp_file_fdw.source
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--
-- Test foreign-data wrapper file_fdw. Cloudberry MPP specific
-- Test foreign-data wrapper file_fdw. Cloudberry Database MPP specific
--
-- Clean up in case a prior regression run failed
SET client_min_messages TO 'error';
Expand Down
2 changes: 1 addition & 1 deletion contrib/interconnect/ic_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* ic_common.c
* Interconnect code shared between UDP, and TCP IPC Layers.
*
* Portions Copyright (c) 2023-, Cloudberry
* Portions Copyright (c) 2023, HashData Technology Limited.
*
*
* IDENTIFICATION
Expand Down
2 changes: 1 addition & 1 deletion contrib/interconnect/ic_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* ic_common.c
* Interconnect code shared between UDP, and TCP IPC Layers.
*
* Portions Copyright (c) 2023-, Cloudberry
* Portions Copyright (c) 2023, HashData Technology Limited.
*
*
* IDENTIFICATION
Expand Down
2 changes: 1 addition & 1 deletion contrib/interconnect/ic_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* interconnect_internal.h
* Motion IPC Layer.
*
* Portions Copyright (c) 2023-, Cloudberry inc
* Portions Copyright (c) 2023, HashData Technology Limited.
*
*
* IDENTIFICATION
Expand Down
2 changes: 1 addition & 1 deletion contrib/interconnect/ic_modules.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* interconnect.c
* Interconnect code shared between UDP, and TCP IPC Layers.
*
* Portions Copyright (c) 2023-, Cloudberry
* Portions Copyright (c) 2023, HashData Technology Limited.
*
*
* IDENTIFICATION
Expand Down
2 changes: 1 addition & 1 deletion contrib/interconnect/ic_modules.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* interconnect.h
* Motion IPC Layer.
*
* Portions Copyright (c) 2023-, Cloudberry inc
* Portions Copyright (c) 2023, HashData Technology Limited.
*
*
* IDENTIFICATION
Expand Down
2 changes: 1 addition & 1 deletion contrib/interconnect/proxy/ic_proxy_addr.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
*
* Copyright (c) 2020-Present VMware, Inc. or its affiliates.
*
* Portions Copyright (c) 2023, HashData Technology Limited.
*
*-------------------------------------------------------------------------
*/
Expand Down
2 changes: 1 addition & 1 deletion contrib/interconnect/tcp/ic_tcp.c
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* ic_tcp.c
* Interconnect code specific to TCP transport.
*
* Portions Copyright (c) 2005-2008, Cloudberry, Inc.
* Portions Copyright (c) 2005-2008, Greenplum, Inc.
* Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
*
*
Expand Down
2 changes: 1 addition & 1 deletion contrib/interconnect/tcp/ic_tcp.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* ic_tcp.h
* Motion IPC TCP implements.
*
* Portions Copyright (c) 2023-, Cloudberry inc
* Portions Copyright (c) 2023, HashData Technology Limited.
*
*
* IDENTIFICATION
Expand Down
1 change: 1 addition & 0 deletions contrib/interconnect/udp/ic_faultinjection.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* ic_faultinjection.h
* Fault injection code for UDP interconnect.
*
* Portions Copyright (c) 2023, HashData Technology Limited.
* Portions Copyright (c) 2005-2011, Greenplum Inc.
* Portions Copyright (c) 2011-2012, EMC Corporation
* Portions Copyright (c) 2012-Present VMware, Inc. or its affiliates.
Expand Down
2 changes: 1 addition & 1 deletion contrib/interconnect/udp/ic_udpifc.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* ic_udp.h
* Motion IPC UDP implements.
*
* Portions Copyright (c) 2023-, Cloudberry inc
* Portions Copyright (c) 2023, HashData Technology Limited.
*
*
* IDENTIFICATION
Expand Down
3 changes: 0 additions & 3 deletions contrib/pgcrypto/sm3.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


#ifndef _SM3_H_
#define _SM3_H_

Expand Down Expand Up @@ -80,5 +78,4 @@ init_sm3(PX_MD *md)
md->reset(md);
}


#endif
5 changes: 0 additions & 5 deletions contrib/pgcrypto/sm4.c
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@



#include "postgres.h"
#include "sm4.h"
#include "px.h"

#include <sys/param.h>


/* fixed SM4 param */
static const u1byte sbx_tab[256] =
{
Expand Down Expand Up @@ -155,7 +151,6 @@ void sm4_setkey_dec(sm4_ctx *ctx, u1byte* key)
}
}


void
sm4_cbc_encrypt(sm4_ctx *ctx, u1byte *iv, u1byte *data, long len)
{
Expand Down
4 changes: 2 additions & 2 deletions deploy/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### CloudBerry Automation Build and Deployment
### Cloudberry Automation Build and Deployment

#### Download the Cloudberry project source code into your working directory
git clone git@code.hashdata.xyz:cloudberry/cbdb.git
Expand Down Expand Up @@ -85,7 +85,7 @@ The build & test environment of cbdb project relies on many systemconfigurations
<br>


### CloudBerry自动编译部署流程
### Cloudberry自动编译部署流程

#### 在工作目录下载cloudberry的代码

Expand Down
6 changes: 3 additions & 3 deletions gpAux/BUILD_INSTRUCTIONS
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## ======================================================================
## ______ _____ ______ ______
## | ____ |_____] | \ |_____]
## |_____| | |_____/ |_____]
## _____ _____ ______ ______
## | |_____] | \ |_____]
## |_____| |_____] |_____/ |_____]
##
## ----------------------------------------------------------------------
## Instruction for Building the Cloudberry Database, Clients,
Expand Down
2 changes: 1 addition & 1 deletion gpAux/Makefile.thirdparty
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ----------------------------------------------------------------------
# Cloudberry ThirdParty Library Makefile
# Cloudberry Database ThirdParty Library Makefile
#
# This file controls which thirdparty libraries are made available to
# the build of our product(s).
Expand Down
2 changes: 1 addition & 1 deletion gpAux/gpdemo/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ----------------------------------------------------------------------
# Makefile for Cloudberry Demo
# Makefile for Cloudberry Database Demo
# ----------------------------------------------------------------------

#
Expand Down
8 changes: 4 additions & 4 deletions gpAux/gpdemo/probe_config.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#!/usr/bin/env bash

#***********************************************************
# Look for Cloudberry executables to find path
# Look for Cloudberry Database executables to find path
#***********************************************************
if [ x"$GPHOME" = x ]; then
if [ x"$BIZHOME" = x ]; then
echo "Neither GPHOME or BIZHOME are set. Set one of these variables to point to the location"
echo "of the Cloudberry installation directory."
echo "of the Cloudberry Database installation directory."
echo ""
exit 1
else
Expand All @@ -20,12 +20,12 @@ GPPATH=`find $GPSEARCH -name gpstart | tail -1`
RETVAL=$?

if [ "$RETVAL" -ne 0 ]; then
echo "Error attempting to find Cloudberry executables in $GPSEARCH"
echo "Error attempting to find Cloudberry Database executables in $GPSEARCH"
exit 1
fi

if [ ! -x "$GPPATH" ]; then
echo "No executables found for Cloudberry installation in $GPSEARCH"
echo "No executables found for Cloudberry Database installation in $GPSEARCH"
exit 1
fi
GPPATH=`dirname $GPPATH`
Expand Down
Loading