Created more FieldExtractable types for templates

Author: colestew

mercurydb/src/main/java/org/mercurydb/ClassToTableExtractor.java

@@ -17,6 +17,8 @@
 import java.util.Set;
 import java.util.TreeSet;
 
+import org.mercurydb.queryutils.FieldExtractable;
+
 import com.github.mustachejava.DefaultMustacheFactory;
 import com.github.mustachejava.Mustache;
 import com.github.mustachejava.MustacheFactory;
@@ -41,6 +43,8 @@ public class ClassToTableExtractor {
 
     public int joinId;
 
+    public List<TemplateCounter> templateCounters;
+    
     public ClassToTableExtractor(
     		Class<?> c, String superTable, Collection<String> subClassTables, String tableSuffix, int joinId) 
     		throws IOException {
@@ -56,10 +60,12 @@ public ClassToTableExtractor(
         this.subClasses = subClassTables;
         populateFieldsList();
         populateQueriesList(queries, fields);
+        templateCounters = new ArrayList<>(fields.size());
+        for (int i = 1; i <= fields.size(); ++i) {
+        	templateCounters.add(new TemplateCounter(i));
+        }
     }
 
-    
-    
     private void populateFieldsList() {
         for (Field f : c.getFields()) {
         	// Ignore fields belonging to superclasses
@@ -155,6 +161,38 @@ public int compareTo(FieldData o) {
 		}
     }
 
+    @SuppressWarnings("unused")
+    private class TemplateCounter {
+    	public List<Integer> counter;
+    	
+    	public TemplateCounter(int size) {
+    		counter = new ArrayList<Integer>(size);
+    		for (int i = 1; i <= size; ++i) {
+    			counter.add(i);
+    		}
+    	}
+    	
+    	public String template() {
+    		StringBuilder sb = new StringBuilder();
+    		sb.append("<");
+    		for (Integer i : counter) {
+    			sb.append("F"+i+",");
+    		}
+    		sb.setCharAt(sb.length()-1, '>');
+    		return sb.toString();
+    	}
+    	
+    	public String prototype() {
+    		StringBuilder sb = new StringBuilder();
+    		for (Integer i : counter) {
+    			sb.append(FieldExtractable.class.getSimpleName());
+    			sb.append("<"+sourceClass()+", F"+i+"> fe"+i+", F"+i+" val"+i+",");
+    		}
+    		sb.setLength(sb.length()-1);
+    		return sb.toString();
+    	}
+    }
+    
     public String fullSourceClass() {
         return c.getName();
     }

mercurydb/src/main/java/org/mercurydb/queryutils/FieldExtractable.java

@@ -1,36 +1,45 @@
 package org.mercurydb.queryutils;
 
+import java.util.Map;
+import java.util.Set;
+
 /**
  * This class defines two accessors for data
  * in a JoinStream. Note that JoinStream implements
  * JoinField. It provides a way for JoinStreams to
  * ask other JoinStreams how to extract a join key given
  * an instance of their class owner.
  */
-public interface FieldExtractable<T> {
+public interface FieldExtractable<T, F> {
 	/**
 	 * Returns the name of the class owner. Note
 	 * that the parameter to extractJoinKey should
 	 * always be of this type. Ex. For a JoinStream
 	 * from ATable, this should return A.class
 	 * @return a Class
 	 */
-	public Class<?> getContainerClass();
+	public Class<T> getContainerClass();
 
 	/**
 	 * Extracts a join key value from an instance of the
 	 * type returned by getClassOwner()
 	 * @param o
 	 * @return
 	 */
-	public T extractField(Object o);
+	public F extractField(T o);
 
 
 	/**
 	 * @return true if field is indexed, false otherwise
 	 */
 	public boolean isIndexed();
 
+	/**
+	 * 
+	 * @return map associated with index this field, or null if no index is present 
+	 */
+	public Map<F, Set<T>> getIndex();
+	
 	/**
 	 * Returns the id generated by the HgDB bootstrap process. This
 	 * is the JOIN_ID in the tables. JOIN_ID should be packaged into

mercurydb/src/main/java/org/mercurydb/queryutils/FieldExtractableJoinInput.java

@@ -0,0 +1,44 @@
+package org.mercurydb.queryutils;
+
+import java.util.Map;
+import java.util.Set;
+
+public class FieldExtractableJoinInput<T,F> implements FieldExtractable<T,F> {
+	private FieldExtractable<T,F> _fwd;
+	private HgStream<T> _stream;
+	
+	public FieldExtractableJoinInput(FieldExtractable<T,F> fe, HgStream<T> stream) {
+		this._fwd = fe;
+		this._stream = stream;
+	}
+	
+	@Override
+	public Class<T> getContainerClass() {
+		return _fwd.getContainerClass();
+	}
+
+	@Override
+	public F extractField(T o) {
+		return _fwd.extractField(o);
+	}
+
+	@Override
+	public boolean isIndexed() {
+		return _fwd.isIndexed();
+	}
+
+	@Override
+	public Map<F, Set<T>> getIndex() {
+		return _fwd.getIndex();
+	}
+
+	@Override
+	public int getContainerId() {
+		return _fwd.getContainerId();
+	}
+	
+	// TODO merge this class with HgMonoStream
+	public HgMonoStream<T> getMonoStream() {
+		return new HgMonoStream<T>(_stream, this);
+	}
+}

mercurydb/src/main/java/org/mercurydb/queryutils/FieldExtractablePredicate.java

@@ -0,0 +1,45 @@
+package org.mercurydb.queryutils;
+
+import java.util.Map;
+import java.util.Set;
+
+public class FieldExtractablePredicate<T,F> implements FieldExtractable<T,F> {
+	
+	private final FieldExtractable<T,F> _fwd;
+	
+	public final HgPredicate<F> predicate;
+	
+	public FieldExtractablePredicate(FieldExtractable<T,F> fe, HgPredicate<F> pred) {
+		this._fwd = fe;
+		this.predicate = pred;
+	}
+	
+	@Override
+	public Class<T> getContainerClass() {
+		return _fwd.getContainerClass();
+	}
+
+	@Override
+	public F extractField(T o) {
+		return _fwd.extractField(o);
+	}
+
+	@Override
+	public boolean isIndexed() {
+		return _fwd.isIndexed();
+	}
+
+	@Override
+	public Map<F,Set<T>> getIndex() {
+		return _fwd.getIndex();
+	}
+
+	@Override
+	public int getContainerId() {
+		return _fwd.getContainerId();
+	}
+	
+	public boolean test(F value) {
+		return predicate.predicate(value);
+	}
+}

mercurydb/src/main/java/org/mercurydb/queryutils/FieldExtractableValue.java

@@ -0,0 +1,46 @@
+package org.mercurydb.queryutils;
+
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * 
+ * @param <T> Type that the table contains. (e.g. CustomerTable -> Customer)
+ * @param <F> Field type.
+ */
+public class FieldExtractableValue<T, F> implements FieldExtractable<T, F> {
+
+	private final FieldExtractable<T,F> _fwd;
+	
+	public final F value;
+	
+	public FieldExtractableValue(FieldExtractable<T,F> src, F value) {
+		this._fwd = src;
+		this.value = value;
+	}
+	
+	@Override
+	public Class<T> getContainerClass() {
+		return _fwd.getContainerClass();
+	}
+
+	@Override
+	public F extractField(T o) {
+		return _fwd.extractField(o);
+	}
+
+	@Override
+	public boolean isIndexed() {
+		return _fwd.isIndexed();
+	}
+
+	@Override
+	public Map<F,Set<T>> getIndex() {
+		return _fwd.getIndex();
+	}
+
+	@Override
+	public int getContainerId() {
+		return _fwd.getContainerId();
+	}
+}

mercurydb/src/main/java/org/mercurydb/queryutils/HgMonoStream.java

@@ -4,17 +4,17 @@
 
 import com.google.common.collect.Sets;
 
-public class HgMonoStream<C> extends HgStream<C> {
-	private HgStream<C> stream;
+public class HgMonoStream<T> extends HgStream<T> {
+	private HgStream<T> stream;
 	public final FieldExtractable joinKey;
 
-	public HgMonoStream(HgStream<C> stream, FieldExtractable joinKey) {
+	public HgMonoStream(HgStream<T> stream, FieldExtractable joinKey) {
 		super(stream.cardinality);
 		this.joinKey = joinKey;
 		this.stream = stream;
 	}
 
-	public HgStream<C> getWrappedStream() {
+	public HgStream<T> getWrappedStream() {
 		return stream;
 	}
 
@@ -32,7 +32,7 @@ public boolean hasNext() {
 	}
 
 	@Override
-	public C next() {
+	public T next() {
 		return stream.next();
 	}
 

mercurydb/src/main/java/org/mercurydb/queryutils/HgPredicate.java

@@ -0,0 +1,5 @@
+package org.mercurydb.queryutils;
+
+public interface HgPredicate<T> {
+	public boolean predicate(T value);
+}

mercurydb/src/main/java/org/mercurydb/queryutils/HgQuery.java

@@ -0,0 +1,8 @@
+package org.mercurydb.queryutils;
+
+public class HgQuery {
+
+	public static<T> HgStream<T> query(FieldExtractableValue<T,?>...extractableValues) {
+		return null;
+	}
+}