From 1579808218126423096dfd9d57611ebcfb631d2c Mon Sep 17 00:00:00 2001 From: Alek Westover Date: Wed, 26 Jul 2023 13:25:35 -0400 Subject: [PATCH] real s3 tests pass --- compute_tools/src/bin/compute_ctl.rs | 2 +- compute_tools/src/compute.rs | 7 +++++-- .../{5648391853 => 5670669815}/v14/ext_index.json | 7 ++++--- .../v14/extensions/anon.tar.zst | Bin .../v14/extensions/kq_imcx.tar.zst | Bin .../{5648391853 => 5670669815}/v15/ext_index.json | 7 ++++--- .../v15/extensions/anon.tar.zst | Bin .../v15/extensions/kq_imcx.tar.zst | Bin 8 files changed, 14 insertions(+), 9 deletions(-) rename test_runner/regress/data/extension_test/{5648391853 => 5670669815}/v14/ext_index.json (90%) rename test_runner/regress/data/extension_test/{5648391853 => 5670669815}/v14/extensions/anon.tar.zst (100%) rename test_runner/regress/data/extension_test/{5648391853 => 5670669815}/v14/extensions/kq_imcx.tar.zst (100%) rename test_runner/regress/data/extension_test/{5648391853 => 5670669815}/v15/ext_index.json (90%) rename test_runner/regress/data/extension_test/{5648391853 => 5670669815}/v15/extensions/anon.tar.zst (100%) rename test_runner/regress/data/extension_test/{5648391853 => 5670669815}/v15/extensions/kq_imcx.tar.zst (100%) diff --git a/compute_tools/src/bin/compute_ctl.rs b/compute_tools/src/bin/compute_ctl.rs index 9459a2389e..b1aee345f3 100644 --- a/compute_tools/src/bin/compute_ctl.rs +++ b/compute_tools/src/bin/compute_ctl.rs @@ -60,7 +60,7 @@ use compute_tools::spec::*; // this is an arbitrary build tag. Fine as a default / for testing purposes // in-case of not-set environment var -const BUILD_TAG_DEFAULT: &str = "5648391853"; +const BUILD_TAG_DEFAULT: &str = "5670669815"; fn main() -> Result<()> { init_tracing_and_logging(DEFAULT_LOG_LEVEL)?; diff --git a/compute_tools/src/compute.rs b/compute_tools/src/compute.rs index 374a923d78..7eb33486f1 100644 --- a/compute_tools/src/compute.rs +++ b/compute_tools/src/compute.rs @@ -770,8 +770,11 @@ LIMIT 100", let mut real_ext_name = ext_name.to_string(); if is_library { real_ext_name = real_ext_name.replace(".so", ""); - real_ext_name = - self.library_index.get().expect("oncelock err")[&real_ext_name].clone(); + real_ext_name = self + .library_index + .get() + .expect("must have already downloaded the library_index")[&real_ext_name] + .clone(); } { diff --git a/test_runner/regress/data/extension_test/5648391853/v14/ext_index.json b/test_runner/regress/data/extension_test/5670669815/v14/ext_index.json similarity index 90% rename from test_runner/regress/data/extension_test/5648391853/v14/ext_index.json rename to test_runner/regress/data/extension_test/5670669815/v14/ext_index.json index e742a4bcfa..634c8d3a18 100644 --- a/test_runner/regress/data/extension_test/5648391853/v14/ext_index.json +++ b/test_runner/regress/data/extension_test/5670669815/v14/ext_index.json @@ -11,13 +11,14 @@ "control_data": { "kq_imcx.control": "# This file is generated content from add_postgresql_extension.\n# No point in modifying it, it will be overwritten anyway.\n\n# Default version, always set\ndefault_version = '0.1'\n\n# Module pathname generated from target shared library name. Use\n# MODULE_PATHNAME in script file.\nmodule_pathname = '$libdir/kq_imcx.so'\n\n# Comment for extension. Set using COMMENT option. Can be set in\n# script file as well.\ncomment = 'ketteQ In-Memory Calendar Extension (IMCX)'\n\n# Encoding for script file. Set using ENCODING option.\n#encoding = ''\n\n# Required extensions. Set using REQUIRES option (multi-valued).\n#requires = ''\ntrusted = true\n" }, - "archive_path": "5648391853/v14/extensions/kq_imcx.tar.zst" + "archive_path": "5670669815/v14/extensions/kq_imcx.tar.zst" }, "anon": { "control_data": { "anon.control": "# PostgreSQL Anonymizer (anon) extension \ncomment = 'Data anonymization tools' \ndefault_version = '1.1.0' \ndirectory='extension/anon' \nrelocatable = false \nrequires = 'pgcrypto' \nsuperuser = false \nmodule_pathname = '$libdir/anon' \ntrusted = true \n" }, - "archive_path": "5648391853/v14/extensions/anon.tar.zst" + "archive_path": "5670669815/v14/extensions/anon.tar.zst" } } -} \ No newline at end of file +} + diff --git a/test_runner/regress/data/extension_test/5648391853/v14/extensions/anon.tar.zst b/test_runner/regress/data/extension_test/5670669815/v14/extensions/anon.tar.zst similarity index 100% rename from test_runner/regress/data/extension_test/5648391853/v14/extensions/anon.tar.zst rename to test_runner/regress/data/extension_test/5670669815/v14/extensions/anon.tar.zst diff --git a/test_runner/regress/data/extension_test/5648391853/v14/extensions/kq_imcx.tar.zst b/test_runner/regress/data/extension_test/5670669815/v14/extensions/kq_imcx.tar.zst similarity index 100% rename from test_runner/regress/data/extension_test/5648391853/v14/extensions/kq_imcx.tar.zst rename to test_runner/regress/data/extension_test/5670669815/v14/extensions/kq_imcx.tar.zst diff --git a/test_runner/regress/data/extension_test/5648391853/v15/ext_index.json b/test_runner/regress/data/extension_test/5670669815/v15/ext_index.json similarity index 90% rename from test_runner/regress/data/extension_test/5648391853/v15/ext_index.json rename to test_runner/regress/data/extension_test/5670669815/v15/ext_index.json index 533665994c..4448b1c8ba 100644 --- a/test_runner/regress/data/extension_test/5648391853/v15/ext_index.json +++ b/test_runner/regress/data/extension_test/5670669815/v15/ext_index.json @@ -11,13 +11,14 @@ "control_data": { "kq_imcx.control": "# This file is generated content from add_postgresql_extension.\n# No point in modifying it, it will be overwritten anyway.\n\n# Default version, always set\ndefault_version = '0.1'\n\n# Module pathname generated from target shared library name. Use\n# MODULE_PATHNAME in script file.\nmodule_pathname = '$libdir/kq_imcx.so'\n\n# Comment for extension. Set using COMMENT option. Can be set in\n# script file as well.\ncomment = 'ketteQ In-Memory Calendar Extension (IMCX)'\n\n# Encoding for script file. Set using ENCODING option.\n#encoding = ''\n\n# Required extensions. Set using REQUIRES option (multi-valued).\n#requires = ''\ntrusted = true\n" }, - "archive_path": "5648391853/v15/extensions/kq_imcx.tar.zst" + "archive_path": "5670669815/v15/extensions/kq_imcx.tar.zst" }, "anon": { "control_data": { "anon.control": "# PostgreSQL Anonymizer (anon) extension \ncomment = 'Data anonymization tools' \ndefault_version = '1.1.0' \ndirectory='extension/anon' \nrelocatable = false \nrequires = 'pgcrypto' \nsuperuser = false \nmodule_pathname = '$libdir/anon' \ntrusted = true \n" }, - "archive_path": "5648391853/v15/extensions/anon.tar.zst" + "archive_path": "5670669815/v15/extensions/anon.tar.zst" } } -} \ No newline at end of file +} + diff --git a/test_runner/regress/data/extension_test/5648391853/v15/extensions/anon.tar.zst b/test_runner/regress/data/extension_test/5670669815/v15/extensions/anon.tar.zst similarity index 100% rename from test_runner/regress/data/extension_test/5648391853/v15/extensions/anon.tar.zst rename to test_runner/regress/data/extension_test/5670669815/v15/extensions/anon.tar.zst diff --git a/test_runner/regress/data/extension_test/5648391853/v15/extensions/kq_imcx.tar.zst b/test_runner/regress/data/extension_test/5670669815/v15/extensions/kq_imcx.tar.zst similarity index 100% rename from test_runner/regress/data/extension_test/5648391853/v15/extensions/kq_imcx.tar.zst rename to test_runner/regress/data/extension_test/5670669815/v15/extensions/kq_imcx.tar.zst