You want your water to be ever so slightly smaller than your glass. Interseting gemotery makes for some strange artifacts when rendering.

Try upping the size of the shadow map. This can be found in the light settings.