>From Michael Blow <mb...@apache.org>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19007 )
Change subject: Merge branch 'gerrit/trinity' into 'gerrit/goldfish'
......................................................................
Merge branch 'gerrit/trinity' into 'gerrit/goldfish'
Ext-ref: MB-63819
Change-Id: Ib5168f1c571a673b52c18a13d787b6be11465e3b
---
M
asterixdb/asterix-lang-sqlpp/src/test/java/org/apache/asterix/lang/expression/CommutativeEqualsTest.java
2 files changed, 17 insertions(+), 22 deletions(-)
Approvals:
Michael Blow: Looks good to me, approved; Verified
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 aec0b7c..6f68772 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,7 +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
@@ -105,27 +104,6 @@
ConstantExpression.TRUE));
Assert.assertFalse(FunctionUtil.commutativeEquals(expr1, expr2));
-=======
- Assert.assertFalse(FunctionUtil.commutativeEquals(expr1, expr2));
-
- expr2 = createExpression(BuiltinFunctions.EQ,
- createExpression(BuiltinFunctions.EQ,
- createExpression(BuiltinFunctions.STRING_LOWERCASE,
getVariableExpression('x')),
- ConstantExpression.TRUE),
- createExpression(BuiltinFunctions.EQ,
getVariableExpression('y'),
- new ConstantExpression(new AsterixConstantValue(new
AInt32(2)))));
-
- // ( 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.EQ,
- createExpression(BuiltinFunctions.EQ,
getVariableExpression('y'),
- new ConstantExpression(new AsterixConstantValue(new
AInt32(2)))),
- createExpression(BuiltinFunctions.EQ,
- createExpression(BuiltinFunctions.STRING_LOWERCASE,
getVariableExpression('x')),
- ConstantExpression.TRUE));
-
->>>>>>> BRANCH (e49261 Merge branch 'gerrit/neo' into 'gerrit/trinity')
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/+/19007
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: Ib5168f1c571a673b52c18a13d787b6be11465e3b
Gerrit-Change-Number: 19007
Gerrit-PatchSet: 3
Gerrit-Owner: Michael Blow <mb...@apache.org>
Gerrit-Reviewer: Anon. E. Moose #1000171
Gerrit-Reviewer: Jenkins <jenk...@fulliautomatix.ics.uci.edu>
Gerrit-Reviewer: Michael Blow <mb...@apache.org>
Gerrit-MessageType: merged
