From 5a0f75b68774bd23a92fc5612d48e837d0daf08b Mon Sep 17 00:00:00 2001
From: Zharkov Roman <r.zharkov@postgrespro.ru>
Date: Tue, 21 Jan 2025 15:55:49 +0300
Subject: [PATCH 1/2] Add meson.build file to support building from the contrib
 source tree.

---
 meson.build | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 meson.build

diff --git a/meson.build b/meson.build
new file mode 100644
index 0000000..b2d4248
--- /dev/null
+++ b/meson.build
@@ -0,0 +1,53 @@
+# Copyright (c) 2025, Postgres Professional
+
+# Does not support the PGXS infrastructure at this time. Please, compile as part
+# of the contrib source tree.
+
+pg_query_state_sources = files(
+  'pg_query_state.c',
+  'signal_handler.c',
+)
+
+if host_system == 'windows'
+  pg_query_state_sources += rc_lib_gen.process(win32ver_rc, extra_args: [
+    '--NAME', 'pg_query_state',
+    '--FILEDESC', 'pg_query_state - provides facility to know the current state of query execution on working backend.',])
+endif
+
+pg_query_state = shared_module('pg_query_state',
+  pg_query_state_sources,
+  kwargs: contrib_mod_args,
+)
+contrib_targets += pg_query_state
+
+extversion = '1.1'
+output_name = 'pg_query_state--' + extversion + '.sql'
+
+configure_file(
+  input: 'init.sql',
+  output: output_name,
+  copy: true,
+  install: true,
+  install_dir: contrib_data_args['install_dir'],
+)
+
+install_data(
+  'pg_query_state.control',
+  'pg_query_state--1.0--1.1.sql',
+  kwargs: contrib_data_args,
+)
+
+tests += {
+  'name': 'pg_query_state',
+  'sd': meson.current_source_dir(),
+  'bd': meson.current_build_dir(),
+  'isolation': {
+    'specs': [
+      'corner_cases',
+    ],
+    'regress_args': [
+      '--temp-config', files('test.conf'),
+      '--load-extension=pg_query_state',
+    ],
+  },
+}

From ee0d4a809821a2a32215aa9f8dcaaa14279c90d8 Mon Sep 17 00:00:00 2001
From: Ekaterina Sokolova <e.sokolova@postgrespro.ru>
Date: Tue, 28 Jan 2025 15:48:16 +0300
Subject: [PATCH 2/2] Disable TPC-DS tests in Travis CI because of using an
 outdated third-party library.

---
 .travis.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c272005..0812444 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,15 +23,15 @@ notifications:
 
 env:
     - PG_VERSION=17
-    - PG_VERSION=16 LEVEL=hardcore USE_TPCDS=1
+    - PG_VERSION=16 LEVEL=hardcore USE_TPCDS=0
     - PG_VERSION=16
-    - PG_VERSION=15 LEVEL=hardcore USE_TPCDS=1
+    - PG_VERSION=15 LEVEL=hardcore USE_TPCDS=0
     - PG_VERSION=15
-    - PG_VERSION=14 LEVEL=hardcore USE_TPCDS=1
+    - PG_VERSION=14 LEVEL=hardcore USE_TPCDS=0
     - PG_VERSION=14
-    - PG_VERSION=13 LEVEL=hardcore USE_TPCDS=1
+    - PG_VERSION=13 LEVEL=hardcore USE_TPCDS=0
     - PG_VERSION=13
-    - PG_VERSION=12 LEVEL=hardcore USE_TPCDS=1
+    - PG_VERSION=12 LEVEL=hardcore USE_TPCDS=0
     - PG_VERSION=12
     - PG_VERSION=10
     - PG_VERSION=9.6