You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by ga...@apache.org on 2008/03/28 00:53:29 UTC
svn commit: r642033 - in /incubator/pig/branches/types: ./
src/org/apache/pig/backend/hadoop/executionengine/ src/org/apache/pig/data/
Author: gates
Date: Thu Mar 27 16:53:23 2008
New Revision: 642033
URL: http://svn.apache.org/viewvc?rev=642033&view=rev
Log:
Changes to make data package build. Had to comment out EvalSpec in SortedDataBag and heartbeat in DefaultAbstractBag.
Modified:
incubator/pig/branches/types/build.xml
incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java
incubator/pig/branches/types/src/org/apache/pig/data/BagFactory.java
incubator/pig/branches/types/src/org/apache/pig/data/DefaultAbstractBag.java
incubator/pig/branches/types/src/org/apache/pig/data/DefaultBagFactory.java
incubator/pig/branches/types/src/org/apache/pig/data/DefaultDataBag.java
incubator/pig/branches/types/src/org/apache/pig/data/DistinctDataBag.java
incubator/pig/branches/types/src/org/apache/pig/data/SortedDataBag.java
Modified: incubator/pig/branches/types/build.xml
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/build.xml?rev=642033&r1=642032&r2=642033&view=diff
==============================================================================
--- incubator/pig/branches/types/build.xml (original)
+++ incubator/pig/branches/types/build.xml Thu Mar 27 16:53:23 2008
@@ -132,28 +132,9 @@
</target>
<target name="compile-sources">
- <javac encoding="${build.encoding}" srcdir="${sources}" includes="**/plan/*.java, **/test/TestOperatorPlan.java, **/logicalLayer/LogicalPlan.java, **/logicalLayer/LOEval.java, **/logicalLayer/LOSort.java, **/logicalLayer/LOGenerate.java, **/logicalLayer/LOVisitor.java, **/logicalLayer/schema/Schema.java " destdir="${dist}" debug="${javac.debug}" optimize="${javac.optimize}" target="${javac.version}" source="${javac.version}" deprecation="${javac.deprecation}">
+ <javac encoding="${build.encoding}" srcdir="${sources}" includes="**/plan/*.java, **/data/*.java, **/test/TestOperatorPlan.java, **/logicalLayer/LogicalPlan.java, **/logicalLayer/LOEval.java, **/logicalLayer/LOSort.java, **/logicalLayer/LOGenerate.java, **/logicalLayer/LOVisitor.java, **/logicalLayer/schema/Schema.java " destdir="${dist}" debug="${javac.debug}" optimize="${javac.optimize}" target="${javac.version}" source="${javac.version}" deprecation="${javac.deprecation}">
<compilerarg line="${javac.args} ${javac.args.warnings}" />
<classpath refid="${cp}" />
- <!--
- <exclude name="**/StandAloneParser.java"/>
- <exclude name="**/hadoop/executionengine/*.java"/>
- <exclude name="**/local/executionengine/*.java"/>
- <exclude name="**/physicalLayer/*.java"/>
- <exclude name="**/builtin/*.java"/>
- <exclude name="**/LOSplit.java"/>
- <exclude name="**/LOCogroup.java"/>
- <exclude name="**/LOLoad.java"/>
- <exclude name="**/LOPrinter.java"/>
- <exclude name="**/LOUserFunc.java"/>
- <exclude name="**/LOSplitOutput.java"/>
- <exclude name="**/LOStore.java"/>
- <exclude name="**/LOUnion.java"/>
- <exclude name="**/impl/parser/*.java"/>
- <exclude name="**/tools/grunt/*.java"/>
- <exclude name="**/Main.java"/>
- <exclude name="**/PigServer.java"/>
- -->
</javac>
</target>
Modified: incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java?rev=642033&r1=642032&r2=642033&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/backend/hadoop/executionengine/HExecutionEngine.java Thu Mar 27 16:53:23 2008
@@ -60,7 +60,6 @@
import org.apache.pig.shock.SSHSocketImplFactory;
-/*
public class HExecutionEngine implements ExecutionEngine {
private final Log log = LogFactory.getLog(getClass());
@@ -477,7 +476,6 @@
}
}
-*/
Modified: incubator/pig/branches/types/src/org/apache/pig/data/BagFactory.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/data/BagFactory.java?rev=642033&r1=642032&r2=642033&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/data/BagFactory.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/data/BagFactory.java Thu Mar 27 16:53:23 2008
@@ -22,7 +22,6 @@
import java.net.URL;
import java.net.URLClassLoader;
-import org.apache.pig.impl.eval.EvalSpec;
import org.apache.pig.impl.util.SpillableMemoryManager;
/**
@@ -88,7 +87,8 @@
* @param spec EvalSpec that controls how the data is sorted.
* If null, default comparator will be used.
*/
- public abstract DataBag newSortedBag(EvalSpec spec);
+ // TODO FIX Need to pass in comparator
+ public abstract DataBag newSortedBag(/*EvalSpec spec*/);
/**
* Get a distinct data bag.
Modified: incubator/pig/branches/types/src/org/apache/pig/data/DefaultAbstractBag.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/data/DefaultAbstractBag.java?rev=642033&r1=642032&r2=642033&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/data/DefaultAbstractBag.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/data/DefaultAbstractBag.java Thu Mar 27 16:53:23 2008
@@ -29,7 +29,7 @@
import java.util.ArrayList;
import org.apache.pig.impl.util.Spillable;
-import org.apache.pig.backend.hadoop.executionengine.mapreduceExec.PigMapReduce;
+//import org.apache.pig.backend.hadoop.executionengine.mapreduceExec.PigMapReduce;
/**
* A collection of Tuples. A DataBag may or may not fit into memory.
@@ -134,7 +134,6 @@
/**
* Return the size of memory usage.
*/
- @Override
public long getMemorySize() {
if (!mMemSizeChanged) return mMemSize;
@@ -209,7 +208,9 @@
this instanceof DistinctDataBag) {
thisClone = this;
} else {
- thisClone = new SortedDataBag(null);
+ // TODO FIX
+ // thisClone = new SortedDataBag(null);
+ thisClone = new SortedDataBag();
Iterator<Tuple> i = iterator();
while (i.hasNext()) thisClone.add(i.next());
}
@@ -217,7 +218,9 @@
this instanceof DistinctDataBag) {
otherClone = bOther;
} else {
- otherClone = new SortedDataBag(null);
+ // TODO FIX
+ //otherClone = new SortedDataBag(null);
+ otherClone = new SortedDataBag();
Iterator<Tuple> i = bOther.iterator();
while (i.hasNext()) otherClone.add(i.next());
}
@@ -247,7 +250,6 @@
* @param out DataOutput to write data to.
* @throws IOException (passes it on from underlying calls).
*/
- @Override
public void write(DataOutput out) throws IOException {
// We don't care whether this bag was sorted or distinct because
// using the iterator to write it will guarantee those things come
@@ -345,9 +347,12 @@
* Report progress to HDFS.
*/
protected void reportProgress() {
+ // TODO FIX
+ /*
if (PigMapReduce.reporter != null) {
PigMapReduce.reporter.progress();
}
+ */
}
public static abstract class BagDelimiterTuple extends DefaultTuple{}
Modified: incubator/pig/branches/types/src/org/apache/pig/data/DefaultBagFactory.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/data/DefaultBagFactory.java?rev=642033&r1=642032&r2=642033&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/data/DefaultBagFactory.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/data/DefaultBagFactory.java Thu Mar 27 16:53:23 2008
@@ -17,7 +17,6 @@
*/
package org.apache.pig.data;
-import org.apache.pig.impl.eval.EvalSpec;
import org.apache.pig.impl.util.SpillableMemoryManager;
/**
@@ -39,10 +38,14 @@
* @param spec EvalSpec that controls how the data is sorted.
* If null, default comparator will be used.
*/
- public DataBag newSortedBag(EvalSpec spec) {
+ // TODO FIX Need to pass in comparator
+ public DataBag newSortedBag(/*EvalSpec spec*/) {
+ /*
DataBag b = new SortedDataBag(spec);
registerBag(b);
return b;
+ */
+ return null;
}
/**
Modified: incubator/pig/branches/types/src/org/apache/pig/data/DefaultDataBag.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/data/DefaultDataBag.java?rev=642033&r1=642032&r2=642033&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/data/DefaultDataBag.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/data/DefaultDataBag.java Thu Mar 27 16:53:23 2008
@@ -46,17 +46,14 @@
mContents = new ArrayList<Tuple>();
}
- @Override
public boolean isSorted() {
return false;
}
- @Override
public boolean isDistinct() {
return false;
}
- @Override
public Iterator<Tuple> iterator() {
return new DefaultDataBagIterator();
}
Modified: incubator/pig/branches/types/src/org/apache/pig/data/DistinctDataBag.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/data/DistinctDataBag.java?rev=642033&r1=642032&r2=642033&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/data/DistinctDataBag.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/data/DistinctDataBag.java Thu Mar 27 16:53:23 2008
@@ -59,17 +59,14 @@
mContents = new HashSet<Tuple>();
}
- @Override
public boolean isSorted() {
return false;
}
- @Override
public boolean isDistinct() {
return true;
}
- @Override
public Iterator<Tuple> iterator() {
return new DistinctDataBagIterator();
}
Modified: incubator/pig/branches/types/src/org/apache/pig/data/SortedDataBag.java
URL: http://svn.apache.org/viewvc/incubator/pig/branches/types/src/org/apache/pig/data/SortedDataBag.java?rev=642033&r1=642032&r2=642033&view=diff
==============================================================================
--- incubator/pig/branches/types/src/org/apache/pig/data/SortedDataBag.java (original)
+++ incubator/pig/branches/types/src/org/apache/pig/data/SortedDataBag.java Thu Mar 27 16:53:23 2008
@@ -36,9 +36,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.pig.impl.eval.EvalSpec;
-
-
/**
* An ordered collection of Tuples (possibly) with multiples. Data is
@@ -73,27 +70,27 @@
* will be called to populate our mComp field. If null,
* DefaultComparator will be used.
*/
- public SortedDataBag(EvalSpec spec) {
+ // TODO FIX Need to pass in comparator from somewhere.
+ public SortedDataBag(/*EvalSpec spec*/) {
+ /*
if (spec == null) {
mComp = new DefaultComparator();
} else {
mComp = spec.getComparator();
}
+ */
mContents = new ArrayList<Tuple>();
}
- @Override
public boolean isSorted() {
return true;
}
- @Override
public boolean isDistinct() {
return false;
}
- @Override
public Iterator<Tuple> iterator() {
return new SortedDataBagIterator();
}