ST_Bin: decimal bin size argument (#164)

Author: randallwhitman

hive/src/main/java/com/esri/hadoop/hive/ST_Bin.java

@@ -33,36 +33,36 @@ public ObjectInspector initialize(ObjectInspector[] OIs)
 if (OIs.length != 2) {
 throw new UDFArgumentException("Function takes exactly 2 arguments");
 }
-
+
 if (OIs[0].getCategory() != Category.PRIMITIVE) {
-throw new UDFArgumentException("Argument 0 must be a number");
+throw new UDFArgumentException("Argument 0 must be a number - got: " + OIs[0].getCategory());
 }
-
+
 oiBinSize = (PrimitiveObjectInspector)OIs[0];
-if (!EnumSet.of(PrimitiveCategory.DOUBLE,PrimitiveCategory.INT,PrimitiveCategory.LONG,PrimitiveCategory.SHORT, PrimitiveCategory.FLOAT).contains(oiBinSize.getPrimitiveCategory())) {
-throw new UDFArgumentException("Argument 0 must be a number");
+if (!EnumSet.of(PrimitiveCategory.DECIMAL,PrimitiveCategory.DOUBLE,PrimitiveCategory.INT,PrimitiveCategory.LONG,PrimitiveCategory.SHORT, PrimitiveCategory.FLOAT).contains(oiBinSize.getPrimitiveCategory())) {
+throw new UDFArgumentException("Argument 0 must be a number - got: " + oiBinSize.getPrimitiveCategory());
 }
-
+
 geomHelper = HiveGeometryOIHelper.create(OIs[1], 1);
 binSizeIsConstant = ObjectInspectorUtils.isConstantObjectInspector(OIs[0]);
 
 return PrimitiveObjectInspectorFactory.javaLongObjectInspector;
 }
-
+
 @Override
 public Object evaluate(DeferredObject[] args) throws HiveException {
 double binSize = PrimitiveObjectInspectorUtils.getDouble(args[0].get(), oiBinSize);
-
+
 if (!binSizeIsConstant || bins == null) {
 bins = new BinUtils(binSize);
 } 
-
+
 OGCPoint point = geomHelper.getPoint(args);
-
+
 if (point == null) {
 return null;
 }
-
+
 return bins.getId(point.X(), point.Y());
 }
 
@@ -71,4 +71,5 @@ public String getDisplayString(String[] args) {
 assert(args.length == 2);
 return String.format("st_bin(%s,%s)", args[0], args[1]);
 }
+
 }

pom.xml

@@ -166,31 +166,37 @@
  <profile>
  <id>hadoop-2.7</id>
  <properties>
- <hadoop.version>2.7.6</hadoop.version>
+ <hadoop.version>2.7.7</hadoop.version>
  </properties>
  </profile>
  <profile>
  <id>hadoop-2.8</id>
  <properties>
- <hadoop.version>2.8.4</hadoop.version>
+ <hadoop.version>2.8.5</hadoop.version>
  </properties>
  </profile>
  <profile>
  <id>hadoop-2.9</id>
  <properties>
- <hadoop.version>2.9.1</hadoop.version>
+ <hadoop.version>2.9.2</hadoop.version>
  </properties>
  </profile>
  <profile>
  <id>hadoop-3.0</id>
  <properties>
- <hadoop.version>3.0.2</hadoop.version> <!-- 3.0.3 ? -->
+ <hadoop.version>3.0.3</hadoop.version>
  </properties>
  </profile>
  <profile>
  <id>hadoop-3.1</id>
  <properties>
- <hadoop.version>3.1.0</hadoop.version>
+ <hadoop.version>3.1.2</hadoop.version>
+ </properties>
+ </profile>
+ <profile>
+ <id>hadoop-3.2</id>
+ <properties>
+ <hadoop.version>3.2.0</hadoop.version>
  </properties>
  </profile>
 
@@ -295,7 +301,7 @@
  <profile>
  <id>hive-2.3</id>
  <properties>
- <hive.version>2.3.3</hive.version>
+ <hive.version>2.3.5</hive.version>
  </properties>
  </profile>
  <profile>
@@ -304,6 +310,12 @@
  <hive.version>3.0.0</hive.version>
  </properties>
  </profile>
+ <profile>
+ <id>hive-3.1</id>
+ <properties>
+ <hive.version>3.1.1</hive.version>
+ </properties>
+ </profile>
 
  <profile>
  <id>release-sign-artifacts</id>