rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-03 19:42:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix minor typos and copy-pastos

Browse Source
This commit is contained in:
Heikki Linnakangas
2021-04-07 16:39:37 +03:00
parent 3fea78d688
commit 6b9fc3aff0
8 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pageserver/src/page_cache.rs
View File

@@ -113,7 +113,7 @@ lazy_static! {
pub static ref PAGECACHES: Mutex<HashMap<u64, Arc<PageCache>>> = Mutex::new(HashMap::new());
}
pub fn get_pagecahe(conf: PageServerConf, sys_id: u64) -> Arc<PageCache> {
pub fn get_pagecache(conf: PageServerConf, sys_id: u64) -> Arc<PageCache> {
let mut pcaches = PAGECACHES.lock().unwrap();
if !pcaches.contains_key(&sys_id) {

4
pageserver/src/page_service.rs
View File

@@ -462,7 +462,7 @@ impl Connection {
})
.unwrap();
// generick ack:
// generic ack:
self.write_message_noflush(&BeMessage::RowDescription)
.await?;
self.write_message_noflush(&BeMessage::DataRow).await?;
@@ -503,7 +503,7 @@ impl Connection {
self.stream.write_i16(0).await?; /* numAttributes */
self.stream.flush().await?;
let pcache = page_cache::get_pagecahe(self.conf.clone(), sysid);
let pcache = page_cache::get_pagecache(self.conf.clone(), sysid);
loop {
let message = self.read_message().await?;

4
pageserver/src/restore_s3.rs
View File

@@ -119,7 +119,7 @@ async fn restore_chunk(conf: &PageServerConf) -> Result<(), S3Error> {
panic!("no base backup found");
}
let pcache = page_cache::get_pagecahe(conf.clone(), sys_id);
let pcache = page_cache::get_pagecache(conf.clone(), sys_id);
pcache.init_valid_lsn(oldest_lsn);
info!("{} files to restore...", slurp_futures.len());
@@ -305,7 +305,7 @@ async fn slurp_base_file(
// FIXME: use constants (BLCKSZ)
let mut blknum: u32 = parsed.segno * (1024 * 1024 * 1024 / 8192);
let pcache = page_cache::get_pagecahe(conf.clone(), sys_id);
let pcache = page_cache::get_pagecache(conf.clone(), sys_id);
while bytes.remaining() >= 8192 {
let tag = page_cache::BufferTag {

2
pageserver/src/walreceiver.rs
View File

@@ -71,7 +71,7 @@ async fn walreceiver_main(
let mut caught_up = false;
let sysid: u64 = identify_system.systemid().parse().unwrap();
let pcache = page_cache::get_pagecahe(conf, sysid);
let pcache = page_cache::get_pagecache(conf, sysid);
//
// Start streaming the WAL, from where we left off previously.

2
pageserver/src/walredo.rs
View File

@@ -52,7 +52,7 @@ pub fn wal_redo_main(conf: PageServerConf, sys_id: u64) {
.build()
.unwrap();
let pcache = page_cache::get_pagecahe(conf.clone(), sys_id);
let pcache = page_cache::get_pagecache(conf.clone(), sys_id);
// Loop forever, handling requests as they come.
let walredo_channel_receiver = &pcache.walredo_receiver;

2
vendor/postgres vendored

Submodule vendor/postgres updated: b1f5a5ec14...4d92fa940f

4
walkeeper/src/bin/wal_acceptor.rs
View File

@@ -27,14 +27,14 @@ fn main() -> Result<(), io::Error> {
.short("D")
.long("dir")
.takes_value(true)
.help("Path to the page server data directory"),
.help("Path to the WAL acceptor data directory"),
)
.arg(
Arg::with_name("listen")
.short("l")
.long("listen")
.takes_value(true)
.help("listen for incoming page requests on ip:port (default: 127.0.0.1:5454)"),
.help("listen for incoming connections on ip:port (default: 127.0.0.1:5454)"),
)
.arg(
Arg::with_name("pageserver")

2
walkeeper/src/wal_service.rs
View File

@@ -444,7 +444,7 @@ impl System {
return shared_state.hs_feedback;
}
// Load and lock control file (prevent running more than one instane of safekeeper */
// Load and lock control file (prevent running more than one instance of safekeeper
fn load_control_file(&self, conf: &WalAcceptorConf) {
let control_file_path = conf.data_dir
.join(self.id.to_string())