athaller/hstdb - Change NXADNFPSCM7ETIGZ676I7X3WENZPRBEZGIOLDWC2FSY652QK2UBAC

Make history listing with single hostname more efficient

Created by Alexander Thaller on September 24, 2020

NXADNFPSCM7ETIGZ676I7X3WENZPRBEZGIOLDWC2FSY652QK2UBAC

Dependencies

In channels

main

Change contents

Replacement in src/main.rs at line 191 [5.9144]

B:BD[4.599] → [2.3941:4013]

            let entries = store::new().get_nth_entries(&hostname, 25)?;

[4.599]

[2.4013]

            let entries = store::new().get_nth_entries(Some(&hostname), 25)?;

Replacement in src/store.rs at line 111 [6.10073]

B:BD[4.1676] → [2.5711:5806]

    pub fn get_nth_entries(&self, hostname: &str, count: usize) -> Result<Vec<Entry>, Error> {

[4.1676]

[4.1755]

    pub fn get_nth_entries(
        &self,
        hostname: Option<&str>,
        count: usize,
    ) -> Result<Vec<Entry>, Error> {

Replacement in src/store.rs at line 119 [6.10073]

B:BD[4.1889] → [3.125:179]

        let glob_string = datadir_path.join("*.csv");

[4.1889]

[4.1973]

        let mut entries: Vec<_> = if let Some(hostname) = hostname {
            let index_path = datadir_path.join(format!("{}.csv", hostname));
            Self::read_log_file(index_path)?
        } else {
            let glob_string = datadir_path.join("*.csv");

Replacement in src/store.rs at line 125 [6.10073]

B:BD[4.1974] → [4.1974:2066]

        let glob = glob::glob(&glob_string.to_string_lossy()).map_err(Error::InvalidGlob)?;

[4.1974]

[4.2066]

            let glob = glob::glob(&glob_string.to_string_lossy()).map_err(Error::InvalidGlob)?;

Replacement in src/store.rs at line 127 [6.10073]

B:BD[4.2067] → [4.2067:2207]

        let index_paths = glob
            .collect::<Result<Vec<PathBuf>, glob::GlobError>>()
            .map_err(Error::GlobIteration)?;

[4.2067]

[4.2207]

            let index_paths = glob
                .collect::<Result<Vec<PathBuf>, glob::GlobError>>()
                .map_err(Error::GlobIteration)?;

Replacement in src/store.rs at line 131 [6.10073]

B:BD[4.2208] → [4.2208:2279]

B:BD[4.2279] → [2.5807:5845]

∅:D[2.5845] → [4.2322:2424]

B:BD[4.2322] → [4.2322:2424]

B:BD[4.2424] → [2.5846:5902]

∅:D[2.5902] → [4.2424:2448]

B:BD[4.2424] → [4.2424:2448]

        let mut entries: Vec<_> = index_paths
            .into_iter()
            .map(Self::read_log_file)
            .collect::<Result<Vec<Vec<_>>, Error>>()?
            .into_iter()
            .flatten()
            .filter(|entry| entry.hostname == hostname)
            .collect();

[4.2208]

[4.2448]

            index_paths
                .into_iter()
                .map(Self::read_log_file)
                .collect::<Result<Vec<Vec<_>>, Error>>()?
                .into_iter()
                .flatten()
                .collect()
        };