From b3444c71bf298e9c62a8fcd35ee0e83772e0fe82 Mon Sep 17 00:00:00 2001 From: "Brian S. O'Neill" Date: Mon, 4 Sep 2006 23:47:05 +0000 Subject: Rollback from revision 69. --- src/main/java/com/amazon/carbonado/qe/OrderingScore.java | 11 +---------- src/test/java/com/amazon/carbonado/qe/TestOrderingScore.java | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) (limited to 'src') 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 { } // 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 { /** * 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()); } } -- cgit v1.2.3