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/03/24 13:34:35 UTC
[GitHub] [hive] dengzhhu653 opened a new pull request #3138: HIVE-26062: Make sure that running 4.0.0-alpha-2 above 4.0.0-alpha-1 …
dengzhhu653 opened a new pull request #3138:
URL: https://github.com/apache/hive/pull/3138
…HMS DB reports the correct error
<!--
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.
-->
### 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.
-->
### 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'.
-->
### 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.
-->
--
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 change in pull request #3138: HIVE-26062: Make sure that running 4.0.0-alpha-2 above 4.0.0-alpha-1 …
Posted by GitBox <gi...@apache.org>.
dengzhhu653 commented on a change in pull request #3138:
URL: https://github.com/apache/hive/pull/3138#discussion_r835034203
##########
File path: standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java
##########
@@ -205,19 +206,32 @@ public boolean isVersionCompatible(String hiveVersion, String dbVersion) {
return false;
}
- for (int i = 0; i < dbVerParts.length; i++) {
- int dbVerPart = Integer.parseInt(dbVerParts[i]);
- int hiveVerPart = Integer.parseInt(hiveVerParts[i]);
- if (dbVerPart > hiveVerPart) {
- return true;
- } else if (dbVerPart < hiveVerPart) {
- return false;
- } else {
- continue; // compare next part
+ int i = 0;
Review comment:
If `i` reaches the end of `dbVerParts`, means that the hive version is behind the db version, which supposed to be compatiable. For example,
dbVerParts is `4`, `0`, `0`
hiveVerParts is `4`, `0`, `0`, `alpha`, `1`
the `hiveVerParts.length == dbVerParts.length;` returns false in this case.
--
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 #3138: HIVE-26062: Make sure that running 4.0.0-alpha-2 above 4.0.0-alpha-1 …
Posted by GitBox <gi...@apache.org>.
dengzhhu653 merged pull request #3138:
URL: https://github.com/apache/hive/pull/3138
--
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 change in pull request #3138: HIVE-26062: Make sure that running 4.0.0-alpha-2 above 4.0.0-alpha-1 …
Posted by GitBox <gi...@apache.org>.
dengzhhu653 commented on a change in pull request #3138:
URL: https://github.com/apache/hive/pull/3138#discussion_r835096139
##########
File path: standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java
##########
@@ -205,19 +206,32 @@ public boolean isVersionCompatible(String hiveVersion, String dbVersion) {
return false;
}
- for (int i = 0; i < dbVerParts.length; i++) {
- int dbVerPart = Integer.parseInt(dbVerParts[i]);
- int hiveVerPart = Integer.parseInt(hiveVerParts[i]);
- if (dbVerPart > hiveVerPart) {
- return true;
- } else if (dbVerPart < hiveVerPart) {
- return false;
- } else {
- continue; // compare next part
+ int i = 0;
Review comment:
`hiveVerParts.length > dbVerParts.length` makes sense, I will fix that. Thank you for your suggestion!
--
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 change in pull request #3138: HIVE-26062: Make sure that running 4.0.0-alpha-2 above 4.0.0-alpha-1 …
Posted by GitBox <gi...@apache.org>.
dengzhhu653 commented on a change in pull request #3138:
URL: https://github.com/apache/hive/pull/3138#discussion_r834376989
##########
File path: standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java
##########
@@ -205,19 +206,33 @@ public boolean isVersionCompatible(String hiveVersion, String dbVersion) {
return false;
}
- for (int i = 0; i < dbVerParts.length; i++) {
- int dbVerPart = Integer.parseInt(dbVerParts[i]);
- int hiveVerPart = Integer.parseInt(hiveVerParts[i]);
- if (dbVerPart > hiveVerPart) {
- return true;
- } else if (dbVerPart < hiveVerPart) {
- return false;
- } else {
- continue; // compare next part
+ hiveVerParts = hiveVersion.split("\\.|-");
+ dbVerParts = dbVersion.split("\\.|-");
+
+ int i = 0;
+ for (; i < Math.min(hiveVerParts.length, dbVerParts.length); i++) {
+ int compare = compareVersion(dbVerParts[i], hiveVerParts[i]);
+ if (compare != 0) {
+ return compare > 0;
}
}
- return true;
+ return i == dbVerParts.length;
+ }
+
+ private int compareVersion(String dbVerPart, String hiveVerPart) {
+ if (dbVerPart.equals(hiveVerPart)) {
+ return 0;
+ }
+ boolean isDbVerNum = NumberUtils.isNumber(dbVerPart);
+ boolean isHiveVerNum = NumberUtils.isNumber(hiveVerPart);
+ if (isDbVerNum && isHiveVerNum) {
+ return Integer.parseInt(dbVerPart) - Integer.parseInt(hiveVerPart);
+ } else if (!isDbVerNum && !isHiveVerNum) {
+ return dbVerPart.compareTo(hiveVerPart);
Review comment:
This is useful for comparing the versions like:
hive version: `4.0.0-alpha-1`
db version: `4.0.0-beta-1`
as beta is behind alpha, so this case is compatible.
--
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] pvary commented on a change in pull request #3138: HIVE-26062: Make sure that running 4.0.0-alpha-2 above 4.0.0-alpha-1 …
Posted by GitBox <gi...@apache.org>.
pvary commented on a change in pull request #3138:
URL: https://github.com/apache/hive/pull/3138#discussion_r834378529
##########
File path: standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java
##########
@@ -205,19 +206,33 @@ public boolean isVersionCompatible(String hiveVersion, String dbVersion) {
return false;
}
- for (int i = 0; i < dbVerParts.length; i++) {
- int dbVerPart = Integer.parseInt(dbVerParts[i]);
- int hiveVerPart = Integer.parseInt(hiveVerParts[i]);
- if (dbVerPart > hiveVerPart) {
- return true;
- } else if (dbVerPart < hiveVerPart) {
- return false;
- } else {
- continue; // compare next part
+ hiveVerParts = hiveVersion.split("\\.|-");
+ dbVerParts = dbVersion.split("\\.|-");
+
+ int i = 0;
+ for (; i < Math.min(hiveVerParts.length, dbVerParts.length); i++) {
+ int compare = compareVersion(dbVerParts[i], hiveVerParts[i]);
+ if (compare != 0) {
+ return compare > 0;
}
}
- return true;
+ return i == dbVerParts.length;
+ }
+
+ private int compareVersion(String dbVerPart, String hiveVerPart) {
+ if (dbVerPart.equals(hiveVerPart)) {
+ return 0;
+ }
+ boolean isDbVerNum = NumberUtils.isNumber(dbVerPart);
+ boolean isHiveVerNum = NumberUtils.isNumber(hiveVerPart);
+ if (isDbVerNum && isHiveVerNum) {
+ return Integer.parseInt(dbVerPart) - Integer.parseInt(hiveVerPart);
+ } else if (!isDbVerNum && !isHiveVerNum) {
+ return dbVerPart.compareTo(hiveVerPart);
Review comment:
Makes sense
--
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] pvary commented on a change in pull request #3138: HIVE-26062: Make sure that running 4.0.0-alpha-2 above 4.0.0-alpha-1 …
Posted by GitBox <gi...@apache.org>.
pvary commented on a change in pull request #3138:
URL: https://github.com/apache/hive/pull/3138#discussion_r835020859
##########
File path: standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java
##########
@@ -205,19 +206,32 @@ public boolean isVersionCompatible(String hiveVersion, String dbVersion) {
return false;
}
- for (int i = 0; i < dbVerParts.length; i++) {
- int dbVerPart = Integer.parseInt(dbVerParts[i]);
- int hiveVerPart = Integer.parseInt(hiveVerParts[i]);
- if (dbVerPart > hiveVerPart) {
- return true;
- } else if (dbVerPart < hiveVerPart) {
- return false;
- } else {
- continue; // compare next part
+ int i = 0;
Review comment:
This makes me nervous 😄
Why do we have to move around the declaration of `i`?
Maybe the code would be easier to read this way:
```
hiveVerParts = hiveVersion.split("\\.|-");
dbVerParts = dbVersion.split("\\.|-");
for (int i; i < Math.min(hiveVerParts.length, dbVerParts.length); i++) {
int compare = compareVersion(dbVerParts[i], hiveVerParts[i]);
if (compare != 0) {
return compare > 0;
}
}
// This is always false, as we already checked that hiveVersion and dbVersions are different
return hiveVerParts.length == dbVerParts.length;
```
--
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] pvary commented on a change in pull request #3138: HIVE-26062: Make sure that running 4.0.0-alpha-2 above 4.0.0-alpha-1 …
Posted by GitBox <gi...@apache.org>.
pvary commented on a change in pull request #3138:
URL: https://github.com/apache/hive/pull/3138#discussion_r834346677
##########
File path: standalone-metastore/metastore-server/src/main/java/org/apache/hadoop/hive/metastore/MetaStoreSchemaInfo.java
##########
@@ -205,19 +206,33 @@ public boolean isVersionCompatible(String hiveVersion, String dbVersion) {
return false;
}
- for (int i = 0; i < dbVerParts.length; i++) {
- int dbVerPart = Integer.parseInt(dbVerParts[i]);
- int hiveVerPart = Integer.parseInt(hiveVerParts[i]);
- if (dbVerPart > hiveVerPart) {
- return true;
- } else if (dbVerPart < hiveVerPart) {
- return false;
- } else {
- continue; // compare next part
+ hiveVerParts = hiveVersion.split("\\.|-");
+ dbVerParts = dbVersion.split("\\.|-");
+
+ int i = 0;
+ for (; i < Math.min(hiveVerParts.length, dbVerParts.length); i++) {
+ int compare = compareVersion(dbVerParts[i], hiveVerParts[i]);
+ if (compare != 0) {
+ return compare > 0;
}
}
- return true;
+ return i == dbVerParts.length;
+ }
+
+ private int compareVersion(String dbVerPart, String hiveVerPart) {
+ if (dbVerPart.equals(hiveVerPart)) {
+ return 0;
+ }
+ boolean isDbVerNum = NumberUtils.isNumber(dbVerPart);
+ boolean isHiveVerNum = NumberUtils.isNumber(hiveVerPart);
+ if (isDbVerNum && isHiveVerNum) {
+ return Integer.parseInt(dbVerPart) - Integer.parseInt(hiveVerPart);
+ } else if (!isDbVerNum && !isHiveVerNum) {
+ return dbVerPart.compareTo(hiveVerPart);
Review comment:
This might be unnecessary as we have already compared `dbVerPart` to `hiveVerPart` in the first line of the 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