Index: eclipse-templates/.classpath
===================================================================
--- eclipse-templates/.classpath (revision 1469344)
+++ eclipse-templates/.classpath (working copy)
@@ -89,7 +89,6 @@
-
@@ -97,7 +96,6 @@
-
@@ -115,8 +113,6 @@
-
-
Index: builtins/test/iris.txt
===================================================================
--- builtins/test/iris.txt (revision 1469344)
+++ builtins/test/iris.txt (working copy)
@@ -1,150 +0,0 @@
-6 2.9 4.5 1.5 versicolor
-6.9 3.1 5.1 2.3 virginica
-5.4 3.4 1.5 0.4 setosa
-5.5 3.5 1.3 0.2 setosa
-4.6 3.1 1.5 0.2 setosa
-4.4 2.9 1.4 0.2 setosa
-5.9 3 4.2 1.5 versicolor
-5.1 3.8 1.6 0.2 setosa
-5 3.6 1.4 0.2 setosa
-6.7 3.1 5.6 2.4 virginica
-4.9 3.6 1.4 0.1 setosa
-4.9 2.5 4.5 1.7 virginica
-5.8 2.8 5.1 2.4 virginica
-4.5 2.3 1.3 0.3 setosa
-6.7 3 5.2 2.3 virginica
-6 3 4.8 1.8 virginica
-6.4 3.2 4.5 1.5 versicolor
-7.7 3.8 6.7 2.2 virginica
-5.7 2.6 3.5 1 versicolor
-5.7 2.9 4.2 1.3 versicolor
-5.4 3.9 1.7 0.4 setosa
-5 3.5 1.3 0.3 setosa
-6 2.2 5 1.5 virginica
-6.6 2.9 4.6 1.3 versicolor
-5.9 3 5.1 1.8 virginica
-4.7 3.2 1.6 0.2 setosa
-5 3.4 1.5 0.2 setosa
-6.9 3.2 5.7 2.3 virginica
-6.5 3 5.8 2.2 virginica
-5.5 4.2 1.4 0.2 setosa
-7.1 3 5.9 2.1 virginica
-6.2 2.9 4.3 1.3 versicolor
-5.7 4.4 1.5 0.4 setosa
-4.9 2.4 3.3 1 versicolor
-5.4 3.9 1.3 0.4 setosa
-6.4 2.8 5.6 2.1 virginica
-6.9 3.1 4.9 1.5 versicolor
-5.9 3.2 4.8 1.8 versicolor
-6.1 3 4.9 1.8 virginica
-5.6 3 4.5 1.5 versicolor
-5.3 3.7 1.5 0.2 setosa
-6.4 2.9 4.3 1.3 versicolor
-6.6 3 4.4 1.4 versicolor
-6.4 3.1 5.5 1.8 virginica
-6.3 2.5 4.9 1.5 versicolor
-6.7 3.3 5.7 2.5 virginica
-6.4 2.7 5.3 1.9 virginica
-6.5 3 5.5 1.8 virginica
-6.7 3.1 4.4 1.4 versicolor
-4.9 3 1.4 0.2 setosa
-6.2 2.8 4.8 1.8 virginica
-7.6 3 6.6 2.1 virginica
-5.2 3.5 1.5 0.2 setosa
-7.7 2.6 6.9 2.3 virginica
-6.5 3.2 5.1 2 virginica
-5.8 2.6 4 1.2 versicolor
-6.3 2.9 5.6 1.8 virginica
-5.8 4 1.2 0.2 setosa
-6.5 2.8 4.6 1.5 versicolor
-5 3.2 1.2 0.2 setosa
-7.4 2.8 6.1 1.9 virginica
-7 3.2 4.7 1.4 versicolor
-4.8 3.4 1.6 0.2 setosa
-6.4 2.8 5.6 2.2 virginica
-5.4 3.7 1.5 0.2 setosa
-5.7 3.8 1.7 0.3 setosa
-5.2 2.7 3.9 1.4 versicolor
-6.3 3.3 6 2.5 virginica
-5.1 2.5 3 1.1 versicolor
-7.7 2.8 6.7 2 virginica
-5.5 2.4 3.7 1 versicolor
-7.3 2.9 6.3 1.8 virginica
-4.3 3 1.1 0.1 setosa
-5.6 2.7 4.2 1.3 versicolor
-7.9 3.8 6.4 2 virginica
-5.6 2.8 4.9 2 virginica
-5 3 1.6 0.2 setosa
-6.1 3 4.6 1.4 versicolor
-5.1 3.5 1.4 0.2 setosa
-5.1 3.4 1.5 0.2 setosa
-4.8 3.4 1.9 0.2 setosa
-4.6 3.4 1.4 0.3 setosa
-6.5 3 5.2 2 virginica
-5.1 3.8 1.9 0.4 setosa
-5.6 2.9 3.6 1.3 versicolor
-6.7 3 5 1.7 versicolor
-7.2 3.6 6.1 2.5 virginica
-4.9 3.1 1.5 0.1 setosa
-6.2 3.4 5.4 2.3 virginica
-5.8 2.7 5.1 1.9 virginica
-5.6 2.5 3.9 1.1 versicolor
-6.3 2.5 5 1.9 virginica
-4.6 3.2 1.4 0.2 setosa
-5.8 2.7 5.1 1.9 virginica
-5.5 2.3 4 1.3 versicolor
-6.7 3.3 5.7 2.1 virginica
-6 2.2 4 1 versicolor
-5.1 3.7 1.5 0.4 setosa
-5 3.5 1.6 0.6 setosa
-5.8 2.7 4.1 1 versicolor
-5.7 2.8 4.1 1.3 versicolor
-6 3.4 4.5 1.6 versicolor
-6.1 2.9 4.7 1.4 versicolor
-5.2 3.4 1.4 0.2 setosa
-5.6 3 4.1 1.3 versicolor
-6.8 2.8 4.8 1.4 versicolor
-5.8 2.7 3.9 1.2 versicolor
-4.8 3.1 1.6 0.2 setosa
-5.1 3.5 1.4 0.3 setosa
-5 3.3 1.4 0.2 setosa
-7.2 3.2 6 1.8 virginica
-6.7 3.1 4.7 1.5 versicolor
-6.8 3.2 5.9 2.3 virginica
-4.6 3.6 1 0.2 setosa
-5.4 3 4.5 1.5 versicolor
-6.4 3.2 5.3 2.3 virginica
-4.8 3 1.4 0.1 setosa
-5.5 2.5 4 1.3 versicolor
-6.9 3.1 5.4 2.1 virginica
-6.8 3 5.5 2.1 virginica
-4.8 3 1.4 0.3 setosa
-6.3 2.7 4.9 1.8 virginica
-6 2.7 5.1 1.6 versicolor
-6.1 2.6 5.6 1.4 virginica
-7.2 3 5.8 1.6 virginica
-5 2.3 3.3 1 versicolor
-6.3 3.3 4.7 1.6 versicolor
-6.3 2.8 5.1 1.5 virginica
-4.7 3.2 1.3 0.2 setosa
-6.3 3.4 5.6 2.4 virginica
-5.7 2.8 4.5 1.3 versicolor
-5.7 3 4.2 1.2 versicolor
-4.9 3.1 1.5 0.2 setosa
-5 2 3.5 1 versicolor
-7.7 3 6.1 2.3 virginica
-5.7 2.5 5 2 virginica
-5.5 2.4 3.8 1.1 versicolor
-5.1 3.3 1.7 0.5 setosa
-6.3 2.3 4.4 1.3 versicolor
-4.4 3 1.3 0.2 setosa
-6.1 2.8 4 1.3 versicolor
-6.1 2.8 4.7 1.2 versicolor
-5.5 2.6 4.4 1.2 versicolor
-5.1 3.8 1.5 0.3 setosa
-4.4 3.2 1.3 0.2 setosa
-5 3.4 1.6 0.4 setosa
-6.7 2.5 5.8 1.8 virginica
-5.2 4.1 1.5 0.1 setosa
-6.2 2.2 4.5 1.5 versicolor
-5.4 3.4 1.7 0.2 setosa
Index: builtins/test/cleanup.sql
===================================================================
--- builtins/test/cleanup.sql (revision 1469344)
+++ builtins/test/cleanup.sql (working copy)
@@ -1,2 +0,0 @@
-drop table if exists onerow;
-drop table if exists iris;
Index: builtins/test/onerow.txt
===================================================================
--- builtins/test/onerow.txt (revision 1469344)
+++ builtins/test/onerow.txt (working copy)
@@ -1 +0,0 @@
-plugh
Index: builtins/test/setup.sql
===================================================================
--- builtins/test/setup.sql (revision 1469344)
+++ builtins/test/setup.sql (working copy)
@@ -1,10 +0,0 @@
-create table onerow(s string);
-load data local inpath '${env:HIVE_PLUGIN_ROOT_DIR}/test/onerow.txt'
-overwrite into table onerow;
-create table iris(
-sepal_length string, sepal_width string,
-petal_length string, petal_width string,
-species string)
-row format delimited fields terminated by '\t' stored as textfile;
-load data local inpath '${env:HIVE_PLUGIN_ROOT_DIR}/test/iris.txt'
-overwrite into table iris;
Index: builtins/ivy.xml
===================================================================
--- builtins/ivy.xml (revision 1469344)
+++ builtins/ivy.xml (working copy)
@@ -1,42 +0,0 @@
-
-
-
-
-
-
- The Apache Hive (TM) data warehouse software facilitates querying and managing large datasets residing in distributed storage.
- https://cwiki.apache.org/confluence/display/Hive/Home
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Index: builtins/src/org/apache/hive/builtins/UDAFUnionMap.java
===================================================================
--- builtins/src/org/apache/hive/builtins/UDAFUnionMap.java (revision 1469344)
+++ builtins/src/org/apache/hive/builtins/UDAFUnionMap.java (working copy)
@@ -1,127 +0,0 @@
-/**
- * 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.hive.builtins;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.hive.pdk.HivePdkUnitTest;
-import org.apache.hive.pdk.HivePdkUnitTests;
-
-import org.apache.hadoop.hive.ql.exec.Description;
-import org.apache.hadoop.hive.ql.metadata.HiveException;
-import org.apache.hadoop.hive.ql.parse.SemanticException;
-import org.apache.hadoop.hive.ql.udf.generic.AbstractGenericUDAFResolver;
-import org.apache.hadoop.hive.ql.udf.generic.GenericUDAFEvaluator;
-import org.apache.hadoop.hive.ql.udf.generic.GenericUDAFEvaluator.AggregationBuffer;
-import org.apache.hadoop.hive.serde2.objectinspector.MapObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorUtils;
-import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
-
-/**
- * Aggregate all maps into a single map. If there are multiple values for
- * the same key, result can contain any of those values.
- * Because the mappers must keep all of the data in memory, if your data is
- * non-trivially large you should set hive.map.aggr=false to ensure that
- * UNION_MAP is only executed in the reduce phase.
- */
-@HivePdkUnitTests(
- setup = "",
- cleanup = "",
- cases = {
- @HivePdkUnitTest(
- query = "SELECT size(UNION_MAP(MAP(sepal_width, sepal_length))) "
- +"FROM iris",
- result = "23")
- })
-@Description(
- name = "union_map",
- value = "_FUNC_(col) - aggregate given maps into a single map",
- extended = "Aggregate maps, returns as a HashMap.")
-public class UDAFUnionMap extends AbstractGenericUDAFResolver {
- @Override
- public GenericUDAFEvaluator getEvaluator(TypeInfo[] parameters) throws SemanticException {
-
- // Next two validation calls are dependent on HIVE-2524, so
- // leave them commented out for now.
- //
- // new LengthEquals(1).check(parameters.length);
- // new IsMap().check(parameters[0], 0);
-
- return new Evaluator();
- }
-
- public static class State implements AggregationBuffer {
- HashMap