Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-pick commits from GPDB, for psycopg2 #571

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Cherry-pick commits from GPDB, for psycopg2 #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a3fa714
added cluster health check for gpexpand (#13695)
shrakesh Jun 23, 2022
66a1f77
Revert "added cluster health check for gpexpand (#13695)" (#13752)
shrakesh Jun 30, 2022
1a20e0a
added cluster health check for gpexpand (#13757)
shrakesh Jul 4, 2022
784eca6
gpexpand : Fix multi port issue when clusters are not in balanced sta…
shrakesh Aug 10, 2022
3873433
Improve the performance of source_bytes computation during gpexpand.
kainwen Aug 30, 2022
2df9e69
Warn if any segment has a running basebackup (#13620)
Annu149 Oct 21, 2022
f805320
Replace scp with rsync (#14145)
Annu149 Oct 28, 2022
7875ee3
gpexpand.status_detail should be distributed by "table_oid".
kainwen Jan 9, 2023
5e7d120
Refine struct of gpexpand.status_detail table.
kainwen Jan 19, 2023
b3f3217
Replace pygresql with psycopg2 for gpMgmt tools. (#15988)
higuoxing Jul 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions gpMgmt/bin/analyzedb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,15 @@ from contextlib import closing
import pipes # for shell-quoting, pipes.quote()
import fcntl
import itertools

import psycopg2
try:
import pg

from gppylib import gplog, pgconf, userinput
from gppylib.commands.base import Command, WorkerPool, Worker
from gppylib.operations import Operation
from gppylib.gpversion import GpVersion
from gppylib.db import dbconn
from gppylib.operations.unix import CheckDir, CheckFile, MakeDir
from gppylib.utils import escape_string

except ImportError as e:
sys.exit('Cannot import modules. Please check that you have sourced greenplum_path.sh. Detail: ' + str(e))
Expand Down Expand Up @@ -166,7 +165,7 @@ def validate_schema_exists(pg_port, dbname, schema):
try:
dburl = dbconn.DbURL(port=pg_port, dbname=dbname)
conn = dbconn.connect(dburl)
count = dbconn.querySingleton(conn, "select count(*) from pg_namespace where nspname='%s';" % pg.escape_string(schema))
count = dbconn.querySingleton(conn, "select count(*) from pg_namespace where nspname='%s';" % escape_string(schema))
if count == 0:
raise ExceptionNoStackTraceNeeded("Schema %s does not exist in database %s." % (schema, dbname))
finally:
Expand Down Expand Up @@ -213,7 +212,7 @@ def get_partition_state_tuples(pg_port, dbname, catalog_schema, partition_info):
try:
modcount_sql = "select to_char(coalesce(sum(modcount::bigint), 0), '999999999999999999999') from gp_dist_random('%s.%s')" % (catalog_schema, tupletable)
modcount = dbconn.querySingleton(conn, modcount_sql)
except pg.DatabaseError as e:
except psycopg2.DatabaseError as e:
if "does not exist" in str(e):
logger.info("Table %s.%s (%s) no longer exists and will not be analyzed", schemaname, partition_name, tupletable)
else:
Expand Down Expand Up @@ -971,7 +970,7 @@ def get_oid_str(table_list):
def regclass_schema_tbl(schema, tbl):
schema_tbl = "%s.%s" % (escape_identifier(schema), escape_identifier(tbl))

return "to_regclass('%s')" % (pg.escape_string(schema_tbl))
return "to_regclass('%s')" % (escape_string(schema_tbl))


# Escape double-quotes in a string, so that the resulting string is suitable for
Expand Down Expand Up @@ -1239,7 +1238,7 @@ def validate_tables(conn, tablenames):
while curr_batch < nbatches:
batch = tablenames[curr_batch * batch_size:(curr_batch + 1) * batch_size]

oid_str = ','.join(map((lambda x: "('%s')" % pg.escape_string(x)), batch))
oid_str = ','.join(map((lambda x: "('%s')" % escape_string(x)), batch))
if not oid_str:
break

Expand All @@ -1255,7 +1254,7 @@ def get_include_cols_from_exclude(conn, schema, table, exclude_cols):
"""
Given a list of excluded columns of a table, get the list of included columns
"""
quoted_exclude_cols = ','.join(["'%s'" % pg.escape_string(x) for x in exclude_cols])
quoted_exclude_cols = ','.join(["'%s'" % escape_string(x) for x in exclude_cols])

oid_str = regclass_schema_tbl(schema, table)
cols = run_sql(conn, GET_INCLUDED_COLUMNS_FROM_EXCLUDE_SQL % (oid_str, quoted_exclude_cols))
Expand All @@ -1271,7 +1270,7 @@ def validate_columns(conn, schema, table, column_list):
return

sql = VALIDATE_COLUMN_NAMES_SQL % (regclass_schema_tbl(schema, table),
','.join(["'%s'" % pg.escape_string(x) for x in column_list]))
','.join(["'%s'" % escape_string(x) for x in column_list]))
valid_col_count = dbconn.querySingleton(conn, sql)

if int(valid_col_count) != len(column_list):
Expand Down
5 changes: 2 additions & 3 deletions gpMgmt/bin/gpactivatestandby
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,9 @@ import time
import shutil
import tempfile
from datetime import datetime, timedelta

import psycopg2
# import GPDB modules
try:
import pg as pygresql
from gppylib.commands import unix, gp, pg
from gppylib.db import dbconn
from gppylib.gpparseopts import OptParser, OptChecker, OptionGroup, SUPPRESS_HELP
Expand Down Expand Up @@ -332,7 +331,7 @@ def promote_standby(coordinator_data_dir):
logger.info('Standby coordinator is promoted')
conn.close()
return True
except pygresql.InternalError as e:
except (psycopg2.InternalError, psycopg2.OperationalError) as e:
pass
time.sleep(1)

Expand Down
Loading
Loading