clean up the upser executor and use the same schema for update inside up...

...sert

Fix the master valgrind problem.