diff options
Diffstat (limited to 'src/tools/pgindent')
| -rw-r--r-- | src/tools/pgindent/README | 26 | ||||
| -rwxr-xr-x | src/tools/pgindent/pgindent | 23 | ||||
| -rw-r--r-- | src/tools/pgindent/typedefs.list | 203 |
3 files changed, 198 insertions, 54 deletions
diff --git a/src/tools/pgindent/README b/src/tools/pgindent/README index 34d59768fdc..16ee06119b0 100644 --- a/src/tools/pgindent/README +++ b/src/tools/pgindent/README @@ -29,18 +29,7 @@ This can format all PostgreSQL *.c and *.h files, but excludes *.y, and 7) Remove any files that generate errors and restore their original versions. -8) Do a full test build: - - > run configure - # stop is only necessary if it's going to install in a location with an - # already running server - pg_ctl stop - gmake -C src install - gmake -C contrib install - pg_ctl start - gmake installcheck-world - -9) Indent the Perl code: +8) Indent the Perl code: ( find . -name \*.pl -o -name \*.pm @@ -52,6 +41,19 @@ This can format all PostgreSQL *.c and *.h files, but excludes *.y, and sort -u | xargs perltidy --profile=src/tools/pgindent/perltidyrc +9) Do a full test build: + + > run configure + # stop is only necessary if it's going to install in a location with an + # already running server + pg_ctl stop + gmake -C src install + gmake -C contrib install + pg_ctl start + gmake installcheck-world + +10) Remove Perl backup files after testing + --------------------------------------------------------------------------- BSD indent diff --git a/src/tools/pgindent/pgindent b/src/tools/pgindent/pgindent index 44766e86d74..584218f384a 100755 --- a/src/tools/pgindent/pgindent +++ b/src/tools/pgindent/pgindent @@ -119,7 +119,7 @@ sub load_typedefs $tdtry = "$tdtry/.."; } die "cannot locate typedefs file \"$typedefs_file\"\n" - unless $typedefs_file && -f $typedefs_file; + unless $typedefs_file && -f $typedefs_file; open(my $typedefs_fh, '<', $typedefs_file) || die "cannot open typedefs file \"$typedefs_file\": $!\n"; @@ -144,7 +144,8 @@ sub process_exclude { if ($excludes && @files) { - open(my $eh, '<', $excludes) || die "cannot open exclude file \"$excludes\"\n"; + open(my $eh, '<', $excludes) + || die "cannot open exclude file \"$excludes\"\n"; while (my $line = <$eh>) { chomp $line; @@ -205,7 +206,8 @@ sub pre_indent # FILE: ../../../src/backend/rewrite/rewriteHandler.c # Error@2259: # Stuff missing from end of file - $source =~ s!(\}|[ \t])else[ \t]*(/\*)(.*\*/)[ \t]*$!$1else\n $2 _PGMV$3!gm; + $source =~ + s!(\}|[ \t])else[ \t]*(/\*)(.*\*/)[ \t]*$!$1else\n $2 _PGMV$3!gm; # Indent multi-line after-'else' comment so BSD indent will move it # properly. We already moved down single-line comments above. @@ -442,20 +444,25 @@ sub run_build chdir "$code_base/src/tools/pgindent"; - my $typedefs_list_url = "http://buildfarm.postgresql.org/cgi-bin/typedefs.pl"; + my $typedefs_list_url = + "http://buildfarm.postgresql.org/cgi-bin/typedefs.pl"; my $rv = getstore($typedefs_list_url, "tmp_typedefs.list"); - die "cannot fetch typedefs list from $typedefs_list_url\n" unless is_success($rv); + die "cannot fetch typedefs list from $typedefs_list_url\n" + unless is_success($rv); $ENV{PGTYPEDEFS} = abs_path('tmp_typedefs.list'); - my $pg_bsd_indent_url = "ftp://ftp.postgresql.org/pub/dev/pg_bsd_indent-" . - $INDENT_VERSION . ".tar.gz"; + my $pg_bsd_indent_url = + "ftp://ftp.postgresql.org/pub/dev/pg_bsd_indent-" + . $INDENT_VERSION + . ".tar.gz"; $rv = getstore($pg_bsd_indent_url, "pg_bsd_indent.tgz"); - die "cannot fetch BSD indent tarfile from $pg_bsd_indent_url\n" unless is_success($rv); + die "cannot fetch BSD indent tarfile from $pg_bsd_indent_url\n" + unless is_success($rv); # XXX add error checking here diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list index a831a1e7a7b..b68a649e415 100644 --- a/src/tools/pgindent/typedefs.list +++ b/src/tools/pgindent/typedefs.list @@ -23,6 +23,7 @@ AclObjectKind AclResult AcquireSampleRowsFunc ActiveSnapshotElt +AddForeignUpdateTargets_function AffixNode AffixNodeData AfterTriggerEvent @@ -42,8 +43,10 @@ AggStatePerAgg AggStatePerGroup AggStatePerGroupData AggStrategy +AggVals Aggref AggrefExprState +AlenState Alias AllocBlock AllocChunk @@ -57,6 +60,7 @@ AlterDatabaseStmt AlterDefaultPrivilegesStmt AlterDomainStmt AlterEnumStmt +AlterEventTrigStmt AlterExtensionContentsStmt AlterExtensionStmt AlterFdwStmt @@ -163,8 +167,11 @@ Backend BackendId BackendParameters BackendState +BackgroundWorker BaseBackupCmd +BeginForeignModify_function BeginForeignScan_function +BgWorkerStartTime BitmapAnd BitmapAndPath BitmapAndState @@ -270,6 +277,8 @@ CollInfo CollateClause CollateExpr CollateStrength +ColorTrgm +ColorTrgmInfo ColumnCompareData ColumnDef ColumnIOData @@ -290,6 +299,8 @@ CompositeTypeStmt CompressionAlgorithm CompressorState ConfigVariable +ConnCacheEntry +ConnCacheKey ConnStatusType ConnType ConsiderSplitContext @@ -304,6 +315,7 @@ ControlData ControlFileData ConvInfo ConvProcInfo +ConversionLocation ConvertRowtypeExpr ConvertRowtypeExprState CookedConstraint @@ -319,6 +331,7 @@ CreateCastStmt CreateConversionStmt CreateDomainStmt CreateEnumStmt +CreateEventTrigStmt CreateExtensionStmt CreateFdwStmt CreateForeignServerStmt @@ -351,6 +364,7 @@ CurrentOfExpr CustomOutPtr CycleCtr DBState +DBWriteRequest DCHCacheEntry DEADLOCK_INFO DECountItem @@ -362,6 +376,7 @@ DR_copy DR_intorel DR_printtup DR_sqlfunction +DR_transientrel DWORD DataDumperPtr DataPageDeleteStack @@ -388,11 +403,10 @@ DictSnowball DictSubState DictSyn DictThesaurus +DisableTimeoutParams DiscardMode DiscardStmt DistinctExpr -Dlelem -Dllist DoStmt DocRepresentation DomainConstraintState @@ -417,10 +431,14 @@ EState EVP_MD EVP_MD_CTX EVP_PKEY +EachState Edge +ElementsState +EnableTimeoutParams EndBlobPtr EndBlobsPtr EndDataPtr +EndForeignModify_function EndForeignScan_function EnumItem EolType @@ -428,9 +446,19 @@ EquivalenceClass EquivalenceMember ErrorContextCallback ErrorData +EventTriggerCacheEntry +EventTriggerCacheItem +EventTriggerCacheStateType +EventTriggerData +EventTriggerEvent +EventTriggerInfo +EventTriggerQueryState ExceptionLabelMap ExceptionMap ExecAuxRowMark +ExecForeignDelete_function +ExecForeignInsert_function +ExecForeignUpdate_function ExecRowMark ExecScanAccessMtd ExecScanRecheckMtd @@ -442,6 +470,7 @@ ExecutorEnd_hook_type ExecutorFinish_hook_type ExecutorRun_hook_type ExecutorStart_hook_type +ExplainForeignModify_function ExplainForeignScan_function ExplainFormat ExplainOneQuery_hook_type @@ -459,6 +488,7 @@ ExtensionControlFile ExtensionInfo ExtensionVersionInfo Extention +FDWCollateState FD_SET FILE FILETIME @@ -513,6 +543,7 @@ FormData_pg_database FormData_pg_default_acl FormData_pg_depend FormData_pg_enum +FormData_pg_event_trigger FormData_pg_extension FormData_pg_foreign_data_wrapper FormData_pg_foreign_server @@ -559,6 +590,7 @@ Form_pg_database Form_pg_default_acl Form_pg_depend Form_pg_enum +Form_pg_event_trigger Form_pg_extension Form_pg_foreign_data_wrapper Form_pg_foreign_server @@ -629,11 +661,13 @@ GISTTYPE GIST_SPLITVEC GV Gene +GenericCosts GenericExprState GeqoPrivateData GetForeignPaths_function GetForeignPlan_function GetForeignRelSize_function +GetState GiSTOptions GinBtree GinBtreeData @@ -641,6 +675,7 @@ GinBtreeStack GinBuildState GinChkVal GinEntryAccumulator +GinIndexStat GinMetaPageData GinNullCategory GinOptions @@ -734,13 +769,13 @@ HbaLine HbaToken HeadlineParsedText HeadlineWordEntry -HeapPosition HeapScanDesc HeapTuple HeapTupleData HeapTupleFields HeapTupleHeader HeapTupleHeaderData +HeapUpdateFailureData HistControl HotStandbyState I32 @@ -750,6 +785,7 @@ IOFuncSelector IPCompareMethod ITEM IV +IdentLine IdentifierLookup IdentifySystemCmd IncrementVarSublevelsUp_context @@ -771,6 +807,7 @@ IndexRuntimeKeyInfo IndexScan IndexScanDesc IndexScanState +IndexStateFlagsAction IndexStmt IndexTuple IndexTupleData @@ -804,6 +841,7 @@ ItemIdData ItemPointer ItemPointerData IterateForeignScan_function +JHashState JOBOBJECTINFOCLASS JOBOBJECT_BASIC_LIMIT_INFORMATION JOBOBJECT_BASIC_UI_RESTRICTIONS @@ -815,11 +853,12 @@ JoinHashEntry JoinPath JoinState JoinType +JsonHashEntry JsonLexContext -JsonParseStack -JsonParseState -JsonStackOp -JsonValueType +JsonParseContext +JsonSearch +JsonSemAction +JsonTokenType JunkFilter KeyArray KeySuffix @@ -827,6 +866,7 @@ KeyWord LARGE_INTEGER LDAP LDAPMessage +LDAPURLDesc LDAP_TIMEVAL LINE LOCALLOCK @@ -860,6 +900,7 @@ LWLockPadded LabelProvider LargeObjectDesc Latch +LateralJoinInfo LexDescr LexemeEntry LexemeHashKey @@ -881,6 +922,7 @@ LocalBufferLookupEnt LocalTransactionId LocationIndex LockAcquireResult +LockClauseStrength LockData LockInfoData LockInstanceData @@ -902,6 +944,8 @@ MBuf MINIDUMPWRITEDUMP MINIDUMP_TYPE MJEvalResult +MasterEndParallelItemPtr +MasterStartParallelItemPtr Material MaterialPath MaterialState @@ -927,8 +971,10 @@ ModifyTable ModifyTableState MsgType MultiXactId +MultiXactMember MultiXactOffset MultiXactStateData +MultiXactStatus MyData NDBOX NODE @@ -960,12 +1006,16 @@ NullTestType Numeric NumericDigit NumericVar +OM_uint32 OP OSInfo OSSLDigest OSVERSIONINFO OVERLAPPED ObjectAccessDrop +ObjectAccessNamespaceSearch +ObjectAccessPostAlter +ObjectAccessPostCreate ObjectAccessType ObjectAddress ObjectAddressExtra @@ -979,6 +1029,7 @@ OffsetNumber OffsetVarNodes_context Oid OidOptions +OkeysState OldSerXidControl OldToNewMapping OldToNewMappingData @@ -1104,6 +1155,7 @@ PLpgSQL_stmt_return PLpgSQL_stmt_return_next PLpgSQL_stmt_return_query PLpgSQL_stmt_while +PLpgSQL_trigtype PLpgSQL_type PLpgSQL_var PLpgSQL_variable @@ -1120,6 +1172,7 @@ PLyObToTuple PLyPlanObject PLyProcedure PLyProcedureEntry +PLyProcedureKey PLyResultObject PLySubtransactionData PLySubtransactionObject @@ -1142,7 +1195,6 @@ PQconninfoOption PQnoticeProcessor PQnoticeReceiver PQprintOpt -PQrowProcessor PREDICATELOCK PREDICATELOCKTAG PREDICATELOCKTARGET @@ -1168,14 +1220,16 @@ PX_Combo PX_HMAC PX_MD Page +PageGistNSN PageHeader PageHeaderData PageSplitRecord +PageXLogRecPtr PagetableEntry Pairs +ParallelArgs ParallelSlot ParallelState -ParallelStateEntry Param ParamExecData ParamExternData @@ -1186,6 +1240,8 @@ ParamPathInfo ParamRef ParentMapEntry ParseCallbackState +ParseExprKind +ParseNamespaceItem ParseParamRefHook ParseState ParsedLex @@ -1201,12 +1257,16 @@ PathKeysComparison Pattern_Prefix_Status Pattern_Type PendingOperationEntry -PendingOperationTag PendingRelDelete PendingUnlinkEntry PerlInterpreter Perl_ppaddr_t PgBackendStatus +PgFdwAnalyzeState +PgFdwModifyState +PgFdwOption +PgFdwRelationInfo +PgFdwScanState PgIfAddrCallback PgStat_BackendFunctionEntry PgStat_Counter @@ -1252,6 +1312,7 @@ PipeProtoHeader PlaceHolderInfo PlaceHolderVar Plan +PlanForeignModify_function PlanInvalItem PlanRowMark PlanState @@ -1262,6 +1323,7 @@ PlannerParamItem Point Pointer Pool +PopulateRecordsetState Port Portal PortalHashEnt @@ -1281,7 +1343,6 @@ PredicateLockTargetType PrepareStmt PreparedParamsData PreparedStatement -PrimaryKeepaliveMessage PrintExtraTocPtr PrintTocDataPtr PrintfArgType @@ -1295,6 +1356,7 @@ ProcLangInfo ProcSignalReason ProcSignalSlot ProcState +ProcessUtilityContext ProcessUtility_hook_type ProcessingMode ProjectionInfo @@ -1374,9 +1436,11 @@ RecoveryTargetType RecursionContext RecursiveUnion RecursiveUnionState +RefreshMatViewStmt RegProcedure Regis RegisNode +RegisteredBgWorker ReindexStmt RelFileNode RelFileNodeBackend @@ -1400,13 +1464,13 @@ Relids RelocationBufferInfo RenameStmt ReopenPtr +ReplaceVarsFromTargetList_context +ReplaceVarsNoMatchOption ResTarget -ResolveNew_context ResourceOwner ResourceReleaseCallback ResourceReleaseCallbackItem ResourceReleasePhase -RestoreArgs RestoreOptions RestrictInfo Result @@ -1417,6 +1481,7 @@ ReturnSetInfo RewriteRule RewriteState RmgrData +RmgrDescData RmgrId RoleStmtType RowCompareExpr @@ -1453,6 +1518,7 @@ SID_NAME_USE SISeg SMgrRelation SMgrRelationData +SOCKADDR SOCKET SPELL SPIPlanPtr @@ -1461,6 +1527,7 @@ SPLITCOST SPNode SPNodeData SPPageDesc +SQLDropObject SQLFunctionCache SQLFunctionCachePtr SQLFunctionParseInfoPtr @@ -1509,6 +1576,7 @@ SetOpStrategy SetOperation SetOperationStmt SetToDefault +SetupWorkerPtr SharedDependencyType SharedInvalCatalogMsg SharedInvalCatcacheMsg @@ -1580,8 +1648,6 @@ SplitVar SplitedPageLayout StackElem StandardChunkHeader -StandbyHSFeedbackMessage -StandbyReplyMessage StartBlobPtr StartBlobsPtr StartDataPtr @@ -1605,7 +1671,6 @@ SubXactCallbackItem SubXactEvent SubqueryScan SubqueryScanState -SuffixChar Syn SysScanDesc SyscacheCallbackFunction @@ -1650,6 +1715,8 @@ TState TStoreState TTOffList TYPCATEGORY +T_Action +T_WorkerStatus TabStatusArray TableDataInfo TableInfo @@ -1675,11 +1742,15 @@ TidScanState TimeADT TimeInterval TimeIntervalData +TimeLineHistoryCmd +TimeLineHistoryEntry TimeLineID TimeOffset TimeStamp TimeTzADT TimeZoneAbbrevTable +TimeoutId +TimeoutType Timestamp TimestampTz TmFromChar @@ -1694,6 +1765,19 @@ TransactionState TransactionStateData TransactionStmt TransactionStmtKind +TrgmArc +TrgmArcInfo +TrgmColor +TrgmColorInfo +TrgmNFA +TrgmPackArcInfo +TrgmPackedArc +TrgmPackedGraph +TrgmPackedState +TrgmPrefix +TrgmState +TrgmStateKey +TrieChar Trigger TriggerData TriggerDesc @@ -1785,14 +1869,13 @@ WSABUF WSADATA WSANETWORKEVENTS WSAPROTOCOL_INFO -WalDataMessageHeader WalLevel WalRcvData WalRcvState WalSnd WalSndCtlData WalSndState -WalSndrMessage +WholeRowVarExprState WindowAgg WindowAggState WindowClause @@ -1813,6 +1896,9 @@ WordEntryPosVector WorkTableScan WorkTableScanState WorkerInfo +WorkerInfoData +WorkerJobDumpPtr +WorkerJobRestorePtr Working_State WriteBufPtr WriteBytePtr @@ -1824,17 +1910,23 @@ X509_NAME X509_NAME_ENTRY X509_STORE X509_STORE_CTX -XLogContRecord XLogCtlData XLogCtlInsert XLogCtlWrite +XLogDumpConfig +XLogDumpPrivate XLogLongPageHeader XLogLongPageHeaderData XLogPageHeader XLogPageHeaderData +XLogPageReadCB +XLogPageReadPrivate +XLogReaderState XLogRecData XLogRecPtr XLogRecord +XLogSegNo +XLogSource XLogwrtResult XLogwrtRqst XPVIV @@ -1871,6 +1963,10 @@ avw_dbase backslashResult base_yy_extra_type basebackup_options +bgworker_main_type +bgworker_sighdlr_type +binaryheap +binaryheap_comparator bitmapword bits16 bits32 @@ -1882,6 +1978,7 @@ cached_re_str cashKEY celt cfp +check_agg_arguments_context check_network_data check_object_relabel_type check_password_hook_type @@ -1909,24 +2006,35 @@ crosstab_cat_desc dateKEY datetkn decimal +deparse_columns deparse_context +deparse_expr_cxt deparse_namespace destructor dev_t directory_fctx +dlist_head +dlist_iter +dlist_mutable_iter +dlist_node ds_state eLogType ean13 eary +ec_matches_callback_type +ec_member_foreign_arg +ec_member_matches_arg emit_log_hook_type eval_const_expressions_context +event_trigger_command_tag_check_result +event_trigger_support_data +exec_thread_arg execution_state explain_get_index_name_hook_type f_smgr fd_set finalize_primnode_context find_expr_references_context -find_minimum_var_level_context fix_join_expr_context fix_scan_expr_context fix_upper_expr_context @@ -1938,6 +2046,8 @@ float8KEY fmNodePtr fmStringInfo fmgr_hook_type +foreign_glob_cxt +foreign_loc_cxt freeaddrinfo_ptr_t freefunc fsec_t @@ -1966,11 +2076,15 @@ ginxlogSplit ginxlogUpdateMeta ginxlogVacuumPage gistxlogPage -gistxlogPageDelete gistxlogPageSplit gistxlogPageUpdate gseg_picksplit_item +gss_OID gss_buffer_desc +gss_cred_id_t +gss_ctx_id_t +gss_name_t +gtrgm_consistent_cache gzFile hashfunc hbaPort @@ -1983,42 +2097,37 @@ inetKEY inet_struct inline_error_callback_arg ino_t +inquiry instr_time int16 int16KEY -int2 int2vector int32 int32KEY int32_t -int4 int64 int64KEY int8 +internalPQconninfoOption intptr_t intvKEY itemIdSort itemIdSortData jmp_buf join_search_hook_type +jsonSemAction +json_aelem_action +json_ofield_action +json_scalar_action +json_struct_action keyEntryData key_t -krb5_auth_context -krb5_ccache -krb5_context -krb5_error -krb5_error_code -krb5_keytab -krb5_pointer -krb5_principal -krb5_ticket lclContext lclTocEntry line_t locale_t locate_agg_of_level_context locate_var_of_level_context -locate_var_of_relation_context locate_windowfunc_context logstreamer_param lquery @@ -2031,6 +2140,7 @@ ltxtquery mXactCacheEnt macKEY macaddr +map_variable_attnos_context mb2wchar_with_len_converter mbcharacter_incrementer mbdisplaylen_converter @@ -2049,6 +2159,8 @@ mp_sign mp_size mp_word mpz_t +mxact +mxtruncinfo needs_fmgr_hook_type nodeitem normal_rand_fctx @@ -2074,6 +2186,7 @@ pg_enc2gettext pg_enc2name pg_encname pg_gssinfo +pg_int64 pg_local_to_utf pg_local_to_utf_combined pg_locale_t @@ -2139,8 +2252,10 @@ pthread_t pull_var_clause_context pull_varattnos_context pull_varnos_context +pull_vars_context pullup_replace_vars_context qsort_arg_comparator +query_pathkeys_callback radius_attribute radius_packet rangeTableEntry_used_context @@ -2150,8 +2265,8 @@ rb_combiner rb_comparator rb_freefunc reduce_outer_joins_state +regex_arc_t regex_t -regexp regexp_matches_ctx regmatch_t regoff_t @@ -2183,6 +2298,10 @@ sigjmp_buf signedbitmapword sigset_t size_t +slist_head +slist_iter +slist_mutable_iter +slist_node slock_t smgrid spgBulkDeleteState @@ -2215,6 +2334,7 @@ ss_lru_item_t ss_scan_location_t ss_scan_locations_t ssize_t +standard_qp_extra stemmer_module stmtCacheEntry storeInfo @@ -2232,11 +2352,15 @@ temp_tablespaces_extra text timeKEY time_t +timeout_handler_proc +timeout_params timerCA timezone_extra tlist_vinfo transferMode +transfer_thread_arg trgm +trgm_mb_char tsKEY ts_db_fctx ts_tokentype @@ -2267,12 +2391,18 @@ varattrib_1b_e varattrib_4b walrcv_connect_type walrcv_disconnect_type +walrcv_endstreaming_type +walrcv_identify_system_type +walrcv_readtimelinehistoryfile_type walrcv_receive_type walrcv_send_type +walrcv_startstreaming_type +wchar2mb_with_len_converter wchar_t win32_deadchild_waitinfo win32_pthread wint_t +worktable xl_btree_delete xl_btree_delete_page xl_btree_insert @@ -2284,6 +2414,7 @@ xl_btree_vacuum xl_btreetid xl_dbase_create_rec xl_dbase_drop_rec +xl_end_of_recovery xl_heap_clean xl_heap_cleanup_info xl_heap_delete @@ -2292,6 +2423,7 @@ xl_heap_header xl_heap_inplace xl_heap_insert xl_heap_lock +xl_heap_lock_updated xl_heap_multi_insert xl_heap_newpage xl_heap_update @@ -2323,6 +2455,7 @@ xmlBufferPtr xmlChar xmlDocPtr xmlErrorPtr +xmlExternalEntityLoader xmlGenericErrorFunc xmlNodePtr xmlNodeSetPtr @@ -2336,7 +2469,9 @@ xmlXPathContextPtr xmlXPathObjectPtr xmltype xpath_workspace +xsltSecurityPrefsPtr xsltStylesheetPtr +xsltTransformContextPtr yy_parser yy_size_t yyscan_t |