Observability: pxf_stat_activity and pxf_cancel_backend

automation/sqlrepo/features/fdw_extension_tests/create_extension/expected/query01.ans

@@ -17,13 +17,13 @@
 SELECT extversion FROM pg_extension WHERE extname = 'pxf_fdw';
  extversion
 ------------
- 2.0
+ 2.1
 (1 row)
 
 \dx+ pxf_fdw
-     Objects in extension "pxf_fdw"
-           Object Description
-----------------------------------------
+       Objects in extension "pxf_fdw"
+             Object Description
+---------------------------------------------
  foreign-data wrapper abfss_pxf_fdw
  foreign-data wrapper file_pxf_fdw
  foreign-data wrapper gs_pxf_fdw
@@ -33,6 +33,12 @@ SELECT extversion FROM pg_extension WHERE extname = 'pxf_fdw';
  foreign-data wrapper jdbc_pxf_fdw
  foreign-data wrapper s3_pxf_fdw
  foreign-data wrapper wasbs_pxf_fdw
+ function pxf_cancel_backend(integer)
+ function pxf_cancel_backend_raw(integer)
  function pxf_fdw_handler()
  function pxf_fdw_validator(text[],oid)
-(11 rows)
+ function pxf_interrupt_backend(integer)
+ function pxf_interrupt_backend_raw(integer)
+ function pxf_stat_activity_raw()
+ view pxf_stat_activity
+(17 rows)

automation/sqlrepo/features/fdw_extension_tests/downgrade_then_upgrade/step_1_check_extension/expected/query01.ans

@@ -17,13 +17,13 @@
 SELECT extversion FROM pg_extension WHERE extname = 'pxf_fdw';
  extversion
 ------------
- 2.0
+ 2.1
 (1 row)
 
 \dx+ pxf_fdw
-     Objects in extension "pxf_fdw"
-           Object Description
-----------------------------------------
+       Objects in extension "pxf_fdw"
+             Object Description
+---------------------------------------------
  foreign-data wrapper abfss_pxf_fdw
  foreign-data wrapper file_pxf_fdw
  foreign-data wrapper gs_pxf_fdw
@@ -33,6 +33,12 @@ SELECT extversion FROM pg_extension WHERE extname = 'pxf_fdw';
  foreign-data wrapper jdbc_pxf_fdw
  foreign-data wrapper s3_pxf_fdw
  foreign-data wrapper wasbs_pxf_fdw
+ function pxf_cancel_backend(integer)
+ function pxf_cancel_backend_raw(integer)
  function pxf_fdw_handler()
  function pxf_fdw_validator(text[],oid)
-(11 rows)
+ function pxf_interrupt_backend(integer)
+ function pxf_interrupt_backend_raw(integer)
+ function pxf_stat_activity_raw()
+ view pxf_stat_activity
+(17 rows)

automation/sqlrepo/features/fdw_extension_tests/upgrade/step_2_after_alter_extension/expected/query01.ans

@@ -17,13 +17,13 @@
 SELECT extversion FROM pg_extension WHERE extname = 'pxf_fdw';
  extversion
 ------------
- 2.0
+ 2.1
 (1 row)
 
 \dx+ pxf_fdw
-     Objects in extension "pxf_fdw"
-           Object Description
-----------------------------------------
+       Objects in extension "pxf_fdw"
+             Object Description
+---------------------------------------------
  foreign-data wrapper abfss_pxf_fdw
  foreign-data wrapper file_pxf_fdw
  foreign-data wrapper gs_pxf_fdw
@@ -33,9 +33,15 @@ SELECT extversion FROM pg_extension WHERE extname = 'pxf_fdw';
  foreign-data wrapper jdbc_pxf_fdw
  foreign-data wrapper s3_pxf_fdw
  foreign-data wrapper wasbs_pxf_fdw
+ function pxf_cancel_backend(integer)
+ function pxf_cancel_backend_raw(integer)
  function pxf_fdw_handler()
  function pxf_fdw_validator(text[],oid)
-(11 rows)
+ function pxf_interrupt_backend(integer)
+ function pxf_interrupt_backend_raw(integer)
+ function pxf_stat_activity_raw()
+ view pxf_stat_activity
+(17 rows)
 
 SELECT fdw.fdwname FROM pg_catalog.pg_foreign_data_wrapper fdw where fdw.fdwname='adl_pxf_fdw';
  fdwname

automation/sqlrepo/features/fdw_extension_tests_2_1/create_extension/expected/query01.ans

@@ -0,0 +1,82 @@
+-- start_ignore
+-- end_ignore
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+--
+--   http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied.  See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+
+-- @description query01 for PXF FDW 2.1 install test (pxf_stat_activity + backend control)
+-- start_matchsubs
+--
+-- m{.*/usr/local/pxf-(dev|gp\d).*}
+-- s{/usr/local/pxf-(dev|gp\d)}{\$PXF_HOME}
+--
+-- m{.*\$libdir/pxf.*}
+-- s{\$libdir}{\$PXF_HOME/gpextable}
+--
+-- end_matchsubs
+-- start_ignore
+\c pxfautomation_extension
+-- end_ignore
+
+SELECT extversion FROM pg_extension WHERE extname = 'pxf_fdw';
+ extversion
+------------
+ 2.1
+(1 row)
+
+\dx+ pxf_fdw
+       Objects in extension "pxf_fdw"
+             Object Description
+---------------------------------------------
+ foreign-data wrapper abfss_pxf_fdw
+ foreign-data wrapper file_pxf_fdw
+ foreign-data wrapper gs_pxf_fdw
+ foreign-data wrapper hbase_pxf_fdw
+ foreign-data wrapper hdfs_pxf_fdw
+ foreign-data wrapper hive_pxf_fdw
+ foreign-data wrapper jdbc_pxf_fdw
+ foreign-data wrapper s3_pxf_fdw
+ foreign-data wrapper wasbs_pxf_fdw
+ function pxf_cancel_backend(integer)
+ function pxf_cancel_backend_raw(integer)
+ function pxf_fdw_handler()
+ function pxf_fdw_validator(text[],oid)
+ function pxf_interrupt_backend(integer)
+ function pxf_interrupt_backend_raw(integer)
+ function pxf_stat_activity_raw()
+ view pxf_stat_activity
+(17 rows)
+
+-- backend-control functions are reachable end-to-end (C -> local PXF -> registry);
+-- with no in-flight requests they are no-ops returning 0
+SELECT pxf_cancel_backend(-1);
+ pxf_cancel_backend
+--------------------
+                  0
+(1 row)
+
+SELECT pxf_interrupt_backend(-1);
+ pxf_interrupt_backend
+-----------------------
+                     0
+(1 row)
+
+-- the activity view is empty while PXF is idle
+SELECT count(*) FROM pxf_stat_activity;
+ count
+-------
+     0
+(1 row)

automation/sqlrepo/features/fdw_extension_tests_2_1/create_extension/sql/query01.sql

@@ -0,0 +1,42 @@
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+--
+--   http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied.  See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+
+-- @description query01 for PXF FDW 2.1 install test (pxf_stat_activity + backend control)
+-- start_matchsubs
+--
+-- m{.*/usr/local/pxf-(dev|gp\d).*}
+-- s{/usr/local/pxf-(dev|gp\d)}{\$PXF_HOME}
+--
+-- m{.*\$libdir/pxf.*}
+-- s{\$libdir}{\$PXF_HOME/gpextable}
+--
+-- end_matchsubs
+-- start_ignore
+\c pxfautomation_extension
+-- end_ignore
+
+SELECT extversion FROM pg_extension WHERE extname = 'pxf_fdw';
+
+\dx+ pxf_fdw
+
+-- backend-control functions are reachable end-to-end (C -> local PXF -> registry);
+-- with no in-flight requests they are no-ops returning 0
+SELECT pxf_cancel_backend(-1);
+SELECT pxf_interrupt_backend(-1);
+
+-- the activity view is empty while PXF is idle
+SELECT count(*) FROM pxf_stat_activity;

automation/sqlrepo/features/fdw_extension_tests_2_1/upgrade_downgrade/step_1_create_2_0/expected/query01.ans

@@ -0,0 +1,55 @@
+-- start_ignore
+-- end_ignore
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+--
+--   http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied.  See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+
+-- @description query01 for PXF FDW 2.1 upgrade/downgrade test - step 1: create at 2.0
+-- start_matchsubs
+--
+-- m{.*/usr/local/pxf-(dev|gp\d).*}
+-- s{/usr/local/pxf-(dev|gp\d)}{\$PXF_HOME}
+--
+-- m{.*\$libdir/pxf.*}
+-- s{\$libdir}{\$PXF_HOME/gpextable}
+--
+-- end_matchsubs
+-- start_ignore
+\c pxfautomation_extension
+-- end_ignore
+
+SELECT extversion FROM pg_extension WHERE extname = 'pxf_fdw';
+ extversion
+------------
+ 2.0
+(1 row)
+
+\dx+ pxf_fdw
+     Objects in extension "pxf_fdw"
+           Object Description
+----------------------------------------
+ foreign-data wrapper abfss_pxf_fdw
+ foreign-data wrapper file_pxf_fdw
+ foreign-data wrapper gs_pxf_fdw
+ foreign-data wrapper hbase_pxf_fdw
+ foreign-data wrapper hdfs_pxf_fdw
+ foreign-data wrapper hive_pxf_fdw
+ foreign-data wrapper jdbc_pxf_fdw
+ foreign-data wrapper s3_pxf_fdw
+ foreign-data wrapper wasbs_pxf_fdw
+ function pxf_fdw_handler()
+ function pxf_fdw_validator(text[],oid)
+(11 rows)

automation/sqlrepo/features/fdw_extension_tests_2_1/upgrade_downgrade/step_1_create_2_0/sql/query01.sql

@@ -0,0 +1,34 @@
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+--
+--   http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied.  See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+
+-- @description query01 for PXF FDW 2.1 upgrade/downgrade test - step 1: create at 2.0
+-- start_matchsubs
+--
+-- m{.*/usr/local/pxf-(dev|gp\d).*}
+-- s{/usr/local/pxf-(dev|gp\d)}{\$PXF_HOME}
+--
+-- m{.*\$libdir/pxf.*}
+-- s{\$libdir}{\$PXF_HOME/gpextable}
+--
+-- end_matchsubs
+-- start_ignore
+\c pxfautomation_extension
+-- end_ignore
+
+SELECT extversion FROM pg_extension WHERE extname = 'pxf_fdw';
+
+\dx+ pxf_fdw

automation/sqlrepo/features/fdw_extension_tests_2_1/upgrade_downgrade/step_2_after_upgrade_2_1/expected/query01.ans

@@ -0,0 +1,61 @@
+-- start_ignore
+-- end_ignore
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements.  See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership.  The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License.  You may obtain a copy of the License at
+--
+--   http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied.  See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+
+-- @description query01 for PXF FDW 2.1 upgrade/downgrade test - step 2: after upgrade to 2.1
+-- start_matchsubs
+--
+-- m{.*/usr/local/pxf-(dev|gp\d).*}
+-- s{/usr/local/pxf-(dev|gp\d)}{\$PXF_HOME}
+--
+-- m{.*\$libdir/pxf.*}
+-- s{\$libdir}{\$PXF_HOME/gpextable}
+--
+-- end_matchsubs
+-- start_ignore
+\c pxfautomation_extension
+-- end_ignore
+
+SELECT extversion FROM pg_extension WHERE extname = 'pxf_fdw';
+ extversion
+------------
+ 2.1
+(1 row)
+
+\dx+ pxf_fdw
+       Objects in extension "pxf_fdw"
+             Object Description
+---------------------------------------------
+ foreign-data wrapper abfss_pxf_fdw
+ foreign-data wrapper file_pxf_fdw
+ foreign-data wrapper gs_pxf_fdw
+ foreign-data wrapper hbase_pxf_fdw
+ foreign-data wrapper hdfs_pxf_fdw
+ foreign-data wrapper hive_pxf_fdw
+ foreign-data wrapper jdbc_pxf_fdw
+ foreign-data wrapper s3_pxf_fdw
+ foreign-data wrapper wasbs_pxf_fdw
+ function pxf_cancel_backend(integer)
+ function pxf_cancel_backend_raw(integer)
+ function pxf_fdw_handler()
+ function pxf_fdw_validator(text[],oid)
+ function pxf_interrupt_backend(integer)
+ function pxf_interrupt_backend_raw(integer)
+ function pxf_stat_activity_raw()
+ view pxf_stat_activity
+(17 rows)