Abstract: Examples herein involve providing a first query to an optimizer; identifying a first execution plan selected by the optimizer based on the first query; generating an annotated query based on the selected first execution plan, the annotated query comprising hints for executing the selected first execution plan; and storing the annotated query in a database, the annotated query to cause the optimizer to generate a second execution plan corresponding to the first execution plan based on the hints.