Skip to content

Invoca 2.39.2/drop orig functions but still repoint #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ColinDKelley wants to merge 4 commits into
base: invoca-2.39.2-extensions
Choose a base branch
from
Open

Invoca 2.39.2/drop orig functions but still repoint #11

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8482d1d
temporarily drop orig_ aliases
ColinDKelley Jul 20, 2023
38b23c2
temporarily drop orig_ aliases for 'x' as well
ColinDKelley Jul 20, 2023
68bf68c
include a repointParserFunctions() function versus copyParserFunction()
praymann Jul 21, 2023
fc65ddf
add TODO
ColinDKelley Jul 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 32 additions & 19 deletions promql/functions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1388,35 +1388,48 @@ func init() {
fmt.Println("Successfully replaced rate & friends with xrate & friends (and removed xrate & friends function keys).")

case "x", "X":
copyParserFunction("delta", "orig_delta")
copyParserFunction("increase", "orig_increase")
copyParserFunction("rate", "orig_rate")
repointFunction("delta", "xdelta", "orig_delta")
repointFunction("increase", "xincrease", "orig_increase")
repointFunction("rate", "xrate", "orig_rate")
// copyParserFunction("delta", "orig_delta")
// copyParserFunction("increase", "orig_increase")
// copyParserFunction("rate", "orig_rate")
repointParserFunctions("delta", "xdelta")
repointParserFunctions("increase", "xincrease")
repointParserFunctions("rate", "xrate")
repointFunction("delta", "xdelta" /*, "orig_delta" */)
repointFunction("increase", "xincrease" /*, "orig_increase" */)
repointFunction("rate", "xrate" /*, "orig_rate" */)

fmt.Println("Successfully replaced rate/increase/delta with xrate/xincrease/xdelta (and left the latter names available as well, and original functions callable as orig_rate/orig_increase/orig_delta).")

case "2", "y", "Y":
copyParserFunction("delta", "orig_delta")
copyParserFunction("increase", "orig_increase")
copyParserFunction("rate", "orig_rate")
repointFunction("delta", "ydelta", "orig_delta")
repointFunction("increase", "yincrease", "orig_increase")
repointFunction("rate", "yrate", "orig_rate")

fmt.Println("Successfully replaced rate/increase/delta with yrate/yincrease/ydelta (and left the latter names available as well, and original functions callable as orig_rate/orig_increase/orig_delta).")
// copyParserFunction("delta", "orig_delta")
// copyParserFunction("increase", "orig_increase")
// copyParserFunction("rate", "orig_rate")
repointParserFunctions("delta", "ydelta")
repointParserFunctions("increase", "yincrease")
repointParserFunctions("rate", "yrate")
repointFunction("delta", "ydelta" /*, "orig_delta" */)
repointFunction("increase", "yincrease" /*, "orig_increase" */)
repointFunction("rate", "yrate" /*, "orig_rate" */)

fmt.Println("Successfully replaced rate/increase/delta with yrate/yincrease/ydelta (and left the latter names available as well).")
}
}

/*
func copyParserFunction(fromName, toName string) {
fromFunction := *parser.Functions[fromName]
fromFunction.Name = toName
parser.Functions[toName] = &fromFunction
functionCopy := *parser.Functions[fromName]
functionCopy.Name = toName
parser.Functions[toName] = &functionCopy
}
*/

func repointFunction(name, newName, origName string) {
FunctionCalls[origName] = FunctionCalls[name]
func repointParserFunctions(name, newName string) {
parser.Functions[name] = parser.Functions[newName]
parser.Functions[name].Name = newName // TODO: This line feels redundant since the Name should already be newName. Hoping we can drop it. -Colin
}

func repointFunction(name, newName string /*, origName string */) {
// FunctionCalls[origName] = FunctionCalls[name]
FunctionCalls[name] = FunctionCalls[newName]
}

Expand Down