summaryrefslogtreecommitdiff
path: root/src/main/java/com
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com')
-rw-r--r--src/main/java/com/amazon/carbonado/qe/CompositeScore.java38
-rw-r--r--src/main/java/com/amazon/carbonado/qe/IndexedQueryAnalyzer.java9
-rw-r--r--src/main/java/com/amazon/carbonado/qe/OrderingScore.java38
-rw-r--r--src/main/java/com/amazon/carbonado/qe/UnionQueryAnalyzer.java7
4 files changed, 4 insertions, 88 deletions
diff --git a/src/main/java/com/amazon/carbonado/qe/CompositeScore.java b/src/main/java/com/amazon/carbonado/qe/CompositeScore.java
index be4ceb7..2a85a32 100644
--- a/src/main/java/com/amazon/carbonado/qe/CompositeScore.java
+++ b/src/main/java/com/amazon/carbonado/qe/CompositeScore.java
@@ -45,22 +45,7 @@ public class CompositeScore<S extends Storable> {
*
* @param index index to evaluate
* @param filter optional filter which cannot contain any logical 'or' operations.
- * @throws IllegalArgumentException if index is null or filter is not supported
- */
- public static <S extends Storable> CompositeScore<S> evaluate
- (StorableIndex<S> index,
- Filter<S> filter)
- {
- return evaluate(index, filter, null);
- }
-
- /**
- * Evaluates the given index for its filtering and ordering capabilities
- * against the given filter and order-by properties.
- *
- * @param index index to evaluate
- * @param filter optional filter which cannot contain any logical 'or' operations.
- * @param orderings properties which define desired ordering
+ * @param orderings optional properties which define desired ordering
* @throws IllegalArgumentException if index is null or filter is not supported
*/
public static <S extends Storable> CompositeScore<S> evaluate
@@ -87,26 +72,7 @@ public class CompositeScore<S extends Storable> {
* @param unique true if index is unique
* @param clustered true if index is clustered
* @param filter optional filter which cannot contain any logical 'or' operations.
- * @throws IllegalArgumentException if index is null or filter is not supported
- */
- public static <S extends Storable> CompositeScore<S> evaluate
- (OrderedProperty<S>[] indexProperties,
- boolean unique,
- boolean clustered,
- Filter<S> filter)
- {
- return evaluate(indexProperties, unique, clustered, filter, null);
- }
-
- /**
- * Evaluates the given index properties for its filtering and ordering
- * capabilities against the given filter and order-by properties.
- *
- * @param indexProperties index properties to evaluate
- * @param unique true if index is unique
- * @param clustered true if index is clustered
- * @param filter optional filter which cannot contain any logical 'or' operations.
- * @param orderings properties which define desired ordering
+ * @param orderings optional properties which define desired ordering
* @throws IllegalArgumentException if index is null or filter is not supported
*/
public static <S extends Storable> CompositeScore<S> evaluate
diff --git a/src/main/java/com/amazon/carbonado/qe/IndexedQueryAnalyzer.java b/src/main/java/com/amazon/carbonado/qe/IndexedQueryAnalyzer.java
index 92c21dd..23ec0d1 100644
--- a/src/main/java/com/amazon/carbonado/qe/IndexedQueryAnalyzer.java
+++ b/src/main/java/com/amazon/carbonado/qe/IndexedQueryAnalyzer.java
@@ -76,15 +76,6 @@ public class IndexedQueryAnalyzer<S extends Storable> {
/**
* @param filter optional filter which which must be {@link Filter#isBound
* bound} and cannot contain any logical 'or' operations.
- * @throws IllegalArgumentException if filter is not supported
- */
- public Result analyze(Filter<S> filter) {
- return analyze(filter, null);
- }
-
- /**
- * @param filter optional filter which which must be {@link Filter#isBound
- * bound} and cannot contain any logical 'or' operations.
* @param orderings optional properties which define desired ordering
* @throws IllegalArgumentException if filter is not supported
*/
diff --git a/src/main/java/com/amazon/carbonado/qe/OrderingScore.java b/src/main/java/com/amazon/carbonado/qe/OrderingScore.java
index 67edcdd..843e22d 100644
--- a/src/main/java/com/amazon/carbonado/qe/OrderingScore.java
+++ b/src/main/java/com/amazon/carbonado/qe/OrderingScore.java
@@ -68,22 +68,7 @@ public class OrderingScore<S extends Storable> {
*
* @param index index to evaluate
* @param filter optional filter which cannot contain any logical 'or' operations.
- * @throws IllegalArgumentException if index is null or filter is not supported
- */
- public static <S extends Storable> OrderingScore<S> evaluate
- (StorableIndex<S> index,
- Filter<S> filter)
- {
- return evaluate(index, filter, null);
- }
-
- /**
- * Evaluates the given index for its ordering capabilities against the
- * given filter and order-by properties.
- *
- * @param index index to evaluate
- * @param filter optional filter which cannot contain any logical 'or' operations.
- * @param orderings properties which define desired ordering
+ * @param orderings optional properties which define desired ordering
* @throws IllegalArgumentException if index is null or filter is not supported
*/
public static <S extends Storable> OrderingScore<S> evaluate
@@ -110,26 +95,7 @@ public class OrderingScore<S extends Storable> {
* @param unique true if index is unique
* @param clustered true if index is clustered
* @param filter optional filter which cannot contain any logical 'or' operations.
- * @throws IllegalArgumentException if index is null or filter is not supported
- */
- public static <S extends Storable> OrderingScore<S> evaluate
- (OrderedProperty<S>[] indexProperties,
- boolean unique,
- boolean clustered,
- Filter<S> filter)
- {
- return evaluate(indexProperties, unique, clustered, filter, null);
- }
-
- /**
- * Evaluates the given index properties for its ordering capabilities
- * against the given filter and order-by properties.
- *
- * @param indexProperties index properties to evaluate
- * @param unique true if index is unique
- * @param clustered true if index is clustered
- * @param filter optional filter which cannot contain any logical 'or' operations.
- * @param orderings properties which define desired ordering
+ * @param orderings optional properties which define desired ordering
* @throws IllegalArgumentException if index is null or filter is not supported
*/
public static <S extends Storable> OrderingScore<S> evaluate
diff --git a/src/main/java/com/amazon/carbonado/qe/UnionQueryAnalyzer.java b/src/main/java/com/amazon/carbonado/qe/UnionQueryAnalyzer.java
index b4e45fa..b07934c 100644
--- a/src/main/java/com/amazon/carbonado/qe/UnionQueryAnalyzer.java
+++ b/src/main/java/com/amazon/carbonado/qe/UnionQueryAnalyzer.java
@@ -59,13 +59,6 @@ public class UnionQueryAnalyzer<S extends Storable> {
/**
* @param filter optional filter which must be {@link Filter#isBound bound}
- */
- public Result analyze(Filter<S> filter) {
- return analyze(filter, null);
- }
-
- /**
- * @param filter optional filter which must be {@link Filter#isBound bound}
* @param orderings optional properties which define desired ordering
*/
public Result analyze(Filter<S> filter, List<OrderedProperty<S>> orderings) {