GNU bug report logs - #59187
[PATCH] gnu: timescaledb: Update to 2.8.1.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 59187 in the body.
You can then email your comments to 59187 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: jgart <jgart <at> dismail.de>
To: guix-patches <at> gnu.org
Cc: jgart <jgart <at> dismail.de>
Subject: [PATCH] gnu: timescaledb: Update to 2.8.1.
Date: Thu, 10 Nov 2022 19:57:37 -0600

* gnu/packages/databases.scm (timescaledb): Update to 2.8.1.
[source]: Remove failing patch.
---
 gnu/packages/databases.scm                    |   5 +-
 .../patches/timescaledb-flaky-test.patch      | 107 ------------------
 2 files changed, 2 insertions(+), 110 deletions(-)
 delete mode 100644 gnu/packages/patches/timescaledb-flaky-test.patch

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index e2aabc1363..1117ef6e19 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1333,7 +1333,7 @@ (define-public postgresql postgresql-14)
 (define-public timescaledb
   (package
     (name "timescaledb")
-    (version "2.7.0")
+    (version "2.8.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1342,8 +1342,7 @@ (define-public timescaledb
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "18wszj8ia5rs4y4zkyfb0f5z4y1g7ac3jym748nbkbszhxmq7nc7"))
-              (patches (search-patches "timescaledb-flaky-test.patch"))
+                "1gbadna0ilmqad7sbrixm12wd71h43njhsbp1kh5lispb6drdb6r"))
               (modules '((guix build utils)))
               (snippet
                ;; Remove files carrying the proprietary TIMESCALE license.
diff --git a/gnu/packages/patches/timescaledb-flaky-test.patch b/gnu/packages/patches/timescaledb-flaky-test.patch
deleted file mode 100644
index 6268bcecad..0000000000
--- a/gnu/packages/patches/timescaledb-flaky-test.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-Use fixed dates in test for consistent results.
-
-Taken from upstream:
-
-  https://github.com/timescale/timescaledb/commit/1d0670e703862b284c241ab797404f851b25b5df
-
-diff --git a/test/expected/copy-12.out b/test/expected/copy-12.out
-index 5cb28a45a2..37abf6f6ff 100644
---- a/test/expected/copy-12.out
-+++ b/test/expected/copy-12.out
-@@ -324,13 +324,12 @@ INSERT INTO hyper_copy_large
- SELECT time,
- random() AS value
- FROM
--generate_series(now() - INTERVAL '1 months', now() - INTERVAL '1 day',
--  INTERVAL '1 hour') AS g1(time)
-+generate_series('2022-01-01', '2022-01-31', INTERVAL '1 hour') AS g1(time)
- ORDER BY time;
- SELECT COUNT(*) FROM hyper_copy_large;
-  count 
- -------
--   697
-+   721
- (1 row)
- 
- -- Migrate data to chunks by using copy
-@@ -345,7 +344,7 @@ NOTICE:  migrating data to chunks
- SELECT COUNT(*) FROM hyper_copy_large;
-  count 
- -------
--   697
-+   721
- (1 row)
- 
- ----------------------------------------------------------------
-diff --git a/test/expected/copy-13.out b/test/expected/copy-13.out
-index 02bf913eff..89e16fe8e2 100644
---- a/test/expected/copy-13.out
-+++ b/test/expected/copy-13.out
-@@ -324,13 +324,12 @@ INSERT INTO hyper_copy_large
- SELECT time,
- random() AS value
- FROM
--generate_series(now() - INTERVAL '1 months', now() - INTERVAL '1 day',
--  INTERVAL '1 hour') AS g1(time)
-+generate_series('2022-01-01', '2022-01-31', INTERVAL '1 hour') AS g1(time)
- ORDER BY time;
- SELECT COUNT(*) FROM hyper_copy_large;
-  count 
- -------
--   697
-+   721
- (1 row)
- 
- -- Migrate data to chunks by using copy
-@@ -345,7 +344,7 @@ NOTICE:  migrating data to chunks
- SELECT COUNT(*) FROM hyper_copy_large;
-  count 
- -------
--   697
-+   721
- (1 row)
- 
- ----------------------------------------------------------------
-diff --git a/test/expected/copy-14.out b/test/expected/copy-14.out
-index 02bf913eff..89e16fe8e2 100644
---- a/test/expected/copy-14.out
-+++ b/test/expected/copy-14.out
-@@ -324,13 +324,12 @@ INSERT INTO hyper_copy_large
- SELECT time,
- random() AS value
- FROM
--generate_series(now() - INTERVAL '1 months', now() - INTERVAL '1 day',
--  INTERVAL '1 hour') AS g1(time)
-+generate_series('2022-01-01', '2022-01-31', INTERVAL '1 hour') AS g1(time)
- ORDER BY time;
- SELECT COUNT(*) FROM hyper_copy_large;
-  count 
- -------
--   697
-+   721
- (1 row)
- 
- -- Migrate data to chunks by using copy
-@@ -345,7 +344,7 @@ NOTICE:  migrating data to chunks
- SELECT COUNT(*) FROM hyper_copy_large;
-  count 
- -------
--   697
-+   721
- (1 row)
- 
- ----------------------------------------------------------------
-diff --git a/test/sql/copy.sql.in b/test/sql/copy.sql.in
-index 91402c2ab8..bba4265064 100644
---- a/test/sql/copy.sql.in
-+++ b/test/sql/copy.sql.in
-@@ -276,8 +276,7 @@ INSERT INTO hyper_copy_large
- SELECT time,
- random() AS value
- FROM
--generate_series(now() - INTERVAL '1 months', now() - INTERVAL '1 day',
--  INTERVAL '1 hour') AS g1(time)
-+generate_series('2022-01-01', '2022-01-31', INTERVAL '1 hour') AS g1(time)
- ORDER BY time;
- 
- SELECT COUNT(*) FROM hyper_copy_large;
-- 
2.38.1

Message #8 received at 59187 <at> debbugs.gnu.org (full text, mbox):

From: jgart <jgart <at> dismail.de>
To: 59187 <at> debbugs.gnu.org
Cc: jgart <jgart <at> dismail.de>
Subject: [PATCH v2] gnu: timescaledb: Update to 2.8.1.
Date: Thu, 10 Nov 2022 20:06:24 -0600

* gnu/local.mk (timescaledb-flaky-test): Remove it.
* gnu/packages/patches/timescaledb-flaky-test.patch: Remove it.
* gnu/packages/databases.scm (timescaledb): Update to 2.8.1.
[source]: Remove failing patch.

Version 2 updates the commit message, removes the patch references from
local.mk, and adds my copyright statement.

all best

jgart
---
 gnu/local.mk                                  |   2 +-
 gnu/packages/databases.scm                    |   7 +-
 .../patches/timescaledb-flaky-test.patch      | 107 ------------------
 3 files changed, 4 insertions(+), 112 deletions(-)
 delete mode 100644 gnu/packages/patches/timescaledb-flaky-test.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 27b31ea27f..f27b49243a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -55,6 +55,7 @@
 # Copyright © 2022 Hilton Chain <hako <at> ultrarare.space>
 # Copyright © 2022 Alex Griffin <a <at> ajgrf.com>
 # Copyright © 2022 ( <paren <at> disroot.org>
+# Copyright © 2022 jgart <jgart <at> dismail.de>
 #
 # This file is part of GNU Guix.
 #
@@ -1888,7 +1889,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/texlive-hyph-utf8-no-byebug.patch	\
   %D%/packages/patches/thefuck-test-environ.patch		\
   %D%/packages/patches/tidy-CVE-2015-5522+5523.patch		\
-  %D%/packages/patches/timescaledb-flaky-test.patch		\
   %D%/packages/patches/tinyxml-use-stl.patch			\
   %D%/packages/patches/tipp10-disable-downloader.patch		\
   %D%/packages/patches/tipp10-fix-compiling.patch		\
diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index e2aabc1363..a5716af636 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -53,12 +53,12 @@
 ;;; Copyright © 2021 Simon Streit <simon <at> netpanic.org>
 ;;; Copyright © 2021 Alexandre Hannud Abdo <abdo <at> member.fsf.org>
 ;;; Copyright © 2021 Simon Tournier <zimon.toutoune <at> gmail.com>
-;;; Copyright © 2021 jgart <jgart <at> dismail.de>
 ;;; Copyright © 2021 Foo Chuan Wei <chuanwei.foo <at> hotmail.com>
 ;;; Copyright © 2022 Zhu Zihao <all_but_last <at> 163.com>
 ;;; Copyright © 2021 Brice Waegeneire <brice <at> waegenei.re>
 ;;; Copyright © 2022 muradm <mail <at> muradm.net>
 ;;; Copyright © 2022 Thomas Albers Raviola <thomas <at> thomaslabs.org>
+;;; Copyright © 2021, 2022 jgart <jgart <at> dismail.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1333,7 +1333,7 @@ (define-public postgresql postgresql-14)
 (define-public timescaledb
   (package
     (name "timescaledb")
-    (version "2.7.0")
+    (version "2.8.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1342,8 +1342,7 @@ (define-public timescaledb
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "18wszj8ia5rs4y4zkyfb0f5z4y1g7ac3jym748nbkbszhxmq7nc7"))
-              (patches (search-patches "timescaledb-flaky-test.patch"))
+                "1gbadna0ilmqad7sbrixm12wd71h43njhsbp1kh5lispb6drdb6r"))
               (modules '((guix build utils)))
               (snippet
                ;; Remove files carrying the proprietary TIMESCALE license.
diff --git a/gnu/packages/patches/timescaledb-flaky-test.patch b/gnu/packages/patches/timescaledb-flaky-test.patch
deleted file mode 100644
index 6268bcecad..0000000000
--- a/gnu/packages/patches/timescaledb-flaky-test.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-Use fixed dates in test for consistent results.
-
-Taken from upstream:
-
-  https://github.com/timescale/timescaledb/commit/1d0670e703862b284c241ab797404f851b25b5df
-
-diff --git a/test/expected/copy-12.out b/test/expected/copy-12.out
-index 5cb28a45a2..37abf6f6ff 100644
---- a/test/expected/copy-12.out
-+++ b/test/expected/copy-12.out
-@@ -324,13 +324,12 @@ INSERT INTO hyper_copy_large
- SELECT time,
- random() AS value
- FROM
--generate_series(now() - INTERVAL '1 months', now() - INTERVAL '1 day',
--  INTERVAL '1 hour') AS g1(time)
-+generate_series('2022-01-01', '2022-01-31', INTERVAL '1 hour') AS g1(time)
- ORDER BY time;
- SELECT COUNT(*) FROM hyper_copy_large;
-  count 
- -------
--   697
-+   721
- (1 row)
- 
- -- Migrate data to chunks by using copy
-@@ -345,7 +344,7 @@ NOTICE:  migrating data to chunks
- SELECT COUNT(*) FROM hyper_copy_large;
-  count 
- -------
--   697
-+   721
- (1 row)
- 
- ----------------------------------------------------------------
-diff --git a/test/expected/copy-13.out b/test/expected/copy-13.out
-index 02bf913eff..89e16fe8e2 100644
---- a/test/expected/copy-13.out
-+++ b/test/expected/copy-13.out
-@@ -324,13 +324,12 @@ INSERT INTO hyper_copy_large
- SELECT time,
- random() AS value
- FROM
--generate_series(now() - INTERVAL '1 months', now() - INTERVAL '1 day',
--  INTERVAL '1 hour') AS g1(time)
-+generate_series('2022-01-01', '2022-01-31', INTERVAL '1 hour') AS g1(time)
- ORDER BY time;
- SELECT COUNT(*) FROM hyper_copy_large;
-  count 
- -------
--   697
-+   721
- (1 row)
- 
- -- Migrate data to chunks by using copy
-@@ -345,7 +344,7 @@ NOTICE:  migrating data to chunks
- SELECT COUNT(*) FROM hyper_copy_large;
-  count 
- -------
--   697
-+   721
- (1 row)
- 
- ----------------------------------------------------------------
-diff --git a/test/expected/copy-14.out b/test/expected/copy-14.out
-index 02bf913eff..89e16fe8e2 100644
---- a/test/expected/copy-14.out
-+++ b/test/expected/copy-14.out
-@@ -324,13 +324,12 @@ INSERT INTO hyper_copy_large
- SELECT time,
- random() AS value
- FROM
--generate_series(now() - INTERVAL '1 months', now() - INTERVAL '1 day',
--  INTERVAL '1 hour') AS g1(time)
-+generate_series('2022-01-01', '2022-01-31', INTERVAL '1 hour') AS g1(time)
- ORDER BY time;
- SELECT COUNT(*) FROM hyper_copy_large;
-  count 
- -------
--   697
-+   721
- (1 row)
- 
- -- Migrate data to chunks by using copy
-@@ -345,7 +344,7 @@ NOTICE:  migrating data to chunks
- SELECT COUNT(*) FROM hyper_copy_large;
-  count 
- -------
--   697
-+   721
- (1 row)
- 
- ----------------------------------------------------------------
-diff --git a/test/sql/copy.sql.in b/test/sql/copy.sql.in
-index 91402c2ab8..bba4265064 100644
---- a/test/sql/copy.sql.in
-+++ b/test/sql/copy.sql.in
-@@ -276,8 +276,7 @@ INSERT INTO hyper_copy_large
- SELECT time,
- random() AS value
- FROM
--generate_series(now() - INTERVAL '1 months', now() - INTERVAL '1 day',
--  INTERVAL '1 hour') AS g1(time)
-+generate_series('2022-01-01', '2022-01-31', INTERVAL '1 hour') AS g1(time)
- ORDER BY time;
- 
- SELECT COUNT(*) FROM hyper_copy_large;
-- 
2.38.1

Message #13 received at 59187-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: jgart <jgart <at> dismail.de>
Cc: 59187-done <at> debbugs.gnu.org
Subject: Re: bug#59187: [PATCH] gnu: timescaledb: Update to 2.8.1.
Date: Fri, 18 Nov 2022 15:04:16 +0100

jgart <jgart <at> dismail.de> skribis:

> * gnu/local.mk (timescaledb-flaky-test): Remove it.
> * gnu/packages/patches/timescaledb-flaky-test.patch: Remove it.
> * gnu/packages/databases.scm (timescaledb): Update to 2.8.1.
> [source]: Remove failing patch.

Tweaked the commit message and applied it, thanks!

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.