Author: olga
Date: Thu Apr 30 22:52:58 2009
New Revision: 770481
URL: http://svn.apache.org/viewvc?rev=770481&view=rev
Log:
merge from trunk; part 2
Added:
hadoop/pig/branches/multiquery/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/SearchQuery.java
- copied unchanged from r770480,
hadoop/pig/trunk/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/SearchQuery.java
hadoop/pig/branches/multiquery/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/Top.java
- copied unchanged from r770480,
hadoop/pig/trunk/contrib/piggybank/java/src/main/java/org/apache/pig/piggybank/evaluation/util/Top.java
hadoop/pig/branches/multiquery/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/
- copied from r770480,
hadoop/pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/
hadoop/pig/branches/multiquery/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/TestSearchQuery.java
- copied unchanged from r770480,
hadoop/pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/TestSearchQuery.java
hadoop/pig/branches/multiquery/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/TestTop.java
- copied unchanged from r770480,
hadoop/pig/trunk/contrib/piggybank/java/src/test/java/org/apache/pig/piggybank/test/evaluation/util/TestTop.java
Modified:
hadoop/pig/branches/multiquery/ (props changed)
hadoop/pig/branches/multiquery/contrib/CHANGES.txt
hadoop/pig/branches/multiquery/test/org/apache/pig/test/utils/dotGraph/DOTParser.jjt
(props changed)
Propchange: hadoop/pig/branches/multiquery/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 30 22:52:58 2009
@@ -1 +1 @@
-/hadoop/pig/trunk:741728-767341,767975-770110
+/hadoop/pig/trunk:741728-767341,767975-770480
Modified: hadoop/pig/branches/multiquery/contrib/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/pig/branches/multiquery/contrib/CHANGES.txt?rev=770481&r1=770480&r2=770481&view=diff
==============================================================================
--- hadoop/pig/branches/multiquery/contrib/CHANGES.txt (original)
+++ hadoop/pig/branches/multiquery/contrib/CHANGES.txt Thu Apr 30 22:52:58 2009
@@ -1,3 +1,4 @@
+PIG-273: addition of Top and SearchQuery UDFs (ankur via olgan)
PIG-246: created UDF repository (olgan)
PIG-245: UDF wrappers for Java Math functions (ajaygarg via olgan)
PIG-277: UDF for computing correlation and covariance between data sets
(ajaygarg via olgan)
Propchange:
hadoop/pig/branches/multiquery/test/org/apache/pig/test/utils/dotGraph/DOTParser.jjt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Apr 30 22:52:58 2009
@@ -1 +1 @@
-/hadoop/pig/trunk/test/org/apache/pig/test/utils/dotGraph/DOTParser.jjt:758070-767341,767975-770110
+/hadoop/pig/trunk/test/org/apache/pig/test/utils/dotGraph/DOTParser.jjt:758070-767341,767975-770480
