From bd82a2dd9722b810e1c997bfdf17223313d684a5 Mon Sep 17 00:00:00 2001
From: Vitaly Baranov <vitlibar@clickhouse.com>
Date: Thu, 4 Apr 2024 18:11:56 +0200
Subject: [PATCH] Add test.

---
 .../02864_restore_table_with_broken_part.sh   |  35 ++++++++-------
 ...03001_backup_matview_after_modify_query.sh |   3 +-
 ...ith_matview_inner_table_metadata.reference |   4 ++
 ...ackup_with_matview_inner_table_metadata.sh |  40 ++++++++++++++++++
 ...ckup_with_matview_inner_table_metadata.zip | Bin 0 -> 8272 bytes
 5 files changed, 65 insertions(+), 17 deletions(-)
 create mode 100644 tests/queries/0_stateless/03001_restore_from_old_backup_with_matview_inner_table_metadata.reference
 create mode 100755 tests/queries/0_stateless/03001_restore_from_old_backup_with_matview_inner_table_metadata.sh
 create mode 100644 tests/queries/0_stateless/backups/old_backup_with_matview_inner_table_metadata.zip

diff --git a/tests/queries/0_stateless/02864_restore_table_with_broken_part.sh b/tests/queries/0_stateless/02864_restore_table_with_broken_part.sh
index d3252b29eb7..fe26784dab4 100755
--- a/tests/queries/0_stateless/02864_restore_table_with_broken_part.sh
+++ b/tests/queries/0_stateless/02864_restore_table_with_broken_part.sh
@@ -5,33 +5,38 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-# Copy backups/with_broken_part.zip into the disk named "backups".
-SRC_BACKUP_DIR=$CURDIR/backups
-SRC_BACKUP_FILENAME=with_broken_part.zip
+# Copies a test predefined backup from "/tests/queries/0_stateless/backups/" folder to the "backups" disk,
+# returns the path to the backup relative to that disk.
+function install_test_backup()
+{
+    local test_backup_filename="$1"
+    local test_backup_path="$CURDIR/backups/${test_backup_filename}"
 
-BACKUPS_DISK=backups
-BACKUPS_DIR=$($CLICKHOUSE_CLIENT --query "SELECT path FROM system.disks WHERE name='$BACKUPS_DISK'")
+    local backups_disk_root=$($CLICKHOUSE_CLIENT --query "SELECT path FROM system.disks WHERE name='backups'")
 
-if [ -z "$BACKUPS_DIR" ]; then
-    echo Disk \'$BACKUPS_DISK\' not found
-    exit 1
-fi
+    if [ -z "${backups_disk_root}" ]; then
+        echo Disk \'${backups_disk_root}\' not found
+        exit 1
+    fi
 
-BACKUP_FILENAME=$CLICKHOUSE_DATABASE/${SRC_BACKUP_FILENAME}
-BACKUP_NAME="Disk('$BACKUPS_DISK', '$BACKUP_FILENAME')"
+    local install_path=${backups_disk_root}/${CLICKHOUSE_DATABASE}/${test_backup_filename}
+    mkdir -p "$(dirname "${install_path}")"
+    ln -s "${test_backup_path}" "${install_path}"
 
-mkdir -p "$(dirname "$BACKUPS_DIR/$BACKUP_FILENAME")"
-ln -s "$SRC_BACKUP_DIR/$SRC_BACKUP_FILENAME" "$BACKUPS_DIR/$BACKUP_FILENAME"
+    echo "${CLICKHOUSE_DATABASE}/${test_backup_filename}"
+}
+
+backup_name="$(install_test_backup with_broken_part.zip)"
 
 $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS tbl"
 
 # First try to restore with the setting `restore_broken_parts_as_detached` set to false.
-$CLICKHOUSE_CLIENT --query "RESTORE TABLE default.tbl AS tbl FROM $BACKUP_NAME" 2>&1 | tr -d \\n | grep "data.bin doesn't exist" | grep "while restoring part all_2_2_0" > /dev/null && echo "OK" || echo "FAILED"
+$CLICKHOUSE_CLIENT --query "RESTORE TABLE default.tbl AS tbl FROM Disk('backups', '${backup_name}')" 2>&1 | tr -d \\n | grep "data.bin doesn't exist" | grep "while restoring part all_2_2_0" > /dev/null && echo "OK" || echo "FAILED"
 
 $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS tbl"
 
 # Then try to restore with the setting `restore_broken_parts_as_detached` set to true.
-$CLICKHOUSE_CLIENT --query "RESTORE TABLE default.tbl AS tbl FROM $BACKUP_NAME SETTINGS restore_broken_parts_as_detached = true" 2>/dev/null | awk -F '\t' '{print $2}'
+$CLICKHOUSE_CLIENT --query "RESTORE TABLE default.tbl AS tbl FROM Disk('backups', '${backup_name}') SETTINGS restore_broken_parts_as_detached = true" 2>/dev/null | awk -F '\t' '{print $2}'
 
 $CLICKHOUSE_CLIENT --multiquery <<EOF
 SELECT * FROM tbl ORDER BY x;
diff --git a/tests/queries/0_stateless/03001_backup_matview_after_modify_query.sh b/tests/queries/0_stateless/03001_backup_matview_after_modify_query.sh
index d49f1c41c69..f857358a5ea 100755
--- a/tests/queries/0_stateless/03001_backup_matview_after_modify_query.sh
+++ b/tests/queries/0_stateless/03001_backup_matview_after_modify_query.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
-# Tags: no-ordinary-database, no-replicated-database
-# Tag no-ordinary-database: TO DO
+# Tags: no-replicated-database
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/03001_restore_from_old_backup_with_matview_inner_table_metadata.reference b/tests/queries/0_stateless/03001_restore_from_old_backup_with_matview_inner_table_metadata.reference
new file mode 100644
index 00000000000..04ceb193415
--- /dev/null
+++ b/tests/queries/0_stateless/03001_restore_from_old_backup_with_matview_inner_table_metadata.reference
@@ -0,0 +1,4 @@
+RESTORED
+2024-02-22 07:00:00	00
+2024-02-22 07:00:01	11
+2024-02-22 07:00:02	22
diff --git a/tests/queries/0_stateless/03001_restore_from_old_backup_with_matview_inner_table_metadata.sh b/tests/queries/0_stateless/03001_restore_from_old_backup_with_matview_inner_table_metadata.sh
new file mode 100755
index 00000000000..3a3d0edc38f
--- /dev/null
+++ b/tests/queries/0_stateless/03001_restore_from_old_backup_with_matview_inner_table_metadata.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# Copies a test predefined backup from "/tests/queries/0_stateless/backups/" folder to the "backups" disk,
+# returns the path to the backup relative to that disk.
+function install_test_backup()
+{
+    local test_backup_filename="$1"
+    local test_backup_path="$CURDIR/backups/${test_backup_filename}"
+
+    local backups_disk_root=$($CLICKHOUSE_CLIENT --query "SELECT path FROM system.disks WHERE name='backups'")
+
+    if [ -z "${backups_disk_root}" ]; then
+        echo Disk \'${backups_disk_root}\' not found
+        exit 1
+    fi
+
+    local install_path=${backups_disk_root}/${CLICKHOUSE_DATABASE}/${test_backup_filename}
+    mkdir -p "$(dirname "${install_path}")"
+    ln -s "${test_backup_path}" "${install_path}"
+
+    echo "${CLICKHOUSE_DATABASE}/${test_backup_filename}"
+}
+
+backup_name="$(install_test_backup old_backup_with_matview_inner_table_metadata.zip)"
+
+$CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS mv"
+$CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS src"
+
+db="$CLICKHOUSE_DATABASE"
+${CLICKHOUSE_CLIENT} -q "RESTORE DATABASE mydb AS ${db} FROM Disk('backups', '${backup_name}') SETTINGS allow_different_database_def=true" | grep -o "RESTORED"
+
+${CLICKHOUSE_CLIENT} -q "SELECT toDateTime(timestamp, 'UTC') AS ts, c12 FROM mv ORDER BY ts"
+
+$CLICKHOUSE_CLIENT --query "DROP TABLE mv"
+$CLICKHOUSE_CLIENT --query "DROP TABLE src"
diff --git a/tests/queries/0_stateless/backups/old_backup_with_matview_inner_table_metadata.zip b/tests/queries/0_stateless/backups/old_backup_with_matview_inner_table_metadata.zip
new file mode 100644
index 0000000000000000000000000000000000000000..a2476da7dedf94c40ec04d12b41a754179a172e5
GIT binary patch
literal 8272
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

literal 0
HcmV?d00001