From 8696e1253e84dcc914d5ddbd32160c447a9701bf Mon Sep 17 00:00:00 2001 From: "Brian S. O'Neill" Date: Wed, 11 Oct 2006 16:16:15 +0000 Subject: Resolved some warnings. --- src/main/java/com/amazon/carbonado/qe/AbstractQuery.java | 2 -- src/main/java/com/amazon/carbonado/qe/CompositeScore.java | 3 --- .../java/com/amazon/carbonado/qe/DelegatedQueryExecutor.java | 4 ---- src/main/java/com/amazon/carbonado/qe/EmptyQuery.java | 3 --- .../java/com/amazon/carbonado/qe/FilteredQueryExecutor.java | 4 ---- src/main/java/com/amazon/carbonado/qe/FilteringScore.java | 1 - .../java/com/amazon/carbonado/qe/FullScanQueryExecutor.java | 5 ----- .../java/com/amazon/carbonado/qe/IndexedQueryExecutor.java | 3 --- src/main/java/com/amazon/carbonado/qe/JoinedQueryExecutor.java | 10 +--------- src/main/java/com/amazon/carbonado/qe/KeyQueryExecutor.java | 4 ---- src/main/java/com/amazon/carbonado/qe/OrderingScore.java | 3 +-- src/main/java/com/amazon/carbonado/qe/QueryExecutor.java | 4 ---- src/main/java/com/amazon/carbonado/qe/QueryExecutorCache.java | 2 -- src/main/java/com/amazon/carbonado/qe/QueryFactory.java | 2 -- src/main/java/com/amazon/carbonado/qe/SortedQueryExecutor.java | 2 -- src/main/java/com/amazon/carbonado/qe/StandardQuery.java | 5 ----- .../java/com/amazon/carbonado/qe/StandardQueryFactory.java | 3 --- src/main/java/com/amazon/carbonado/qe/StorageAccess.java | 4 ---- src/main/java/com/amazon/carbonado/qe/UnionQueryAnalyzer.java | 1 - src/main/java/com/amazon/carbonado/qe/UnionQueryExecutor.java | 2 -- 20 files changed, 2 insertions(+), 65 deletions(-) (limited to 'src/main/java/com/amazon/carbonado/qe') diff --git a/src/main/java/com/amazon/carbonado/qe/AbstractQuery.java b/src/main/java/com/amazon/carbonado/qe/AbstractQuery.java index 74d6e8d..436c2c2 100644 --- a/src/main/java/com/amazon/carbonado/qe/AbstractQuery.java +++ b/src/main/java/com/amazon/carbonado/qe/AbstractQuery.java @@ -32,8 +32,6 @@ import com.amazon.carbonado.Storable; import com.amazon.carbonado.filter.Filter; -import com.amazon.carbonado.info.OrderedProperty; - import com.amazon.carbonado.util.Appender; /** diff --git a/src/main/java/com/amazon/carbonado/qe/CompositeScore.java b/src/main/java/com/amazon/carbonado/qe/CompositeScore.java index 7190776..9992690 100644 --- a/src/main/java/com/amazon/carbonado/qe/CompositeScore.java +++ b/src/main/java/com/amazon/carbonado/qe/CompositeScore.java @@ -19,9 +19,6 @@ package com.amazon.carbonado.qe; import java.util.Comparator; -import java.util.Collections; -import java.util.List; - import com.amazon.carbonado.Storable; import com.amazon.carbonado.filter.Filter; diff --git a/src/main/java/com/amazon/carbonado/qe/DelegatedQueryExecutor.java b/src/main/java/com/amazon/carbonado/qe/DelegatedQueryExecutor.java index ef44963..1fe3ba8 100644 --- a/src/main/java/com/amazon/carbonado/qe/DelegatedQueryExecutor.java +++ b/src/main/java/com/amazon/carbonado/qe/DelegatedQueryExecutor.java @@ -20,8 +20,6 @@ package com.amazon.carbonado.qe; import java.io.IOException; -import java.util.List; - import com.amazon.carbonado.Cursor; import com.amazon.carbonado.FetchException; import com.amazon.carbonado.Query; @@ -31,8 +29,6 @@ import com.amazon.carbonado.Storage; import com.amazon.carbonado.filter.Filter; import com.amazon.carbonado.filter.FilterValues; -import com.amazon.carbonado.info.OrderedProperty; - /** * QueryExecutor which delegates by executing a Query on a Storage. * diff --git a/src/main/java/com/amazon/carbonado/qe/EmptyQuery.java b/src/main/java/com/amazon/carbonado/qe/EmptyQuery.java index d0f133c..161ad90 100644 --- a/src/main/java/com/amazon/carbonado/qe/EmptyQuery.java +++ b/src/main/java/com/amazon/carbonado/qe/EmptyQuery.java @@ -22,7 +22,6 @@ import java.io.IOException; import com.amazon.carbonado.Cursor; import com.amazon.carbonado.FetchException; -import com.amazon.carbonado.IsolationLevel; import com.amazon.carbonado.PersistNoneException; import com.amazon.carbonado.Storable; import com.amazon.carbonado.Query; @@ -32,8 +31,6 @@ import com.amazon.carbonado.cursor.EmptyCursor; import com.amazon.carbonado.filter.Filter; import com.amazon.carbonado.filter.FilterValues; -import com.amazon.carbonado.info.OrderedProperty; - /** * Special query implementation that fetches nothing. * diff --git a/src/main/java/com/amazon/carbonado/qe/FilteredQueryExecutor.java b/src/main/java/com/amazon/carbonado/qe/FilteredQueryExecutor.java index edf51cd..d431b3d 100644 --- a/src/main/java/com/amazon/carbonado/qe/FilteredQueryExecutor.java +++ b/src/main/java/com/amazon/carbonado/qe/FilteredQueryExecutor.java @@ -20,8 +20,6 @@ package com.amazon.carbonado.qe; import java.io.IOException; -import java.util.List; - import com.amazon.carbonado.Cursor; import com.amazon.carbonado.FetchException; import com.amazon.carbonado.Storable; @@ -33,8 +31,6 @@ import com.amazon.carbonado.filter.Filter; import com.amazon.carbonado.filter.FilterValues; import com.amazon.carbonado.filter.OpenFilter; -import com.amazon.carbonado.info.OrderedProperty; - /** * QueryExecutor which wraps another and filters results. * diff --git a/src/main/java/com/amazon/carbonado/qe/FilteringScore.java b/src/main/java/com/amazon/carbonado/qe/FilteringScore.java index 22a8c86..d3b3f35 100644 --- a/src/main/java/com/amazon/carbonado/qe/FilteringScore.java +++ b/src/main/java/com/amazon/carbonado/qe/FilteringScore.java @@ -23,7 +23,6 @@ import java.math.BigInteger; import java.util.ArrayList; import java.util.Comparator; import java.util.Collections; -import java.util.Iterator; import java.util.List; import com.amazon.carbonado.Storable; diff --git a/src/main/java/com/amazon/carbonado/qe/FullScanQueryExecutor.java b/src/main/java/com/amazon/carbonado/qe/FullScanQueryExecutor.java index f0e4517..d356e6b 100644 --- a/src/main/java/com/amazon/carbonado/qe/FullScanQueryExecutor.java +++ b/src/main/java/com/amazon/carbonado/qe/FullScanQueryExecutor.java @@ -20,9 +20,6 @@ package com.amazon.carbonado.qe; import java.io.IOException; -import java.util.Collections; -import java.util.List; - import com.amazon.carbonado.Cursor; import com.amazon.carbonado.FetchException; import com.amazon.carbonado.Storable; @@ -30,8 +27,6 @@ import com.amazon.carbonado.Storable; import com.amazon.carbonado.filter.Filter; import com.amazon.carbonado.filter.FilterValues; -import com.amazon.carbonado.info.OrderedProperty; - /** * QueryExecutor which fully scans all Storables of a given type. * diff --git a/src/main/java/com/amazon/carbonado/qe/IndexedQueryExecutor.java b/src/main/java/com/amazon/carbonado/qe/IndexedQueryExecutor.java index 46527bf..45ce4aa 100644 --- a/src/main/java/com/amazon/carbonado/qe/IndexedQueryExecutor.java +++ b/src/main/java/com/amazon/carbonado/qe/IndexedQueryExecutor.java @@ -20,8 +20,6 @@ package com.amazon.carbonado.qe; import java.io.IOException; -import java.util.Arrays; -import java.util.Collections; import java.util.List; import com.amazon.carbonado.Cursor; @@ -33,7 +31,6 @@ import com.amazon.carbonado.filter.FilterValues; import com.amazon.carbonado.filter.PropertyFilter; import com.amazon.carbonado.info.StorableIndex; -import com.amazon.carbonado.info.OrderedProperty; /** * QueryExecutor which utilizes an index. diff --git a/src/main/java/com/amazon/carbonado/qe/JoinedQueryExecutor.java b/src/main/java/com/amazon/carbonado/qe/JoinedQueryExecutor.java index 2272ecb..f3399a5 100644 --- a/src/main/java/com/amazon/carbonado/qe/JoinedQueryExecutor.java +++ b/src/main/java/com/amazon/carbonado/qe/JoinedQueryExecutor.java @@ -25,8 +25,6 @@ import java.util.Map; import org.cojen.classfile.ClassFile; import org.cojen.classfile.CodeBuilder; -import org.cojen.classfile.FieldInfo; -import org.cojen.classfile.Label; import org.cojen.classfile.LocalVariable; import org.cojen.classfile.MethodInfo; import org.cojen.classfile.Modifiers; @@ -37,20 +35,13 @@ import org.cojen.util.SoftValuedHashMap; import com.amazon.carbonado.Cursor; import com.amazon.carbonado.FetchException; -import com.amazon.carbonado.Repository; import com.amazon.carbonado.RepositoryException; import com.amazon.carbonado.Storable; -import com.amazon.carbonado.Storage; - import com.amazon.carbonado.cursor.MultiTransformedCursor; -import com.amazon.carbonado.filter.AndFilter; -import com.amazon.carbonado.filter.ClosedFilter; import com.amazon.carbonado.filter.Filter; import com.amazon.carbonado.filter.FilterValues; import com.amazon.carbonado.filter.OpenFilter; -import com.amazon.carbonado.filter.OrFilter; -import com.amazon.carbonado.filter.PropertyFilter; import com.amazon.carbonado.filter.RelOp; import com.amazon.carbonado.info.ChainedProperty; @@ -608,6 +599,7 @@ public class JoinedQueryExecutor return mOuterLoopFilterValues.withValues(values.getValuesFor(mSourceFilterAsFromTarget)); } + @SuppressWarnings("unused") private static interface Joiner { /** * Needs to be public for {@link QuickConstructorGenerator}, but hide diff --git a/src/main/java/com/amazon/carbonado/qe/KeyQueryExecutor.java b/src/main/java/com/amazon/carbonado/qe/KeyQueryExecutor.java index fcf728d..f26a9b3 100644 --- a/src/main/java/com/amazon/carbonado/qe/KeyQueryExecutor.java +++ b/src/main/java/com/amazon/carbonado/qe/KeyQueryExecutor.java @@ -20,9 +20,6 @@ package com.amazon.carbonado.qe; import java.io.IOException; -import java.util.Collections; -import java.util.List; - import com.amazon.carbonado.Cursor; import com.amazon.carbonado.FetchException; import com.amazon.carbonado.Storable; @@ -30,7 +27,6 @@ import com.amazon.carbonado.Storable; import com.amazon.carbonado.filter.Filter; import com.amazon.carbonado.filter.FilterValues; -import com.amazon.carbonado.info.OrderedProperty; import com.amazon.carbonado.info.StorableIndex; /** diff --git a/src/main/java/com/amazon/carbonado/qe/OrderingScore.java b/src/main/java/com/amazon/carbonado/qe/OrderingScore.java index 8eda9b9..15a277f 100644 --- a/src/main/java/com/amazon/carbonado/qe/OrderingScore.java +++ b/src/main/java/com/amazon/carbonado/qe/OrderingScore.java @@ -21,7 +21,6 @@ package com.amazon.carbonado.qe; import java.util.Comparator; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Set; import com.amazon.carbonado.Storable; @@ -249,7 +248,7 @@ public class OrderingScore { if (shouldReverseOrder == null) { freeProp = freeProp.direction(UNSPECIFIED); } else { - Direction freePropDir = freePropDir = freeProp.getDirection(); + Direction freePropDir = freeProp.getDirection(); if (freePropDir == UNSPECIFIED) { freePropDir = ASCENDING; } diff --git a/src/main/java/com/amazon/carbonado/qe/QueryExecutor.java b/src/main/java/com/amazon/carbonado/qe/QueryExecutor.java index 6348fb9..b0ab801 100644 --- a/src/main/java/com/amazon/carbonado/qe/QueryExecutor.java +++ b/src/main/java/com/amazon/carbonado/qe/QueryExecutor.java @@ -20,8 +20,6 @@ package com.amazon.carbonado.qe; import java.io.IOException; -import java.util.List; - import com.amazon.carbonado.Cursor; import com.amazon.carbonado.FetchException; import com.amazon.carbonado.Storable; @@ -29,8 +27,6 @@ import com.amazon.carbonado.Storable; import com.amazon.carbonado.filter.Filter; import com.amazon.carbonado.filter.FilterValues; -import com.amazon.carbonado.info.OrderedProperty; - /** * Performs all the actual work of executing a query. QueryExecutors are linked * together forming a query plan. diff --git a/src/main/java/com/amazon/carbonado/qe/QueryExecutorCache.java b/src/main/java/com/amazon/carbonado/qe/QueryExecutorCache.java index 2729851..ab333a7 100644 --- a/src/main/java/com/amazon/carbonado/qe/QueryExecutorCache.java +++ b/src/main/java/com/amazon/carbonado/qe/QueryExecutorCache.java @@ -28,8 +28,6 @@ import com.amazon.carbonado.Storable; import com.amazon.carbonado.filter.Filter; -import com.amazon.carbonado.info.OrderedProperty; - /** * QueryExecutors should be cached since expensive analysis is often required * to build them. diff --git a/src/main/java/com/amazon/carbonado/qe/QueryFactory.java b/src/main/java/com/amazon/carbonado/qe/QueryFactory.java index 738d18a..b7ead1d 100644 --- a/src/main/java/com/amazon/carbonado/qe/QueryFactory.java +++ b/src/main/java/com/amazon/carbonado/qe/QueryFactory.java @@ -24,8 +24,6 @@ import com.amazon.carbonado.Storable; import com.amazon.carbonado.filter.FilterValues; -import com.amazon.carbonado.info.OrderedProperty; - /** * Produces {@link Query} instances from a query specification. * diff --git a/src/main/java/com/amazon/carbonado/qe/SortedQueryExecutor.java b/src/main/java/com/amazon/carbonado/qe/SortedQueryExecutor.java index 38a8e36..a142b72 100644 --- a/src/main/java/com/amazon/carbonado/qe/SortedQueryExecutor.java +++ b/src/main/java/com/amazon/carbonado/qe/SortedQueryExecutor.java @@ -33,8 +33,6 @@ import com.amazon.carbonado.cursor.SortedCursor; import com.amazon.carbonado.filter.Filter; import com.amazon.carbonado.filter.FilterValues; -import com.amazon.carbonado.info.OrderedProperty; - /** * QueryExecutor which wraps another and sorts the results. * diff --git a/src/main/java/com/amazon/carbonado/qe/StandardQuery.java b/src/main/java/com/amazon/carbonado/qe/StandardQuery.java index 2e1cdfc..0a4c9d9 100644 --- a/src/main/java/com/amazon/carbonado/qe/StandardQuery.java +++ b/src/main/java/com/amazon/carbonado/qe/StandardQuery.java @@ -28,7 +28,6 @@ import com.amazon.carbonado.IsolationLevel; import com.amazon.carbonado.PersistException; import com.amazon.carbonado.PersistMultipleException; import com.amazon.carbonado.RepositoryException; -import com.amazon.carbonado.Storage; import com.amazon.carbonado.Storable; import com.amazon.carbonado.Transaction; import com.amazon.carbonado.Query; @@ -436,10 +435,6 @@ public abstract class StandardQuery extends AbstractQuery return newInstance(values, mOrdering); } - private Query createQuery(FilterValues values) throws FetchException { - return queryFactory().query(values, mOrdering); - } - private Query createQuery(FilterValues values, OrderingList ordering) throws FetchException { diff --git a/src/main/java/com/amazon/carbonado/qe/StandardQueryFactory.java b/src/main/java/com/amazon/carbonado/qe/StandardQueryFactory.java index e0f716f..c7ac720 100644 --- a/src/main/java/com/amazon/carbonado/qe/StandardQueryFactory.java +++ b/src/main/java/com/amazon/carbonado/qe/StandardQueryFactory.java @@ -25,12 +25,9 @@ import org.cojen.util.SoftValuedHashMap; import org.cojen.util.WeakIdentityMap; import com.amazon.carbonado.FetchException; -import com.amazon.carbonado.IsolationLevel; import com.amazon.carbonado.Query; import com.amazon.carbonado.RepositoryException; import com.amazon.carbonado.Storable; -import com.amazon.carbonado.Transaction; - import com.amazon.carbonado.filter.ClosedFilter; import com.amazon.carbonado.filter.Filter; import com.amazon.carbonado.filter.FilterValues; diff --git a/src/main/java/com/amazon/carbonado/qe/StorageAccess.java b/src/main/java/com/amazon/carbonado/qe/StorageAccess.java index 643d61c..8bef2f9 100644 --- a/src/main/java/com/amazon/carbonado/qe/StorageAccess.java +++ b/src/main/java/com/amazon/carbonado/qe/StorageAccess.java @@ -20,13 +20,9 @@ package com.amazon.carbonado.qe; import java.util.Collection; -import com.amazon.carbonado.Cursor; -import com.amazon.carbonado.FetchException; import com.amazon.carbonado.Storable; import com.amazon.carbonado.Storage; -import com.amazon.carbonado.cursor.SortBuffer; - import com.amazon.carbonado.info.StorableIndex; /** diff --git a/src/main/java/com/amazon/carbonado/qe/UnionQueryAnalyzer.java b/src/main/java/com/amazon/carbonado/qe/UnionQueryAnalyzer.java index 3e7a0a3..64888ba 100644 --- a/src/main/java/com/amazon/carbonado/qe/UnionQueryAnalyzer.java +++ b/src/main/java/com/amazon/carbonado/qe/UnionQueryAnalyzer.java @@ -30,7 +30,6 @@ import java.util.Set; import com.amazon.carbonado.FetchException; import com.amazon.carbonado.RepositoryException; import com.amazon.carbonado.Storable; -import com.amazon.carbonado.Storage; import com.amazon.carbonado.SupportException; import com.amazon.carbonado.filter.AndFilter; diff --git a/src/main/java/com/amazon/carbonado/qe/UnionQueryExecutor.java b/src/main/java/com/amazon/carbonado/qe/UnionQueryExecutor.java index 47672d1..aa3577f 100644 --- a/src/main/java/com/amazon/carbonado/qe/UnionQueryExecutor.java +++ b/src/main/java/com/amazon/carbonado/qe/UnionQueryExecutor.java @@ -34,8 +34,6 @@ import com.amazon.carbonado.cursor.UnionCursor; import com.amazon.carbonado.filter.Filter; import com.amazon.carbonado.filter.FilterValues; -import com.amazon.carbonado.info.OrderedProperty; - /** * QueryExecutor which wraps several others and unions the results. * -- cgit v1.2.3