Repository: asterixdb Updated Branches: refs/heads/master 8b44d1517 -> e383d5f72
ASTERIXDB-1493 Enable AUUID Rule on Upsert Fix the bug that Upsert cannot use IntroduceAutogeneratedIDRule. Change-Id: I8e7a120e48e3a734639ae3680d0237d07270ac3b Reviewed-on: https://asterix-gerrit.ics.uci.edu/1686 Sonar-Qube: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Tested-by: Jenkins <jenk...@fulliautomatix.ics.uci.edu> BAD: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Integration-Tests: Jenkins <jenk...@fulliautomatix.ics.uci.edu> Reviewed-by: Ian Maxon <ima...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/e383d5f7 Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/e383d5f7 Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/e383d5f7 Branch: refs/heads/master Commit: e383d5f72639e549fb3bbf65e8804ba358fdeed1 Parents: 8b44d15 Author: Xikui Wang <xkk...@gmail.com> Authored: Fri Apr 14 18:23:38 2017 -0700 Committer: Xikui Wang <xkk...@gmail.com> Committed: Mon Apr 17 15:44:31 2017 -0700 ---------------------------------------------------------------------- .../asterix/optimizer/rules/IntroduceAutogenerateIDRule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/asterixdb/blob/e383d5f7/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceAutogenerateIDRule.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceAutogenerateIDRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceAutogenerateIDRule.java index 5c13467..a24c6e0 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceAutogenerateIDRule.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceAutogenerateIDRule.java @@ -99,7 +99,7 @@ public class IntroduceAutogenerateIDRule implements IAlgebraicRewriteRule { } InsertDeleteUpsertOperator insertOp = (InsertDeleteUpsertOperator) currentOp; - if (insertOp.getOperation() != Kind.INSERT) { + if (insertOp.getOperation() != Kind.INSERT && insertOp.getOperation() != Kind.UPSERT) { return false; }