cartodb4/cartodb-postgresql
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #397 from Algunenano/plpy_warnings

Browse Source 
Remove leftover plpython warnings
This commit is contained in:
Raúl Marín
2020-03-26 17:37:32 +01:00
committed by GitHub
parent 998402e531 38f26f4e8b
commit da5a566ecf
5 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.travis.yml
View File

@@ -6,7 +6,6 @@ env:
- PGUSER=postgres - PGUSER=postgres
- PGDATABASE=postgres - PGDATABASE=postgres
- PGOPTIONS='-c client_min_messages=NOTICE' - PGOPTIONS='-c client_min_messages=NOTICE'
- PGPORT=5432
jobs: jobs:
include: include:
@@ -22,17 +21,15 @@ jobs:
dist: bionic dist: bionic
script: script:
- sudo service postgresql stop;
- sudo apt-get remove postgresql* -y
- sudo apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests postgresql-$POSTGRESQL_VERSION postgresql-client-$POSTGRESQL_VERSION postgresql-server-dev-$POSTGRESQL_VERSION postgresql-common - sudo apt-get install -y --allow-unauthenticated --no-install-recommends --no-install-suggests postgresql-$POSTGRESQL_VERSION postgresql-client-$POSTGRESQL_VERSION postgresql-server-dev-$POSTGRESQL_VERSION postgresql-common
- if [[ $POSTGRESQL_VERSION == '9.6' ]]; then sudo apt-get install -y postgresql-contrib-9.6; fi; - if [[ $POSTGRESQL_VERSION == '9.6' ]]; then sudo apt-get install -y postgresql-contrib-9.6; fi;
- sudo apt-get install -y --allow-unauthenticated postgresql-$POSTGRESQL_VERSION-postgis-$POSTGIS_VERSION postgresql-$POSTGRESQL_VERSION-postgis-$POSTGIS_VERSION-scripts postgis - sudo apt-get install -y --allow-unauthenticated postgresql-$POSTGRESQL_VERSION-postgis-$POSTGIS_VERSION postgresql-$POSTGRESQL_VERSION-postgis-$POSTGIS_VERSION-scripts postgis
# For pre12, install plpython2. For PG12 install plpython3 # For pre12, install plpython2. For PG12 install plpython3
- if [[ $POSTGRESQL_VERSION != '12' ]]; then sudo apt-get install -y postgresql-plpython-$POSTGRESQL_VERSION python python-redis; else sudo apt-get install -y postgresql-plpython3-12 python3 python3-redis; fi; - if [[ $POSTGRESQL_VERSION != '12' ]]; then sudo apt-get install -y postgresql-plpython-$POSTGRESQL_VERSION python python-redis; else sudo apt-get install -y postgresql-plpython3-12 python3 python3-redis; fi;
- sudo pg_dropcluster --stop $POSTGRESQL_VERSION main - sudo pg_dropcluster --stop $POSTGRESQL_VERSION main
- sudo rm -rf /etc/postgresql/$POSTGRESQL_VERSION /var/lib/postgresql/$POSTGRESQL_VERSION - sudo rm -rf /etc/postgresql/$POSTGRESQL_VERSION /var/lib/postgresql/$POSTGRESQL_VERSION /var/ramfs/postgresql/$POSTGRESQL_VERSION
- sudo pg_createcluster -u postgres $POSTGRESQL_VERSION main -- --auth-local trust --auth-host password - sudo pg_createcluster -u postgres $POSTGRESQL_VERSION main --start -- --auth-local trust --auth-host password
- sudo /etc/init.d/postgresql start $POSTGRESQL_VERSION || sudo journalctl -xe - export PGPORT=$(pg_lsclusters | grep $POSTGRESQL_VERSION | awk '{print $3}')
- make - make
- sudo make install - sudo make install
- make installcheck - make installcheck
@@ -41,3 +38,5 @@ after_failure:
- pg_lsclusters - pg_lsclusters
- cat regression.out - cat regression.out
- cat regression.diffs - cat regression.diffs
- echo $PGPORT
- cat /var/log/postgresql/postgresql-$POSTGRESQL_VERSION-main.log

3
scripts-available/CDB_Groups_API.sql
View File

@@ -201,13 +201,10 @@ $$
import base64 import base64
data_to_encode = '%s:%s' % (username, password) data_to_encode = '%s:%s' % (username, password)
plpy.warning('DEBUG: _CDB_Group_API_Auth python v' + str(sys.version_info[0]))
if sys.version_info[0] < 3: if sys.version_info[0] < 3:
data_encoded = base64.encodestring(data_to_encode) data_encoded = base64.encodestring(data_to_encode)
else: else:
plpy.warning('DEBUG: _CDB_Group_API_Auth entra')
data_encoded = base64.b64encode(data_to_encode.encode()).decode() data_encoded = base64.b64encode(data_to_encode.encode()).decode()
plpy.warning('DEBUG: _CDB_Group_API_Auth sale')
data_encoded = data_encoded.replace('\n', '') data_encoded = data_encoded.replace('\n', '')
return data_encoded return data_encoded

11
test/CDB_FederatedServerDiagnostics.sql
View File

@@ -99,11 +99,12 @@ FROM latency;
\echo '%% It raises an error if the wrong port is provided' \echo '%% It raises an error if the wrong port is provided'
SELECT '3.0', cartodb.CDB_Federated_Server_Diagnostics(server => 'wrong-port'); SELECT '3.0', cartodb.CDB_Federated_Server_Diagnostics(server => 'wrong-port');
\echo '%% Latency stats: can get them on default PG port 5432 when not provided' -- Disabled: It's not compatible with Travis since the target database (self) might be in a different port
WITH latency AS ( -- \echo '%% Latency stats: can get them on default PG port 5432 when not provided'
SELECT CDB_Federated_Server_Diagnostics('loopback-no-port')->'server_latency_ms' ms -- WITH latency AS (
) SELECT '2.4', 0.0 <= (latency.ms->'min')::text::float, (latency.ms->'max')::text::float <= 1000.0 -- SELECT CDB_Federated_Server_Diagnostics('loopback-no-port')->'server_latency_ms' ms
FROM latency; -- ) SELECT '2.4', 0.0 <= (latency.ms->'min')::text::float, (latency.ms->'max')::text::float <= 1000.0
-- FROM latency;
-- =================================================================== -- ===================================================================

2
test/CDB_FederatedServerDiagnostics_expect
View File

@@ -21,8 +21,6 @@ ERROR: Server "doesNotExist" does not exist
2.3|t 2.3|t
%% It raises an error if the wrong port is provided %% It raises an error if the wrong port is provided
ERROR: could not connect to server "cdb_fs_wrong-port" ERROR: could not connect to server "cdb_fs_wrong-port"
%% Latency stats: can get them on default PG port 5432 when not provided
2.4|t|t
D1| D1|
D2| D2|
D3| D3|

22
test/CDB_FederatedServer_expect
View File

@@ -2,20 +2,20 @@
## List non-existent server shows nothing ## List non-existent server shows nothing
## Create and list a server works ## Create and list a server works
1.3| 1.3|
1.4|(myRemote,postgres_fdw,localhost,5432,,read-only,fdw_user) 1.4|(myRemote,postgres_fdw,localhost,@@PGPORT@@,,read-only,fdw_user)
## Create and list a second server works ## Create and list a second server works
2.1| 2.1|
2.2|(myRemote,postgres_fdw,localhost,5432,,read-only,fdw_user) 2.2|(myRemote,postgres_fdw,localhost,@@PGPORT@@,,read-only,fdw_user)
2.2|(myRemote2,postgres_fdw,localhost,5432,fdw_target,read-only,fdw_user) 2.2|(myRemote2,postgres_fdw,localhost,@@PGPORT@@,fdw_target,read-only,fdw_user)
## List server by name works ## List server by name works
2.3|(myRemote,postgres_fdw,localhost,5432,,read-only,fdw_user) 2.3|(myRemote,postgres_fdw,localhost,@@PGPORT@@,,read-only,fdw_user)
## Re-register a second server works ## Re-register a second server works
3.1| 3.1|
3.2|(myRemote,postgres_fdw,localhost,5432,,read-only,fdw_user) 3.2|(myRemote,postgres_fdw,localhost,@@PGPORT@@,,read-only,fdw_user)
3.2|(myRemote2,postgres_fdw,localhost,5432,fdw_target,read-only,other_remote_user) 3.2|(myRemote2,postgres_fdw,localhost,@@PGPORT@@,fdw_target,read-only,other_remote_user)
## Unregister server 1 works ## Unregister server 1 works
4.1| 4.1|
4.2|(myRemote2,postgres_fdw,localhost,5432,fdw_target,read-only,other_remote_user) 4.2|(myRemote2,postgres_fdw,localhost,@@PGPORT@@,fdw_target,read-only,other_remote_user)
## Unregistering a server that does not exist fails ## Unregistering a server that does not exist fails
ERROR: Server "doesNotExist" does not exist ERROR: Server "doesNotExist" does not exist
## Unregister the second server works ## Unregister the second server works
@@ -30,25 +30,25 @@ ERROR: Server information is mandatory
ERROR: Credentials are mandatory ERROR: Credentials are mandatory
## Create a server with empty credentials works ## Create a server with empty credentials works
7.3| 7.3|
7.4|(empty,postgres_fdw,localhost,5432,fdw_target,read-only,) 7.4|(empty,postgres_fdw,localhost,@@PGPORT@@,fdw_target,read-only,)
7.5| 7.5|
## Create a server without options fails ## Create a server without options fails
ERROR: Server information is mandatory ERROR: Server information is mandatory
## Create a server with special characters works ## Create a server with special characters works
8.1| 8.1|
8.2|("myRemote"" or'not",postgres_fdw,localhost,5432,"fdw target",read-only,"fdw user") 8.2|("myRemote"" or'not",postgres_fdw,localhost,@@PGPORT@@,"fdw target",read-only,"fdw user")
8.3| 8.3|
9.1| 9.1|
You are now connected to database "contrib_regression" as user "cdb_fs_tester". You are now connected to database "contrib_regression" as user "cdb_fs_tester".
## All users are able to list servers ## All users are able to list servers
9.2|(myRemote3,postgres_fdw,localhost,5432,,read-only,) 9.2|(myRemote3,postgres_fdw,localhost,@@PGPORT@@,,read-only,)
## Only superadmins can create servers ## Only superadmins can create servers
ERROR: Could not create server myRemote4: permission denied for foreign-data wrapper postgres_fdw ERROR: Could not create server myRemote4: permission denied for foreign-data wrapper postgres_fdw
You are now connected to database "contrib_regression" as user "postgres". You are now connected to database "contrib_regression" as user "postgres".
## Granting access to a user works ## Granting access to a user works
9.5| 9.5|
You are now connected to database "contrib_regression" as user "cdb_fs_tester". You are now connected to database "contrib_regression" as user "cdb_fs_tester".
9.55|(myRemote3,postgres_fdw,localhost,5432,,read-only,fdw_user) 9.55|(myRemote3,postgres_fdw,localhost,@@PGPORT@@,,read-only,fdw_user)
You are now connected to database "contrib_regression" as user "postgres". You are now connected to database "contrib_regression" as user "postgres".
ERROR: Server "does not exist" does not exist ERROR: Server "does not exist" does not exist
ERROR: Could not grant access on "myRemote3" to "does not exist": role "does not exist" does not exist ERROR: Could not grant access on "myRemote3" to "does not exist": role "does not exist" does not exist