veghlaci05 commented on code in PR #4112:
URL: https://github.com/apache/hive/pull/4112#discussion_r1141772702
##########
ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java:
##########
@@ -2589,15 +2589,17 @@ private boolean isPathEncrypted(Path path) throws
HiveException {
* @throws HiveException If an error occurs while comparing key strengths.
*/
private int comparePathKeyStrength(Path p1, Path p2) throws HiveException {
- HadoopShims.HdfsEncryptionShim hdfsEncryptionShim;
+ try {
+ HadoopShims.HdfsEncryptionShim hdfsEncryptionShim1;
+ HadoopShims.HdfsEncryptionShim hdfsEncryptionShim2;
+ hdfsEncryptionShim1 =
SessionState.get().getHdfsEncryptionShim(p1.getFileSystem(conf), conf);
+ hdfsEncryptionShim2 =
SessionState.get().getHdfsEncryptionShim(p2.getFileSystem(conf), conf);
- hdfsEncryptionShim = SessionState.get().getHdfsEncryptionShim();
- if (hdfsEncryptionShim != null) {
- try {
- return hdfsEncryptionShim.comparePathKeyStrength(p1, p2);
- } catch (Exception e) {
- throw new HiveException("Unable to compare key strength for " + p1 + "
and " + p2 + " : " + e, e);
+ if (hdfsEncryptionShim1 != null && hdfsEncryptionShim2 != null) {
+ return hdfsEncryptionShim1.comparePathKeyStrength(p1, p2,
hdfsEncryptionShim2);
Review Comment:
I think your point is valid, however the method below has the same arg list,
so I think it would be better to keep this structure for both methods.
```
public boolean arePathsOnSameEncryptionZone(Path path1, Path path2,
HadoopShims.HdfsEncryptionShim encryptionShim2)
```
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
