8000 Only ever have one empty line as separator · percona/postgres@5c2b727 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5c2b727

Browse files
jeltzjeltz
committed
Only ever have one empty line as separator
While in theory it could be useful to separate blocks with double empty lines nobody does that consistently so we might as well only ever use one empty line.
1 parent 40ce62f commit 5c2b727

11 files changed

+0
-21
lines changed

‎contrib/pg_tde/documentation/mkdocs.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ site_author: Percona LLC
66
copyright: >
77
<a href="https://www.percona.com/about">Percona LLC</a> and/or its affiliates © 2025 — <a href="#__consent">Cookie Consent</a>
88
9-
109
repo_name: percona/postgres
1110
repo_url: https://github.com/percona/postgres
1211
edit_uri: edit/TDE_REL_17_STABLE/contrib/pg_tde/documentation/docs
@@ -54,8 +53,6 @@ theme:
5453
- navigation.tracking
5554
- navigation.indexes
5655

57-
58-
5956
extra_css:
6057
- https://unicons.iconscout.com/release/v3.0.3/css/line.css
6158
- https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.4.0/css/font-awesome.min.css
@@ -100,7 +97,6 @@ markdown_extensions:
10097
custom_icons:
10198
- _resource/.icons
10299

103-
104100
plugins:
105101
- search:
106102
separator: '[\s\-,:!=\[\]()"/]+|(?!\b)(?=[A-Z][a-z])|\.(?!\d)|&[lg]t;'

‎contrib/pg_tde/pg_tde--1.0-rc.sql

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ BEGIN ATOMIC
9797
'certPath' VALUE kmip_cert_path));
9898
END;
9999

100-
101100
CREATE FUNCTION pg_tde_list_all_database_key_providers
102101
(OUT id INT,
103102
OUT provider_name TEXT,

‎contrib/pg_tde/src/access/pg_tde_tdemap.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555

5656
#define PG_TDE_FILEMAGIC 0x02454454 /* version ID value = TDE 02 */
5757

58-
5958
#define MAP_ENTRY_SIZE sizeof(TDEMapEntry)
6059
#define TDE_FILE_HEADER_SIZE sizeof(TDEFileHeader)
6160

@@ -100,7 +99,6 @@ RelKeyCache tde_rel_key_cache = {
10099
.cap = 0,
101100
};
102101

103-
104102
/*
105103
* TODO: WAL should have its own RelKeyCache
106104
*/
@@ -911,7 +909,6 @@ tde_decrypt_rel_key(TDEPrincipalKey *principal_key, TDEMapEntry *map_entry)
911909
ereport(ERROR,
912910
errmsg("Failed to decrypt key, incorrect principal key or corrupted key file"));
913911

914-
915912
return rel_key_data;
916913
}
917914

@@ -963,7 +960,6 @@ pg_tde_open_file_basic(const char *tde_filename, int fileFlags, bool ignore_miss
963960
return fd;
964961
}
965962

966-
967963
/*
968964
* Read TDE file header from a TDE file and fill in the fheader data structure.
969965
*/
@@ -989,7 +985,6 @@ pg_tde_file_header_read(const char *tde_filename, int fd, TDEFileHeader *fheader
989985
}
990986
}
991987

992-
993988
/*
994989
* Returns true if a map entry if found or false if we have reached the end of
995990
* the file.

‎contrib/pg_tde/src/catalog/tde_keyring.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,6 @@ load_keyring_provider_from_record(KeyringProviderRecord *provider)
811811
return keyring;
812812
}
813813

814-
815814
static GenericKeyring *
816815
load_keyring_provider_options(ProviderType provider_type, char *keyring_options)
817816
{

‎contrib/pg_tde/src/catalog/tde_keyring_parse_opts.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
/*
4242
* JSON parser state
4343
*/
44-
4544
typedef enum JsonKeyringSemState
4645
{
4746
JK_EXPECT_TOP_LEVEL_OBJECT,
@@ -138,7 +137,6 @@ static JsonParseErrorType json_kring_assign_scalar(JsonKeyringState *parse, Json
138137
static char *get_remote_kring_value(const char *url, const char *field_name);
139138
static char *get_file_kring_value(const char *path, const char *field_name);
140139

141-
142140
/*
143141
* Parses json input for the given provider type and sets the provided options.
144142
* out_opts should be a palloc'd keyring object matching the provider_type.
@@ -184,7 +182,6 @@ ParseKeyringJSONOptions(ProviderType provider_type, GenericKeyring *out_opts, ch
184182
ereport(ERROR,
185183
errmsg("parsing of keyring options failed: %s",
186184
json_errdetail(jerr, jlex)));
187-
188185
}
189186
#if PG_VERSION_NUM >= 170000
190187
freeJsonLexContext(jlex);

‎contrib/pg_tde/src/include/access/pg_tde_tdemap.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ typedef struct WALKeyCacheRec
8989
struct WALKeyCacheRec *next;
9090
} WALKeyCacheRec;
9191

92-
9392
extern InternalKey *pg_tde_read_last_wal_key(void);
9493

9594
extern WALKeyCacheRec *pg_tde_get_last_wal_key(void);

‎contrib/pg_tde/src/include/catalog/tde_principal_key.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#ifndef PG_TDE_PRINCIPAL_KEY_H
1111
#define PG_TDE_PRINCIPAL_KEY_H
1212

13-
1413
#include "postgres.h"
1514
#include "catalog/tde_keyring.h"
1615
#ifndef FRONTEND

‎contrib/pg_tde/src/include/pg_tde_guc.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#ifndef TDE_GUC_H
1212
#define TDE_GUC_H
1313

14-
1514
#include "postgres.h"
1615

1716
#ifndef FRONTEND

‎contrib/pg_tde/src/pg_tde.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939

4040
#include <sys/stat.h>
4141

42-
4342
PG_MODULE_MAGIC;
4443

4544
static void pg_tde_init_data_dir(void);

‎contrib/pg_tde/src/pg_tde_change_key_provider.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ build_json(char *buffer, int count,...)
6363
ptr = strcat(ptr, ",");
6464
}
6565

66-
6766
ptr = strcat(ptr, "\"");
6867
ptr = strcat(ptr, key);
6968
ptr = strcat(ptr, "\":");
@@ -146,7 +145,6 @@ main(int argc, char *argv[])
146145
argstart += 2;
147146
}
148147

149-
150148
if (datadir == NULL || strlen(datadir) == 0)
151149
{
152150
help();

‎contrib/pg_tde/t/014_pg_waldump_basic.pl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
});
4141
$node->restart;
4242

43-
4443
my ($start_lsn, $start_walfile) = split /\|/,
4544
$node->safe_psql('postgres',
4645
q{SELECT pg_current_wal_insert_lsn(), pg_walfile_name(pg_current_wal_insert_lsn())}

0 commit comments

Comments
 (0)
0