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

2017-04-17 Thread Xikui Wang (Code Review) 
Xikui Wang has submitted this change and it was merged.

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
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1686
Sonar-Qube: Jenkins 
Tested-by: Jenkins 
BAD: Jenkins 
Integration-Tests: Jenkins 
Reviewed-by: Ian Maxon 
---
M 
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceAutogenerateIDRule.java
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Ian Maxon: Looks good to me, approved
  Jenkins: Verified; No violations found; No violations found; Verified



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: merged
Gerrit-Change-Id: I8e7a120e48e3a734639ae3680d0237d07270ac3b
Gerrit-PatchSet: 2
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Xikui Wang 
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Xikui Wang

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

2017-04-17 Thread Ian Maxon (Code Review) 
Ian Maxon has posted comments on this change.

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


Patch Set 1: Code-Review+2

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I8e7a120e48e3a734639ae3680d0237d07270ac3b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Xikui Wang 
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Xikui Wang 
Gerrit-HasComments: No

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

2017-04-14 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

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


Patch Set 1: Integration-Tests+1

Integration Tests Successful

https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/2552/ 
: SUCCESS

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I8e7a120e48e3a734639ae3680d0237d07270ac3b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Xikui Wang 
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Xikui Wang 
Gerrit-HasComments: No

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

2017-04-14 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

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


Patch Set 1: BAD+1

BAD Compatibility Tests Successful

https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/1027/ : SUCCESS

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I8e7a120e48e3a734639ae3680d0237d07270ac3b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Xikui Wang 
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Xikui Wang 
Gerrit-HasComments: No

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

2017-04-14 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

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


Patch Set 1:

BAD Compatibility Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterixbad-compat/1027/

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I8e7a120e48e3a734639ae3680d0237d07270ac3b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Xikui Wang 
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Xikui Wang 
Gerrit-HasComments: No

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

2017-04-14 Thread Xikui Wang (Code Review) 
Xikui Wang has posted comments on this change.

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


Patch Set 1:

(1 comment)

https://asterix-gerrit.ics.uci.edu/#/c/1686/1/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceAutogenerateIDRule.java
File 
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceAutogenerateIDRule.java:

PS1, Line 102: &&
> Why &&?
If the insertOp is NOT insert and is NOT upsert (a.k.a NOT(is upsert OR is 
insert)), bypass this rule.


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I8e7a120e48e3a734639ae3680d0237d07270ac3b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Xikui Wang 
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-Reviewer: Xikui Wang 
Gerrit-HasComments: Yes

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

2017-04-14 Thread Ian Maxon (Code Review) 
Ian Maxon has posted comments on this change.

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


Patch Set 1:

(1 comment)

https://asterix-gerrit.ics.uci.edu/#/c/1686/1/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceAutogenerateIDRule.java
File 
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceAutogenerateIDRule.java:

PS1, Line 102: &&
Why &&?


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

Gerrit-MessageType: comment
Gerrit-Change-Id: I8e7a120e48e3a734639ae3680d0237d07270ac3b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Xikui Wang 
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: Yes

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

2017-04-14 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

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


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-asterix-app/369/ (6/6)

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I8e7a120e48e3a734639ae3680d0237d07270ac3b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Xikui Wang 
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

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

2017-04-14 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

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


Patch Set 1:

Integration Tests Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-integration-tests/2552/

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I8e7a120e48e3a734639ae3680d0237d07270ac3b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Xikui Wang 
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

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

2017-04-14 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

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


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-sonar/3579/ (3/6)

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I8e7a120e48e3a734639ae3680d0237d07270ac3b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Xikui Wang 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

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

2017-04-14 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

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


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-notopic/5055/ (4/6)

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I8e7a120e48e3a734639ae3680d0237d07270ac3b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Xikui Wang 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

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

2017-04-14 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

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


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-verify-storage/108/ (5/6)

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I8e7a120e48e3a734639ae3680d0237d07270ac3b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Xikui Wang 
Gerrit-Reviewer: Ian Maxon 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

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

2017-04-14 Thread 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

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

2017-04-14 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

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


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-no-installer-app/188/
 (1/6)

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I8e7a120e48e3a734639ae3680d0237d07270ac3b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Xikui Wang 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No

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

2017-04-14 Thread Jenkins (Code Review) 
Jenkins has posted comments on this change.

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


Patch Set 1:

Build Started 
https://asterix-jenkins.ics.uci.edu/job/asterix-gerrit-verify-asterix-app/190/ 
(2/6)

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I8e7a120e48e3a734639ae3680d0237d07270ac3b
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Xikui Wang 
Gerrit-Reviewer: Jenkins 
Gerrit-HasComments: No