Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[3677] branches/QUADS_QUERY_BRANCH
|
From: <mar...@us...> - 2010-09-29 15:37:02
|
Revision: 3677
http://bigdata.svn.sourceforge.net/bigdata/?rev=3677&view=rev
Author: martyncutcher
Date: 2010-09-29 15:36:55 +0000 (Wed, 29 Sep 2010)
Log Message:
-----------
Remove references to m_state Filter member field
Modified Paths:
--------------
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/ap/filter/DistinctFilter.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/filter/TupleFilter.java
branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/filter/TupleUpdater.java
branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/ExclusionFilter.java
branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Expander.java
branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Filter.java
branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/FilterBase.java
branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Resolver.java
branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Striterator.java
branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/UniquenessFilter.java
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/ap/filter/DistinctFilter.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/ap/filter/DistinctFilter.java 2010-09-29 15:29:12 UTC (rev 3676)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/bop/ap/filter/DistinctFilter.java 2010-09-29 15:36:55 UTC (rev 3677)
@@ -94,14 +94,7 @@
private final LinkedHashSet members;
public DistinctFilterImpl() {
- this(null);
- }
- @SuppressWarnings("unchecked")
- public DistinctFilterImpl(final Object state) {
-
- super(state);
-
members = new LinkedHashSet(getInitialCapacity(), getLoadFactor());
}
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/filter/TupleFilter.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/filter/TupleFilter.java 2010-09-29 15:29:12 UTC (rev 3676)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/filter/TupleFilter.java 2010-09-29 15:36:55 UTC (rev 3677)
@@ -64,17 +64,8 @@
public TupleFilter() {
- this(null/* state */);
-
}
- public TupleFilter(final Object state) {
-
-// this.state = state;
- super(state);
-
- }
-
@SuppressWarnings("unchecked")
@Override
public ITupleIterator<E> filterOnce(final Iterator src,Object context) {
Modified: branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/filter/TupleUpdater.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/filter/TupleUpdater.java 2010-09-29 15:29:12 UTC (rev 3676)
+++ branches/QUADS_QUERY_BRANCH/bigdata/src/java/com/bigdata/btree/filter/TupleUpdater.java 2010-09-29 15:36:55 UTC (rev 3677)
@@ -25,12 +25,6 @@
}
- public TupleUpdater(Object state) {
-
- super(state);
-
- }
-
@SuppressWarnings("unchecked")
@Override
public ITupleIterator<E> filterOnce(Iterator src, Object context) {
Modified: branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/ExclusionFilter.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/ExclusionFilter.java 2010-09-29 15:29:12 UTC (rev 3676)
+++ branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/ExclusionFilter.java 2010-09-29 15:36:55 UTC (rev 3677)
@@ -29,14 +29,16 @@
* Derived from Filter, and excludes a single object from the iteration.
*/
public class ExclusionFilter extends Filter {
- public ExclusionFilter(Object state) {
- super(state);
+ private Object m_exclude;
+
+ public ExclusionFilter(Object exclude) {
+ m_exclude = exclude;
}
/***********************************************************************
* Just make sure that the current object is not the one to be excluded.
**/
protected boolean isValid(Object obj) {
- return obj != m_state;
+ return obj != m_exclude;
}
}
Modified: branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Expander.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Expander.java 2010-09-29 15:29:12 UTC (rev 3676)
+++ branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Expander.java 2010-09-29 15:36:55 UTC (rev 3677)
@@ -39,10 +39,6 @@
public Expander() { }
- public Expander(Object state) {
- super(state);
- }
-
//-------------------------------------------------------------
@Override
Modified: branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Filter.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Filter.java 2010-09-29 15:29:12 UTC (rev 3676)
+++ branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Filter.java 2010-09-29 15:36:55 UTC (rev 3677)
@@ -39,10 +39,6 @@
public Filter() {}
- public Filter(Object state) {
- super(state);
- }
-
//-------------------------------------------------------------
@Override
Modified: branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/FilterBase.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/FilterBase.java 2010-09-29 15:29:12 UTC (rev 3676)
+++ branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/FilterBase.java 2010-09-29 15:36:55 UTC (rev 3677)
@@ -57,28 +57,10 @@
*/
/*private*/ volatile Map<String, Object> annotations;
- /**
- * State from the constructor (optional).
- * <p>
- * Note: Striterators should not have a side-effect on state object since
- * that can have unexpected consequences if the {@link IFilter} is reused.
- */
- final protected Object m_state;
-
public FilterBase() {
- m_state = null;
}
/**
- *
- * @param state
- * State (optional).
- */
- public FilterBase(final Object state) {
- m_state = state;
- }
-
- /**
* Add a filter to the end of this filter chain.
*
* @param filter
@@ -202,8 +184,7 @@
public String toString() {
final StringBuilder sb = new StringBuilder();
sb.append(super.toString());
- sb.append("{state=" + m_state);
- sb.append(",annotations=" + annotations);
+ sb.append("{annotations=" + annotations);
sb.append(",filterChain=" + filterChain);
sb.append("}");
return sb.toString();
Modified: branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Resolver.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Resolver.java 2010-09-29 15:29:12 UTC (rev 3676)
+++ branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Resolver.java 2010-09-29 15:36:55 UTC (rev 3677)
@@ -39,10 +39,6 @@
public Resolver() {}
- public Resolver(Object state) {
- super(state);
- }
-
//-------------------------------------------------------------
@Override
Modified: branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Striterator.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Striterator.java 2010-09-29 15:29:12 UTC (rev 3676)
+++ branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/Striterator.java 2010-09-29 15:36:55 UTC (rev 3677)
@@ -136,10 +136,10 @@
}
/** check each object against cls.isInstance(object) **/
- public IStriterator addTypeFilter(Class cls) {
- addFilter(new Filter(cls) {
+ public IStriterator addTypeFilter(final Class cls) {
+ addFilter(new Filter() {
protected boolean isValid(Object obj) {
- boolean ret = ((Class) m_state).isInstance(obj);
+ boolean ret = cls.isInstance(obj);
return ret;
}
@@ -149,10 +149,10 @@
}
/** check each object against cls.isInstance(object) **/
- public IStriterator addInstanceOfFilter(Class cls) {
- addFilter(new Filter(cls) {
+ public IStriterator addInstanceOfFilter(final Class cls) {
+ addFilter(new Filter() {
protected boolean isValid(Object obj) {
- return obj.getClass() == m_state;
+ return obj == null ? false : obj.getClass() == obj;
}
} );
Modified: branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/UniquenessFilter.java
===================================================================
--- branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/UniquenessFilter.java 2010-09-29 15:29:12 UTC (rev 3676)
+++ branches/QUADS_QUERY_BRANCH/ctc-striterators/src/java/cutthecrap/utils/striterators/UniquenessFilter.java 2010-09-29 15:36:55 UTC (rev 3677)
@@ -43,7 +43,6 @@
private final LinkedHashSet<Object> m_members = new LinkedHashSet<Object>();
public UniquenessFilter() {
- super(null);
}
/***********************************************************************
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
