In pg_upgrade, create a script to incrementally generate more accurate

optimizer statistics so the cluster can be made available sooner.

diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
index cf4338400dd00ac9cb91bc634a1a41d8c996e0f7..9fbfd400dce74a28d97f8ee24c682da7894ba2d4 100644 (file)
--- a/contrib/pg_upgrade/check.c
+++ b/contrib/pg_upgrade/check.c
@@ -23,6 +23,11 @@ static void check_for_reg_data_type_usage(ClusterInfo *cluster);
 static void check_for_support_lib(ClusterInfo *cluster);
 static void get_bin_version(ClusterInfo *cluster);
 
+#ifndef WIN32
+#define        ECHO_QUOTE      "'"
+#else
+#define        ECHO_QUOTE      ""
+#endif
 
 void
 output_check_banner(bool *live_check)
@@ -193,21 +198,20 @@ issue_warnings(char *sequence_script_file_name)
 
 
 void
-output_completion_banner(char *deletion_script_file_name)
+output_completion_banner(char *analyze_script_file_name,
+                                                char *deletion_script_file_name)
 {
        /* Did we copy the free space files? */
        if (GET_MAJOR_VERSION(old_cluster.major_version) >= 804)
                pg_log(PG_REPORT,
-                          "Optimizer statistics are not transferred by pg_upgrade so\n"
-                          "consider running:\n"
-                          "    vacuumdb --all --analyze-only\n"
-                          "on the newly-upgraded cluster.\n\n");
+                          "Optimizer statistics are not transferred by pg_upgrade so,\n"
+                          "once you start the new server, consider running:\n"
+                          "    %s\n\n", analyze_script_file_name);
        else
                pg_log(PG_REPORT,
                           "Optimizer statistics and free space information are not transferred\n"
-                          "by pg_upgrade so consider running:\n"
-                          "    vacuumdb --all --analyze\n"
-                          "on the newly-upgraded cluster.\n\n");
+                          "by pg_upgrade so, once you start the new server, consider running:\n"
+                          "    %s\n\n", analyze_script_file_name);
 
        pg_log(PG_REPORT,
                   "Running this script will delete the old cluster's data files:\n"
@@ -379,6 +383,130 @@ check_new_cluster_is_empty(void)
 }
 
 
+/*
+ * create_script_for_cluster_analyze()
+ *
+ *     This incrementally generates better optimizer statistics
+ */
+void
+create_script_for_cluster_analyze(char **analyze_script_file_name)
+{
+       FILE       *script = NULL;
+
+       *analyze_script_file_name = pg_malloc(MAXPGPATH);
+
+       prep_status("Creating script to analyze new cluster");
+
+       snprintf(*analyze_script_file_name, MAXPGPATH, "analyze_new_cluster.%s",
+                        SCRIPT_EXT);
+
+       if ((script = fopen_priv(*analyze_script_file_name, "w")) == NULL)
+               pg_log(PG_FATAL, "Could not open file \"%s\": %s\n",
+                          *analyze_script_file_name, getErrorText(errno));
+
+#ifndef WIN32
+       /* add shebang header */
+       fprintf(script, "#!/bin/sh\n\n");
+#endif
+
+       fprintf(script, "echo %sThis script will generate minimal optimizer statistics rapidly%s\n",
+                                       ECHO_QUOTE, ECHO_QUOTE);
+       fprintf(script, "echo %sso your system is usable, and then gather statistics twice more%s\n",
+                                       ECHO_QUOTE, ECHO_QUOTE);
+       fprintf(script, "echo %swith increasing accuracy.  When it is done, your system will%s\n",
+                                       ECHO_QUOTE, ECHO_QUOTE);
+       fprintf(script, "echo %shave the default level of optimizer statistics.%s\n",
+                                       ECHO_QUOTE, ECHO_QUOTE);
+       fprintf(script, "echo\n\n");
+
+       fprintf(script, "echo %sIf you have used ALTER TABLE to modify the statistics target for%s\n",
+                                       ECHO_QUOTE, ECHO_QUOTE);
+       fprintf(script, "echo %sany tables, you might want to remove them and restore them after%s\n",
+                                       ECHO_QUOTE, ECHO_QUOTE);
+       fprintf(script, "echo %srunning this script because they will delay fast statistics generation.%s\n",
+                                       ECHO_QUOTE, ECHO_QUOTE);
+       fprintf(script, "echo\n\n");
+
+       fprintf(script, "echo %sIf you would like default statistics as quickly as possible, cancel%s\n",
+                                       ECHO_QUOTE, ECHO_QUOTE);
+       fprintf(script, "echo %sthis script and run:%s\n",
+                                       ECHO_QUOTE, ECHO_QUOTE);
+       fprintf(script, "echo %s    vacuumdb --all %s%s\n", ECHO_QUOTE,
+               /* Did we copy the free space files? */
+               (GET_MAJOR_VERSION(old_cluster.major_version) >= 804) ?
+               "--analyze-only" : "--analyze", ECHO_QUOTE);
+       fprintf(script, "echo\n\n");
+
+#ifndef WIN32
+       fprintf(script, "sleep 2\n");
+       fprintf(script, "PGOPTIONS='-c default_statistics_target=1 -c vacuum_cost_delay=0'\n");
+       /* only need to export once */
+       fprintf(script, "export PGOPTIONS\n");
+#else
+       fprintf(script, "REM simulate sleep 2\n");
+       fprintf(script, "PING 1.1.1.1 -n 1 -w 2000 > nul\n");
+       fprintf(script, "SET PGOPTIONS=-c default_statistics_target=1 -c vacuum_cost_delay=0\n");
+#endif
+
+       fprintf(script, "echo %sGenerating minimal optimizer statistics (1 target)%s\n",
+                                       ECHO_QUOTE, ECHO_QUOTE);
+       fprintf(script, "echo %s--------------------------------------------------%s\n",
+                                       ECHO_QUOTE, ECHO_QUOTE);
+       fprintf(script, "vacuumdb --all --analyze-only\n");
+       fprintf(script, "echo\n");
+       fprintf(script, "echo %sThe server is now available with minimal optimizer statistics.%s\n",
+                                       ECHO_QUOTE, ECHO_QUOTE);
+       fprintf(script, "echo %sQuery performance will be optimal once this script completes.%s\n",
+                                       ECHO_QUOTE, ECHO_QUOTE);
+       fprintf(script, "echo\n\n");
+
+#ifndef WIN32
+       fprintf(script, "sleep 2\n");
+       fprintf(script, "PGOPTIONS='-c default_statistics_target=10'\n");
+#else
+       fprintf(script, "REM simulate sleep\n");
+       fprintf(script, "PING 1.1.1.1 -n 1 -w 2000 > nul\n");
+       fprintf(script, "SET PGOPTIONS=-c default_statistics_target=10\n");
+#endif
+
+       fprintf(script, "echo %sGenerating medium optimizer statistics (10 targets)%s\n",
+                                       ECHO_QUOTE, ECHO_QUOTE);
+       fprintf(script, "echo %s---------------------------------------------------%s\n",
+                                       ECHO_QUOTE, ECHO_QUOTE);
+       fprintf(script, "vacuumdb --all --analyze-only\n");
+       fprintf(script, "echo\n\n");
+
+#ifndef WIN32
+       fprintf(script, "unset PGOPTIONS\n");
+#else
+       fprintf(script, "SET PGOPTIONS\n");
+#endif
+
+       fprintf(script, "echo %sGenerating default (full) optimizer statistics (100 targets?)%s\n",
+                                       ECHO_QUOTE, ECHO_QUOTE);
+       fprintf(script, "echo %s-------------------------------------------------------------%s\n",
+                                       ECHO_QUOTE, ECHO_QUOTE);
+       fprintf(script, "vacuumdb --all %s\n",
+               /* Did we copy the free space files? */
+               (GET_MAJOR_VERSION(old_cluster.major_version) >= 804) ?
+               "--analyze-only" : "--analyze");
+
+       fprintf(script, "echo\n\n");
+       fprintf(script, "echo %sDone%s\n",
+                                       ECHO_QUOTE, ECHO_QUOTE);
+
+       fclose(script);
+
+#ifndef WIN32
+       if (chmod(*analyze_script_file_name, S_IRWXU) != 0)
+               pg_log(PG_FATAL, "Could not add execute permission to file \"%s\": %s\n",
+                          *analyze_script_file_name, getErrorText(errno));
+#endif
+
+       check_ok();
+}
+
+
 /*
  * create_script_for_old_cluster_deletion()
  *

diff --git a/contrib/pg_upgrade/pg_upgrade.c b/contrib/pg_upgrade/pg_upgrade.c
index b0720c37aeaa7d8c0ace182fa6e1c37f49ff8d70..fa48ef18dc996a9909b2540748846b99bb3653fe 100644 (file)
--- a/contrib/pg_upgrade/pg_upgrade.c
+++ b/contrib/pg_upgrade/pg_upgrade.c
@@ -67,6 +67,7 @@ int
 main(int argc, char **argv)
 {
        char       *sequence_script_file_name = NULL;
+       char       *analyze_script_file_name = NULL;
        char       *deletion_script_file_name = NULL;
        bool            live_check = false;
 
@@ -142,6 +143,7 @@ main(int argc, char **argv)
                          new_cluster.pgdata, UTILITY_LOG_FILE);
        check_ok();
 
+       create_script_for_cluster_analyze(&analyze_script_file_name);
        create_script_for_old_cluster_deletion(&deletion_script_file_name);
 
        issue_warnings(sequence_script_file_name);
@@ -149,8 +151,10 @@ main(int argc, char **argv)
        pg_log(PG_REPORT, "\nUpgrade Complete\n");
        pg_log(PG_REPORT, "----------------\n");
 
-       output_completion_banner(deletion_script_file_name);
+       output_completion_banner(analyze_script_file_name,
+                                                        deletion_script_file_name);
 
+       pg_free(analyze_script_file_name);
        pg_free(deletion_script_file_name);
        pg_free(sequence_script_file_name);
 

diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h
index 46f9169d0c40945532321a963daa0ea94198b6af..da372494b4c89c9a687f4c03d1e42242acd71eb2 100644 (file)
--- a/contrib/pg_upgrade/pg_upgrade.h
+++ b/contrib/pg_upgrade/pg_upgrade.h
@@ -283,10 +283,12 @@ void check_old_cluster(bool live_check,
 void           check_new_cluster(void);
 void           report_clusters_compatible(void);
 void           issue_warnings(char *sequence_script_file_name);
-void           output_completion_banner(char *deletion_script_file_name);
+void           output_completion_banner(char *analyze_script_file_name,
+                                                                        char *deletion_script_file_name);
 void           check_cluster_versions(void);
 void           check_cluster_compatibility(bool live_check);
 void           create_script_for_old_cluster_deletion(char **deletion_script_file_name);
+void           create_script_for_cluster_analyze(char **analyze_script_file_name);
 
 
 /* controldata.c */