From 7d5f64b1d3795a0e9971a34517f270cc76ec9c65 Mon Sep 17 00:00:00 2001 From: liwenkai Date: Fri, 17 May 2024 17:18:30 +0800 Subject: [PATCH] Replace "Greenplum" with "Cloudberry" in README.md & update Makefile This commit updates the README.md file by replacing all occurrences of "Greenplum" with "cdbd". This commit includes the following changes: 1. README.md: - Replaced all instances of "Greenplum" with "Cloudberry" to reflect the new naming convention. 2. Makefile: - Added new libraries to GPDEMO_LIBS. - Added new targets for `gpdemo` and `gpshrink`. - Included a command to create the directory '$(DESTDIR)$(bindir)/lib/gpdemo': $(MKDIR_P) '$(DESTDIR)$(bindir)/lib/gpdemo' Related to Issue#id --- gpMgmt/bin/Makefile | 17 ++++++++++++++--- gpMgmt/bin/README.md | 24 ++++++++++++------------ 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/gpMgmt/bin/Makefile b/gpMgmt/bin/Makefile index 70d650fc772..7a81781d2b1 100644 --- a/gpMgmt/bin/Makefile +++ b/gpMgmt/bin/Makefile @@ -13,19 +13,27 @@ SUBDIRS += ifaddrs $(recurse) PROGRAMS= analyzedb gpactivatestandby gpaddmirrors gpcheckcat gpcheckperf \ - gpcheckresgroupimpl gpconfig gpdeletesystem gpexpand gpinitstandby \ + gpcheckresgroupimpl gpconfig gpdeletesystem gpexpand gpshrink gpinitstandby \ gpinitsystem gpload gpload.py gplogfilter gpmovemirrors \ gppkg gprecoverseg gpreload gpsync gpsd gpssh gpssh-exkeys gpstart \ - gpstate gpstop minirepro gpmemwatcher gpmemreport + gpstate gpstop minirepro gpmemwatcher gpmemreport gpdemo gpdirtableload + + GPDEMO_LIBS = gpdemo-defaults.sh lalshell generate_certs.sh demo_cluster.sh \ + probe_config.sh README installdirs: $(MKDIR_P) '$(DESTDIR)$(bindir)/lib' + $(MKDIR_P) '$(DESTDIR)$(bindir)/lib/gpdemo' installprograms: installdirs for file in $(PROGRAMS); do \ $(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)/'$$file ; \ $(PERL) $(top_builddir)/putversion '$(DESTDIR)$(bindir)/'$$file ; \ done + # install dependencies of gpdemo + for file in $(GPDEMO_LIBS); do \ + $(INSTALL_SCRIPT) $(top_builddir)/gpAux/gpdemo/$$file '$(DESTDIR)$(bindir)/lib/gpdemo/'$$file ; \ + done # Symlink gpcheckcat from bin to bin/lib to maintain backward compatibility if [ ! -L $(DESTDIR)$(bindir)/lib/gpcheckcat ]; then \ cd $(DESTDIR)$(bindir)/lib/ && $(LN_S) ../gpcheckcat gpcheckcat; \ @@ -36,6 +44,9 @@ uninstall: for file in $(PROGRAMS); do \ rm -f '$(DESTDIR)$(bindir)/'$$file ; \ done + for file in $(GPDEMO_LIBS); do \ + rm -f '$(DESTDIR)$(bindir)/lib/gpdemo/'$$file ; \ + done rm -f '$(DESTDIR)$(bindir)/gpload.bat' # @@ -183,7 +194,7 @@ clean distclean: rm -rf *.pyc rm -f analyzedbc gpactivatestandbyc gpaddmirrorsc gpcheckcatc \ gpcheckperfc gpcheckresgroupimplc gpchecksubnetcfgc gpconfigc \ - gpdeletesystemc gpexpandc gpinitstandbyc gplogfilterc gpmovemirrorsc \ + gpdeletesystemc gpexpandc gpshrinkc gpinitstandbyc gplogfilterc gpmovemirrorsc \ gppkgc gprecoversegc gpreloadc gpscpc gpsyncc gpsdc gpssh-exkeysc gpsshc \ gpstartc gpstatec gpstopc minireproc rm -f gpconfig_modules/gucs_disallowed_in_file.txt diff --git a/gpMgmt/bin/README.md b/gpMgmt/bin/README.md index b003592b16c..248ead1a18f 100644 --- a/gpMgmt/bin/README.md +++ b/gpMgmt/bin/README.md @@ -12,7 +12,7 @@ To run any of these python scripts, necessary libraries must be installed, and P PYTHONPATH="\$GPHOME/lib/python:${PYTHONPATH}" ``` -This will be set automatically with a `source $GPHOME/greenplum_path.sh` +This will be set automatically with a `source $GPHOME/Cloudberry_path.sh` ## Python Version @@ -28,20 +28,20 @@ Where Things Go List of Management Scripts Written in Bash ------------------------------------------ -bin/gpinitsystem - Creates a new Greenplum Database +bin/gpinitsystem - Creates a new Cloudberry Database bin/gpload - Sets env variables and calls gpload.py List of Management Scripts Written in Python (no libraries) ----------------------------------------------------------- -bin/gpload.py - Loads data into a Greenplum Database +bin/gpload.py - Loads data into a Cloudberry Database List of Management Scripts Written in Python (gpmlib - old libraries) --------------------------------------------------------------------- bin/gpaddmirrors - Adds mirrors to an array (needs rewrite) bin/gprecoverseg - Recovers a failed segment (needs rewrite) -bin/gpcheckperf - Checks the hardware for Greenplum Database +bin/gpcheckperf - Checks the hardware for Cloudberry Database bin/gpsync - Copies files to many hosts bin/gpssh - Remote shell to many hosts bin/gpssh-exkeys - Exchange ssh keys between many hosts @@ -51,12 +51,12 @@ List of Management Scripts Written in Python (gppylib - current libraries) -------------------------------------------------------------------------- bin/gpactivatestandby - Activates the Standby Coordinator bin/gpconfig_helper - Edits postgresql.conf file for all segments -bin/gpdeletesystem - Deletes a Greenplum Database -bin/gpexpand - Adds additional segments to a Greenplum Database +bin/gpdeletesystem - Deletes a Cloudberry Database +bin/gpexpand - Adds additional segments to a Cloudberry Database bin/gpinitstandby - Initializes standby coordinator bin/gplogfilter - Filters log files -bin/gpstart - Start a Greenplum Database -bin/gpstop - Stop a Greenplum Database +bin/gpstart - Start a Cloudberry Database +bin/gpstop - Stop a Cloudberry Database sbin/gpconfig_helper.py - Helper script for gpconfig sbin/gpsegcopy - Helper script for gpexpand @@ -76,10 +76,10 @@ gparray.py +- SegmentPair - Configuration information for a single content id | \- Contains multiple Segment objects | - +- GpArray - Configuration information for a Greenplum Database + +- GpArray - Configuration information for a Cloudberry Database \- Contains multiple SegmentPair objects -gplog.py - Utility functions to assist in Greenplum standard logging +gplog.py - Utility functions to assist in Cloudberry standard logging gpparseopts.py - Wrapper around optparse library to aid in locating help files @@ -143,7 +143,7 @@ db/dbconn.py - Connections to the database | +- Should have a wrapper class around a pygresql connection object! -util/gp_utils.py - Greenplum related utility functions that are not Commands +util/gp_utils.py - Cloudberry related utility functions that are not Commands util/ssh_session.py - SSH and RSYNC related utility functions brought in from gpmlib.py/gplib.py that are used by gpssh, gpsync and gpssh-exkeys @@ -175,7 +175,7 @@ tests that do not require a running cluster. ## Testing Management Scripts (behave tests) -Behave tests require a running Greenplum cluster, and additional python libraries for testing, available to gpadmin. +Behave tests require a running Cloudberry cluster, and additional python libraries for testing, available to gpadmin. Thus, you can install these additional python libraries using any of the following methods: