You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2011/12/18 09:36:56 UTC
svn commit: r1220353 [2/11] - in
/incubator/lcf/branches/CONNECTORS-286/warthog-reimport: ./
src/main/java/org/apache/warthog/api/
src/main/java/org/apache/warthog/bytekeyvalue/
src/main/java/org/apache/warthog/common/ src/main/java/org/apache/warthog/...
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterBetween.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterBetween.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterCriteria.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterCriteria.java?rev=1220353&r1=1220352&r2=1220353&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterCriteria.java (original)
+++ incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterCriteria.java Sun Dec 18 08:36:52 2011
@@ -1,38 +1,38 @@
-/* $Id: FilterCriteria.java -1 $ */
-
-/**
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package org.apache.warthog.api;
-
-/** This base class specifies filtering that is applied on top of an accessor.
-*/
-public class FilterCriteria
-{
- public FilterCriteria()
- {
- }
-
- /** Check if a row should be filtered or not.
- */
- public boolean include(WHAccessor accessor)
- throws WHException
- {
- return true;
- }
-
-}
+/* $Id$ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.warthog.api;
+
+/** This base class specifies filtering that is applied on top of an accessor.
+*/
+public class FilterCriteria
+{
+ public FilterCriteria()
+ {
+ }
+
+ /** Check if a row should be filtered or not.
+ */
+ public boolean include(WHAccessor accessor)
+ throws WHException
+ {
+ return true;
+ }
+
+}
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterCriteria.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterCriteria.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterEquals.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterEquals.java?rev=1220353&r1=1220352&r2=1220353&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterEquals.java (original)
+++ incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterEquals.java Sun Dec 18 08:36:52 2011
@@ -1,47 +1,47 @@
-/* $Id: FilterCriteria.java -1 $ */
-
-/**
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package org.apache.warthog.api;
-
-/** This class specifies filtering on a specific column for a specific value.
-*/
-public class FilterEquals extends FilterCriteria
-{
- protected WHComparator comparator;
- protected String columnName;
- protected WHValue matchValue;
-
- public FilterEquals(String columnName, WHValue matchValue, WHComparator comparator)
- {
- super();
- this.comparator = comparator;
- this.columnName = columnName;
- this.matchValue = matchValue;
- }
-
- /** Check if a row should be filtered or not.
- */
- public boolean include(WHAccessor accessor)
- throws WHException
- {
- WHValue value = accessor.getValue(columnName);
- return comparator.compare(value,matchValue) == WHComparator.RESULT_EQUALS;
- }
-
-}
+/* $Id$ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.warthog.api;
+
+/** This class specifies filtering on a specific column for a specific value.
+*/
+public class FilterEquals extends FilterCriteria
+{
+ protected WHComparator comparator;
+ protected String columnName;
+ protected WHValue matchValue;
+
+ public FilterEquals(String columnName, WHValue matchValue, WHComparator comparator)
+ {
+ super();
+ this.comparator = comparator;
+ this.columnName = columnName;
+ this.matchValue = matchValue;
+ }
+
+ /** Check if a row should be filtered or not.
+ */
+ public boolean include(WHAccessor accessor)
+ throws WHException
+ {
+ WHValue value = accessor.getValue(columnName);
+ return comparator.compare(value,matchValue) == WHComparator.RESULT_EQUALS;
+ }
+
+}
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterEquals.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterEquals.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterEqualsMultiple.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterEqualsMultiple.java?rev=1220353&r1=1220352&r2=1220353&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterEqualsMultiple.java (original)
+++ incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterEqualsMultiple.java Sun Dec 18 08:36:52 2011
@@ -1,52 +1,52 @@
-/* $Id: FilterCriteria.java -1 $ */
-
-/**
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package org.apache.warthog.api;
-
-/** This class specifies filtering on a specific column for a specific set of values.
-*/
-public class FilterEqualsMultiple extends FilterCriteria
-{
- protected WHComparator comparator;
- protected String columnName;
- protected WHValue[] matchValues;
-
- public FilterEqualsMultiple(String columnName, WHValue[] matchValues, WHComparator comparator)
- {
- super();
- this.comparator = comparator;
- this.columnName = columnName;
- this.matchValues = matchValues;
- }
-
- /** Check if a row should be filtered or not.
- */
- public boolean include(WHAccessor accessor)
- throws WHException
- {
- WHValue value = accessor.getValue(columnName);
- for (int i = 0 ; i < matchValues.length ; i++)
- {
- if (comparator.compare(value,matchValues[i]) == WHComparator.RESULT_EQUALS)
- return true;
- }
- return false;
- }
-
-}
+/* $Id$ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.warthog.api;
+
+/** This class specifies filtering on a specific column for a specific set of values.
+*/
+public class FilterEqualsMultiple extends FilterCriteria
+{
+ protected WHComparator comparator;
+ protected String columnName;
+ protected WHValue[] matchValues;
+
+ public FilterEqualsMultiple(String columnName, WHValue[] matchValues, WHComparator comparator)
+ {
+ super();
+ this.comparator = comparator;
+ this.columnName = columnName;
+ this.matchValues = matchValues;
+ }
+
+ /** Check if a row should be filtered or not.
+ */
+ public boolean include(WHAccessor accessor)
+ throws WHException
+ {
+ WHValue value = accessor.getValue(columnName);
+ for (int i = 0 ; i < matchValues.length ; i++)
+ {
+ if (comparator.compare(value,matchValues[i]) == WHComparator.RESULT_EQUALS)
+ return true;
+ }
+ return false;
+ }
+
+}
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterEqualsMultiple.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterEqualsMultiple.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterEqualsOrAfter.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterEqualsOrAfter.java?rev=1220353&r1=1220352&r2=1220353&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterEqualsOrAfter.java (original)
+++ incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterEqualsOrAfter.java Sun Dec 18 08:36:52 2011
@@ -1,49 +1,49 @@
-/* $Id: FilterCriteria.java -1 $ */
-
-/**
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package org.apache.warthog.api;
-
-/** This class specifies filtering where a specific column is equal to or after a specific value, based
-* on a comparator.
-*/
-public class FilterEqualsOrAfter extends FilterCriteria
-{
- protected WHComparator comparator;
- protected String columnName;
- protected WHValue matchValue;
-
- public FilterEqualsOrAfter(String columnName, WHValue matchValue, WHComparator comparator)
- {
- super();
- this.comparator = comparator;
- this.columnName = columnName;
- this.matchValue = matchValue;
- }
-
- /** Check if a row should be filtered or not.
- */
- public boolean include(WHAccessor accessor)
- throws WHException
- {
- WHValue value = accessor.getValue(columnName);
- int result = comparator.compare(value,matchValue);
- return result == WHComparator.RESULT_LESS || result == WHComparator.RESULT_EQUALS;
- }
-
-}
+/* $Id$ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.warthog.api;
+
+/** This class specifies filtering where a specific column is equal to or after a specific value, based
+* on a comparator.
+*/
+public class FilterEqualsOrAfter extends FilterCriteria
+{
+ protected WHComparator comparator;
+ protected String columnName;
+ protected WHValue matchValue;
+
+ public FilterEqualsOrAfter(String columnName, WHValue matchValue, WHComparator comparator)
+ {
+ super();
+ this.comparator = comparator;
+ this.columnName = columnName;
+ this.matchValue = matchValue;
+ }
+
+ /** Check if a row should be filtered or not.
+ */
+ public boolean include(WHAccessor accessor)
+ throws WHException
+ {
+ WHValue value = accessor.getValue(columnName);
+ int result = comparator.compare(value,matchValue);
+ return result == WHComparator.RESULT_LESS || result == WHComparator.RESULT_EQUALS;
+ }
+
+}
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterEqualsOrAfter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterEqualsOrAfter.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterEqualsOrBefore.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterEqualsOrBefore.java?rev=1220353&r1=1220352&r2=1220353&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterEqualsOrBefore.java (original)
+++ incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterEqualsOrBefore.java Sun Dec 18 08:36:52 2011
@@ -1,49 +1,49 @@
-/* $Id: FilterCriteria.java -1 $ */
-
-/**
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package org.apache.warthog.api;
-
-/** This class specifies filtering where a specific column is equal to or before a specific value, based
-* on a comparator.
-*/
-public class FilterEqualsOrBefore extends FilterCriteria
-{
- protected WHComparator comparator;
- protected String columnName;
- protected WHValue matchValue;
-
- public FilterEqualsOrBefore(String columnName, WHValue matchValue, WHComparator comparator)
- {
- super();
- this.comparator = comparator;
- this.columnName = columnName;
- this.matchValue = matchValue;
- }
-
- /** Check if a row should be filtered or not.
- */
- public boolean include(WHAccessor accessor)
- throws WHException
- {
- WHValue value = accessor.getValue(columnName);
- int result = comparator.compare(value,matchValue);
- return result == WHComparator.RESULT_GREATER || result == WHComparator.RESULT_EQUALS;
- }
-
-}
+/* $Id$ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.warthog.api;
+
+/** This class specifies filtering where a specific column is equal to or before a specific value, based
+* on a comparator.
+*/
+public class FilterEqualsOrBefore extends FilterCriteria
+{
+ protected WHComparator comparator;
+ protected String columnName;
+ protected WHValue matchValue;
+
+ public FilterEqualsOrBefore(String columnName, WHValue matchValue, WHComparator comparator)
+ {
+ super();
+ this.comparator = comparator;
+ this.columnName = columnName;
+ this.matchValue = matchValue;
+ }
+
+ /** Check if a row should be filtered or not.
+ */
+ public boolean include(WHAccessor accessor)
+ throws WHException
+ {
+ WHValue value = accessor.getValue(columnName);
+ int result = comparator.compare(value,matchValue);
+ return result == WHComparator.RESULT_GREATER || result == WHComparator.RESULT_EQUALS;
+ }
+
+}
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterEqualsOrBefore.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterEqualsOrBefore.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterRelationship.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterRelationship.java?rev=1220353&r1=1220352&r2=1220353&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterRelationship.java (original)
+++ incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterRelationship.java Sun Dec 18 08:36:52 2011
@@ -1,53 +1,53 @@
-/* $Id: FilterRelationship.java -1 $ */
-
-/**
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package org.apache.warthog.api;
-
-/** This relationship type applies filtering criteria on top of another relationship.
-*/
-public class FilterRelationship implements WHRelationship
-{
- protected WHRelationship relationshipToFilter;
- protected FilterCriteria filterer;
-
- /** Constructor */
- public FilterRelationship(WHRelationship relationshipToFilter, FilterCriteria filterer)
- {
- this.relationshipToFilter = relationshipToFilter;
- this.filterer = filterer;
- }
-
- /** Get the column names represented by the relationship. */
- public String[] getColumnNames()
- throws WHException
- {
- return relationshipToFilter.getColumnNames();
- }
-
- /** Get the row accessor. This determines
- * both the initial set of rows and the ordering. The results can be later filtered to
- * yield the final output data.
- */
- public WHAccessor buildAccessor()
- throws WHException
- {
- return new FilterAccessor(relationshipToFilter.buildAccessor(),filterer);
- }
-
-}
+/* $Id$ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.warthog.api;
+
+/** This relationship type applies filtering criteria on top of another relationship.
+*/
+public class FilterRelationship implements WHRelationship
+{
+ protected WHRelationship relationshipToFilter;
+ protected FilterCriteria filterer;
+
+ /** Constructor */
+ public FilterRelationship(WHRelationship relationshipToFilter, FilterCriteria filterer)
+ {
+ this.relationshipToFilter = relationshipToFilter;
+ this.filterer = filterer;
+ }
+
+ /** Get the column names represented by the relationship. */
+ public String[] getColumnNames()
+ throws WHException
+ {
+ return relationshipToFilter.getColumnNames();
+ }
+
+ /** Get the row accessor. This determines
+ * both the initial set of rows and the ordering. The results can be later filtered to
+ * yield the final output data.
+ */
+ public WHAccessor buildAccessor()
+ throws WHException
+ {
+ return new FilterAccessor(relationshipToFilter.buildAccessor(),filterer);
+ }
+
+}
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterRelationship.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterRelationship.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterRelationshipBuilder.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterRelationshipBuilder.java?rev=1220353&r1=1220352&r2=1220353&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterRelationshipBuilder.java (original)
+++ incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterRelationshipBuilder.java Sun Dec 18 08:36:52 2011
@@ -1,100 +1,100 @@
-/* $Id: FilterRelationshipBuilder.java -1 $ */
-
-/**
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package org.apache.warthog.api;
-
-import java.lang.reflect.*;
-
-/** Build a relationship based on another WHRelationshipBuilder with an applied filter.
-*/
-public class FilterRelationshipBuilder implements WHRelationshipBuilder
-{
- protected WHRelationshipBuilder baseRelationshipBuilder;
- protected FilterCriteria filterer;
- protected String columnToFilter;
- protected String filterClassName;
- protected String matchColumnName;
- protected WHComparator comparator;
-
- /** Constructor.
- * Can be called on one of two ways. Either filterer is null and matchColumnName, columnToFilter, and filterClassName
- * are set, or filterer is non-null. The class specified by filterClassName will be instantiated
- * using the XXX(columnName, value) constructor.
- */
- public FilterRelationshipBuilder(WHRelationshipBuilder baseRelationshipBuilder,
- FilterCriteria filterer, String matchColumnName, String filterClassName, String columnToFilter,
- WHComparator comparator)
- throws WHException
- {
- this.baseRelationshipBuilder = baseRelationshipBuilder;
- this.filterer = filterer;
- this.columnToFilter = columnToFilter;
- this.filterClassName = filterClassName;
- this.matchColumnName = matchColumnName;
- this.comparator = comparator;
- }
-
- /** Construct a relationship based on the specified accessor row.
- */
- public WHRelationship createRelationship(WHAccessor accessor)
- throws WHException
- {
- // Build the base accessor using the accessor builder we've been handed
- WHRelationship baseRelationship = baseRelationshipBuilder.createRelationship(accessor);
-
- if (matchColumnName != null && columnToFilter != null && filterClassName != null &&
- comparator != null)
- {
- WHValue theMatchValue = accessor.getValue(matchColumnName);
- try
- {
- Class classValue = Class.forName(filterClassName);
- Constructor constructor = classValue.getConstructor(new Class[]{String.class,WHValue.class,WHComparator.class});
- Object object = constructor.newInstance(new Object[]{columnToFilter,theMatchValue,comparator});
- if (!(object instanceof FilterCriteria))
- throw new WHException("Filter class '"+filterClassName+"' does not extend FilterCriteria");
- filterer = (FilterCriteria)object;
- }
- catch (ClassNotFoundException e)
- {
- throw new WHException("Can't find filter class '"+filterClassName+"': "+e.getMessage(),e);
- }
- catch (NoSuchMethodException e)
- {
- throw new WHException("Filter class '"+filterClassName+"' does not have a constructor with (String,WHValue,WHComparator) arguments: "+e.getMessage(),e);
- }
- catch (InvocationTargetException e)
- {
- throw new WHException("Constructor exception instantiating filter class '"+filterClassName+"': "+e.getMessage(),e);
- }
- catch (InstantiationException e)
- {
- throw new WHException("Instantiation exception for filter class '"+filterClassName+"': "+e.getMessage(),e);
- }
- catch (IllegalAccessException e)
- {
- throw new WHException("Filter class '"+filterClassName+"' (String,WHValue,WHComparator) constructor has protected access",e);
- }
- }
-
- // Now build the filter relationship with it.
- return new FilterRelationship(baseRelationship,filterer);
- }
-
+/* $Id$ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.warthog.api;
+
+import java.lang.reflect.*;
+
+/** Build a relationship based on another WHRelationshipBuilder with an applied filter.
+*/
+public class FilterRelationshipBuilder implements WHRelationshipBuilder
+{
+ protected WHRelationshipBuilder baseRelationshipBuilder;
+ protected FilterCriteria filterer;
+ protected String columnToFilter;
+ protected String filterClassName;
+ protected String matchColumnName;
+ protected WHComparator comparator;
+
+ /** Constructor.
+ * Can be called on one of two ways. Either filterer is null and matchColumnName, columnToFilter, and filterClassName
+ * are set, or filterer is non-null. The class specified by filterClassName will be instantiated
+ * using the XXX(columnName, value) constructor.
+ */
+ public FilterRelationshipBuilder(WHRelationshipBuilder baseRelationshipBuilder,
+ FilterCriteria filterer, String matchColumnName, String filterClassName, String columnToFilter,
+ WHComparator comparator)
+ throws WHException
+ {
+ this.baseRelationshipBuilder = baseRelationshipBuilder;
+ this.filterer = filterer;
+ this.columnToFilter = columnToFilter;
+ this.filterClassName = filterClassName;
+ this.matchColumnName = matchColumnName;
+ this.comparator = comparator;
+ }
+
+ /** Construct a relationship based on the specified accessor row.
+ */
+ public WHRelationship createRelationship(WHAccessor accessor)
+ throws WHException
+ {
+ // Build the base accessor using the accessor builder we've been handed
+ WHRelationship baseRelationship = baseRelationshipBuilder.createRelationship(accessor);
+
+ if (matchColumnName != null && columnToFilter != null && filterClassName != null &&
+ comparator != null)
+ {
+ WHValue theMatchValue = accessor.getValue(matchColumnName);
+ try
+ {
+ Class classValue = Class.forName(filterClassName);
+ Constructor constructor = classValue.getConstructor(new Class[]{String.class,WHValue.class,WHComparator.class});
+ Object object = constructor.newInstance(new Object[]{columnToFilter,theMatchValue,comparator});
+ if (!(object instanceof FilterCriteria))
+ throw new WHException("Filter class '"+filterClassName+"' does not extend FilterCriteria");
+ filterer = (FilterCriteria)object;
+ }
+ catch (ClassNotFoundException e)
+ {
+ throw new WHException("Can't find filter class '"+filterClassName+"': "+e.getMessage(),e);
+ }
+ catch (NoSuchMethodException e)
+ {
+ throw new WHException("Filter class '"+filterClassName+"' does not have a constructor with (String,WHValue,WHComparator) arguments: "+e.getMessage(),e);
+ }
+ catch (InvocationTargetException e)
+ {
+ throw new WHException("Constructor exception instantiating filter class '"+filterClassName+"': "+e.getMessage(),e);
+ }
+ catch (InstantiationException e)
+ {
+ throw new WHException("Instantiation exception for filter class '"+filterClassName+"': "+e.getMessage(),e);
+ }
+ catch (IllegalAccessException e)
+ {
+ throw new WHException("Filter class '"+filterClassName+"' (String,WHValue,WHComparator) constructor has protected access",e);
+ }
+ }
+
+ // Now build the filter relationship with it.
+ return new FilterRelationship(baseRelationship,filterer);
+ }
+
}
\ No newline at end of file
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterRelationshipBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterRelationshipBuilder.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterSubquery.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterSubquery.java?rev=1220353&r1=1220352&r2=1220353&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterSubquery.java (original)
+++ incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterSubquery.java Sun Dec 18 08:36:52 2011
@@ -1,54 +1,54 @@
-/* $Id: FilterSubquery.java -1 $ */
-
-/**
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package org.apache.warthog.api;
-
-/** Filter using a secondary index, in either an "exists" or "not exists"
-* way. This filter must build a new accessor for every isUnfiltered() request,
-* and return 'true' if the accessor is non-empty, or the converse (depending on the
-* setting of the isExists flag).
-* Note that there are a number of 'moving parts' needed to make this filter work.
-* The accessor must be constructed on the fly, so there has to be some code that
-* finds the right table or index accessor based on the join criteria. That's going to
-* be handled by a class implementing WHRelationshipBuilder.
-*/
-public class FilterSubquery extends FilterCriteria
-{
- protected boolean isExists;
- protected WHRelationshipBuilder builder;
-
- /** Constructor */
- public FilterSubquery(boolean isExists, WHRelationshipBuilder builder)
- {
- super();
- this.isExists = isExists;
- this.builder = builder;
- }
-
- /** Check if a row should be filtered or not.
- */
- @Override
- public boolean include(WHAccessor accessor)
- throws WHException
- {
- WHRelationship checkerRelationship = builder.createRelationship(accessor);
- return isExists ^ (checkerRelationship.buildAccessor().getCurrentRowID() == null);
- }
-
+/* $Id$ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.warthog.api;
+
+/** Filter using a secondary index, in either an "exists" or "not exists"
+* way. This filter must build a new accessor for every isUnfiltered() request,
+* and return 'true' if the accessor is non-empty, or the converse (depending on the
+* setting of the isExists flag).
+* Note that there are a number of 'moving parts' needed to make this filter work.
+* The accessor must be constructed on the fly, so there has to be some code that
+* finds the right table or index accessor based on the join criteria. That's going to
+* be handled by a class implementing WHRelationshipBuilder.
+*/
+public class FilterSubquery extends FilterCriteria
+{
+ protected boolean isExists;
+ protected WHRelationshipBuilder builder;
+
+ /** Constructor */
+ public FilterSubquery(boolean isExists, WHRelationshipBuilder builder)
+ {
+ super();
+ this.isExists = isExists;
+ this.builder = builder;
+ }
+
+ /** Check if a row should be filtered or not.
+ */
+ @Override
+ public boolean include(WHAccessor accessor)
+ throws WHException
+ {
+ WHRelationship checkerRelationship = builder.createRelationship(accessor);
+ return isExists ^ (checkerRelationship.buildAccessor().getCurrentRowID() == null);
+ }
+
}
\ No newline at end of file
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterSubquery.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterSubquery.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexAfter.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexAfter.java?rev=1220353&r1=1220352&r2=1220353&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexAfter.java (original)
+++ incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexAfter.java Sun Dec 18 08:36:52 2011
@@ -1,62 +1,62 @@
-/* $Id: IndexAfter.java -1 $ */
-
-/**
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package org.apache.warthog.api;
-
-/** This class represents index criteria designed to locate matches that follow
-* a specific WHValue.
-*/
-public class IndexAfter extends IndexCriteria
-{
- protected WHValue value;
-
- /** Constructor */
- public IndexAfter(WHValue value)
- {
- super();
- this.value = value;
- }
-
- /** Evaluate a given value (which comes from a table row described by a btree node, and which
- * may turn out to be null) against the criteria as determined by this class, and return
- * an appropriate bit pattern. The bit pattern is used to limit which branches of the index tree the search
- * should descend.
- *
- * The comparator is provided to allow simple inequality comparisons against known values using the same logic
- * as the index is organized by.
- */
- public int evaluateValue(WHValue value, WHComparator comparator)
- throws WHException
- {
- int result = comparator.compare(value,this.value);
- if (result == WHComparator.RESULT_EQUALS)
- return SIGNAL_GREATER;
-
- if (result == WHComparator.RESULT_GREATER)
- return SIGNAL_GREATER;
-
- if (result == WHComparator.RESULT_LESS)
- return SIGNAL_LESSER | SIGNAL_EQUALS | SIGNAL_GREATER;
-
- throw new WHException("Comparator returned unexpected value");
- }
-
-}
-
+/* $Id$ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.warthog.api;
+
+/** This class represents index criteria designed to locate matches that follow
+* a specific WHValue.
+*/
+public class IndexAfter extends IndexCriteria
+{
+ protected WHValue value;
+
+ /** Constructor */
+ public IndexAfter(WHValue value)
+ {
+ super();
+ this.value = value;
+ }
+
+ /** Evaluate a given value (which comes from a table row described by a btree node, and which
+ * may turn out to be null) against the criteria as determined by this class, and return
+ * an appropriate bit pattern. The bit pattern is used to limit which branches of the index tree the search
+ * should descend.
+ *
+ * The comparator is provided to allow simple inequality comparisons against known values using the same logic
+ * as the index is organized by.
+ */
+ public int evaluateValue(WHValue value, WHComparator comparator)
+ throws WHException
+ {
+ int result = comparator.compare(value,this.value);
+ if (result == WHComparator.RESULT_EQUALS)
+ return SIGNAL_GREATER;
+
+ if (result == WHComparator.RESULT_GREATER)
+ return SIGNAL_GREATER;
+
+ if (result == WHComparator.RESULT_LESS)
+ return SIGNAL_LESSER | SIGNAL_EQUALS | SIGNAL_GREATER;
+
+ throw new WHException("Comparator returned unexpected value");
+ }
+
+}
+
\ No newline at end of file
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexAfter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexAfter.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexBefore.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexBefore.java?rev=1220353&r1=1220352&r2=1220353&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexBefore.java (original)
+++ incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexBefore.java Sun Dec 18 08:36:52 2011
@@ -1,62 +1,62 @@
-/* $Id: IndexBefore.java -1 $ */
-
-/**
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package org.apache.warthog.api;
-
-/** This class represents index criteria designed to locate matches that precede
-* a specific WHValue.
-*/
-public class IndexBefore extends IndexCriteria
-{
- protected WHValue value;
-
- /** Constructor */
- public IndexBefore(WHValue value)
- {
- super();
- this.value = value;
- }
-
- /** Evaluate a given value (which comes from a table row described by a btree node, and which
- * may turn out to be null) against the criteria as determined by this class, and return
- * an appropriate bit pattern. The bit pattern is used to limit which branches of the index tree the search
- * should descend.
- *
- * The comparator is provided to allow simple inequality comparisons against known values using the same logic
- * as the index is organized by.
- */
- public int evaluateValue(WHValue value, WHComparator comparator)
- throws WHException
- {
- int result = comparator.compare(value,this.value);
- if (result == WHComparator.RESULT_EQUALS)
- return SIGNAL_LESSER;
-
- if (result == WHComparator.RESULT_GREATER)
- return SIGNAL_GREATER | SIGNAL_EQUALS | SIGNAL_LESSER;
-
- if (result == WHComparator.RESULT_LESS)
- return SIGNAL_LESSER;
-
- throw new WHException("Comparator returned unexpected value");
- }
-
-}
-
+/* $Id$ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.warthog.api;
+
+/** This class represents index criteria designed to locate matches that precede
+* a specific WHValue.
+*/
+public class IndexBefore extends IndexCriteria
+{
+ protected WHValue value;
+
+ /** Constructor */
+ public IndexBefore(WHValue value)
+ {
+ super();
+ this.value = value;
+ }
+
+ /** Evaluate a given value (which comes from a table row described by a btree node, and which
+ * may turn out to be null) against the criteria as determined by this class, and return
+ * an appropriate bit pattern. The bit pattern is used to limit which branches of the index tree the search
+ * should descend.
+ *
+ * The comparator is provided to allow simple inequality comparisons against known values using the same logic
+ * as the index is organized by.
+ */
+ public int evaluateValue(WHValue value, WHComparator comparator)
+ throws WHException
+ {
+ int result = comparator.compare(value,this.value);
+ if (result == WHComparator.RESULT_EQUALS)
+ return SIGNAL_LESSER;
+
+ if (result == WHComparator.RESULT_GREATER)
+ return SIGNAL_GREATER | SIGNAL_EQUALS | SIGNAL_LESSER;
+
+ if (result == WHComparator.RESULT_LESS)
+ return SIGNAL_LESSER;
+
+ throw new WHException("Comparator returned unexpected value");
+ }
+
+}
+
\ No newline at end of file
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexBefore.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexBefore.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexBetween.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexBetween.java?rev=1220353&r1=1220352&r2=1220353&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexBetween.java (original)
+++ incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexBetween.java Sun Dec 18 08:36:52 2011
@@ -1,74 +1,74 @@
-/* $Id: IndexBetween.java -1 $ */
-
-/**
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package org.apache.warthog.api;
-
-/** This class represents index criteria designed to locate matches that follow
-* a specific WHValue, but precede a second WHValue, non-inclusive.
-*/
-public class IndexBetween extends IndexCriteria
-{
- protected WHValue afterValue;
- protected WHValue beforeValue;
-
- /** Constructor */
- public IndexBetween(WHValue afterValue, WHValue beforeValue)
- {
- super();
- this.afterValue = afterValue;
- this.beforeValue = beforeValue;
- }
-
- /** Evaluate a given value (which comes from a table row described by a btree node, and which
- * may turn out to be null) against the criteria as determined by this class, and return
- * an appropriate bit pattern. The bit pattern is used to limit which branches of the index tree the search
- * should descend.
- *
- * The comparator is provided to allow simple inequality comparisons against known values using the same logic
- * as the index is organized by.
- */
- public int evaluateValue(WHValue value, WHComparator comparator)
- throws WHException
- {
- int afterResult = comparator.compare(value,afterValue);
- if (afterResult == WHComparator.RESULT_EQUALS)
- return SIGNAL_GREATER;
-
- if (afterResult == WHComparator.RESULT_GREATER)
- return SIGNAL_GREATER;
-
- if (afterResult == WHComparator.RESULT_LESS)
- {
- int beforeResult = comparator.compare(value,beforeValue);
- if (beforeResult == WHComparator.RESULT_EQUALS)
- return SIGNAL_LESSER;
-
- if (beforeResult == WHComparator.RESULT_GREATER)
- return SIGNAL_LESSER | SIGNAL_EQUALS | SIGNAL_GREATER;
-
- if (beforeResult == WHComparator.RESULT_LESS)
- return SIGNAL_LESSER;
- }
-
- throw new WHException("Comparator returned unexpected value");
- }
-
-}
-
+/* $Id$ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.warthog.api;
+
+/** This class represents index criteria designed to locate matches that follow
+* a specific WHValue, but precede a second WHValue, non-inclusive.
+*/
+public class IndexBetween extends IndexCriteria
+{
+ protected WHValue afterValue;
+ protected WHValue beforeValue;
+
+ /** Constructor */
+ public IndexBetween(WHValue afterValue, WHValue beforeValue)
+ {
+ super();
+ this.afterValue = afterValue;
+ this.beforeValue = beforeValue;
+ }
+
+ /** Evaluate a given value (which comes from a table row described by a btree node, and which
+ * may turn out to be null) against the criteria as determined by this class, and return
+ * an appropriate bit pattern. The bit pattern is used to limit which branches of the index tree the search
+ * should descend.
+ *
+ * The comparator is provided to allow simple inequality comparisons against known values using the same logic
+ * as the index is organized by.
+ */
+ public int evaluateValue(WHValue value, WHComparator comparator)
+ throws WHException
+ {
+ int afterResult = comparator.compare(value,afterValue);
+ if (afterResult == WHComparator.RESULT_EQUALS)
+ return SIGNAL_GREATER;
+
+ if (afterResult == WHComparator.RESULT_GREATER)
+ return SIGNAL_GREATER;
+
+ if (afterResult == WHComparator.RESULT_LESS)
+ {
+ int beforeResult = comparator.compare(value,beforeValue);
+ if (beforeResult == WHComparator.RESULT_EQUALS)
+ return SIGNAL_LESSER;
+
+ if (beforeResult == WHComparator.RESULT_GREATER)
+ return SIGNAL_LESSER | SIGNAL_EQUALS | SIGNAL_GREATER;
+
+ if (beforeResult == WHComparator.RESULT_LESS)
+ return SIGNAL_LESSER;
+ }
+
+ throw new WHException("Comparator returned unexpected value");
+ }
+
+}
+
\ No newline at end of file
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexBetween.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexBetween.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexCriteria.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexCriteria.java?rev=1220353&r1=1220352&r2=1220353&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexCriteria.java (original)
+++ incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexCriteria.java Sun Dec 18 08:36:52 2011
@@ -1,62 +1,62 @@
-/* $Id: IndexCriteria.java -1 $ */
-
-/**
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package org.apache.warthog.api;
-
-/** This class represents what is needed to scan an index and make decisions about
-* what subtrees to descend into, and which not to. An instance of this interface will
-* be present for each column present in the index. Override this class to provide
-* specific exclusions for specific index scans.
-*/
-public class IndexCriteria
-{
- // Return signals. This constitutes 3 bits which determine how to proceed in order
- // to locate the next matching row in the index, at least as far as the current
- // comparator and key are concerned.
-
- // Zero value for the bit indicates "skip", while a 1 value indicates "descend".
-
- public static final int SIGNAL_LESSER = 1;
- public static final int SIGNAL_GREATER = 2;
- public static final int SIGNAL_EQUALS = 4;
-
- /** Constructor */
- public IndexCriteria()
- {
- }
-
- /** Evaluate a given value (which comes from a table row described by a btree node, and which
- * may turn out to be null) against the criteria as determined by this class, and return
- * an appropriate bit pattern. The bit pattern is used to limit which branches of the index tree the search
- * should descend.
- *
- * The comparator is provided to allow simple inequality comparisons against known values using the same logic
- * as the index is organized by.
- */
- public int evaluateValue(WHValue value, WHComparator comparator)
- throws WHException
- {
- // The base case is that there is no limiting criteria, so that the criteria places no restrictions
- // on which way we are allowed to descend.
- return SIGNAL_LESSER | SIGNAL_GREATER | SIGNAL_EQUALS;
- }
-
-}
-
+/* $Id$ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.warthog.api;
+
+/** This class represents what is needed to scan an index and make decisions about
+* what subtrees to descend into, and which not to. An instance of this interface will
+* be present for each column present in the index. Override this class to provide
+* specific exclusions for specific index scans.
+*/
+public class IndexCriteria
+{
+ // Return signals. This constitutes 3 bits which determine how to proceed in order
+ // to locate the next matching row in the index, at least as far as the current
+ // comparator and key are concerned.
+
+ // Zero value for the bit indicates "skip", while a 1 value indicates "descend".
+
+ public static final int SIGNAL_LESSER = 1;
+ public static final int SIGNAL_GREATER = 2;
+ public static final int SIGNAL_EQUALS = 4;
+
+ /** Constructor */
+ public IndexCriteria()
+ {
+ }
+
+ /** Evaluate a given value (which comes from a table row described by a btree node, and which
+ * may turn out to be null) against the criteria as determined by this class, and return
+ * an appropriate bit pattern. The bit pattern is used to limit which branches of the index tree the search
+ * should descend.
+ *
+ * The comparator is provided to allow simple inequality comparisons against known values using the same logic
+ * as the index is organized by.
+ */
+ public int evaluateValue(WHValue value, WHComparator comparator)
+ throws WHException
+ {
+ // The base case is that there is no limiting criteria, so that the criteria places no restrictions
+ // on which way we are allowed to descend.
+ return SIGNAL_LESSER | SIGNAL_GREATER | SIGNAL_EQUALS;
+ }
+
+}
+
\ No newline at end of file
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexCriteria.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexCriteria.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexEquals.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexEquals.java?rev=1220353&r1=1220352&r2=1220353&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexEquals.java (original)
+++ incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexEquals.java Sun Dec 18 08:36:52 2011
@@ -1,62 +1,62 @@
-/* $Id: IndexEquals.java -1 $ */
-
-/**
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package org.apache.warthog.api;
-
-/** This class represents index criteria designed to locate only exact matches against
-* a specific WHValue.
-*/
-public class IndexEquals extends IndexCriteria
-{
- protected WHValue value;
-
- /** Constructor */
- public IndexEquals(WHValue value)
- {
- super();
- this.value = value;
- }
-
- /** Evaluate a given value (which comes from a table row described by a btree node, and which
- * may turn out to be null) against the criteria as determined by this class, and return
- * an appropriate bit pattern. The bit pattern is used to limit which branches of the index tree the search
- * should descend.
- *
- * The comparator is provided to allow simple inequality comparisons against known values using the same logic
- * as the index is organized by.
- */
- public int evaluateValue(WHValue value, WHComparator comparator)
- throws WHException
- {
- int result = comparator.compare(value,this.value);
- if (result == WHComparator.RESULT_EQUALS)
- return SIGNAL_EQUALS;
-
- if (result == WHComparator.RESULT_GREATER)
- return SIGNAL_GREATER;
-
- if (result == WHComparator.RESULT_LESS)
- return SIGNAL_LESSER;
-
- throw new WHException("Comparator returned unexpected value");
- }
-
-}
-
+/* $Id$ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.warthog.api;
+
+/** This class represents index criteria designed to locate only exact matches against
+* a specific WHValue.
+*/
+public class IndexEquals extends IndexCriteria
+{
+ protected WHValue value;
+
+ /** Constructor */
+ public IndexEquals(WHValue value)
+ {
+ super();
+ this.value = value;
+ }
+
+ /** Evaluate a given value (which comes from a table row described by a btree node, and which
+ * may turn out to be null) against the criteria as determined by this class, and return
+ * an appropriate bit pattern. The bit pattern is used to limit which branches of the index tree the search
+ * should descend.
+ *
+ * The comparator is provided to allow simple inequality comparisons against known values using the same logic
+ * as the index is organized by.
+ */
+ public int evaluateValue(WHValue value, WHComparator comparator)
+ throws WHException
+ {
+ int result = comparator.compare(value,this.value);
+ if (result == WHComparator.RESULT_EQUALS)
+ return SIGNAL_EQUALS;
+
+ if (result == WHComparator.RESULT_GREATER)
+ return SIGNAL_GREATER;
+
+ if (result == WHComparator.RESULT_LESS)
+ return SIGNAL_LESSER;
+
+ throw new WHException("Comparator returned unexpected value");
+ }
+
+}
+
\ No newline at end of file
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexEquals.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexEquals.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexEqualsMultiple.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexEqualsMultiple.java?rev=1220353&r1=1220352&r2=1220353&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexEqualsMultiple.java (original)
+++ incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexEqualsMultiple.java Sun Dec 18 08:36:52 2011
@@ -1,73 +1,73 @@
-/* $Id: IndexEqualsMultiple.java -1 $ */
-
-/**
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package org.apache.warthog.api;
-
-/** This class represents index criteria designed to locate only exact matches against
-* a specific set of WHValues.
-*/
-public class IndexEqualsMultiple extends IndexCriteria
-{
- protected WHValue[] values;
-
- /** Constructor */
- public IndexEqualsMultiple(WHValue[] values)
- {
- super();
- this.values = values;
- }
-
- /** Evaluate a given value (which comes from a table row described by a btree node, and which
- * may turn out to be null) against the criteria as determined by this class, and return
- * an appropriate bit pattern. The bit pattern is used to limit which branches of the index tree the search
- * should descend.
- *
- * The comparator is provided to allow simple inequality comparisons against known values using the same logic
- * as the index is organized by.
- */
- public int evaluateValue(WHValue value, WHComparator comparator)
- throws WHException
- {
-
- // Accumulate result
- int rval = 0;
-
- for (int i = 0 ; i < values.length ; i++)
- {
- // Look at this value, and accumulate results
- int result = comparator.compare(value,values[i]);
- if (result == WHComparator.RESULT_EQUALS)
- rval |= SIGNAL_EQUALS;
-
- else if (result == WHComparator.RESULT_GREATER)
- rval |= SIGNAL_GREATER;
-
- else if (result == WHComparator.RESULT_LESS)
- rval |= SIGNAL_LESSER;
-
- else
- throw new WHException("Comparator returned unexpected value");
- }
-
- return rval;
- }
-
-}
-
+/* $Id$ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.warthog.api;
+
+/** This class represents index criteria designed to locate only exact matches against
+* a specific set of WHValues.
+*/
+public class IndexEqualsMultiple extends IndexCriteria
+{
+ protected WHValue[] values;
+
+ /** Constructor */
+ public IndexEqualsMultiple(WHValue[] values)
+ {
+ super();
+ this.values = values;
+ }
+
+ /** Evaluate a given value (which comes from a table row described by a btree node, and which
+ * may turn out to be null) against the criteria as determined by this class, and return
+ * an appropriate bit pattern. The bit pattern is used to limit which branches of the index tree the search
+ * should descend.
+ *
+ * The comparator is provided to allow simple inequality comparisons against known values using the same logic
+ * as the index is organized by.
+ */
+ public int evaluateValue(WHValue value, WHComparator comparator)
+ throws WHException
+ {
+
+ // Accumulate result
+ int rval = 0;
+
+ for (int i = 0 ; i < values.length ; i++)
+ {
+ // Look at this value, and accumulate results
+ int result = comparator.compare(value,values[i]);
+ if (result == WHComparator.RESULT_EQUALS)
+ rval |= SIGNAL_EQUALS;
+
+ else if (result == WHComparator.RESULT_GREATER)
+ rval |= SIGNAL_GREATER;
+
+ else if (result == WHComparator.RESULT_LESS)
+ rval |= SIGNAL_LESSER;
+
+ else
+ throw new WHException("Comparator returned unexpected value");
+ }
+
+ return rval;
+ }
+
+}
+
\ No newline at end of file
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexEqualsMultiple.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexEqualsMultiple.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexEqualsOrAfter.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexEqualsOrAfter.java?rev=1220353&r1=1220352&r2=1220353&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexEqualsOrAfter.java (original)
+++ incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexEqualsOrAfter.java Sun Dec 18 08:36:52 2011
@@ -1,62 +1,62 @@
-/* $Id: IndexEqualsOrAfter.java -1 $ */
-
-/**
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package org.apache.warthog.api;
-
-/** This class represents index criteria designed to locate matches that equal or come after
-* a specific WHValue.
-*/
-public class IndexEqualsOrAfter extends IndexCriteria
-{
- protected WHValue value;
-
- /** Constructor */
- public IndexEqualsOrAfter(WHValue value)
- {
- super();
- this.value = value;
- }
-
- /** Evaluate a given value (which comes from a table row described by a btree node, and which
- * may turn out to be null) against the criteria as determined by this class, and return
- * an appropriate bit pattern. The bit pattern is used to limit which branches of the index tree the search
- * should descend.
- *
- * The comparator is provided to allow simple inequality comparisons against known values using the same logic
- * as the index is organized by.
- */
- public int evaluateValue(WHValue value, WHComparator comparator)
- throws WHException
- {
- int result = comparator.compare(value,this.value);
- if (result == WHComparator.RESULT_EQUALS)
- return SIGNAL_GREATER | SIGNAL_EQUALS;
-
- if (result == WHComparator.RESULT_GREATER)
- return SIGNAL_GREATER;
-
- if (result == WHComparator.RESULT_LESS)
- return SIGNAL_LESSER | SIGNAL_EQUALS | SIGNAL_GREATER;
-
- throw new WHException("Comparator returned unexpected value");
- }
-
-}
-
+/* $Id$ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.warthog.api;
+
+/** This class represents index criteria designed to locate matches that equal or come after
+* a specific WHValue.
+*/
+public class IndexEqualsOrAfter extends IndexCriteria
+{
+ protected WHValue value;
+
+ /** Constructor */
+ public IndexEqualsOrAfter(WHValue value)
+ {
+ super();
+ this.value = value;
+ }
+
+ /** Evaluate a given value (which comes from a table row described by a btree node, and which
+ * may turn out to be null) against the criteria as determined by this class, and return
+ * an appropriate bit pattern. The bit pattern is used to limit which branches of the index tree the search
+ * should descend.
+ *
+ * The comparator is provided to allow simple inequality comparisons against known values using the same logic
+ * as the index is organized by.
+ */
+ public int evaluateValue(WHValue value, WHComparator comparator)
+ throws WHException
+ {
+ int result = comparator.compare(value,this.value);
+ if (result == WHComparator.RESULT_EQUALS)
+ return SIGNAL_GREATER | SIGNAL_EQUALS;
+
+ if (result == WHComparator.RESULT_GREATER)
+ return SIGNAL_GREATER;
+
+ if (result == WHComparator.RESULT_LESS)
+ return SIGNAL_LESSER | SIGNAL_EQUALS | SIGNAL_GREATER;
+
+ throw new WHException("Comparator returned unexpected value");
+ }
+
+}
+
\ No newline at end of file
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexEqualsOrAfter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexEqualsOrAfter.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexEqualsOrBefore.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexEqualsOrBefore.java?rev=1220353&r1=1220352&r2=1220353&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexEqualsOrBefore.java (original)
+++ incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexEqualsOrBefore.java Sun Dec 18 08:36:52 2011
@@ -1,62 +1,62 @@
-/* $Id: IndexEqualsOrBefore.java -1 $ */
-
-/**
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package org.apache.warthog.api;
-
-/** This class represents index criteria designed to locate that precede or equal
-* a specific WHValue.
-*/
-public class IndexEqualsOrBefore extends IndexCriteria
-{
- protected WHValue value;
-
- /** Constructor */
- public IndexEqualsOrBefore(WHValue value)
- {
- super();
- this.value = value;
- }
-
- /** Evaluate a given value (which comes from a table row described by a btree node, and which
- * may turn out to be null) against the criteria as determined by this class, and return
- * an appropriate bit pattern. The bit pattern is used to limit which branches of the index tree the search
- * should descend.
- *
- * The comparator is provided to allow simple inequality comparisons against known values using the same logic
- * as the index is organized by.
- */
- public int evaluateValue(WHValue value, WHComparator comparator)
- throws WHException
- {
- int result = comparator.compare(value,this.value);
- if (result == WHComparator.RESULT_EQUALS)
- return SIGNAL_LESSER | SIGNAL_EQUALS;
-
- if (result == WHComparator.RESULT_GREATER)
- return SIGNAL_GREATER | SIGNAL_EQUALS | SIGNAL_LESSER;
-
- if (result == WHComparator.RESULT_LESS)
- return SIGNAL_LESSER;
-
- throw new WHException("Comparator returned unexpected value");
- }
-
-}
-
+/* $Id$ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package org.apache.warthog.api;
+
+/** This class represents index criteria designed to locate that precede or equal
+* a specific WHValue.
+*/
+public class IndexEqualsOrBefore extends IndexCriteria
+{
+ protected WHValue value;
+
+ /** Constructor */
+ public IndexEqualsOrBefore(WHValue value)
+ {
+ super();
+ this.value = value;
+ }
+
+ /** Evaluate a given value (which comes from a table row described by a btree node, and which
+ * may turn out to be null) against the criteria as determined by this class, and return
+ * an appropriate bit pattern. The bit pattern is used to limit which branches of the index tree the search
+ * should descend.
+ *
+ * The comparator is provided to allow simple inequality comparisons against known values using the same logic
+ * as the index is organized by.
+ */
+ public int evaluateValue(WHValue value, WHComparator comparator)
+ throws WHException
+ {
+ int result = comparator.compare(value,this.value);
+ if (result == WHComparator.RESULT_EQUALS)
+ return SIGNAL_LESSER | SIGNAL_EQUALS;
+
+ if (result == WHComparator.RESULT_GREATER)
+ return SIGNAL_GREATER | SIGNAL_EQUALS | SIGNAL_LESSER;
+
+ if (result == WHComparator.RESULT_LESS)
+ return SIGNAL_LESSER;
+
+ throw new WHException("Comparator returned unexpected value");
+ }
+
+}
+
\ No newline at end of file
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexEqualsOrBefore.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexEqualsOrBefore.java
------------------------------------------------------------------------------
svn:keywords = Id