incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1220353 [1/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/...
Date Sun, 18 Dec 2011 08:36:56 GMT
Author: kwright
Date: Sun Dec 18 08:36:52 2011
New Revision: 1220353

URL: http://svn.apache.org/viewvc?rev=1220353&view=rev
Log:
Set all the properties

Modified:
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/build.xml   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/AggregateAccessor.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/AggregateRelationship.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/ColumnBreakOnChange.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/ColumnMax.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/ColumnMin.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterAccessor.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterAfter.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterBefore.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterBetween.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterCriteria.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterEquals.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterEqualsMultiple.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterEqualsOrAfter.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterEqualsOrBefore.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterRelationship.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterRelationshipBuilder.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterSubquery.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexAfter.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexBefore.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexBetween.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexCriteria.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexEquals.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexEqualsMultiple.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexEqualsOrAfter.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexEqualsOrBefore.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexRelationship.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/IndexRelationshipBuilder.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/JoinAccessor.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/JoinRelationship.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/RowSkipAccessor.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/RowSkipRelationship.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/WHAccessor.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/WHColumnCalculator.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/WHColumnDescription.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/WHComparator.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/WHConcurrencyException.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/WHException.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/WHIndex.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/WHRelationship.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/WHRelationshipBuilder.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/WHRowID.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/WHTable.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/WHTableStore.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/WHUniqueConstraintViolationException.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/WHValue.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/bytekeyvalue/WHAtomicByteKeyValueStore.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/bytekeyvalue/WHByteKeyIterator.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/bytekeyvalue/WHByteKeyMap.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/common/BooleanValue.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/common/BufferPointer.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/common/CharacterArray.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/common/CharacterValue.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/common/ColumnCount.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/common/ColumnSumLong.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/common/IntegerKey.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/common/IntegerValue.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/common/LongArray.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/common/LongComparatorAscending.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/common/LongKey.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/common/LongValue.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/common/StringArray.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/common/StringComparatorAscending.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/common/StringKey.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/common/StringValue.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvalue/WHAtomicKeyValueStore.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvalue/WHKeyIterator.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvalue/WHKeyMap.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvaluetablestore/GeneralIDFactoryKey.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvaluetablestore/Index.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvaluetablestore/IndexAccessor.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvaluetablestore/IndexKey.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvaluetablestore/IndexLookupKey.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvaluetablestore/IndexNameKey.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvaluetablestore/IndexNodeColumnKey.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvaluetablestore/IndexNodeEqualsKey.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvaluetablestore/IndexNodeGreaterKey.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvaluetablestore/IndexNodeKey.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvaluetablestore/IndexNodeLesserKey.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvaluetablestore/IndexNodeParentKey.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvaluetablestore/IndexRootKey.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvaluetablestore/IndexValue.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvaluetablestore/Table.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvaluetablestore/TableAccessor.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvaluetablestore/TableBaseKey.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvaluetablestore/TableColumnKey.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvaluetablestore/TableHeadKey.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvaluetablestore/TableIndexKey.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvaluetablestore/TableKey.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvaluetablestore/TableLookupKey.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvaluetablestore/TableNameKey.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvaluetablestore/TableRowIDFactoryKey.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvaluetablestore/TableRowKey.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvaluetablestore/TableRowNextKey.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvaluetablestore/TableRowPrevKey.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvaluetablestore/TableStore.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvaluetablestore/TableTailKey.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/keyvaluetablestore/TableValue.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/transactionalkeyvaluestore/WHKey.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/transactionalkeyvaluestore/WHKeyValue.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/transactionalkeyvaluestore/WHTransaction.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/transactionalkeyvaluestore/WHTransactionalStore.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/test/java/org/apache/warthog/tests/InMemAtomicByteKeyValueStore.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/test/java/org/apache/warthog/tests/InMemAtomicKeyValueStore.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/test/java/org/apache/warthog/tests/InMemAtomicNativeKeyValueStore.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/test/java/org/apache/warthog/tests/InMemAtomicNativeNonblockingKeyValueStore.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/test/java/org/apache/warthog/tests/InMemByteTransactionImpl.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/test/java/org/apache/warthog/tests/InMemByteTransactionalStoreImpl.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/test/java/org/apache/warthog/tests/InMemNativeTransactionImpl.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/test/java/org/apache/warthog/tests/InMemNativeTransactionalStoreImpl.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/test/java/org/apache/warthog/tests/InMemTransactionImpl.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/test/java/org/apache/warthog/tests/InMemTransactionalStoreImpl.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/test/java/org/apache/warthog/tests/MultiThreadTest.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/test/java/org/apache/warthog/tests/PerformanceTest.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/test/java/org/apache/warthog/tests/SanityTest.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/test/java/org/apache/warthog/tests/WrappedByteKey.java   (contents, props changed)
    incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/test/java/org/apache/warthog/tests/WrappedKey.java   (contents, props changed)

Modified: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-286/warthog-reimport/build.xml?rev=1220353&r1=1220352&r2=1220353&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-286/warthog-reimport/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-286/warthog-reimport/build.xml Sun Dec 18 08:36:52 2011
@@ -1,87 +1,87 @@
-<!--
- 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.
--->
-
-<project default="all">
-
-    <target name="clean">
-        <delete dir="build"/>
-    </target>
-    
-    <target name="compile">
-        <mkdir dir="build/classes"/>
-        <javac srcdir="src/main/java" destdir="build/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
-            <classpath>
-                <fileset dir="lib"> 
-                    <include name="*.jar"/> 
-                </fileset>
-            </classpath>
-        </javac>
-    </target>
-
-    <target name="compile-tests" depends="compile">
-        <mkdir dir="build/test-classes"/>
-        <javac srcdir="src/test/java" destdir="build/test-classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
-            <classpath>
-                 <fileset dir="lib"> 
-                    <include name="*.jar"/> 
-                </fileset>
-                <pathelement location="build/classes"/>
-            </classpath>
-        </javac>
-    </target>
-
-
-    <target name="run-tests" depends="compile-tests">
-        <mkdir dir="build/test-output"/>
-        <junit fork="true" maxmemory="128m" dir="build/test-output" outputtoformatters="true" showoutput="true" haltonfailure="true">
-            <classpath>
-                <fileset dir="lib">
-                    <include name="*.jar"/>
-                </fileset>
-                <pathelement location="build/classes"/>
-                <pathelement location="build/test-classes"/>
-            </classpath>
-            <formatter type="brief" usefile="false"/>
-
-            <test name="org.apache.warthog.tests.SanityTest" todir="build/test-output"/>
-            <!-- MHL -->
-            
-        </junit>
-    </target>
-
-    <target name="run-perf-tests" depends="compile-tests">
-        <mkdir dir="build/test-output"/>
-        <junit fork="true" maxmemory="512m" dir="build/test-output" outputtoformatters="true" showoutput="true" haltonfailure="true">
-            <classpath>
-                <fileset dir="lib">
-                    <include name="*.jar"/>
-                </fileset>
-                <pathelement location="build/classes"/>
-                <pathelement location="build/test-classes"/>
-            </classpath>
-            <formatter type="brief" usefile="false"/>
-
-            <test name="org.apache.warthog.tests.PerformanceTest" todir="build/test-output"/>
-            <test name="org.apache.warthog.tests.MultiThreadTest" todir="build/test-output"/>
-            <!-- MHL -->
-            
-        </junit>
-    </target>
-
-    <target name="all" depends="compile,run-tests"/>
-    
-</project>
+<!--
+ 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.
+-->
+
+<project default="all">
+
+    <target name="clean">
+        <delete dir="build"/>
+    </target>
+    
+    <target name="compile">
+        <mkdir dir="build/classes"/>
+        <javac srcdir="src/main/java" destdir="build/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+            <classpath>
+                <fileset dir="lib"> 
+                    <include name="*.jar"/> 
+                </fileset>
+            </classpath>
+        </javac>
+    </target>
+
+    <target name="compile-tests" depends="compile">
+        <mkdir dir="build/test-classes"/>
+        <javac srcdir="src/test/java" destdir="build/test-classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+            <classpath>
+                 <fileset dir="lib"> 
+                    <include name="*.jar"/> 
+                </fileset>
+                <pathelement location="build/classes"/>
+            </classpath>
+        </javac>
+    </target>
+
+
+    <target name="run-tests" depends="compile-tests">
+        <mkdir dir="build/test-output"/>
+        <junit fork="true" maxmemory="128m" dir="build/test-output" outputtoformatters="true" showoutput="true" haltonfailure="true">
+            <classpath>
+                <fileset dir="lib">
+                    <include name="*.jar"/>
+                </fileset>
+                <pathelement location="build/classes"/>
+                <pathelement location="build/test-classes"/>
+            </classpath>
+            <formatter type="brief" usefile="false"/>
+
+            <test name="org.apache.warthog.tests.SanityTest" todir="build/test-output"/>
+            <!-- MHL -->
+            
+        </junit>
+    </target>
+
+    <target name="run-perf-tests" depends="compile-tests">
+        <mkdir dir="build/test-output"/>
+        <junit fork="true" maxmemory="512m" dir="build/test-output" outputtoformatters="true" showoutput="true" haltonfailure="true">
+            <classpath>
+                <fileset dir="lib">
+                    <include name="*.jar"/>
+                </fileset>
+                <pathelement location="build/classes"/>
+                <pathelement location="build/test-classes"/>
+            </classpath>
+            <formatter type="brief" usefile="false"/>
+
+            <test name="org.apache.warthog.tests.PerformanceTest" todir="build/test-output"/>
+            <test name="org.apache.warthog.tests.MultiThreadTest" todir="build/test-output"/>
+            <!-- MHL -->
+            
+        </junit>
+    </target>
+
+    <target name="all" depends="compile,run-tests"/>
+    
+</project>

Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/build.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/AggregateAccessor.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/AggregateAccessor.java?rev=1220353&r1=1220352&r2=1220353&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/AggregateAccessor.java (original)
+++ incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/AggregateAccessor.java Sun Dec 18 08:36:52 2011
@@ -1,178 +1,178 @@
-/* $Id: AggregateAccessor.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.util.*;
-
-/** Accessor class that returns aggregate rows.
-*/
-public class AggregateAccessor implements WHAccessor
-{
-  protected WHAccessor baseAccessor;
-  protected WHColumnCalculator[] returnColumnCalculators;
-  protected String[] returnColumnNames;
-  protected WHRowID currentRowID;
-  protected long nextRowNumber = 0L;
-  protected boolean finalRowRendered = false;
-  
-  protected Map<String,WHValue> currentRowValues = new HashMap<String,WHValue>();
-    
-  public AggregateAccessor(WHAccessor baseAccessor, WHColumnCalculator[] returnColumnCalculators, String[] returnColumnNames)
-    throws WHException
-  {
-    this.baseAccessor = baseAccessor;
-    this.returnColumnCalculators = returnColumnCalculators;
-    this.returnColumnNames = returnColumnNames;
-    goToNextLegalRow();
-  }
-  
-  protected void goToNextLegalRow()
-    throws WHException
-  {
-    while (true)
-    {
-      WHRowID baseRowID = baseAccessor.getCurrentRowID();
-      if (baseRowID == null)
-      {
-        if (!finalRowRendered)
-        {
-          finalRowRendered = true;
-          // End!  Tally all rows; there may a row of data we need to return still.
-          boolean seenNoValue = false;
-          for (int i = 0 ; i < returnColumnCalculators.length ; i++)
-          {
-            if (returnColumnCalculators[i].canGenerateSummaryValue() == false)
-              seenNoValue = true;
-          }
-
-          if (!seenNoValue)
-          {
-            if (tallyCalculators());
-            {
-              currentRowID = new LongRowID(nextRowNumber);
-              return;
-            }
-          }
-        }
-        // No final row
-        currentRowID = null;
-        currentRowValues = null;
-        return;
-      }
-      // Feed the row into all the calculators.  If a value emerges from any one of them, demand a value
-      // from ALL of them and set up a new row.
-      boolean seenValue = false;
-      for (int i = 0 ; i < returnColumnCalculators.length ; i++)
-      {
-        if (returnColumnCalculators[i].canProcessRowValue(baseAccessor) == false)
-          seenValue = true;
-      }
-      
-      if (seenValue)
-      {
-        if (tallyCalculators())
-        {
-          currentRowID = new LongRowID(nextRowNumber);
-          nextRowNumber++;
-          // By returning, we guarantee that the same base accessor row will be
-          // used again, which is part of the contract.
-          return;
-        }
-      }
-      
-      // Add in the row to all column calculators
-      for (int i = 0 ; i < returnColumnCalculators.length ; i++)
-      {
-        returnColumnCalculators[i].processRowValue(baseAccessor);
-      }
-      
-      // Go process the next base accessor row
-      baseAccessor.advance();
-    }
-  }
-
-  protected boolean tallyCalculators()
-    throws WHException
-  {
-    WHValue[] calculatedValues = new WHValue[returnColumnCalculators.length];
-    boolean seenValue = false;
-    boolean seenNoValue = false;
-    for (int i = 0 ; i < returnColumnCalculators.length ; i++)
-    {
-      calculatedValues[i] = returnColumnCalculators[i].tally();
-      if (calculatedValues[i] != null)
-        seenValue = true;
-      else
-        seenNoValue = true;
-    }
-    if (seenValue && seenNoValue)
-      throw new WHException("Column calculators cannot tally consistently");
-    
-    if (seenValue)
-    {
-      currentRowValues.clear();
-      for (int i = 0 ; i < returnColumnCalculators.length ; i++)
-      {
-        currentRowValues.put(returnColumnNames[i],calculatedValues[i]);
-      }
-    }
-    return seenValue;
-  }
-  
-  /** Advance to the next row.
-  */
-  public void advance()
-    throws WHException
-  {
-    if (currentRowID != null)
-    {
-      goToNextLegalRow();
-    }
-  }
-  
-  /** Read the current relationship row ID,  Null will be returned if we are
-  * at the end of the sequence.
-  */
-  public WHRowID getCurrentRowID()
-    throws WHException
-  {
-    return currentRowID;
-  }
-	
-  /** Get the data for the current row and specified column. 
-  */
-  public WHValue getValue(String columnName)
-    throws WHException
-  {
-    if (currentRowID != null)
-      return currentRowValues.get(columnName);
-    throw new WHException("Can't read beyond end of accessor");
-  }
-
-  protected static class LongRowID implements WHRowID
-  {
-    protected long value;
-    
-    public LongRowID(long value)
-    {
-      this.value = 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;
+
+import java.util.*;
+
+/** Accessor class that returns aggregate rows.
+*/
+public class AggregateAccessor implements WHAccessor
+{
+  protected WHAccessor baseAccessor;
+  protected WHColumnCalculator[] returnColumnCalculators;
+  protected String[] returnColumnNames;
+  protected WHRowID currentRowID;
+  protected long nextRowNumber = 0L;
+  protected boolean finalRowRendered = false;
+  
+  protected Map<String,WHValue> currentRowValues = new HashMap<String,WHValue>();
+    
+  public AggregateAccessor(WHAccessor baseAccessor, WHColumnCalculator[] returnColumnCalculators, String[] returnColumnNames)
+    throws WHException
+  {
+    this.baseAccessor = baseAccessor;
+    this.returnColumnCalculators = returnColumnCalculators;
+    this.returnColumnNames = returnColumnNames;
+    goToNextLegalRow();
+  }
+  
+  protected void goToNextLegalRow()
+    throws WHException
+  {
+    while (true)
+    {
+      WHRowID baseRowID = baseAccessor.getCurrentRowID();
+      if (baseRowID == null)
+      {
+        if (!finalRowRendered)
+        {
+          finalRowRendered = true;
+          // End!  Tally all rows; there may a row of data we need to return still.
+          boolean seenNoValue = false;
+          for (int i = 0 ; i < returnColumnCalculators.length ; i++)
+          {
+            if (returnColumnCalculators[i].canGenerateSummaryValue() == false)
+              seenNoValue = true;
+          }
+
+          if (!seenNoValue)
+          {
+            if (tallyCalculators());
+            {
+              currentRowID = new LongRowID(nextRowNumber);
+              return;
+            }
+          }
+        }
+        // No final row
+        currentRowID = null;
+        currentRowValues = null;
+        return;
+      }
+      // Feed the row into all the calculators.  If a value emerges from any one of them, demand a value
+      // from ALL of them and set up a new row.
+      boolean seenValue = false;
+      for (int i = 0 ; i < returnColumnCalculators.length ; i++)
+      {
+        if (returnColumnCalculators[i].canProcessRowValue(baseAccessor) == false)
+          seenValue = true;
+      }
+      
+      if (seenValue)
+      {
+        if (tallyCalculators())
+        {
+          currentRowID = new LongRowID(nextRowNumber);
+          nextRowNumber++;
+          // By returning, we guarantee that the same base accessor row will be
+          // used again, which is part of the contract.
+          return;
+        }
+      }
+      
+      // Add in the row to all column calculators
+      for (int i = 0 ; i < returnColumnCalculators.length ; i++)
+      {
+        returnColumnCalculators[i].processRowValue(baseAccessor);
+      }
+      
+      // Go process the next base accessor row
+      baseAccessor.advance();
+    }
+  }
+
+  protected boolean tallyCalculators()
+    throws WHException
+  {
+    WHValue[] calculatedValues = new WHValue[returnColumnCalculators.length];
+    boolean seenValue = false;
+    boolean seenNoValue = false;
+    for (int i = 0 ; i < returnColumnCalculators.length ; i++)
+    {
+      calculatedValues[i] = returnColumnCalculators[i].tally();
+      if (calculatedValues[i] != null)
+        seenValue = true;
+      else
+        seenNoValue = true;
+    }
+    if (seenValue && seenNoValue)
+      throw new WHException("Column calculators cannot tally consistently");
+    
+    if (seenValue)
+    {
+      currentRowValues.clear();
+      for (int i = 0 ; i < returnColumnCalculators.length ; i++)
+      {
+        currentRowValues.put(returnColumnNames[i],calculatedValues[i]);
+      }
+    }
+    return seenValue;
+  }
+  
+  /** Advance to the next row.
+  */
+  public void advance()
+    throws WHException
+  {
+    if (currentRowID != null)
+    {
+      goToNextLegalRow();
+    }
+  }
+  
+  /** Read the current relationship row ID,  Null will be returned if we are
+  * at the end of the sequence.
+  */
+  public WHRowID getCurrentRowID()
+    throws WHException
+  {
+    return currentRowID;
+  }
+	
+  /** Get the data for the current row and specified column. 
+  */
+  public WHValue getValue(String columnName)
+    throws WHException
+  {
+    if (currentRowID != null)
+      return currentRowValues.get(columnName);
+    throw new WHException("Can't read beyond end of accessor");
+  }
+
+  protected static class LongRowID implements WHRowID
+  {
+    protected long value;
+    
+    public LongRowID(long value)
+    {
+      this.value = value;
+    }
+  }
+}

Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/AggregateAccessor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/AggregateAccessor.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/AggregateRelationship.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/AggregateRelationship.java?rev=1220353&r1=1220352&r2=1220353&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/AggregateRelationship.java (original)
+++ incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/AggregateRelationship.java Sun Dec 18 08:36:52 2011
@@ -1,68 +1,68 @@
-/* $Id: AggregateRelationship.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 column aggregation and row aggregation
-* capabilities.
-*/
-public class AggregateRelationship implements WHRelationship
-{
-  protected WHRelationship relationshipToAggregate;
-  protected WHColumnDescription[] returnColumnCalculators;
-  protected String[] returnColumnNames;
-  
-  /** Constructor */
-  public AggregateRelationship(WHRelationship relationshipToAggregate,
-    WHColumnDescription[] returnColumnCalculators)
-    throws WHException
-  {
-    this.relationshipToAggregate = relationshipToAggregate;
-    this.returnColumnCalculators = returnColumnCalculators;
-    // Calculate the return column names
-    returnColumnNames = new String[returnColumnCalculators.length];
-    for (int i = 0 ; i < returnColumnCalculators.length ; i++)
-    {
-      returnColumnNames[i] = returnColumnCalculators[i].getReturnColumnName();
-    }
-  }
-  
-  /** Get the column names represented by the relationship. */
-  public String[] getColumnNames()
-    throws WHException
-  {
-    return returnColumnNames;
-  }
-  
-  /** 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
-  {
-    WHColumnCalculator[] calculators = new WHColumnCalculator[returnColumnCalculators.length];
-    for (int i = 0 ; i < calculators.length ; i++)
-    {
-      calculators[i] = returnColumnCalculators[i].createCalculator();
-    }
-    return new AggregateAccessor(relationshipToAggregate.buildAccessor(),calculators,returnColumnNames);
-  }
-  
-}
+/* $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 column aggregation and row aggregation
+* capabilities.
+*/
+public class AggregateRelationship implements WHRelationship
+{
+  protected WHRelationship relationshipToAggregate;
+  protected WHColumnDescription[] returnColumnCalculators;
+  protected String[] returnColumnNames;
+  
+  /** Constructor */
+  public AggregateRelationship(WHRelationship relationshipToAggregate,
+    WHColumnDescription[] returnColumnCalculators)
+    throws WHException
+  {
+    this.relationshipToAggregate = relationshipToAggregate;
+    this.returnColumnCalculators = returnColumnCalculators;
+    // Calculate the return column names
+    returnColumnNames = new String[returnColumnCalculators.length];
+    for (int i = 0 ; i < returnColumnCalculators.length ; i++)
+    {
+      returnColumnNames[i] = returnColumnCalculators[i].getReturnColumnName();
+    }
+  }
+  
+  /** Get the column names represented by the relationship. */
+  public String[] getColumnNames()
+    throws WHException
+  {
+    return returnColumnNames;
+  }
+  
+  /** 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
+  {
+    WHColumnCalculator[] calculators = new WHColumnCalculator[returnColumnCalculators.length];
+    for (int i = 0 ; i < calculators.length ; i++)
+    {
+      calculators[i] = returnColumnCalculators[i].createCalculator();
+    }
+    return new AggregateAccessor(relationshipToAggregate.buildAccessor(),calculators,returnColumnNames);
+  }
+  
+}

Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/AggregateRelationship.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/AggregateRelationship.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/ColumnBreakOnChange.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/ColumnBreakOnChange.java?rev=1220353&r1=1220352&r2=1220353&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/ColumnBreakOnChange.java (original)
+++ incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/ColumnBreakOnChange.java Sun Dec 18 08:36:52 2011
@@ -1,114 +1,114 @@
-/* $Id: ColumnBreakOnChange.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 is used to create a column upon which presorted aggregation works.
-* By signaling when the value changes from row to row, this column definition creates
-* "buckets". which can be used for both DISTINCT and GROUP BY functionality,
-* as long as the rows returned by the underlying accessor are ordered by the column
-* being selected.
-*/
-public class ColumnBreakOnChange implements WHColumnDescription
-{
-  protected String baseColumnName;
-  protected String returnColumnName;
-  
-  /** Constructor */
-  public ColumnBreakOnChange(String baseColumnName, String returnColumnName)
-  {
-    this.baseColumnName = baseColumnName;
-    this.returnColumnName = returnColumnName;
-  }
-  
-  /** Get the name of the return column */
-  public String getReturnColumnName()
-    throws WHException
-  {
-    return returnColumnName;
-  }
-  
-  /** Create a return column calculator for this column.
-  */
-  public WHColumnCalculator createCalculator()
-    throws WHException
-  {
-    return new BreakCalculator(baseColumnName);
-  }
-  
-  protected static class BreakCalculator implements WHColumnCalculator
-  {
-    protected String baseColumnName;
-    
-    protected WHValue previousValue = null;
-    
-    public BreakCalculator(String baseColumnName)
-    {
-      this.baseColumnName = baseColumnName;
-    }
-
-    /** Check whether a row can be added to to the column calculator.
-    * Does NOT actually change the result of the calculator!
-    *@return true if the row can be added and false if a tally should be done immediately.
-    */
-    public boolean canProcessRowValue(WHAccessor accessor)
-      throws WHException
-    {
-      if (previousValue == null)
-        return true;
-      WHValue newValue = accessor.getValue(baseColumnName);
-      if (newValue.equals(previousValue))
-        return true;
-      return false;
-    }
-
-    /** Check whether this calculator is capable of generating a final summary row value.
-    *@return true if it is capable.  tally() will only be called at the end for the summary
-    *     row if all columns are capable of generating a summary value.
-    */
-    public boolean canGenerateSummaryValue()
-      throws WHException
-    {
-      return (previousValue != null);
-    }
-
-    /** Feed a row to the column calculator.
-    */
-    public void processRowValue(WHAccessor accessor)
-      throws WHException
-    {
-      previousValue = accessor.getValue(baseColumnName);
-    }
-    
-    /** Tally a final result, obtaining whatever current aggregate value there is.
-    * Also resets the calculator in preparation for another set of rows.
-    */
-    public WHValue tally()
-      throws WHException
-    {
-      WHValue rval = previousValue;
-      previousValue = null;
-      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 is used to create a column upon which presorted aggregation works.
+* By signaling when the value changes from row to row, this column definition creates
+* "buckets". which can be used for both DISTINCT and GROUP BY functionality,
+* as long as the rows returned by the underlying accessor are ordered by the column
+* being selected.
+*/
+public class ColumnBreakOnChange implements WHColumnDescription
+{
+  protected String baseColumnName;
+  protected String returnColumnName;
+  
+  /** Constructor */
+  public ColumnBreakOnChange(String baseColumnName, String returnColumnName)
+  {
+    this.baseColumnName = baseColumnName;
+    this.returnColumnName = returnColumnName;
+  }
+  
+  /** Get the name of the return column */
+  public String getReturnColumnName()
+    throws WHException
+  {
+    return returnColumnName;
+  }
+  
+  /** Create a return column calculator for this column.
+  */
+  public WHColumnCalculator createCalculator()
+    throws WHException
+  {
+    return new BreakCalculator(baseColumnName);
+  }
+  
+  protected static class BreakCalculator implements WHColumnCalculator
+  {
+    protected String baseColumnName;
+    
+    protected WHValue previousValue = null;
+    
+    public BreakCalculator(String baseColumnName)
+    {
+      this.baseColumnName = baseColumnName;
+    }
+
+    /** Check whether a row can be added to to the column calculator.
+    * Does NOT actually change the result of the calculator!
+    *@return true if the row can be added and false if a tally should be done immediately.
+    */
+    public boolean canProcessRowValue(WHAccessor accessor)
+      throws WHException
+    {
+      if (previousValue == null)
+        return true;
+      WHValue newValue = accessor.getValue(baseColumnName);
+      if (newValue.equals(previousValue))
+        return true;
+      return false;
+    }
+
+    /** Check whether this calculator is capable of generating a final summary row value.
+    *@return true if it is capable.  tally() will only be called at the end for the summary
+    *     row if all columns are capable of generating a summary value.
+    */
+    public boolean canGenerateSummaryValue()
+      throws WHException
+    {
+      return (previousValue != null);
+    }
+
+    /** Feed a row to the column calculator.
+    */
+    public void processRowValue(WHAccessor accessor)
+      throws WHException
+    {
+      previousValue = accessor.getValue(baseColumnName);
+    }
+    
+    /** Tally a final result, obtaining whatever current aggregate value there is.
+    * Also resets the calculator in preparation for another set of rows.
+    */
+    public WHValue tally()
+      throws WHException
+    {
+      WHValue rval = previousValue;
+      previousValue = null;
+      return rval;
+    }
+
+  }
+    
+}
+  
   
\ No newline at end of file

Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/ColumnBreakOnChange.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/ColumnBreakOnChange.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/ColumnMax.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/ColumnMax.java?rev=1220353&r1=1220352&r2=1220353&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/ColumnMax.java (original)
+++ incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/ColumnMax.java Sun Dec 18 08:36:52 2011
@@ -1,127 +1,127 @@
-/* $Id: ColumnMax.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 is used to create a column which finds the max of values found in the specified
-* base column.
-*/
-public class ColumnMax implements WHColumnDescription
-{
-  protected WHComparator comparator;
-  protected String baseColumnName;
-  protected String returnColumnName;
-  
-  /** Constructor */
-  public ColumnMax(WHComparator comparator, String baseColumnName, String returnColumnName)
-  {
-    this.comparator = comparator;
-    this.baseColumnName = baseColumnName;
-    this.returnColumnName = returnColumnName;
-  }
-  
-  /** Get the name of the return column */
-  public String getReturnColumnName()
-    throws WHException
-  {
-    return returnColumnName;
-  }
-  
-  /** Create a return column calculator for this column.
-  */
-  public WHColumnCalculator createCalculator()
-    throws WHException
-  {
-    return new MaxCalculator(comparator,baseColumnName);
-  }
-  
-  protected static class MaxCalculator implements WHColumnCalculator
-  {
-    protected WHComparator comparator;
-    protected String baseColumnName;
-    
-    protected boolean firstValue = true;
-    protected WHValue max = null;
-    
-    public MaxCalculator(WHComparator comparator, String baseColumnName)
-    {
-      this.comparator = comparator;
-      this.baseColumnName = baseColumnName;
-    }
-
-    /** Check whether a row can be added to to the column calculator.
-    * Does NOT actually change the result of the calculator!
-    *@return true if the row can be added and false if a tally should be done immediately.
-    */
-    public boolean canProcessRowValue(WHAccessor accessor)
-      throws WHException
-    {
-      // This calculator can always accept new values
-      return true;
-    }
-
-    /** Check whether this calculator is capable of generating a final summary row value.
-    *@return true if it is capable.  tally() will only be called at the end for the summary
-    *     row if all columns are capable of generating a summary value.
-    */
-    public boolean canGenerateSummaryValue()
-      throws WHException
-    {
-      // This calculator can only generate a summary value if there's at least one row
-      return !firstValue;
-    }
-
-    /** Feed a row to the column calculator.
-    */
-    public void processRowValue(WHAccessor accessor)
-      throws WHException
-    {
-      WHValue value = accessor.getValue(baseColumnName);
-      if (value != null)
-      {
-        if (firstValue)
-        {
-          max = value;
-          firstValue = false;
-        }
-        else
-        {
-          if (comparator.compare(max,value) == WHComparator.RESULT_GREATER)
-            max = value;
-        }
-      }
-    }
-    
-    /** Tally a final result, obtaining whatever current aggregate value there is.
-    * Also resets the calculator in preparation for another set of rows.
-    */
-    public WHValue tally()
-      throws WHException
-    {
-      WHValue rval = max;
-      max = null;
-      firstValue = true;
-      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 is used to create a column which finds the max of values found in the specified
+* base column.
+*/
+public class ColumnMax implements WHColumnDescription
+{
+  protected WHComparator comparator;
+  protected String baseColumnName;
+  protected String returnColumnName;
+  
+  /** Constructor */
+  public ColumnMax(WHComparator comparator, String baseColumnName, String returnColumnName)
+  {
+    this.comparator = comparator;
+    this.baseColumnName = baseColumnName;
+    this.returnColumnName = returnColumnName;
+  }
+  
+  /** Get the name of the return column */
+  public String getReturnColumnName()
+    throws WHException
+  {
+    return returnColumnName;
+  }
+  
+  /** Create a return column calculator for this column.
+  */
+  public WHColumnCalculator createCalculator()
+    throws WHException
+  {
+    return new MaxCalculator(comparator,baseColumnName);
+  }
+  
+  protected static class MaxCalculator implements WHColumnCalculator
+  {
+    protected WHComparator comparator;
+    protected String baseColumnName;
+    
+    protected boolean firstValue = true;
+    protected WHValue max = null;
+    
+    public MaxCalculator(WHComparator comparator, String baseColumnName)
+    {
+      this.comparator = comparator;
+      this.baseColumnName = baseColumnName;
+    }
+
+    /** Check whether a row can be added to to the column calculator.
+    * Does NOT actually change the result of the calculator!
+    *@return true if the row can be added and false if a tally should be done immediately.
+    */
+    public boolean canProcessRowValue(WHAccessor accessor)
+      throws WHException
+    {
+      // This calculator can always accept new values
+      return true;
+    }
+
+    /** Check whether this calculator is capable of generating a final summary row value.
+    *@return true if it is capable.  tally() will only be called at the end for the summary
+    *     row if all columns are capable of generating a summary value.
+    */
+    public boolean canGenerateSummaryValue()
+      throws WHException
+    {
+      // This calculator can only generate a summary value if there's at least one row
+      return !firstValue;
+    }
+
+    /** Feed a row to the column calculator.
+    */
+    public void processRowValue(WHAccessor accessor)
+      throws WHException
+    {
+      WHValue value = accessor.getValue(baseColumnName);
+      if (value != null)
+      {
+        if (firstValue)
+        {
+          max = value;
+          firstValue = false;
+        }
+        else
+        {
+          if (comparator.compare(max,value) == WHComparator.RESULT_GREATER)
+            max = value;
+        }
+      }
+    }
+    
+    /** Tally a final result, obtaining whatever current aggregate value there is.
+    * Also resets the calculator in preparation for another set of rows.
+    */
+    public WHValue tally()
+      throws WHException
+    {
+      WHValue rval = max;
+      max = null;
+      firstValue = true;
+      return rval;
+    }
+
+  }
+    
+}
+  
   
\ No newline at end of file

Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/ColumnMax.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/ColumnMax.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/ColumnMin.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/ColumnMin.java?rev=1220353&r1=1220352&r2=1220353&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/ColumnMin.java (original)
+++ incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/ColumnMin.java Sun Dec 18 08:36:52 2011
@@ -1,127 +1,127 @@
-/* $Id: ColumnMin.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 is used to create a column which finds minimum of values found in the specified
-* base column.
-*/
-public class ColumnMin implements WHColumnDescription
-{
-  protected WHComparator comparator;
-  protected String baseColumnName;
-  protected String returnColumnName;
-  
-  /** Constructor */
-  public ColumnMin(WHComparator comparator, String baseColumnName, String returnColumnName)
-  {
-    this.comparator = comparator;
-    this.baseColumnName = baseColumnName;
-    this.returnColumnName = returnColumnName;
-  }
-  
-  /** Get the name of the return column */
-  public String getReturnColumnName()
-    throws WHException
-  {
-    return returnColumnName;
-  }
-  
-  /** Create a return column calculator for this column.
-  */
-  public WHColumnCalculator createCalculator()
-    throws WHException
-  {
-    return new MinCalculator(comparator,baseColumnName);
-  }
-  
-  protected static class MinCalculator implements WHColumnCalculator
-  {
-    protected WHComparator comparator;
-    protected String baseColumnName;
-    
-    protected boolean firstValue = true;
-    protected WHValue min = null;
-    
-    public MinCalculator(WHComparator comparator, String baseColumnName)
-    {
-      this.comparator = comparator;
-      this.baseColumnName = baseColumnName;
-    }
-
-    /** Check whether a row can be added to to the column calculator.
-    * Does NOT actually change the result of the calculator!
-    *@return true if the row can be added and false if a tally should be done immediately.
-    */
-    public boolean canProcessRowValue(WHAccessor accessor)
-      throws WHException
-    {
-      // This calculator can always accept new values
-      return true;
-    }
-
-    /** Check whether this calculator is capable of generating a final summary row value.
-    *@return true if it is capable.  tally() will only be called at the end for the summary
-    *     row if all columns are capable of generating a summary value.
-    */
-    public boolean canGenerateSummaryValue()
-      throws WHException
-    {
-      // This calculator can only generate a summary value if there's at least one row
-      return !firstValue;
-    }
-
-    /** Feed a row to the column calculator.
-    */
-    public void processRowValue(WHAccessor accessor)
-      throws WHException
-    {
-      WHValue value = accessor.getValue(baseColumnName);
-      if (value != null)
-      {
-        if (firstValue)
-        {
-          min = value;
-          firstValue = false;
-        }
-        else
-        {
-          if (comparator.compare(min,value) == WHComparator.RESULT_LESS)
-            min = value;
-        }
-      }
-    }
-    
-    /** Tally a final result, obtaining whatever current aggregate value there is.
-    * Also resets the calculator in preparation for another set of rows.
-    */
-    public WHValue tally()
-      throws WHException
-    {
-      WHValue rval = min;
-      min = null;
-      firstValue = true;
-      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 is used to create a column which finds minimum of values found in the specified
+* base column.
+*/
+public class ColumnMin implements WHColumnDescription
+{
+  protected WHComparator comparator;
+  protected String baseColumnName;
+  protected String returnColumnName;
+  
+  /** Constructor */
+  public ColumnMin(WHComparator comparator, String baseColumnName, String returnColumnName)
+  {
+    this.comparator = comparator;
+    this.baseColumnName = baseColumnName;
+    this.returnColumnName = returnColumnName;
+  }
+  
+  /** Get the name of the return column */
+  public String getReturnColumnName()
+    throws WHException
+  {
+    return returnColumnName;
+  }
+  
+  /** Create a return column calculator for this column.
+  */
+  public WHColumnCalculator createCalculator()
+    throws WHException
+  {
+    return new MinCalculator(comparator,baseColumnName);
+  }
+  
+  protected static class MinCalculator implements WHColumnCalculator
+  {
+    protected WHComparator comparator;
+    protected String baseColumnName;
+    
+    protected boolean firstValue = true;
+    protected WHValue min = null;
+    
+    public MinCalculator(WHComparator comparator, String baseColumnName)
+    {
+      this.comparator = comparator;
+      this.baseColumnName = baseColumnName;
+    }
+
+    /** Check whether a row can be added to to the column calculator.
+    * Does NOT actually change the result of the calculator!
+    *@return true if the row can be added and false if a tally should be done immediately.
+    */
+    public boolean canProcessRowValue(WHAccessor accessor)
+      throws WHException
+    {
+      // This calculator can always accept new values
+      return true;
+    }
+
+    /** Check whether this calculator is capable of generating a final summary row value.
+    *@return true if it is capable.  tally() will only be called at the end for the summary
+    *     row if all columns are capable of generating a summary value.
+    */
+    public boolean canGenerateSummaryValue()
+      throws WHException
+    {
+      // This calculator can only generate a summary value if there's at least one row
+      return !firstValue;
+    }
+
+    /** Feed a row to the column calculator.
+    */
+    public void processRowValue(WHAccessor accessor)
+      throws WHException
+    {
+      WHValue value = accessor.getValue(baseColumnName);
+      if (value != null)
+      {
+        if (firstValue)
+        {
+          min = value;
+          firstValue = false;
+        }
+        else
+        {
+          if (comparator.compare(min,value) == WHComparator.RESULT_LESS)
+            min = value;
+        }
+      }
+    }
+    
+    /** Tally a final result, obtaining whatever current aggregate value there is.
+    * Also resets the calculator in preparation for another set of rows.
+    */
+    public WHValue tally()
+      throws WHException
+    {
+      WHValue rval = min;
+      min = null;
+      firstValue = true;
+      return rval;
+    }
+
+  }
+    
+}
+  
   
\ No newline at end of file

Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/ColumnMin.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/ColumnMin.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterAccessor.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterAccessor.java?rev=1220353&r1=1220352&r2=1220353&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterAccessor.java (original)
+++ incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterAccessor.java Sun Dec 18 08:36:52 2011
@@ -1,81 +1,81 @@
-/* $Id: FilterAccessor.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;
-
-/** Accessor class that performs generic filtering.
-*/
-public class FilterAccessor implements WHAccessor
-{
-  protected FilterCriteria filter;
-  protected WHAccessor baseAccessor;
-  protected WHRowID currentRowID;
-    
-  public FilterAccessor(WHAccessor baseAccessor, FilterCriteria filter)
-    throws WHException
-  {
-    this.baseAccessor = baseAccessor;
-    this.filter = filter;
-    goToNextLegalRow();
-  }
-  
-  protected void goToNextLegalRow()
-    throws WHException
-  {
-    while (true)
-    {
-      currentRowID = baseAccessor.getCurrentRowID();
-      if (currentRowID == null)
-        break;
-      if (filter == null || filter.include(baseAccessor))
-        break;
-      baseAccessor.advance();
-    }
-  }
-
-  /** Advance to the next row.
-  */
-  public void advance()
-    throws WHException
-  {
-    if (currentRowID != null)
-    {
-      baseAccessor.advance();
-      goToNextLegalRow();
-    }
-  }
-  
-  /** Read the current relationship row ID,  Null will be returned if we are
-  * at the end of the sequence.
-  */
-  public WHRowID getCurrentRowID()
-    throws WHException
-  {
-    return currentRowID;
-  }
-	
-  /** Get the data for the current row and specified column. 
-  */
-  public WHValue getValue(String columnName)
-    throws WHException
-  {
-    return baseAccessor.getValue(columnName);
-  }
-
-}
+/* $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;
+
+/** Accessor class that performs generic filtering.
+*/
+public class FilterAccessor implements WHAccessor
+{
+  protected FilterCriteria filter;
+  protected WHAccessor baseAccessor;
+  protected WHRowID currentRowID;
+    
+  public FilterAccessor(WHAccessor baseAccessor, FilterCriteria filter)
+    throws WHException
+  {
+    this.baseAccessor = baseAccessor;
+    this.filter = filter;
+    goToNextLegalRow();
+  }
+  
+  protected void goToNextLegalRow()
+    throws WHException
+  {
+    while (true)
+    {
+      currentRowID = baseAccessor.getCurrentRowID();
+      if (currentRowID == null)
+        break;
+      if (filter == null || filter.include(baseAccessor))
+        break;
+      baseAccessor.advance();
+    }
+  }
+
+  /** Advance to the next row.
+  */
+  public void advance()
+    throws WHException
+  {
+    if (currentRowID != null)
+    {
+      baseAccessor.advance();
+      goToNextLegalRow();
+    }
+  }
+  
+  /** Read the current relationship row ID,  Null will be returned if we are
+  * at the end of the sequence.
+  */
+  public WHRowID getCurrentRowID()
+    throws WHException
+  {
+    return currentRowID;
+  }
+	
+  /** Get the data for the current row and specified column. 
+  */
+  public WHValue getValue(String columnName)
+    throws WHException
+  {
+    return baseAccessor.getValue(columnName);
+  }
+
+}

Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterAccessor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterAccessor.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterAfter.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterAfter.java?rev=1220353&r1=1220352&r2=1220353&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterAfter.java (original)
+++ incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterAfter.java Sun Dec 18 08:36:52 2011
@@ -1,48 +1,48 @@
-/* $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 after a specific value, based
-* on a comparator.
-*/
-public class FilterAfter extends FilterCriteria
-{
-  protected WHComparator comparator;
-  protected String columnName;
-  protected WHValue matchValue;
-  
-  public FilterAfter(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_LESS;
-  }
-  
-}
+/* $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 after a specific value, based
+* on a comparator.
+*/
+public class FilterAfter extends FilterCriteria
+{
+  protected WHComparator comparator;
+  protected String columnName;
+  protected WHValue matchValue;
+  
+  public FilterAfter(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_LESS;
+  }
+  
+}

Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterAfter.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterAfter.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterBefore.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterBefore.java?rev=1220353&r1=1220352&r2=1220353&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterBefore.java (original)
+++ incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterBefore.java Sun Dec 18 08:36:52 2011
@@ -1,48 +1,48 @@
-/* $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 before a specific value, based
-* on a comparator.
-*/
-public class FilterBefore extends FilterCriteria
-{
-  protected WHComparator comparator;
-  protected String columnName;
-  protected WHValue matchValue;
-  
-  public FilterBefore(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_GREATER;
-  }
-  
-}
+/* $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 before a specific value, based
+* on a comparator.
+*/
+public class FilterBefore extends FilterCriteria
+{
+  protected WHComparator comparator;
+  protected String columnName;
+  protected WHValue matchValue;
+  
+  public FilterBefore(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_GREATER;
+  }
+  
+}

Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterBefore.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterBefore.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterBetween.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterBetween.java?rev=1220353&r1=1220352&r2=1220353&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterBetween.java (original)
+++ incubator/lcf/branches/CONNECTORS-286/warthog-reimport/src/main/java/org/apache/warthog/api/FilterBetween.java Sun Dec 18 08:36:52 2011
@@ -1,54 +1,54 @@
-/* $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 between two specific values, based
-* on a comparator.
-*/
-public class FilterBetween extends FilterCriteria
-{
-  protected WHComparator comparator;
-  protected String columnName;
-  protected WHValue afterValue;
-  protected WHValue beforeValue;
-  
-  public FilterBetween(String columnName, WHValue afterValue, WHValue beforeValue, WHComparator comparator)
-  {
-    super();
-    this.comparator = comparator;
-    this.columnName = columnName;
-    this.afterValue = afterValue;
-    this.beforeValue = beforeValue;
-  }
-  
-  /** Check if a row should be filtered or not.
-  */
-  public boolean include(WHAccessor accessor)
-    throws WHException
-  {
-    WHValue value = accessor.getValue(columnName);
-    int afterResult = comparator.compare(value,afterValue);
-    if (afterResult != WHComparator.RESULT_LESS)
-      return false;
-    int beforeResult = comparator.compare(value,beforeValue);
-    return beforeResult == WHComparator.RESULT_GREATER;
-  }
-  
-}
+/* $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 between two specific values, based
+* on a comparator.
+*/
+public class FilterBetween extends FilterCriteria
+{
+  protected WHComparator comparator;
+  protected String columnName;
+  protected WHValue afterValue;
+  protected WHValue beforeValue;
+  
+  public FilterBetween(String columnName, WHValue afterValue, WHValue beforeValue, WHComparator comparator)
+  {
+    super();
+    this.comparator = comparator;
+    this.columnName = columnName;
+    this.afterValue = afterValue;
+    this.beforeValue = beforeValue;
+  }
+  
+  /** Check if a row should be filtered or not.
+  */
+  public boolean include(WHAccessor accessor)
+    throws WHException
+  {
+    WHValue value = accessor.getValue(columnName);
+    int afterResult = comparator.compare(value,afterValue);
+    if (afterResult != WHComparator.RESULT_LESS)
+      return false;
+    int beforeResult = comparator.compare(value,beforeValue);
+    return beforeResult == WHComparator.RESULT_GREATER;
+  }
+  
+}



Mime
View raw message