>From Michael Blow <[email protected]>:
Michael Blow has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18944 )
Change subject: Merge branch 'gerrit/neo' into 'gerrit/goldfish'
......................................................................
Merge branch 'gerrit/neo' into 'gerrit/goldfish'
Ext-ref: MB-63488
Change-Id: I272c310d6c90bdc57d4b51df5570288853ad8691
---
M
asterixdb/asterix-lang-sqlpp/src/test/java/org/apache/asterix/lang/expression/CommutativeEqualsTest.java
2 files changed, 14 insertions(+), 14 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/44/18944/1
diff --git
a/asterixdb/asterix-lang-sqlpp/src/test/java/org/apache/asterix/lang/expression/CommutativeEqualsTest.java
b/asterixdb/asterix-lang-sqlpp/src/test/java/org/apache/asterix/lang/expression/CommutativeEqualsTest.java
index 25c5a63..aba83db 100644
---
a/asterixdb/asterix-lang-sqlpp/src/test/java/org/apache/asterix/lang/expression/CommutativeEqualsTest.java
+++
b/asterixdb/asterix-lang-sqlpp/src/test/java/org/apache/asterix/lang/expression/CommutativeEqualsTest.java
@@ -93,19 +93,6 @@
createExpression(BuiltinFunctions.EQ,
getVariableExpression('y'),
new ConstantExpression(new AsterixConstantValue(new
AInt32(2)))));
-<<<<<<< HEAD (67bbe2 [ASTERIXDB-3504][STO] Error in calculating if Page 0 is
full)
- // ( LOWER(varchar_field1) = varchar_field1 AND int_field1 = 2 )
- // ( int_field1 = 2 AND LOWER(varchar_field1) = varchar_field1)
- // should evaluate to true
- ILogicalExpression expr3 = createExpression(BuiltinFunctions.AND,
- createExpression(BuiltinFunctions.EQ,
getVariableExpression('y'),
- new ConstantExpression(new AsterixConstantValue(new
AInt32(2)))),
- createExpression(BuiltinFunctions.EQ,
- createExpression(BuiltinFunctions.STRING_LOWERCASE,
getVariableExpression('x')),
- ConstantExpression.TRUE));
-
- Assert.assertFalse(FunctionUtil.commutativeEquals(expr1, expr2));
-=======
Assert.assertFalse(FunctionUtil.commutativeEquals(expr1, expr2));
expr2 = createExpression(BuiltinFunctions.EQ,
@@ -125,7 +112,6 @@
createExpression(BuiltinFunctions.STRING_LOWERCASE,
getVariableExpression('x')),
ConstantExpression.TRUE));
->>>>>>> BRANCH (6a8121 [ASTERIXDB-3502][STO] Incorrectly treating two
expressions a)
Assert.assertTrue(FunctionUtil.commutativeEquals(expr2, expr3));
// ( 10/int_field1=6911432 ) AND ( bool_field1=true )
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18944
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: goldfish
Gerrit-Change-Id: I272c310d6c90bdc57d4b51df5570288853ad8691
Gerrit-Change-Number: 18944
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-MessageType: newchange
