You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mrql.apache.org by fe...@apache.org on 2017/01/26 16:21:05 UTC
incubator-mrql git commit: [MRQL-100] Fix a bug in group-by when the
group-by key is a collection
Repository: incubator-mrql
Updated Branches:
refs/heads/master 3158b9083 -> c5d5028bd
[MRQL-100] Fix a bug in group-by when the group-by key is a collection
Project: http://git-wip-us.apache.org/repos/asf/incubator-mrql/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mrql/commit/c5d5028b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mrql/tree/c5d5028b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mrql/diff/c5d5028b
Branch: refs/heads/master
Commit: c5d5028bd956926d1ed9c9b130d53418a91e92dc
Parents: 3158b90
Author: Leonidas Fegaras <fe...@cse.uta.edu>
Authored: Wed Jan 25 12:55:25 2017 -0600
Committer: Leonidas Fegaras <fe...@cse.uta.edu>
Committed: Wed Jan 25 12:55:25 2017 -0600
----------------------------------------------------------------------
core/src/main/java/org/apache/mrql/Bag.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mrql/blob/c5d5028b/core/src/main/java/org/apache/mrql/Bag.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/mrql/Bag.java b/core/src/main/java/org/apache/mrql/Bag.java
index f6fbfe7..83c8d01 100644
--- a/core/src/main/java/org/apache/mrql/Bag.java
+++ b/core/src/main/java/org/apache/mrql/Bag.java
@@ -503,7 +503,7 @@ public class Bag extends MRData implements Iterable<MRData> {
Iterator<MRData> xi = xt.iterator();
Iterator<MRData> yi = iterator();
while ( xi.hasNext() && yi.hasNext() ) {
- int c = xi.next().compareTo(yi.next());
+ int c = yi.next().compareTo(xi.next());
if (c < 0)
return -1;
else if (c > 0)
@@ -551,7 +551,7 @@ public class Bag extends MRData implements Iterable<MRData> {
while ( xi.hasNext() && yi.hasNext() )
if ( !xi.next().equals(yi.next()) )
return false;
- return xi.hasNext() || yi.hasNext();
+ return !xi.hasNext() && !yi.hasNext();
}
/** the hash code of this Bag is the XOR of the hash code of its elements */