Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-01-08 19:38:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

restore historynum and add linenum to historyitems

Browse Source
This commit is contained in:
sawka 2023-03-15 12:27:17 -07:00
parent ed60723720
commit f86f0a78b1
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pkg/sstore/dbops.go
View File

@ -17,7 +17,7 @@ import (
"github.com/scripthaus-dev/sh2-server/pkg/scbase" "github.com/scripthaus-dev/sh2-server/pkg/scbase"
) )
const HistoryCols = "historyid, ts, userid, sessionid, screenid, lineid, cmdid, haderror, cmdstr, remoteownerid, remoteid, remotename, ismetacmd, incognito" const HistoryCols = "h.historyid, h.ts, h.userid, h.sessionid, h.screenid, h.lineid, h.cmdid, h.haderror, h.cmdstr, h.remoteownerid, h.remoteid, h.remotename, h.ismetacmd, h.incognito"
const DefaultMaxHistoryItems = 1000 const DefaultMaxHistoryItems = 1000
type SingleConnDBGetter struct { type SingleConnDBGetter struct {
@ -287,35 +287,36 @@ func runHistoryQuery(tx *TxWrap, opts HistoryQueryOpts, realOffset int, itemLimi
return nil, fmt.Errorf("malformed remoteid") return nil, fmt.Errorf("malformed remoteid")
} }
} }
hnumStr := ""
whereClause := "WHERE 1" whereClause := "WHERE 1"
var queryArgs []interface{} var queryArgs []interface{}
hNumStr := ""
if opts.SessionId != "" && opts.ScreenId != "" { if opts.SessionId != "" && opts.ScreenId != "" {
whereClause += fmt.Sprintf(" AND sessionid = '%s' AND screenid = '%s'", opts.SessionId, opts.ScreenId) whereClause += fmt.Sprintf(" AND h.sessionid = '%s' AND h.screenid = '%s'", opts.SessionId, opts.ScreenId)
hnumStr = "w" hNumStr = ""
} else if opts.SessionId != "" { } else if opts.SessionId != "" {
whereClause += fmt.Sprintf(" AND sessionid = '%s'", opts.SessionId) whereClause += fmt.Sprintf(" AND h.sessionid = '%s'", opts.SessionId)
hnumStr = "s" hNumStr = "s"
} else { } else {
hnumStr = "g" hNumStr = "g"
} }
if opts.SearchText != "" { if opts.SearchText != "" {
whereClause += " AND cmdstr LIKE ? ESCAPE '\\'" whereClause += " AND h.cmdstr LIKE ? ESCAPE '\\'"
likeArg := opts.SearchText likeArg := opts.SearchText
likeArg = strings.ReplaceAll(likeArg, "%", "\\%") likeArg = strings.ReplaceAll(likeArg, "%", "\\%")
likeArg = strings.ReplaceAll(likeArg, "_", "\\_") likeArg = strings.ReplaceAll(likeArg, "_", "\\_")
queryArgs = append(queryArgs, "%"+likeArg+"%") queryArgs = append(queryArgs, "%"+likeArg+"%")
} }
if opts.FromTs > 0 { if opts.FromTs > 0 {
whereClause += fmt.Sprintf(" AND ts <= %d", opts.FromTs) whereClause += fmt.Sprintf(" AND h.ts <= %d", opts.FromTs)
} }
if opts.RemoteId != "" { if opts.RemoteId != "" {
whereClause += fmt.Sprintf(" AND remoteid = '%s'", opts.RemoteId) whereClause += fmt.Sprintf(" AND h.remoteid = '%s'", opts.RemoteId)
} }
if opts.NoMeta { if opts.NoMeta {
whereClause += " AND NOT ismetacmd" whereClause += " AND NOT h.ismetacmd"
} }
query := fmt.Sprintf("SELECT %s, '%s' || row_number() OVER win AS historynum FROM history %s WINDOW win AS (ORDER BY ts, historyid) ORDER BY ts DESC, historyid DESC LIMIT %d OFFSET %d", HistoryCols, hnumStr, whereClause, itemLimit, realOffset) query := fmt.Sprintf("SELECT %s, ('%s' || CAST((row_number() OVER win) as text)) historynum, l.linenum FROM history h LEFT OUTER JOIN line l ON (h.lineid = l.lineid) %s WINDOW win AS (ORDER BY h.ts, h.historyid) ORDER BY h.ts DESC, h.historyid DESC LIMIT %d OFFSET %d", HistoryCols, hNumStr, whereClause, itemLimit, realOffset)
fmt.Printf("HISTORY QUERY %s\n", query)
marr := tx.SelectMaps(query, queryArgs...) marr := tx.SelectMaps(query, queryArgs...)
rtn := make([]*HistoryItemType, len(marr)) rtn := make([]*HistoryItemType, len(marr))
for idx, m := range marr { for idx, m := range marr {

2
pkg/sstore/sstore.go
View File

@ -368,6 +368,7 @@ func (h *HistoryItemType) FromMap(m map[string]interface{}) bool {
quickSetStr(&h.Remote.Name, m, "remotename") quickSetStr(&h.Remote.Name, m, "remotename")
quickSetBool(&h.IsMetaCmd, m, "ismetacmd") quickSetBool(&h.IsMetaCmd, m, "ismetacmd")
quickSetStr(&h.HistoryNum, m, "historynum") quickSetStr(&h.HistoryNum, m, "historynum")
quickSetInt64(&h.LineNum, m, "linenum")
quickSetBool(&h.Incognito, m, "incognito") quickSetBool(&h.Incognito, m, "incognito")
return true return true
} }
@ -497,6 +498,7 @@ type HistoryItemType struct {
// transient (string because of different history orderings) // transient (string because of different history orderings)
HistoryNum string `json:"historynum"` HistoryNum string `json:"historynum"`
LineNum int64 `json:"linenum"`
} }
type HistoryQueryOpts struct { type HistoryQueryOpts struct {