Skip to content

Commit 6b5c6a2

Browse files
August-beauloavamingli
authored andcommitted
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': 3.gpshrink: -update Scp -> Sync $(MKDIR_P) '$(DESTDIR)$(bindir)/lib/gpdemo' Related to Issue#id <#421>
1 parent b4c5a13 commit 6b5c6a2

File tree

3 files changed

+27
-16
lines changed

3 files changed

+27
-16
lines changed

gpMgmt/bin/Makefile

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,27 @@ SUBDIRS += ifaddrs
1313
$(recurse)
1414

1515
PROGRAMS= analyzedb gpactivatestandby gpaddmirrors gpcheckcat gpcheckperf \
16-
gpcheckresgroupimpl gpconfig gpdeletesystem gpexpand gpinitstandby \
16+
gpcheckresgroupimpl gpconfig gpdeletesystem gpexpand gpshrink gpinitstandby \
1717
gpinitsystem gpload gpload.py gplogfilter gpmovemirrors \
1818
gppkg gprecoverseg gpreload gpsync gpsd gpssh gpssh-exkeys gpstart \
19-
gpstate gpstop minirepro gpmemwatcher gpmemreport
19+
gpstate gpstop minirepro gpmemwatcher gpmemreport gpdemo gpdirtableload
20+
21+
GPDEMO_LIBS = gpdemo-defaults.sh lalshell generate_certs.sh demo_cluster.sh \
22+
probe_config.sh README
2023

2124
installdirs:
2225
$(MKDIR_P) '$(DESTDIR)$(bindir)/lib'
26+
$(MKDIR_P) '$(DESTDIR)$(bindir)/lib/gpdemo'
2327

2428
installprograms: installdirs
2529
for file in $(PROGRAMS); do \
2630
$(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)/'$$file ; \
2731
$(PERL) $(top_builddir)/putversion '$(DESTDIR)$(bindir)/'$$file ; \
2832
done
33+
# install dependencies of gpdemo
34+
for file in $(GPDEMO_LIBS); do \
35+
$(INSTALL_SCRIPT) $(top_builddir)/gpAux/gpdemo/$$file '$(DESTDIR)$(bindir)/lib/gpdemo/'$$file ; \
36+
done
2937
# Symlink gpcheckcat from bin to bin/lib to maintain backward compatibility
3038
if [ ! -L $(DESTDIR)$(bindir)/lib/gpcheckcat ]; then \
3139
cd $(DESTDIR)$(bindir)/lib/ && $(LN_S) ../gpcheckcat gpcheckcat; \
@@ -36,6 +44,9 @@ uninstall:
3644
for file in $(PROGRAMS); do \
3745
rm -f '$(DESTDIR)$(bindir)/'$$file ; \
3846
done
47+
for file in $(GPDEMO_LIBS); do \
48+
rm -f '$(DESTDIR)$(bindir)/lib/gpdemo/'$$file ; \
49+
done
3950
rm -f '$(DESTDIR)$(bindir)/gpload.bat'
4051

4152
#
@@ -183,7 +194,7 @@ clean distclean:
183194
rm -rf *.pyc
184195
rm -f analyzedbc gpactivatestandbyc gpaddmirrorsc gpcheckcatc \
185196
gpcheckperfc gpcheckresgroupimplc gpchecksubnetcfgc gpconfigc \
186-
gpdeletesystemc gpexpandc gpinitstandbyc gplogfilterc gpmovemirrorsc \
197+
gpdeletesystemc gpexpandc gpshrinkc gpinitstandbyc gplogfilterc gpmovemirrorsc \
187198
gppkgc gprecoversegc gpreloadc gpscpc gpsyncc gpsdc gpssh-exkeysc gpsshc \
188199
gpstartc gpstatec gpstopc minireproc
189200
rm -f gpconfig_modules/gucs_disallowed_in_file.txt

gpMgmt/bin/README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,20 @@ Where Things Go
2828

2929
List of Management Scripts Written in Bash
3030
------------------------------------------
31-
bin/gpinitsystem - Creates a new Greenplum Database
31+
bin/gpinitsystem - Creates a new Cloudberry Database
3232
bin/gpload - Sets env variables and calls gpload.py
3333

3434

3535
List of Management Scripts Written in Python (no libraries)
3636
-----------------------------------------------------------
37-
bin/gpload.py - Loads data into a Greenplum Database
37+
bin/gpload.py - Loads data into a Cloudberry Database
3838

3939

4040
List of Management Scripts Written in Python (gpmlib - old libraries)
4141
---------------------------------------------------------------------
4242
bin/gpaddmirrors - Adds mirrors to an array (needs rewrite)
4343
bin/gprecoverseg - Recovers a failed segment (needs rewrite)
44-
bin/gpcheckperf - Checks the hardware for Greenplum Database
44+
bin/gpcheckperf - Checks the hardware for Cloudberry Database
4545
bin/gpsync - Copies files to many hosts
4646
bin/gpssh - Remote shell to many hosts
4747
bin/gpssh-exkeys - Exchange ssh keys between many hosts
@@ -51,12 +51,12 @@ List of Management Scripts Written in Python (gppylib - current libraries)
5151
--------------------------------------------------------------------------
5252
bin/gpactivatestandby - Activates the Standby Coordinator
5353
bin/gpconfig_helper - Edits postgresql.conf file for all segments
54-
bin/gpdeletesystem - Deletes a Greenplum Database
55-
bin/gpexpand - Adds additional segments to a Greenplum Database
54+
bin/gpdeletesystem - Deletes a Cloudberry Database
55+
bin/gpexpand - Adds additional segments to a Cloudberry Database
5656
bin/gpinitstandby - Initializes standby coordinator
5757
bin/gplogfilter - Filters log files
58-
bin/gpstart - Start a Greenplum Database
59-
bin/gpstop - Stop a Greenplum Database
58+
bin/gpstart - Start a Cloudberry Database
59+
bin/gpstop - Stop a Cloudberry Database
6060

6161
sbin/gpconfig_helper.py - Helper script for gpconfig
6262
sbin/gpsegcopy - Helper script for gpexpand
@@ -76,10 +76,10 @@ gparray.py
7676
+- SegmentPair - Configuration information for a single content id
7777
| \- Contains multiple Segment objects
7878
|
79-
+- GpArray - Configuration information for a Greenplum Database
79+
+- GpArray - Configuration information for a Cloudberry Database
8080
\- Contains multiple SegmentPair objects
8181

82-
gplog.py - Utility functions to assist in Greenplum standard logging
82+
gplog.py - Utility functions to assist in Cloudberry standard logging
8383

8484
gpparseopts.py - Wrapper around optparse library to aid in locating help files
8585

@@ -143,7 +143,7 @@ db/dbconn.py - Connections to the database
143143
|
144144
+- Should have a wrapper class around a pygresql connection object!
145145

146-
util/gp_utils.py - Greenplum related utility functions that are not Commands
146+
util/gp_utils.py - Cloudberry related utility functions that are not Commands
147147
util/ssh_session.py - SSH and RSYNC related utility functions brought in from gpmlib.py/gplib.py
148148
that are used by gpssh, gpsync and gpssh-exkeys
149149

@@ -175,7 +175,7 @@ tests that do not require a running cluster.
175175

176176
## Testing Management Scripts (behave tests)
177177

178-
Behave tests require a running Greenplum cluster, and additional python libraries for testing, available to gpadmin.
178+
Behave tests require a running Cloudberry cluster, and additional python libraries for testing, available to gpadmin.
179179

180180
Thus, you can install these additional python libraries using any of the following methods:
181181

gpMgmt/bin/gpshrink

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ class gpshrinkStatus():
436436

437437
def _sync_status_file(self):
438438
"""Syncs the gpshrink status file with the coordinator mirror"""
439-
cpCmd = Scp('gpshrink copying status file to coordinator mirror',
439+
cpCmd = Rsync('gpshrink copying status file to coordinator mirror',
440440
srcFile=self._status_filename,
441441
dstFile=self._status_standby_filename,
442442
dstHost=self._coordinator_mirror.getSegmentHostName())
@@ -503,7 +503,7 @@ class gpshrinkStatus():
503503
""" Sync the segment configuration backup file to standby """
504504
if self._coordinator_mirror:
505505
self.logger.debug("Sync segment configuration backup file")
506-
cpCmd = Scp('gpshrink copying segment configuration backup file to coordinator mirror',
506+
cpCmd = Rsync('gpshrink copying segment configuration backup file to coordinator mirror',
507507
srcFile=self._gp_segment_configuration_backup,
508508
dstFile=self._segment_configuration_standby_filename,
509509
dstHost=self._coordinator_mirror.getSegmentHostName())

0 commit comments

Comments
 (0)