Change in asterixdb[master]: ASTERIXDB-1493 Enable AUUID Rule on Upsert

[Xikui Wang (Code Review)]

Xikui Wang has uploaded a new change for review.

  https://asterix-gerrit.ics.uci.edu/1686

Change subject: ASTERIXDB-1493 Enable AUUID Rule on Upsert
......................................................................

ASTERIXDB-1493 Enable AUUID Rule on Upsert

Fix the bug that Upsert cannot use IntroduceAutogeneratedIDRule.

Change-Id: I8e7a120e48e3a734639ae3680d0237d07270ac3b
---
M 
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceAutogenerateIDRule.java
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb 
refs/changes/86/1686/1

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;
         }
 

-- 
To view, visit https://asterix-gerrit.ics.uci.edu/1686
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e7a120e48e3a734639ae3680d0237d07270ac3b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Xikui Wang <xkk...@gmail.com>