You are viewing a plain text version of this content. The canonical link for it is here.
Posted to gitbox@hive.apache.org by GitBox <gi...@apache.org> on 2022/05/06 01:35:52 UTC
[GitHub] [hive] stiga-huang opened a new pull request, #2378: HIVE-25230: Add position and occurrence to INSTR()
stiga-huang opened a new pull request, #2378:
URL: https://github.com/apache/hive/pull/2378
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://cwiki.apache.org/confluence/display/Hive/HowToContribute
2. Ensure that you have created an issue on the Hive project JIRA: https://issues.apache.org/jira/projects/HIVE/summary
3. Ensure you have added or run the appropriate tests for your PR:
4. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP]HIVE-XXXXX: Your PR title ...'.
5. Be sure to keep the PR description updated to reflect all changes.
6. Please write your PR title to summarize what this PR proposes.
7. If possible, provide a concise example to reproduce the issue for a faster review.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
This PR extends the INSTR() function to support optional position and occurrence arguments, which is supported in Oracle, Impala, etc.
https://docs.oracle.com/database/121/SQLRF/functions089.htm#SQLRF00651
https://impala.apache.org/docs/build/html/topics/impala_string_functions.html#string_functions__instr
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
This provides users more functionality in the INSTR() function.
It also helps to reduce the SQL difference between Hive and Impala.
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as the documentation fix.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description, screenshot and/or a reproducable example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Hive versions or within the unreleased branches such as master.
If no, write 'No'.
-->
Yes, INSTR() will have two more optional arguments, which needs document as well.
```
instr(str, substr[, pos[, occurrence]]) - Returns the index of the given occurrence of substr in str after position pos
pos is a 1-based index. If pos < 0, the starting position is
determined by counting backwards from the end of str and then Hive
searches backward from the resulting position.
occurrence is also a 1-based index. The value must be positive.
If occurrence is greater than the number of matching occurrences,
the function returns 0.
If either of the optional arguments, pos or occurrence, is NULL,
the function also returns NULL.
Example:
> SELECT instr('Facebook', 'boo') FROM src LIMIT 1;
5
> SELECT instr('CORPORATE FLOOR','OR', 3, 2) FROM src LIMIT 1;
14
> SELECT instr('CORPORATE FLOOR','OR', -3, 2) FROM src LIMIT 1;
2
```
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
-->
Tests were added in udf_instr_wrong_args_len2.q, udf_instr_wrong_occurrence.q, and udf_instr.q.
--
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-unsubscribe@hive.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: gitbox-unsubscribe@hive.apache.org
For additional commands, e-mail: gitbox-help@hive.apache.org
[GitHub] [hive] stiga-huang commented on pull request #2378: HIVE-25230: Add position and occurrence to INSTR()
Posted by GitBox <gi...@apache.org>.
stiga-huang commented on PR #2378:
URL: https://github.com/apache/hive/pull/2378#issuecomment-1126616115
Thanks for your review, @dengzhhu653 !
--
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-unsubscribe@hive.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: gitbox-unsubscribe@hive.apache.org
For additional commands, e-mail: gitbox-help@hive.apache.org
[GitHub] [hive] stiga-huang commented on a diff in pull request #2378: HIVE-25230: Add position and occurrence to INSTR()
Posted by GitBox <gi...@apache.org>.
stiga-huang commented on code in PR #2378:
URL: https://github.com/apache/hive/pull/2378#discussion_r866596517
##########
ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFInstr.java:
##########
@@ -20,79 +20,158 @@
import org.apache.hadoop.hive.ql.exec.Description;
import org.apache.hadoop.hive.ql.exec.UDFArgumentException;
-import org.apache.hadoop.hive.ql.exec.UDFArgumentLengthException;
-import org.apache.hadoop.hive.ql.exec.UDFArgumentTypeException;
import org.apache.hadoop.hive.ql.metadata.HiveException;
+import org.apache.hadoop.hive.serde2.objectinspector.ConstantObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorConverters;
+import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.Text;
/**
- * Generic UDF for string function <code>INSTR(str,substr)</code>. This mimcs
- * the function from MySQL
+ * Generic UDF for string function <code>INSTR(str,substr[,pos[,occurrence]])</code>.
+ * This extends the function from MySQL
* http://dev.mysql.com/doc/refman/5.1/en/string-functions.html#function_instr
+ * and mimics the function from Oracle
+ * https://docs.oracle.com/database/121/SQLRF/functions089.htm#SQLRF00651
*
* <pre>
* usage:
- * INSTR(str, substr)
+ * INSTR(str, substr[, pos[, occurrence]])
* </pre>
* <p>
*/
@Description(name = "instr",
- value = "_FUNC_(str, substr) - Returns the index of the first occurance of substr in str",
- extended = "Example:\n"
- + " > SELECT _FUNC_('Facebook', 'boo') FROM src LIMIT 1;\n" + " 5")
+ value = "_FUNC_(str, substr[, pos[, occurrence]]) " +
+ "- Returns the index of the given occurrence of substr in str after position pos",
+ extended = "pos is a 1-based index. If pos < 0, the starting position is\n" +
+ "determined by counting backwards from the end of str and then Hive\n" +
+ "searches backward from the resulting position.\n" +
+ "occurrence is also a 1-based index. The value must be positive.\n" +
+ "If occurrence is greater than the number of matching occurrences,\n" +
+ "the function returns 0.\n" +
+ "If either of the optional arguments, pos or occurrence, is NULL,\n" +
+ "the function also returns NULL.\n" +
+ "Example:\n" +
+ " > SELECT _FUNC_('Facebook', 'boo') FROM src LIMIT 1;\n" +
+ " 5\n" +
+ " > SELECT _FUNC_('CORPORATE FLOOR','OR', 3, 2) FROM src LIMIT 1;\n" +
+ " 14\n" +
+ " > SELECT _FUNC_('CORPORATE FLOOR','OR', -3, 2) FROM src LIMIT 1;\n" +
+ " 2")
public class GenericUDFInstr extends GenericUDF {
private transient ObjectInspectorConverters.Converter[] converters;
+ private transient PrimitiveObjectInspector.PrimitiveCategory[] inputTypes;
+ private transient Integer posConst;
+ private transient boolean isPosConst = false;
+ private transient Integer occurrenceConst;
+ private transient boolean isOccurrenceConst = false;
@Override
public ObjectInspector initialize(ObjectInspector[] arguments) throws UDFArgumentException {
- if (arguments.length != 2) {
- throw new UDFArgumentLengthException(
- "The function INSTR accepts exactly 2 arguments.");
- }
+ checkArgsSize(arguments, 2, 4);
+ converters = new ObjectInspectorConverters.Converter[arguments.length];
+ inputTypes = new PrimitiveObjectInspector.PrimitiveCategory[arguments.length];
for (int i = 0; i < arguments.length; i++) {
- Category category = arguments[i].getCategory();
- if (category != Category.PRIMITIVE) {
- throw new UDFArgumentTypeException(i, "The "
- + GenericUDFUtils.getOrdinal(i + 1)
- + " argument of function INSTR is expected to a "
- + Category.PRIMITIVE.toString().toLowerCase() + " type, but "
- + category.toString().toLowerCase() + " is found");
+ checkArgPrimitive(arguments, i);
+ if (i < 2) {
+ obtainStringConverter(arguments, i, inputTypes, converters);
+ } else {
+ obtainIntConverter(arguments, i, inputTypes, converters);
}
}
- converters = new ObjectInspectorConverters.Converter[arguments.length];
- for (int i = 0; i < arguments.length; i++) {
- converters[i] = ObjectInspectorConverters.getConverter(arguments[i],
- PrimitiveObjectInspectorFactory.writableStringObjectInspector);
+ if (arguments.length > 2 && arguments[2] instanceof ConstantObjectInspector) {
Review Comment:
I think this boosts the performance since `initialize()` will only be called once per instance, while `evaluate()` is called per row. Extracting the constants here save some work in `evaluate()`.
We do the same in other functions, e.g. in substring_index():
https://github.com/apache/hive/blob/037eacea46371015a7f9894c5a9ccfb9708d5c56/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFSubstringIndex.java#L71-L79
--
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-unsubscribe@hive.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: gitbox-unsubscribe@hive.apache.org
For additional commands, e-mail: gitbox-help@hive.apache.org
[GitHub] [hive] dengzhhu653 merged pull request #2378: HIVE-25230: Add position and occurrence to INSTR()
Posted by GitBox <gi...@apache.org>.
dengzhhu653 merged PR #2378:
URL: https://github.com/apache/hive/pull/2378
--
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-unsubscribe@hive.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: gitbox-unsubscribe@hive.apache.org
For additional commands, e-mail: gitbox-help@hive.apache.org
[GitHub] [hive] stiga-huang commented on pull request #2378: HIVE-25230: Add position and occurrence to INSTR()
Posted by GitBox <gi...@apache.org>.
stiga-huang commented on PR #2378:
URL: https://github.com/apache/hive/pull/2378#issuecomment-1119373397
Thank @dengzhhu653 for taking a look! I just rebased the PR onto the current master branch.
--
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-unsubscribe@hive.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: gitbox-unsubscribe@hive.apache.org
For additional commands, e-mail: gitbox-help@hive.apache.org
[GitHub] [hive] dengzhhu653 commented on a diff in pull request #2378: HIVE-25230: Add position and occurrence to INSTR()
Posted by GitBox <gi...@apache.org>.
dengzhhu653 commented on code in PR #2378:
URL: https://github.com/apache/hive/pull/2378#discussion_r866443789
##########
ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFInstr.java:
##########
@@ -20,79 +20,158 @@
import org.apache.hadoop.hive.ql.exec.Description;
import org.apache.hadoop.hive.ql.exec.UDFArgumentException;
-import org.apache.hadoop.hive.ql.exec.UDFArgumentLengthException;
-import org.apache.hadoop.hive.ql.exec.UDFArgumentTypeException;
import org.apache.hadoop.hive.ql.metadata.HiveException;
+import org.apache.hadoop.hive.serde2.objectinspector.ConstantObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorConverters;
+import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.Text;
/**
- * Generic UDF for string function <code>INSTR(str,substr)</code>. This mimcs
- * the function from MySQL
+ * Generic UDF for string function <code>INSTR(str,substr[,pos[,occurrence]])</code>.
+ * This extends the function from MySQL
* http://dev.mysql.com/doc/refman/5.1/en/string-functions.html#function_instr
+ * and mimics the function from Oracle
+ * https://docs.oracle.com/database/121/SQLRF/functions089.htm#SQLRF00651
*
* <pre>
* usage:
- * INSTR(str, substr)
+ * INSTR(str, substr[, pos[, occurrence]])
* </pre>
* <p>
*/
@Description(name = "instr",
- value = "_FUNC_(str, substr) - Returns the index of the first occurance of substr in str",
- extended = "Example:\n"
- + " > SELECT _FUNC_('Facebook', 'boo') FROM src LIMIT 1;\n" + " 5")
+ value = "_FUNC_(str, substr[, pos[, occurrence]]) " +
+ "- Returns the index of the given occurrence of substr in str after position pos",
+ extended = "pos is a 1-based index. If pos < 0, the starting position is\n" +
+ "determined by counting backwards from the end of str and then Hive\n" +
+ "searches backward from the resulting position.\n" +
+ "occurrence is also a 1-based index. The value must be positive.\n" +
+ "If occurrence is greater than the number of matching occurrences,\n" +
+ "the function returns 0.\n" +
+ "If either of the optional arguments, pos or occurrence, is NULL,\n" +
+ "the function also returns NULL.\n" +
+ "Example:\n" +
+ " > SELECT _FUNC_('Facebook', 'boo') FROM src LIMIT 1;\n" +
+ " 5\n" +
+ " > SELECT _FUNC_('CORPORATE FLOOR','OR', 3, 2) FROM src LIMIT 1;\n" +
+ " 14\n" +
+ " > SELECT _FUNC_('CORPORATE FLOOR','OR', -3, 2) FROM src LIMIT 1;\n" +
+ " 2")
public class GenericUDFInstr extends GenericUDF {
private transient ObjectInspectorConverters.Converter[] converters;
+ private transient PrimitiveObjectInspector.PrimitiveCategory[] inputTypes;
+ private transient Integer posConst;
+ private transient boolean isPosConst = false;
+ private transient Integer occurrenceConst;
+ private transient boolean isOccurrenceConst = false;
@Override
public ObjectInspector initialize(ObjectInspector[] arguments) throws UDFArgumentException {
- if (arguments.length != 2) {
- throw new UDFArgumentLengthException(
- "The function INSTR accepts exactly 2 arguments.");
- }
+ checkArgsSize(arguments, 2, 4);
+ converters = new ObjectInspectorConverters.Converter[arguments.length];
+ inputTypes = new PrimitiveObjectInspector.PrimitiveCategory[arguments.length];
for (int i = 0; i < arguments.length; i++) {
- Category category = arguments[i].getCategory();
- if (category != Category.PRIMITIVE) {
- throw new UDFArgumentTypeException(i, "The "
- + GenericUDFUtils.getOrdinal(i + 1)
- + " argument of function INSTR is expected to a "
- + Category.PRIMITIVE.toString().toLowerCase() + " type, but "
- + category.toString().toLowerCase() + " is found");
+ checkArgPrimitive(arguments, i);
+ if (i < 2) {
+ obtainStringConverter(arguments, i, inputTypes, converters);
+ } else {
+ obtainIntConverter(arguments, i, inputTypes, converters);
}
}
- converters = new ObjectInspectorConverters.Converter[arguments.length];
- for (int i = 0; i < arguments.length; i++) {
- converters[i] = ObjectInspectorConverters.getConverter(arguments[i],
- PrimitiveObjectInspectorFactory.writableStringObjectInspector);
+ if (arguments.length > 2 && arguments[2] instanceof ConstantObjectInspector) {
Review Comment:
we may not need to get the pos or occurrence constants here, they will be wrapped in DerferredObject passing to the evaluate method.
--
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-unsubscribe@hive.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: gitbox-unsubscribe@hive.apache.org
For additional commands, e-mail: gitbox-help@hive.apache.org
[GitHub] [hive] dengzhhu653 commented on a diff in pull request #2378: HIVE-25230: Add position and occurrence to INSTR()
Posted by GitBox <gi...@apache.org>.
dengzhhu653 commented on code in PR #2378:
URL: https://github.com/apache/hive/pull/2378#discussion_r866443789
##########
ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDFInstr.java:
##########
@@ -20,79 +20,158 @@
import org.apache.hadoop.hive.ql.exec.Description;
import org.apache.hadoop.hive.ql.exec.UDFArgumentException;
-import org.apache.hadoop.hive.ql.exec.UDFArgumentLengthException;
-import org.apache.hadoop.hive.ql.exec.UDFArgumentTypeException;
import org.apache.hadoop.hive.ql.metadata.HiveException;
+import org.apache.hadoop.hive.serde2.objectinspector.ConstantObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector;
-import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspector.Category;
import org.apache.hadoop.hive.serde2.objectinspector.ObjectInspectorConverters;
+import org.apache.hadoop.hive.serde2.objectinspector.PrimitiveObjectInspector;
import org.apache.hadoop.hive.serde2.objectinspector.primitive.PrimitiveObjectInspectorFactory;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.Text;
/**
- * Generic UDF for string function <code>INSTR(str,substr)</code>. This mimcs
- * the function from MySQL
+ * Generic UDF for string function <code>INSTR(str,substr[,pos[,occurrence]])</code>.
+ * This extends the function from MySQL
* http://dev.mysql.com/doc/refman/5.1/en/string-functions.html#function_instr
+ * and mimics the function from Oracle
+ * https://docs.oracle.com/database/121/SQLRF/functions089.htm#SQLRF00651
*
* <pre>
* usage:
- * INSTR(str, substr)
+ * INSTR(str, substr[, pos[, occurrence]])
* </pre>
* <p>
*/
@Description(name = "instr",
- value = "_FUNC_(str, substr) - Returns the index of the first occurance of substr in str",
- extended = "Example:\n"
- + " > SELECT _FUNC_('Facebook', 'boo') FROM src LIMIT 1;\n" + " 5")
+ value = "_FUNC_(str, substr[, pos[, occurrence]]) " +
+ "- Returns the index of the given occurrence of substr in str after position pos",
+ extended = "pos is a 1-based index. If pos < 0, the starting position is\n" +
+ "determined by counting backwards from the end of str and then Hive\n" +
+ "searches backward from the resulting position.\n" +
+ "occurrence is also a 1-based index. The value must be positive.\n" +
+ "If occurrence is greater than the number of matching occurrences,\n" +
+ "the function returns 0.\n" +
+ "If either of the optional arguments, pos or occurrence, is NULL,\n" +
+ "the function also returns NULL.\n" +
+ "Example:\n" +
+ " > SELECT _FUNC_('Facebook', 'boo') FROM src LIMIT 1;\n" +
+ " 5\n" +
+ " > SELECT _FUNC_('CORPORATE FLOOR','OR', 3, 2) FROM src LIMIT 1;\n" +
+ " 14\n" +
+ " > SELECT _FUNC_('CORPORATE FLOOR','OR', -3, 2) FROM src LIMIT 1;\n" +
+ " 2")
public class GenericUDFInstr extends GenericUDF {
private transient ObjectInspectorConverters.Converter[] converters;
+ private transient PrimitiveObjectInspector.PrimitiveCategory[] inputTypes;
+ private transient Integer posConst;
+ private transient boolean isPosConst = false;
+ private transient Integer occurrenceConst;
+ private transient boolean isOccurrenceConst = false;
@Override
public ObjectInspector initialize(ObjectInspector[] arguments) throws UDFArgumentException {
- if (arguments.length != 2) {
- throw new UDFArgumentLengthException(
- "The function INSTR accepts exactly 2 arguments.");
- }
+ checkArgsSize(arguments, 2, 4);
+ converters = new ObjectInspectorConverters.Converter[arguments.length];
+ inputTypes = new PrimitiveObjectInspector.PrimitiveCategory[arguments.length];
for (int i = 0; i < arguments.length; i++) {
- Category category = arguments[i].getCategory();
- if (category != Category.PRIMITIVE) {
- throw new UDFArgumentTypeException(i, "The "
- + GenericUDFUtils.getOrdinal(i + 1)
- + " argument of function INSTR is expected to a "
- + Category.PRIMITIVE.toString().toLowerCase() + " type, but "
- + category.toString().toLowerCase() + " is found");
+ checkArgPrimitive(arguments, i);
+ if (i < 2) {
+ obtainStringConverter(arguments, i, inputTypes, converters);
+ } else {
+ obtainIntConverter(arguments, i, inputTypes, converters);
}
}
- converters = new ObjectInspectorConverters.Converter[arguments.length];
- for (int i = 0; i < arguments.length; i++) {
- converters[i] = ObjectInspectorConverters.getConverter(arguments[i],
- PrimitiveObjectInspectorFactory.writableStringObjectInspector);
+ if (arguments.length > 2 && arguments[2] instanceof ConstantObjectInspector) {
Review Comment:
we may not need to get the pos or occurrence constants here, they will be wrapped in DerferredObject and delivered to the evaluate method.
--
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-unsubscribe@hive.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: gitbox-unsubscribe@hive.apache.org
For additional commands, e-mail: gitbox-help@hive.apache.org