extern/hishtory
1
0
Fork 0
mirror of https://github.com/ddworken/hishtory.git synced 2025-01-22 22:28:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Further improve history importing performance for #93

Browse Source
This commit is contained in:
David Dworken 2023-10-07 14:41:34 -07:00
parent 8097c31afa
commit 5323c264b3
No known key found for this signature in database
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
client/lib/lib.go
View File

@ -292,6 +292,7 @@ func ImportHistory(ctx context.Context, shouldReadStdin, force bool) (int, error
var batch []data.HistoryEntry
importTimestamp := time.Now().UTC()
batchSize := 100
importEntryId := uuid.Must(uuid.NewRandom()).String()
entriesIter(func(cmd string, err error) bool {
if err != nil {
iteratorError = err
@ -301,8 +302,12 @@ func ImportHistory(ctx context.Context, shouldReadStdin, force bool) (int, error
if isBashWeirdness(cmd) || strings.HasPrefix(cmd, " ") {
return true
}
// Set the timestamps so that they are monotonically increasing
startTime := importTimestamp.Add(time.Millisecond * time.Duration(numEntriesImported*2))
endTime := startTime.Add(time.Millisecond)
// And set the entryId in a similar way. This isn't critical from a correctness POV, but uuid.NewRandom() is
// quite slow, so this makes imports considerably faster
entryId := importEntryId + fmt.Sprintf("%d", numEntriesImported)
entry := normalizeEntryTimezone(data.HistoryEntry{
LocalUsername: currentUser.Name,
Hostname: hostname,
@ -313,7 +318,7 @@ func ImportHistory(ctx context.Context, shouldReadStdin, force bool) (int, error
StartTime: startTime,
EndTime: endTime,
DeviceId: config.DeviceId,
EntryId: uuid.Must(uuid.NewRandom()).String(),
EntryId: entryId,
})
batch = append(batch, entry)
if len(batch) > batchSize {