summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian S. O'Neill <bronee@gmail.com>2006-09-04 23:47:05 +0000
committerBrian S. O'Neill <bronee@gmail.com>2006-09-04 23:47:05 +0000
commitb3444c71bf298e9c62a8fcd35ee0e83772e0fe82 (patch)
treea487e6890bf4a695c1d2981ab20874db024430fb
parent49d0e32955c647f33dbfbec592cd77fba3c7d8fa (diff)
Rollback from revision 69.
-rw-r--r--src/main/java/com/amazon/carbonado/qe/OrderingScore.java11
-rw-r--r--src/test/java/com/amazon/carbonado/qe/TestOrderingScore.java2
2 files changed, 2 insertions, 11 deletions
diff --git a/src/main/java/com/amazon/carbonado/qe/OrderingScore.java b/src/main/java/com/amazon/carbonado/qe/OrderingScore.java
index a2b46b9..ce85cb6 100644
--- a/src/main/java/com/amazon/carbonado/qe/OrderingScore.java
+++ b/src/main/java/com/amazon/carbonado/qe/OrderingScore.java
@@ -224,13 +224,6 @@ public class OrderingScore<S extends Storable> {
}
// Property not handled and not an identity filter.
-
- if (property.getDirection() == UNSPECIFIED) {
- // Specify a direction in order for a comparator to be later
- // created from remainder orderings.
- property = property.direction(ASCENDING);
- }
-
remainderProperties.add(property);
indexPos = Integer.MAX_VALUE;
}
@@ -324,9 +317,7 @@ public class OrderingScore<S extends Storable> {
/**
* Returns the ordering properties that the evaluated index does not
- * support. The list of orderings is reduced to eliminate redundancies. If
- * any remainder ordering properties originally had an unspecified
- * direction, the direction in this list is specified as ascending.
+ * support. The list of orderings is reduced to eliminate redundancies.
*
* @return remainder orderings, never null
*/
diff --git a/src/test/java/com/amazon/carbonado/qe/TestOrderingScore.java b/src/test/java/com/amazon/carbonado/qe/TestOrderingScore.java
index 25e9489..83b2364 100644
--- a/src/test/java/com/amazon/carbonado/qe/TestOrderingScore.java
+++ b/src/test/java/com/amazon/carbonado/qe/TestOrderingScore.java
@@ -594,6 +594,6 @@ public class TestOrderingScore extends TestCase {
assertEquals("-id", score.getHandledOrderings().get(0).toString());
assertEquals("-intProp", score.getHandledOrderings().get(1).toString());
- assertEquals("+longProp", score.getRemainderOrderings().get(0).toString());
+ assertEquals("~longProp", score.getRemainderOrderings().get(0).toString());
}
}