| commit | e383d5f72639e549fb3bbf65e8804ba358fdeed1 | [log] [tgz] |
|---|---|---|
| author | Xikui Wang <xkkwww@gmail.com> | Fri Apr 14 18:23:38 2017 -0700 |
| committer | Xikui Wang <xkkwww@gmail.com> | Mon Apr 17 15:44:31 2017 -0700 |
| tree | 7cce5666708c878bfdd76375562072566d092e08 | |
| parent | 8b44d1517d2bfbd5f2a43e4f41a5bcd308759dec [diff] |
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 <jenkins@fulliautomatix.ics.uci.edu> Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu> BAD: Jenkins <jenkins@fulliautomatix.ics.uci.edu> Integration-Tests: Jenkins <jenkins@fulliautomatix.ics.uci.edu> Reviewed-by: Ian Maxon <imaxon@apache.org>
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 @@ } InsertDeleteUpsertOperator insertOp = (InsertDeleteUpsertOperator) currentOp; - if (insertOp.getOperation() != Kind.INSERT) { + if (insertOp.getOperation() != Kind.INSERT && insertOp.getOperation() != Kind.UPSERT) { return false; }