diff --git a/CHANGELOG.md b/CHANGELOG.md index 10303c61a78acfa73a1c12f94f59635025ee1396..5bfe6d9e1dab75fb3b28a7268415f147e5e30323 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # REAL changelog +## Version [0.5.3](https://git.ecdf.ed.ac.uk/pguaglia/real/tags/0.5.3) (2021-10-21) + +#### Bug fixes + +- Fixed a bug in the implementation of intersection (issue #11). + ## Version [0.5.2](https://git.ecdf.ed.ac.uk/pguaglia/real/tags/0.5.2) (2021-10-08) #### Bug fixes diff --git a/pom.xml b/pom.xml index 0eab38b23cd801d6c5f0609a81022678594e3fb4..70bc495bf517fc566e2cc7ea8b18186b54257b5d 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ <groupId>uk.ac.ed.pguaglia</groupId> <artifactId>real</artifactId> - <version>0.5.2</version> + <version>0.5.3</version> <name>real</name> <url>https://git.ecdf.ed.ac.uk/pguaglia/real</url> diff --git a/src/main/java/uk/ac/ed/pguaglia/real/db/Table.java b/src/main/java/uk/ac/ed/pguaglia/real/db/Table.java index 422453ddae8786e6f023588c03144f20951da4d0..8df533f9d1d54635b3d812366c8b75fea1577b5a 100644 --- a/src/main/java/uk/ac/ed/pguaglia/real/db/Table.java +++ b/src/main/java/uk/ac/ed/pguaglia/real/db/Table.java @@ -210,7 +210,7 @@ public class Table { public static Table intersectAll(Table t1, Table t2) { RowComparator c = new RowComparator(); List<String[]> rec1 = t1.getRecords(); - List<String[]> rec2 = t2.getRecords(); + List<String[]> rec2 = t2.getRecords().stream().map(x -> permute(x,t2.attributes,t1.attributes)).collect(Collectors.toList()); rec1.sort(c); rec2.sort(c); @@ -231,7 +231,7 @@ public class Table { } if (cmp > 0) { if (it2.hasNext()) { - curr2 = permute(it2.next(),t2.attributes,t1.attributes); + curr2 = it2.next(); } else { break; } @@ -239,7 +239,7 @@ public class Table { if (cmp == 0) { if (it1.hasNext() && it2.hasNext()) { curr1 = it1.next(); - curr2 = permute(it2.next(),t2.attributes,t1.attributes); + curr2 = it2.next(); } else { break; } diff --git a/src/main/resources/welcome.txt b/src/main/resources/welcome.txt index ed50a5ede6078cfc43adda3cce78a3e382c1b47e..4b3ccb6ef0f5fc9124f532367adc4f0e6f2266fc 100644 --- a/src/main/resources/welcome.txt +++ b/src/main/resources/welcome.txt @@ -1,5 +1,5 @@ ┌──────────────────────────────────────────────────────────────────────────────┠-│ REAL: an interpreter for Relational Algebra (v0.5.2) │ +│ REAL: an interpreter for Relational Algebra (v0.5.3) │ │ Released under the MIT License │ │ Copyright © 2019-2021 Paolo Guagliardo │ └──────────────────────────────────────────────────────────────────────────────┘