You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by tu...@apache.org on 2023/06/20 08:24:33 UTC
[shardingsphere] branch master updated: Fixes #26162 . (#26416)
This is an automated email from the ASF dual-hosted git repository.
tuichenchuxin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 10b3a25371b Fixes #26162 . (#26416)
10b3a25371b is described below
commit 10b3a25371b9d8cb3d5d3c188092b2f422373fad
Author: Master-sudo-doct <85...@users.noreply.github.com>
AuthorDate: Tue Jun 20 16:24:26 2023 +0800
Fixes #26162 . (#26416)
* add PostgreSQL pg_catalog.pg_stat_database_conflicts view empty query #26162
* delete log
* fix bugs
* fix no op code
---------
Co-authored-by: caizhenghua <zh...@bupt.edu.cn>
---
.../schema/builder/SystemSchemaBuilderRule.java | 4 +-
.../pg_catalog/pg_stat_database_conflicts.yaml | 73 ++++++++++++++
.../postgresql/pg_catalog/pg_stat_gssapi.yaml | 51 ++++++++++
.../pg_catalog/pg_stat_progress_analyze.yaml | 107 +++++++++++++++++++++
.../pg_catalog/pg_stat_progress_basebackup.yaml | 65 +++++++++++++
.../pg_catalog/pg_stat_progress_cluster.yaml | 100 +++++++++++++++++++
.../builder/SystemSchemaBuilderRuleTest.java | 8 +-
.../schema/builder/SystemSchemaBuilderTest.java | 2 +-
...resql_pg_catalog_pg_stat_database_conflicts.xml | 28 ++++++
...select_postgresql_pg_catalog_pg_stat_gssapi.xml | 25 +++++
...tgresql_pg_catalog_pg_stat_progress_analyze.xml | 33 +++++++
...esql_pg_catalog_pg_stat_progress_basebackup.xml | 27 ++++++
...tgresql_pg_catalog_pg_stat_progress_cluster.xml | 33 +++++++
.../dql/dql-integration-select-system-schema.xml | 20 ++++
14 files changed, 573 insertions(+), 3 deletions(-)
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilderRule.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilderRule.java
index 3cb03ca191d..fb9099905fe 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilderRule.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilderRule.java
@@ -77,7 +77,8 @@ public enum SystemSchemaBuilderRule {
POSTGRESQL_INFORMATION_SCHEMA("PostgreSQL", "information_schema", new HashSet<>(Arrays.asList("columns", "tables", "views"))),
POSTGRESQL_PG_CATALOG("PostgreSQL", "pg_catalog", new HashSet<>(Arrays.asList("pg_aggregate", "pg_am", "pg_amop", "pg_amproc", "pg_attrdef", "pg_class", "pg_database", "pg_tables", "pg_inherits",
- "pg_tablespace", "pg_trigger", "pg_namespace", "pg_range", "pg_replication_origin", "pg_rewrite", "pg_seclabel", "pg_sequence", "pg_roles", "pg_user_mapping"))),
+ "pg_tablespace", "pg_trigger", "pg_namespace", "pg_range", "pg_replication_origin", "pg_rewrite", "pg_seclabel", "pg_sequence", "pg_roles",
+ "pg_user_mapping", "pg_stat_database_conflicts", "pg_stat_gssapi", "pg_stat_progress_analyze", "pg_stat_progress_basebackup", "pg_stat_progress_cluster"))),
POSTGRESQL_SHARDING_SPHERE("PostgreSQL", "shardingsphere", new HashSet<>(Arrays.asList("sharding_table_statistics", "cluster_information"))),
@@ -156,4 +157,5 @@ public enum SystemSchemaBuilderRule {
}
return false;
}
+
}
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_database_conflicts.yaml b/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_database_conflicts.yaml
new file mode 100644
index 00000000000..e6881978e7f
--- /dev/null
+++ b/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_database_conflicts.yaml
@@ -0,0 +1,73 @@
+#
+# 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.
+#
+
+name: pg_stat_database_conflicts
+columns:
+ datid:
+ caseSensitive: true
+ dataType: -5
+ generated: false
+ name: datid
+ primaryKey: false
+ visible: true
+ datname:
+ caseSensitive: true
+ dataType: 12
+ generated: false
+ name: datname
+ primaryKey: false
+ visible: true
+ confl_tablespace:
+ caseSensitive: true
+ dataType: 5
+ generated: false
+ name: confl_tablespace
+ primaryKey: false
+ visible: true
+ confl_lock:
+ caseSensitive: true
+ dataType: 5
+ generated: false
+ name: confl_lock
+ primaryKey: false
+ visible: true
+ confl_snapshot:
+ caseSensitive: true
+ dataType: 5
+ generated: false
+ name: confl_snapshot
+ primaryKey: false
+ visible: true
+ confl_bufferpin:
+ caseSensitive: true
+ dataType: 5
+ generated: false
+ name: confl_bufferpin
+ primaryKey: false
+ visible: true
+ confl_deadlock:
+ caseSensitive: true
+ dataType: 5
+ generated: false
+ name: confl_deadlock
+ primaryKey: false
+ visible: true
+indexes:
+ pg_stat_database_conflicts_datid_index:
+ name: pg_stat_database_conflicts_datid_index
+ pg_stat_database_conflicts_datname_index:
+ name: pg_stat_database_conflicts_datname_index
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_gssapi.yaml b/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_gssapi.yaml
new file mode 100644
index 00000000000..ae2fcde16b5
--- /dev/null
+++ b/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_gssapi.yaml
@@ -0,0 +1,51 @@
+#
+# 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.
+#
+
+name: pg_stat_gssapi
+columns:
+ pid:
+ caseSensitive: true
+ dataType: 5
+ generated: false
+ name: pid
+ primaryKey: false
+ visible: true
+ gss_authenticated:
+ caseSensitive: true
+ dataType: -7
+ generated: false
+ name: gss_authenticated
+ primaryKey: false
+ visible: true
+ principal:
+ caseSensitive: true
+ dataType: 2003
+ generated: false
+ name: principal
+ primaryKey: false
+ visible: true
+ encrypted:
+ caseSensitive: true
+ dataType: -7
+ generated: false
+ name: encrypted
+ primaryKey: false
+ visible: true
+indexes:
+ pg_stat_gssapi_pid_index:
+ name: pg_stat_gssapi_pid_index
+
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_analyze.yaml b/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_analyze.yaml
new file mode 100644
index 00000000000..57ffc863be4
--- /dev/null
+++ b/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_analyze.yaml
@@ -0,0 +1,107 @@
+#
+# 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.
+#
+
+name: pg_stat_progress_analyze
+columns:
+ pid:
+ caseSensitive: true
+ dataType: 5
+ generated: false
+ name: pid
+ primaryKey: false
+ visible: true
+ datid:
+ caseSensitive: true
+ dataType: -5
+ generated: false
+ name: datid
+ primaryKey: false
+ visible: true
+ datname:
+ caseSensitive: true
+ dataType: 12
+ generated: false
+ name: datname
+ primaryKey: false
+ visible: true
+ relid:
+ caseSensitive: true
+ dataType: -5
+ generated: false
+ name: relid
+ primaryKey: false
+ visible: true
+ phase:
+ caseSensitive: true
+ dataType: 2003
+ generated: false
+ name: phase
+ primaryKey: false
+ visible: true
+ sample_blks_total:
+ caseSensitive: true
+ dataType: 5
+ generated: false
+ name: sample_blks_total
+ primaryKey: false
+ visible: true
+ sample_blks_scanned:
+ caseSensitive: true
+ dataType: 5
+ generated: false
+ name: sample_blks_scanned
+ primaryKey: false
+ visible: true
+ ext_stats_total:
+ caseSensitive: true
+ dataType: 5
+ generated: false
+ name: ext_stats_total
+ primaryKey: false
+ visible: true
+ ext_stats_computed:
+ caseSensitive: true
+ dataType: 5
+ generated: false
+ name: ext_stats_computed
+ primaryKey: false
+ visible: true
+ child_tables_total:
+ caseSensitive: true
+ dataType: 5
+ generated: false
+ name: child_tables_total
+ primaryKey: false
+ visible: true
+ child_tables_done:
+ caseSensitive: true
+ dataType: 5
+ generated: false
+ name: child_tables_done
+ primaryKey: false
+ visible: true
+ current_child_table_relid:
+ caseSensitive: true
+ dataType: -5
+ generated: false
+ name: current_child_table_relid
+ primaryKey: false
+ visible: true
+indexes:
+ pg_stat_progress_analyze_pid_index:
+ name: pg_stat_progress_analyze_pid_index
+
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_basebackup.yaml b/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_basebackup.yaml
new file mode 100644
index 00000000000..9fd9a7488ff
--- /dev/null
+++ b/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_basebackup.yaml
@@ -0,0 +1,65 @@
+#
+# 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.
+#
+
+name: pg_stat_progress_basebackup
+columns:
+ pid:
+ caseSensitive: true
+ dataType: 5
+ generated: false
+ name: pid
+ primaryKey: false
+ visible: true
+ phase:
+ caseSensitive: true
+ dataType: 2003
+ generated: false
+ name: phase
+ primaryKey: false
+ visible: true
+ backup_total:
+ caseSensitive: true
+ dataType: 5
+ generated: false
+ name: backup_total
+ primaryKey: false
+ visible: true
+ backup_streamed:
+ caseSensitive: true
+ dataType: 5
+ generated: false
+ name: backup_streamed
+ primaryKey: false
+ visible: true
+ tablespaces_total:
+ caseSensitive: true
+ dataType: 5
+ generated: false
+ name: tablespaces_total
+ primaryKey: false
+ visible: true
+ tablespaces_streamed:
+ caseSensitive: true
+ dataType: 5
+ generated: false
+ name: tablespaces_streamed
+ primaryKey: false
+ visible: true
+indexes:
+ pg_stat_progress_basebackup_pid_index:
+ name: pg_stat_progress_basebackup_pid_index
+
diff --git a/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_cluster.yaml b/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_cluster.yaml
new file mode 100644
index 00000000000..cc7d3ed934b
--- /dev/null
+++ b/infra/common/src/main/resources/schema/postgresql/pg_catalog/pg_stat_progress_cluster.yaml
@@ -0,0 +1,100 @@
+#
+# 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.
+#
+
+name: pg_stat_progress_cluster
+columns:
+ pid:
+ caseSensitive: true
+ dataType: 5
+ generated: false
+ name: pid
+ primaryKey: false
+ visible: true
+ datid:
+ caseSensitive: true
+ dataType: -5
+ generated: false
+ name: datid
+ primaryKey: false
+ visible: true
+ datname:
+ caseSensitive: true
+ dataType: 12
+ generated: false
+ name: datname
+ primaryKey: false
+ visible: true
+ relid:
+ caseSensitive: true
+ dataType: -5
+ generated: false
+ name: relid
+ primaryKey: false
+ visible: true
+ command:
+ caseSensitive: true
+ dataType: 2003
+ generated: false
+ name: command
+ primaryKey: false
+ visible: true
+ phase:
+ caseSensitive: true
+ dataType: 2003
+ generated: false
+ name: phase
+ primaryKey: false
+ visible: true
+ heap_tuples_scanned:
+ caseSensitive: true
+ dataType: 5
+ generated: false
+ name: heap_tuples_scanned
+ primaryKey: false
+ visible: true
+ heap_tuples_written:
+ caseSensitive: true
+ dataType: 5
+ generated: false
+ name: heap_tuples_written
+ primaryKey: false
+ visible: true
+ heap_blks_total:
+ caseSensitive: true
+ dataType: 5
+ generated: false
+ name: heap_blks_total
+ primaryKey: false
+ visible: true
+ heap_blks_scanned:
+ caseSensitive: true
+ dataType: 5
+ generated: false
+ name: heap_blks_scanned
+ primaryKey: false
+ visible: true
+ index_rebuild_count:
+ caseSensitive: true
+ dataType: 5
+ generated: false
+ name: index_rebuild_count
+ primaryKey: false
+ visible: true
+indexes:
+ pg_stat_progress_cluster_pid_index:
+ name: pg_stat_progress_cluster_pid_index
+
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilderRuleTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilderRuleTest.java
index eeab04db629..5a1d6c8d100 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilderRuleTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilderRuleTest.java
@@ -42,7 +42,7 @@ class SystemSchemaBuilderRuleTest {
assertThat(actualPerformanceSchema.getTables().size(), is(87));
SystemSchemaBuilderRule actualPgCatalog = SystemSchemaBuilderRule.valueOf(new PostgreSQLDatabaseType().getType(), "pg_catalog");
assertThat(actualPgCatalog, is(SystemSchemaBuilderRule.POSTGRESQL_PG_CATALOG));
- assertThat(actualPgCatalog.getTables().size(), is(19));
+ assertThat(actualPgCatalog.getTables().size(), is(24));
}
@Test
@@ -67,6 +67,12 @@ class SystemSchemaBuilderRuleTest {
assertTrue(SystemSchemaBuilderRule.isSystemTable("pg_catalog", "pg_sequence"));
assertTrue(SystemSchemaBuilderRule.isSystemTable("pg_catalog", "pg_roles"));
assertTrue(SystemSchemaBuilderRule.isSystemTable("pg_catalog", "pg_user_mapping"));
+ assertTrue(SystemSchemaBuilderRule.isSystemTable("pg_catalog", "pg_stat_database_conflicts"));
+ assertTrue(SystemSchemaBuilderRule.isSystemTable("pg_catalog", "pg_stat_gssapi"));
+ assertTrue(SystemSchemaBuilderRule.isSystemTable("pg_catalog", "pg_stat_progress_analyze"));
+ assertTrue(SystemSchemaBuilderRule.isSystemTable("pg_catalog", "pg_stat_progress_basebackup"));
+ assertTrue(SystemSchemaBuilderRule.isSystemTable("pg_catalog", "pg_stat_progress_cluster"));
assertFalse(SystemSchemaBuilderRule.isSystemTable("sharding_db", "t_order"));
+
}
}
diff --git a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilderTest.java b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilderTest.java
index 1c0241767ee..91c3146d4cf 100644
--- a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilderTest.java
+++ b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilderTest.java
@@ -55,7 +55,7 @@ class SystemSchemaBuilderTest {
assertTrue(actual.containsKey("pg_catalog"));
assertTrue(actual.containsKey("shardingsphere"));
assertThat(actual.get("information_schema").getTables().size(), is(3));
- assertThat(actual.get("pg_catalog").getTables().size(), is(19));
+ assertThat(actual.get("pg_catalog").getTables().size(), is(24));
assertThat(actual.get("shardingsphere").getTables().size(), is(2));
}
diff --git a/test/e2e/sql/src/test/resources/cases/dql/dataset/db/select_postgresql_pg_catalog_pg_stat_database_conflicts.xml b/test/e2e/sql/src/test/resources/cases/dql/dataset/db/select_postgresql_pg_catalog_pg_stat_database_conflicts.xml
new file mode 100644
index 00000000000..0c26532d179
--- /dev/null
+++ b/test/e2e/sql/src/test/resources/cases/dql/dataset/db/select_postgresql_pg_catalog_pg_stat_database_conflicts.xml
@@ -0,0 +1,28 @@
+<!--
+ ~ 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.
+ -->
+
+<dataset>
+ <metadata>
+ <column name="datid" />
+ <column name="datname" />
+ <column name="confl_tablespace" />
+ <column name="confl_lock" />
+ <column name="confl_snapshot" />
+ <column name="confl_bufferpin" />
+ <column name="confl_deadlock" />
+ </metadata>
+</dataset>
diff --git a/test/e2e/sql/src/test/resources/cases/dql/dataset/db/select_postgresql_pg_catalog_pg_stat_gssapi.xml b/test/e2e/sql/src/test/resources/cases/dql/dataset/db/select_postgresql_pg_catalog_pg_stat_gssapi.xml
new file mode 100644
index 00000000000..919b5b1a271
--- /dev/null
+++ b/test/e2e/sql/src/test/resources/cases/dql/dataset/db/select_postgresql_pg_catalog_pg_stat_gssapi.xml
@@ -0,0 +1,25 @@
+<!--
+ ~ 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.
+ -->
+
+<dataset>
+ <metadata>
+ <column name="pid" />
+ <column name="gss_authenticated" />
+ <column name="principal" />
+ <column name="encrypted" />
+ </metadata>
+</dataset>
diff --git a/test/e2e/sql/src/test/resources/cases/dql/dataset/db/select_postgresql_pg_catalog_pg_stat_progress_analyze.xml b/test/e2e/sql/src/test/resources/cases/dql/dataset/db/select_postgresql_pg_catalog_pg_stat_progress_analyze.xml
new file mode 100644
index 00000000000..826ba8c4eca
--- /dev/null
+++ b/test/e2e/sql/src/test/resources/cases/dql/dataset/db/select_postgresql_pg_catalog_pg_stat_progress_analyze.xml
@@ -0,0 +1,33 @@
+<!--
+ ~ 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.
+ -->
+
+<dataset>
+ <metadata>
+ <column name="pid" />
+ <column name="datid" />
+ <column name="datname" />
+ <column name="relid" />
+ <column name="phase" />
+ <column name="sample_blks_total" />
+ <column name="sample_blks_scanned" />
+ <column name="ext_stats_total" />
+ <column name="ext_stats_computed" />
+ <column name="child_tables_total" />
+ <column name="child_tables_done" />
+ <column name="current_child_table_relid" />
+ </metadata>
+</dataset>
diff --git a/test/e2e/sql/src/test/resources/cases/dql/dataset/db/select_postgresql_pg_catalog_pg_stat_progress_basebackup.xml b/test/e2e/sql/src/test/resources/cases/dql/dataset/db/select_postgresql_pg_catalog_pg_stat_progress_basebackup.xml
new file mode 100644
index 00000000000..02a65463663
--- /dev/null
+++ b/test/e2e/sql/src/test/resources/cases/dql/dataset/db/select_postgresql_pg_catalog_pg_stat_progress_basebackup.xml
@@ -0,0 +1,27 @@
+<!--
+ ~ 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.
+ -->
+
+<dataset>
+ <metadata>
+ <column name="pid" />
+ <column name="phase" />
+ <column name="backup_total" />
+ <column name="backup_streamed" />
+ <column name="tablespaces_total" />
+ <column name="tablespaces_streamed" />
+ </metadata>
+</dataset>
diff --git a/test/e2e/sql/src/test/resources/cases/dql/dataset/db/select_postgresql_pg_catalog_pg_stat_progress_cluster.xml b/test/e2e/sql/src/test/resources/cases/dql/dataset/db/select_postgresql_pg_catalog_pg_stat_progress_cluster.xml
new file mode 100644
index 00000000000..981921145e8
--- /dev/null
+++ b/test/e2e/sql/src/test/resources/cases/dql/dataset/db/select_postgresql_pg_catalog_pg_stat_progress_cluster.xml
@@ -0,0 +1,33 @@
+<!--
+ ~ 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.
+ -->
+
+<dataset>
+ <metadata>
+ <column name="pid" />
+ <column name="datid" />
+ <column name="datname" />
+ <column name="relid" />
+ <column name="command" />
+ <column name="phase" />
+ <column name="cluster_index_relid" />
+ <column name="heap_tuples_scanned" />
+ <column name="heap_tuples_written" />
+ <column name="heap_blks_total" />
+ <column name="heap_blks_scanned" />
+ <column name="index_rebuild_count" />
+ </metadata>
+</dataset>
diff --git a/test/e2e/sql/src/test/resources/cases/dql/dql-integration-select-system-schema.xml b/test/e2e/sql/src/test/resources/cases/dql/dql-integration-select-system-schema.xml
index fb4072ea651..53135d95e21 100644
--- a/test/e2e/sql/src/test/resources/cases/dql/dql-integration-select-system-schema.xml
+++ b/test/e2e/sql/src/test/resources/cases/dql/dql-integration-select-system-schema.xml
@@ -761,4 +761,24 @@
<test-case sql="SELECT * FROM pg_catalog.pg_user_mapping" db-types="PostgreSQL" scenario-types="db">
<assertion expected-data-file="select_postgresql_pg_catalog_pg_user_mapping.xml" />
</test-case>
+
+ <test-case sql="SELECT * FROM pg_catalog.pg_stat_database_conflicts" db-types="PostgreSQL" scenario-types="db">
+ <assertion expected-data-file="select_postgresql_pg_catalog_pg_stat_database_conflicts.xml" />
+ </test-case>
+
+ <test-case sql="SELECT * FROM pg_catalog.pg_stat_gssapi" db-types="PostgreSQL" scenario-types="db">
+ <assertion expected-data-file="select_postgresql_pg_catalog_pg_stat_gssapi.xml" />
+ </test-case>
+
+ <test-case sql="SELECT * FROM pg_catalog.pg_stat_progress_analyze" db-types="PostgreSQL" scenario-types="db">
+ <assertion expected-data-file="select_postgresql_pg_catalog_pg_stat_progress_analyze.xml" />
+ </test-case>
+
+ <test-case sql="SELECT * FROM pg_catalog.pg_stat_progress_basebackup" db-types="PostgreSQL" scenario-types="db">
+ <assertion expected-data-file="select_postgresql_pg_catalog_pg_stat_progress_basebackup.xml" />
+ </test-case>
+
+ <test-case sql="SELECT * FROM pg_catalog.pg_stat_progress_cluster" db-types="PostgreSQL" scenario-types="db">
+ <assertion expected-data-file="select_postgresql_pg_catalog_pg_stat_progress_cluster.xml" />
+ </test-case>
</integration-test-cases>