@@ -350,11 +350,11 @@ private FileCacheValue getFileCache(String location, String inputFormat,
350350 List <String > partitionValues ,
351351 String bindBrokerName ) throws UserException {
352352 FileCacheValue result = new FileCacheValue ();
353+ Map <String , String > properties = new HashMap <>();
354+ jobConf .iterator ().forEachRemaining (e -> properties .put (e .getKey (), e .getValue ()));
353355 RemoteFileSystem fs = Env .getCurrentEnv ().getExtMetaCacheMgr ().getFsCache ().getRemoteFileSystem (
354356 new FileSystemCache .FileSystemCacheKey (LocationPath .getFSIdentity (
355- location , bindBrokerName ),
356- catalog .getCatalogProperty ().getProperties (),
357- bindBrokerName , jobConf ));
357+ location , bindBrokerName ), properties , bindBrokerName ));
358358 result .setSplittable (HiveUtil .isSplittable (fs , inputFormat , location ));
359359 // For Tez engine, it may generate subdirectoies for "union" query.
360360 // So there may be files and directories in the table directory at the same time. eg:
@@ -782,12 +782,12 @@ public List<FileCacheValue> getFilesByTransaction(List<HivePartition> partitions
782782 return Collections .emptyList ();
783783 }
784784 String acidVersionPath = new Path (baseOrDeltaPath , "_orc_acid_version" ).toUri ().toString ();
785+ Map <String , String > properties = new HashMap <>();
786+ jobConf .iterator ().forEachRemaining (e -> properties .put (e .getKey (), e .getValue ()));
785787 RemoteFileSystem fs = Env .getCurrentEnv ().getExtMetaCacheMgr ().getFsCache ().getRemoteFileSystem (
786788 new FileSystemCache .FileSystemCacheKey (
787789 LocationPath .getFSIdentity (baseOrDeltaPath .toUri ().toString (),
788- bindBrokerName ),
789- catalog .getCatalogProperty ().getProperties (),
790- bindBrokerName , jobConf ));
790+ bindBrokerName ), properties , bindBrokerName ));
791791 Status status = fs .exists (acidVersionPath );
792792 if (status != Status .OK ) {
793793 if (status .getErrCode () == ErrCode .NOT_FOUND ) {
@@ -807,10 +807,12 @@ public List<FileCacheValue> getFilesByTransaction(List<HivePartition> partitions
807807 List <DeleteDeltaInfo > deleteDeltas = new ArrayList <>();
808808 for (AcidUtils .ParsedDelta delta : directory .getCurrentDirectories ()) {
809809 String location = delta .getPath ().toString ();
810+ Map <String , String > properties = new HashMap <>();
811+ jobConf .iterator ().forEachRemaining (e -> properties .put (e .getKey (), e .getValue ()));
810812 RemoteFileSystem fs = Env .getCurrentEnv ().getExtMetaCacheMgr ().getFsCache ().getRemoteFileSystem (
811813 new FileSystemCache .FileSystemCacheKey (
812814 LocationPath .getFSIdentity (location , bindBrokerName ),
813- catalog . getCatalogProperty (). getProperties () , bindBrokerName , jobConf ));
815+ properties , bindBrokerName ));
814816 List <RemoteFile > remoteFiles = new ArrayList <>();
815817 Status status = fs .listFiles (location , false , remoteFiles );
816818 if (status .ok ()) {
@@ -832,10 +834,12 @@ public List<FileCacheValue> getFilesByTransaction(List<HivePartition> partitions
832834 // base
833835 if (directory .getBaseDirectory () != null ) {
834836 String location = directory .getBaseDirectory ().toString ();
837+ Map <String , String > properties = new HashMap <>();
838+ jobConf .iterator ().forEachRemaining (e -> properties .put (e .getKey (), e .getValue ()));
835839 RemoteFileSystem fs = Env .getCurrentEnv ().getExtMetaCacheMgr ().getFsCache ().getRemoteFileSystem (
836840 new FileSystemCache .FileSystemCacheKey (
837841 LocationPath .getFSIdentity (location , bindBrokerName ),
838- catalog . getCatalogProperty (). getProperties () , bindBrokerName , jobConf ));
842+ properties , bindBrokerName ));
839843 List <RemoteFile > remoteFiles = new ArrayList <>();
840844 Status status = fs .listFiles (location , false , remoteFiles );
841845 if (status .ok ()) {
0 commit comments