make RewriteWithExpression idempotent#19

cloud-fan merged 2 commits intocloud-fan:withcloud-fan/spark:withfrom

peter-toth:with-idempotentpeter-toth/spark:with-idempotentCopy head branch name to clipboard