nsis patch: optimization, install.log, checks for 32 bit Windows

Author: VictorSpirin

build/helpers/postgres.cmd

@@ -112,6 +112,9 @@ rm -rf %BUILD_UDIR%/distr_%ARCH%_%PGVER%/postgresql/lib/*python3* || GOTO :ERROR
 
 IF EXIST ..\..\..\doc\buildinfo.txt COPY ..\..\..\doc\buildinfo.txt %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\doc
 rem now actually copy DLLs of dependencies into our bindir
+
+SET DEPENDENCIES_BIN_DIR=%DEPENDENCIES_BIN_DIR:\=/%
+
 cp -va %DEPENDENCIES_BIN_DIR%/libintl/lib/*.dll    %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR
 cp -va %DEPENDENCIES_BIN_DIR%/libintl/lib/*.lib    %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\lib || GOTO :ERROR
 cp -va %DEPENDENCIES_BIN_DIR%/iconv/lib/*.dll      %BUILD_DIR%\distr_%ARCH%_%PGVER%\postgresql\bin || GOTO :ERROR

nsis/postgresql.nsi

@@ -22,6 +22,7 @@
 
 !include "WinVer.nsh"
 !include "Ports.nsh"
+!include "x64.nsh"
 !insertmacro VersionCompare
 
 ;--------------------------------
@@ -106,6 +107,8 @@ Var rButton2
 Var checkBoxEnvVar
 Var isEnvVar
 
+Var LogFile
+Var effective_cache_size
 ; Set 'install service' variable
 ;Var service
 
@@ -191,6 +194,7 @@ Section "Microsoft Visual C++ ${REDIST_YEAR} Redistributable" secMS
 SectionEnd
 
 Section $(PostgreSQLString) sec1
+
   ${if} $PG_OLD_DIR != "" ; exist PG install
     MessageBox MB_YESNO|MB_ICONQUESTION  "$(MESS_STOP_SERVER)" IDYES doitStop IDNO noyetStop
     noyetStop:
@@ -216,6 +220,9 @@ Section $(PostgreSQLString) sec1
   File "License.txt"
   File "3rd_party_licenses.txt"
 
+FileOpen $LogFile $INSTDIR\install.log w ;Opens a Empty File an fills it
+
+
   CreateDirectory "$INSTDIR\scripts"
   File  "/oname=$INSTDIR\scripts\pg-psql.ico" "pg-psql.ico"
   File  "/oname=$INSTDIR\doc\pg-help.ico" "pg-help.ico"
@@ -224,9 +231,13 @@ Section $(PostgreSQLString) sec1
   WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" $INSTDIR
 
   ;Create uninstaller
+FileWrite $LogFile "Create uninstaller$\r$\n"
+
   WriteUninstaller "$INSTDIR\Uninstall.exe"
 
   ; write uninstall strings
+FileWrite $LogFile "Write to register\r$\n"
+
   WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PG_DEF_BRANDING}" "InstallLocation" "$INSTDIR"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PG_DEF_BRANDING}" "DisplayName" "$StartMenuFolder"
   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PG_DEF_BRANDING}" "UninstallString" '"$INSTDIR\Uninstall.exe"'
@@ -240,6 +251,7 @@ Section $(PostgreSQLString) sec1
   IntFmt $0 "0x%08X" $0
   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PG_DEF_BRANDING}" "EstimatedSize" "$0"
 
+FileWrite $LogFile "Create BAT files$\r$\n"
   ClearErrors
   FileOpen $0 $INSTDIR\scripts\reload.bat w
   IfErrors creatBatErr
@@ -309,6 +321,8 @@ Section $(PostgreSQLString) sec1
     SetShellVarContext all
   !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
 
+FileWrite $LogFile "Create shortcuts$\r$\n"
+
   ;Create shortcuts
   CreateDirectory "$SMPROGRAMS\$StartMenuFolder"
   CreateShortCut "$SMPROGRAMS\$StartMenuFolder\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
@@ -320,6 +334,7 @@ Section $(PostgreSQLString) sec1
   ${endif}
 
   ; set font Lucida Console for shortcut psql
+FileWrite $LogFile "set font Lucida Console for shortcut psql$\r$\n"
   ReadRegStr $0 HKCU "Console\SQL Shell (psql)" "FaceName"
   ${if} $0 == ""
     WriteRegStr HKCU "Console\SQL Shell (psql)" "FaceName" "Consolas"
@@ -363,11 +378,15 @@ Section $(PostgreSQLString) sec1
 
   !insertmacro MUI_STARTMENU_WRITE_END
   ; Create data dir begin
+FileWrite $LogFile "Create data dir begin$\r$\n"
+
   ${if} $isDataDirExist == 0
     CreateDirectory "$DATA_DIR"
     ;AccessControl::GrantOnFile "$DATA_DIR" "(BU)" "FullAccess" ;GenericWrite
     ;Pop $0 ;"ok" or "error" + error details
 
+FileWrite $LogFile "GRANT Access $\r$\n"
+
     DetailPrint "GRANT FullAccess ON $DATA_DIR TO $loggedInUser"
     AccessControl::GrantOnFile "$DATA_DIR" "$loggedInUser" "FullAccess" ;GenericWrite
     DetailPrint "GRANT FullAccess ON $DATA_DIR TO $loggedInUserShort"
@@ -390,12 +409,22 @@ Section $(PostgreSQLString) sec1
     AccessControl::GrantOnFile "$DATA_DIR" "$0" "FullAccess" ;GenericWrite
     Pop $0 ;"ok" or "error" + error details
     System::Call 'Kernel32::SetEnvironmentVariable(t, t)i ("LC_MESSAGES", "C").r0'	
+FileWrite $LogFile "Database initialization ...$\r$\n"
+
     ${if} "$Locale_text" == "$(DEF_LOCALE_NAME)"
+FileWrite $LogFile '"$INSTDIR\bin\initdb.exe" $tempVar \
+        --encoding=$Coding_text -U "$UserName_text" \
+        -D "$DATA_DIR" $\r$\n' 
       ; Initialise the database cluster, and set the appropriate permissions/ownership
       nsExec::ExecToLog /TIMEOUT=90000 '"$INSTDIR\bin\initdb.exe" $tempVar \
         --encoding=$Coding_text -U "$UserName_text" \
         -D "$DATA_DIR"'
     ${else}
+FileWrite $LogFile '"$INSTDIR\bin\initdb.exe" $tempVar \
+        --locale="$Locale_text" \
+        --encoding=$Coding_text \
+        -U "$UserName_text" \
+        -D "$DATA_DIR" $\r$\n'
       nsExec::ExecToLog /TIMEOUT=60000 '"$INSTDIR\bin\initdb.exe" $tempVar \
         --locale="$Locale_text" \
         --encoding=$Coding_text \
@@ -408,10 +437,16 @@ Section $(PostgreSQLString) sec1
     ${if} $0 != 0
       DetailPrint "initdb.exe return $0"
       DetailPrint "Output: $1"
+FileWrite $LogFile "initdb.exe return $0 $\r$\n"
+FileWrite $LogFile "Output: $1 $\r$\n"
+FileClose $LogFile ;Closes the filled file
+
       MessageBox MB_OK|MB_ICONINFORMATION $(MESS_ERROR_INITDB)
+
       Abort
     ${else}
       DetailPrint "Database initialization OK"
+FileWrite $LogFile "Database initialization OK $\r$\n"
     ${endif}
     ;Delete the password file
     ${if} "$Pass1_text" != ""
@@ -421,6 +456,7 @@ Section $(PostgreSQLString) sec1
     ${EndIf}
   ${endif}
   ; Create data dir end
+FileWrite $LogFile "Create postgresql.conf $\r$\n"
   ${if} $isDataDirExist == 0
     ${if} $checkNoLocal_state == ${BST_CHECKED}
       !insertmacro _ReplaceInFile "$DATA_DIR\postgresql.conf" "#listen_addresses = 'localhost'" "listen_addresses = '*'"
@@ -445,21 +481,76 @@ Section $(PostgreSQLString) sec1
         ;#work_mem = 4MB				# min 64kB
         !insertmacro _ReplaceInFile "$DATA_DIR\postgresql.conf" "#work_mem = 4MB" "work_mem = $work_mem"
       ${endif}
+      ${if} $effective_cache_size != ""
+        ;#work_mem = 4MB				# min 64kB
+        !insertmacro _ReplaceInFile "$DATA_DIR\postgresql.conf" "#effective_cache_size = 4GB" "effective_cache_size = $effective_cache_size"
+      ${endif}
+        !insertmacro _ReplaceInFile "$DATA_DIR\postgresql.conf" "#temp_buffers = 8MB" "temp_buffers = 32MB"
+        !insertmacro _ReplaceInFile "$DATA_DIR\postgresql.conf" "#maintenance_work_mem = 64MB" "maintenance_work_mem = 128MB"
+
+        !insertmacro _ReplaceInFile "$DATA_DIR\postgresql.conf" "#autovacuum_max_workers = 3" "autovacuum_max_workers = 6"
+        !insertmacro _ReplaceInFile "$DATA_DIR\postgresql.conf" "#autovacuum_naptime = 1min" "autovacuum_naptime = 20s"
+        !insertmacro _ReplaceInFile "$DATA_DIR\postgresql.conf" "#autovacuum_vacuum_cost_limit = -1" "autovacuum_vacuum_cost_limit = 400"
+        !insertmacro _ReplaceInFile "$DATA_DIR\postgresql.conf" "#bgwriter_delay = 200ms" "bgwriter_delay = 20ms"
+        !insertmacro _ReplaceInFile "$DATA_DIR\postgresql.conf" "#bgwriter_lru_multiplier = 2.0" "bgwriter_lru_multiplier = 4.0"
+        !insertmacro _ReplaceInFile "$DATA_DIR\postgresql.conf" "#bgwriter_lru_maxpages = 100" "bgwriter_lru_maxpages = 400"
+        !insertmacro _ReplaceInFile "$DATA_DIR\postgresql.conf" "#synchronous_commit = on" "synchronous_commit = off"
+        !insertmacro _ReplaceInFile "$DATA_DIR\postgresql.conf" "#checkpoint_completion_target = 0.5" "checkpoint_completion_target = 0.9"
+
+        ;!insertmacro _ReplaceInFile "$DATA_DIR\postgresql.conf" "#effective_io_concurrency = 0" "effective_io_concurrency = 2"
+
+        !insertmacro _ReplaceInFile "$DATA_DIR\postgresql.conf" "#random_page_cost = 4.0" "random_page_cost = 1.5"
+
+        !insertmacro _ReplaceInFile "$DATA_DIR\postgresql.conf" "max_connections = 100" "max_connections = 500"
+        !insertmacro _ReplaceInFile "$DATA_DIR\postgresql.conf" "#escape_string_warning = on" "escape_string_warning = off"
+        !insertmacro _ReplaceInFile "$DATA_DIR\postgresql.conf" "#standard_conforming_strings = on" "standard_conforming_strings = off"
+        !insertmacro _ReplaceInFile "$DATA_DIR\postgresql.conf" "#max_locks_per_transaction = 64" "max_locks_per_transaction = 256"
+        ;!insertmacro _ReplaceInFile "$DATA_DIR\postgresql.conf" "#shared_preload_libraries = ''" "shared_preload_libraries = 'online_analyze, plantuner'"
+        ;!insertmacro _ReplaceInFile "$DATA_DIR\postgresql.conf" "" ""
+
+        ClearErrors
+        FileOpen $0 $DATA_DIR\postgresql.conf a
+        IfErrors ErrFileCfg1
+        FileSeek $0 0 END
+        FileWrite $0 "#shared_preload_libraries = 'online_analyze, plantuner'$\r$\n"
+        FileWrite $0 "#online_analyze.table_type = 'temporary'$\r$\n"
+        FileWrite $0 "#online_analyze.verbose = 'off'$\r$\n"
+        FileWrite $0 "#online_analyze.local_tracking = 'on'$\r$\n"
+        FileWrite $0 "#plantuner.fix_empty_table = 'on'  $\r$\n"
+        FileWrite $0 "#online_analyze.enable = off$\r$\n"
+        FileClose $0
+        
+        ErrFileCfg1:
+/* shared_preload_libraries = 'online_analyze, plantuner'
+online_analyze.table_type = 'temporary'
+online_analyze.verbose = 'off'
+online_analyze.local_tracking = 'on'
+plantuner.fix_empty_table = 'on'
+online_analyze.enable = off */
     ${endif}
   ${EndIf}
+  Delete "$DATA_DIR\postgresql.conf.old"
+  
   ;# Add line to pg_hba.conf
   Call WriteInstallOptions
   DetailPrint "Service $ServiceID_text registration ..."
+FileWrite $LogFile "Service $ServiceID_text registration ... $\r$\n"
+FileWrite $LogFile '"$INSTDIR\bin\pg_ctl.exe" register -N "$ServiceID_text" -U "$ServiceAccount_text" -D "$DATA_DIR" -w $\r$\n'
+
   nsExec::ExecToStack /TIMEOUT=60000 '"$INSTDIR\bin\pg_ctl.exe" register -N "$ServiceID_text" -U "$ServiceAccount_text" -D "$DATA_DIR" -w'
   Pop $0 # return value/error/timeout
   Pop $1 # printed text, up to ${NSIS_MAX_STRLEN}
 
   ${if} $0 != 0
     DetailPrint "pg_ctl.exe register return $0"
     DetailPrint "Output: $1"
+FileWrite $LogFile "pg_ctl.exe register return $0 $\r$\n"
+FileWrite $LogFile "Output: $1 $\r$\n"
+
     Sleep 5000
   ${else}
     DetailPrint "Service registration OK"
+FileWrite $LogFile "Service registration OK $\r$\n"
   ${endif}
 
   ;Write the DisplayName manually
@@ -517,6 +608,9 @@ Section $(PostgreSQLString) sec1
   ${endif}
 
   DetailPrint "Start server service..."
+FileWrite $LogFile "Start server service... $\r$\n"
+FileWrite $LogFile 'sc start "$ServiceID_text" $\r$\n'
+
   Sleep 1000
 
   nsExec::ExecToStack /TIMEOUT=60000 'sc start "$ServiceID_text"'
@@ -527,9 +621,13 @@ Section $(PostgreSQLString) sec1
   ${if} $0 != 0
     DetailPrint "Start service return $0"
     DetailPrint "Output: $1"
+FileWrite $LogFile "Start service return $0 $\r$\n"
+FileWrite $LogFile "Output: $1 $\r$\n"
     Sleep 5000
   ${else}
     DetailPrint "Start service OK"
+FileWrite $LogFile "Start service OK $\r$\n"
+
   ${endif}
 
   ${if} $isDataDirExist == 0
@@ -540,17 +638,23 @@ Section $(PostgreSQLString) sec1
     ${endif}
 
     DetailPrint "Create adminpack ..."
+FileWrite $LogFile "Create adminpack ... $\r$\n"
+FileWrite $LogFile '"$INSTDIR\bin\psql.exe" -p $TextPort_text -U "$UserName_text" -c "CREATE EXTENSION adminpack;" postgres $\r$\n'
     Sleep 5000
     nsExec::ExecToStack /TIMEOUT=60000 '"$INSTDIR\bin\psql.exe" -p $TextPort_text -U "$UserName_text" -c "CREATE EXTENSION adminpack;" postgres'
     pop $0
     Pop $1 # printed text, up to ${NSIS_MAX_STRLEN}
     ${if} $0 != 0
       DetailPrint "Create adminpack return $0"
       DetailPrint "Output: $1"
+FileWrite $LogFile "Create adminpack return $0 $\r$\n"
+FileWrite $LogFile "Output: $1 $\r$\n"
+
       ;MessageBox MB_OK "Create adminpack error: $1"
       MessageBox MB_OK|MB_ICONSTOP "$(MESS_ERROR_SERVER)"
     ${else}
       DetailPrint "Create adminpack OK"
+FileWrite $LogFile "Create adminpack OK $\r$\n"
     ${endif}
     ${if} "$Pass1_text" != ""
       StrCpy $R0 ""
@@ -565,6 +669,8 @@ Section $(PostgreSQLString) sec1
     WriteRegExpandStr HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment" "PGLOCALEDIR" "$INSTDIR\share\locale\"
     AddToPath::AddToPath "$INSTDIR\bin"
   ${endif}
+FileClose $LogFile ;Closes the filled file
+
 SectionEnd
 
 ;Uninstaller Section
@@ -587,6 +693,8 @@ Section "Uninstall"
   Delete "$INSTDIR\Uninstall.exe"
   Delete "$INSTDIR\license.txt"
   Delete "$INSTDIR\3rd_party_licenses.txt"
+  Delete "$INSTDIR\install.log"
+
 
   RMDir /r "$INSTDIR\bin"
   RMDir /r "$INSTDIR\doc"
@@ -1576,7 +1684,19 @@ Function makeOptimization
   ;768MB = 98304 = 805306368
   ;512MB = 65536 = 536870912
   ;256MB = 32768 = 268435456
+  ${if} $AllMem > 16000 ;>16gb
+    StrCpy $work_mem "128MB"
+    StrCpy $shared_buffers "1GB"
+    StrCpy $effective_cache_size "16GB"
+    return
+  ${endif}
 
+  ${if} $AllMem > 8090 ;>8gb
+    StrCpy $work_mem "128MB"
+    StrCpy $shared_buffers "1GB"
+    StrCpy $effective_cache_size "8GB"
+    return
+  ${endif}
   ${if} $AllMem > 4090 ;>4gb
     StrCpy $work_mem "128MB"
     StrCpy $shared_buffers "512MB"
@@ -1635,6 +1755,7 @@ FunctionEnd
 
 Function nsDialogsOptimizationPageLeave
   ${NSD_GetState} $rButton2 $0
+  
   ${if} $0 == ${BST_CHECKED}
     StrCpy  $needOptimiztion "1"
   ${else}
@@ -1657,6 +1778,13 @@ FunctionEnd
 Function .onInit
   Call CheckWindowsVersion
   Call SetDefaultTcpPort
+
+!ifdef PG_64bit
+${IfNot} ${RunningX64}
+MessageBox MB_OK|MB_ICONSTOP "This version can be installed only on 64-bit Windows!"
+Abort
+${EndIf}
+!endif
 
   !insertmacro MUI_LANGDLL_DISPLAY ;select language
   StrCpy $PG_OLD_DIR ""