Nishikori upsets Federer