[ https://issues.apache.org/jira/browse/HIVE-25297?focusedWorklogId=617515&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-617515 ]
ASF GitHub Bot logged work on HIVE-25297: ----------------------------------------- Author: ASF GitHub Bot Created on: 01/Jul/21 11:07 Start Date: 01/Jul/21 11:07 Worklog Time Spent: 10m Work Description: ashish-kumar-sharma commented on a change in pull request #2437: URL: https://github.com/apache/hive/pull/2437#discussion_r662175526 ########## File path: ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFDateDiff.java ########## @@ -64,121 +66,46 @@ + " 1") @VectorizedExpressions({VectorUDFDateDiffColScalar.class, VectorUDFDateDiffColCol.class, VectorUDFDateDiffScalarCol.class}) public class GenericUDFDateDiff extends GenericUDF { - private transient Converter inputConverter1; - private transient Converter inputConverter2; + private final transient Converter[] tsConverters = new Converter[2]; private IntWritable output = new IntWritable(); - private transient PrimitiveCategory inputType1; - private transient PrimitiveCategory inputType2; - private IntWritable result = new IntWritable(); + private final transient PrimitiveCategory[] tsInputTypes = new PrimitiveCategory[2]; + public GenericUDFDateDiff() { } @Override public ObjectInspector initialize(ObjectInspector[] arguments) throws UDFArgumentException { - if (arguments.length != 2) { - throw new UDFArgumentLengthException( - "datediff() requires 2 argument, got " + arguments.length); - } - inputConverter1 = checkArguments(arguments, 0); - inputConverter2 = checkArguments(arguments, 1); - inputType1 = ((PrimitiveObjectInspector) arguments[0]).getPrimitiveCategory(); - inputType2 = ((PrimitiveObjectInspector) arguments[1]).getPrimitiveCategory(); - ObjectInspector outputOI = PrimitiveObjectInspectorFactory.writableIntObjectInspector; - return outputOI; + checkArgsSize(arguments,2,2); + checkArgPrimitive(arguments, 0); + checkArgPrimitive(arguments, 1); + checkArgGroups(arguments, 0, tsInputTypes, STRING_GROUP, DATE_GROUP); + checkArgGroups(arguments, 1, tsInputTypes, STRING_GROUP, DATE_GROUP); + obtainTimestampConverter(arguments,0, tsInputTypes, tsConverters); + obtainTimestampConverter(arguments,1, tsInputTypes, tsConverters); + return PrimitiveObjectInspectorFactory.writableIntObjectInspector; } @Override public IntWritable evaluate(DeferredObject[] arguments) throws HiveException { - output = evaluate(convertToDate(inputType1, inputConverter1, arguments[0]), - convertToDate(inputType2, inputConverter2, arguments[1])); - return output; - } - @Override - public String getDisplayString(String[] children) { - return getStandardDisplayString("datediff", children); - } + Timestamp ts1 = getTimestampValue(arguments, 0, tsConverters); + Timestamp ts2 = getTimestampValue(arguments, 1, tsConverters); - @Nullable - private Date convertToDate(PrimitiveCategory inputType, Converter converter, DeferredObject argument) - throws HiveException { - assert(converter != null); - assert(argument != null); - if (argument.get() == null) { - return null; - } - switch (inputType) { - case STRING: - case VARCHAR: - case CHAR: { - String dateString = converter.convert(argument.get()).toString(); - Date date = DateParser.parseDate(dateString); - if (date != null) { - return date; - } - Timestamp ts = PrimitiveObjectInspectorUtils.getTimestampFromString(dateString); - if (ts != null) { - return Date.ofEpochMilli(ts.toEpochMilli()); - } + if (ts1 == null || ts2 == null) { return null; } - case TIMESTAMP: - Timestamp ts = ((TimestampWritableV2) converter.convert(argument.get())) - .getTimestamp(); - return Date.ofEpochMilli(ts.toEpochMilli()); - case DATE: - DateWritableV2 dw = (DateWritableV2) converter.convert(argument.get()); - return dw.get(); - case TIMESTAMPLOCALTZ: - TimestampTZ tsz = ((TimestampLocalTZWritable) converter.convert(argument.get())) - .getTimestampTZ(); - return Date.ofEpochMilli(tsz.getEpochSecond() * 1000l); - default: - throw new UDFArgumentException( - "TO_DATE() only takes STRING/TIMESTAMP/TIMESTAMPLOCALTZ types, got " + inputType); - } - } - private Converter checkArguments(ObjectInspector[] arguments, int i) throws UDFArgumentException { - if (arguments[i].getCategory() != ObjectInspector.Category.PRIMITIVE) { - throw new UDFArgumentTypeException(0, - "Only primitive type arguments are accepted but " - + arguments[i].getTypeName() + " is passed. as first arguments"); - } - final PrimitiveCategory inputType = - ((PrimitiveObjectInspector) arguments[i]).getPrimitiveCategory(); - switch (inputType) { - case STRING: - case VARCHAR: - case CHAR: - return ObjectInspectorConverters.getConverter(arguments[i], - PrimitiveObjectInspectorFactory.writableStringObjectInspector); - case TIMESTAMP: - return new TimestampConverter((PrimitiveObjectInspector) arguments[i], - PrimitiveObjectInspectorFactory.writableTimestampObjectInspector); - case TIMESTAMPLOCALTZ: - return new PrimitiveObjectInspectorConverter.TimestampLocalTZConverter( - (PrimitiveObjectInspector) arguments[i], - PrimitiveObjectInspectorFactory.writableTimestampTZObjectInspector - ); - case DATE: - return ObjectInspectorConverters.getConverter(arguments[i], - PrimitiveObjectInspectorFactory.writableDateObjectInspector); - default: - throw new UDFArgumentException( - " DATEDIFF() only takes STRING/TIMESTAMP/DATEWRITABLE/TIMESTAMPLOCALTZ types as " + (i + 1) - + "-th argument, got " + inputType); - } - } + Date date1 = Date.ofEpochMilli(ts1.toEpochMilli()); + Date date2 = Date.ofEpochMilli(ts2.toEpochMilli()); - private IntWritable evaluate(Date date, Date date2) { - - if (date == null || date2 == null) { - return null; - } + output.set(DateWritableV2.dateToDays(date1) - DateWritableV2.dateToDays(date2)); + return output; Review comment: You are right we can use java APIs Since we already have functions to convert tiimestamp to date. I am just reusing the existing code instead of adding new. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: gitbox-unsubscr...@hive.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org Issue Time Tracking ------------------- Worklog Id: (was: 617515) Time Spent: 1h 10m (was: 1h) > Refactor GenericUDFDateDiff > --------------------------- > > Key: HIVE-25297 > URL: https://issues.apache.org/jira/browse/HIVE-25297 > Project: Hive > Issue Type: Task > Components: UDF > Affects Versions: All Versions > Reporter: Ashish Sharma > Assignee: Ashish Sharma > Priority: Trivial > Labels: pull-request-available > Fix For: 4.0.0 > > Time Spent: 1h 10m > Remaining Estimate: 0h > > Description > Remove redundant code and refactor entire GenericUDFDateDiff.class code -- This message was sent by Atlassian Jira (v8.3.4#803005)