Fix bugs in define-all-as-permanent.hive

myui · May 10, 2016 · 9080a9f · 9080a9f
1 parent e5ca6bc
commit 9080a9f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/core/src/main/java/hivemall/xgboost/XGBoostUDTF.java b/core/src/main/java/hivemall/xgboost/XGBoostUDTF.java
@@ -37,6 +37,7 @@
 import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorUtils;
 
 import hivemall.UDTFWithOptions;
+import hivemall.utils.hadoop.HadoopUtils;
 import hivemall.utils.hadoop.HiveUtils;
 
 /**
@@ -265,8 +266,7 @@ public void process(Object[] args) throws HiveException {
      * does not work in there.
      */
     protected String generateUniqueModelId() {
-        // return String.valueOf(HadoopUtils.getTaskId());
-        return UUID.randomUUID().toString();
+        return String.valueOf(HadoopUtils.getTaskId());
     }
 
     private static Booster createXGBooster(

diff --git a/resources/ddl/define-all-as-permanent.hive b/resources/ddl/define-all-as-permanent.hive
@@ -607,17 +607,17 @@ CREATE FUNCTION guess_attribute_types as 'hivemall.smile.tools.GuessAttributesUD
 -- XGBoost related features --
 ------------------------------
 
-DROP TEMPORARY FUNCTION train_xgboost_regr;
-CREATE TEMPORARY FUNCTION train_xgboost_regr AS 'hivemall.xgboost.regression.XGBoostRegressionUDTF';
+DROP FUNCTION train_xgboost_regr;
+CREATE FUNCTION train_xgboost_regr AS 'hivemall.xgboost.regression.XGBoostRegressionUDTF' USING JAR '${hivemall_jar}';
 
-DROP TEMPORARY FUNCTION train_xgboost_classifier;
-CREATE TEMPORARY FUNCTION train_xgboost_classifier AS 'hivemall.xgboost.classification.XGBoostBinaryClassifierUDTF';
+DROP FUNCTION train_xgboost_classifier;
+CREATE FUNCTION train_xgboost_classifier AS 'hivemall.xgboost.classification.XGBoostBinaryClassifierUDTF' USING JAR '${hivemall_jar}';
 
-DROP TEMPORARY FUNCTION train_multiclass_xgboost_classifier;
-CREATE TEMPORARY FUNCTION train_multiclass_xgboost_classifier AS 'hivemall.xgboost.classification.XGBoostMulticlassClassifierUDTF';
+DROP FUNCTION train_multiclass_xgboost_classifier;
+CREATE FUNCTION train_multiclass_xgboost_classifier AS 'hivemall.xgboost.classification.XGBoostMulticlassClassifierUDTF' USING JAR '${hivemall_jar}';
 
-DROP TEMPORARY FUNCTION xgboost_predict;
-CREATE TEMPORARY FUNCTION xgboost_predict AS 'hivemall.xgboost.tools.XGBoostPredictUDTF';
+DROP FUNCTION xgboost_predict;
+CREATE FUNCTION xgboost_predict AS 'hivemall.xgboost.tools.XGBoostPredictUDTF' USING JAR '${hivemall_jar}';
 
-DROP TEMPORARY FUNCTION xgboost_multiclass_predict;
-CREATE TEMPORARY FUNCTION xgboost_multiclass_predict AS 'hivemall.xgboost.tools.XGBoostMulticlassPredictUDTF';
+DROP FUNCTION xgboost_multiclass_predict;
+CREATE FUNCTION xgboost_multiclass_predict AS 'hivemall.xgboost.tools.XGBoostMulticlassPredictUDTF' USING JAR '${hivemall_jar}';