Skip to content

[MINOR] reformat releaseIntern in cacheableData #2167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[MINOR] reformat releaseIntern in cacheableData #2167

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 23 additions & 21 deletions src/main/java/org/apache/sysds/runtime/controlprogram/caching/CacheableData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,7 @@ private synchronized void releaseIntern() {

//cache status maintenance (pass cacheNoWrite flag)
release(_isAcquireFromEmpty && !_requiresLocalWrite);

if( isCachingActive() //only if caching is enabled (otherwise keep everything in mem)
&& isCached(true) //not empty and not read/modify
&& !isBelowCachingThreshold() ) //min size for caching
Expand Down Expand Up @@ -876,37 +876,39 @@ public synchronized void exportData (String fName, String outputFormat, int repl
boolean eqFormat = isEqualOutputFormat(outputFormat);
boolean eqBlksize = (getBlocksize() != blen)
&& (outputFormat == null || outputFormat.equals("binary"));

//actual export (note: no direct transfer of local copy in order to ensure blocking (and hence, parallelism))
if( isDirty() || !eqScheme || isFederated() ||
(pWrite && (!eqFormat | !eqBlksize)) )
{

// CASE 1: dirty in-mem matrix or pWrite w/ different format (write matrix to fname; load into memory if evicted)
// a) get the matrix
boolean federatedWrite = (outputFormat != null ) && outputFormat.contains("federated");

if( isEmpty(true) && !federatedWrite)
{
//read data from HDFS if required (never read before), this applies only to pWrite w/ different output formats
//note: for large rdd outputs, we compile dedicated writespinstructions (no need to handle this here)
try {
if( getRDDHandle()==null || getRDDHandle().allowsShortCircuitRead() )
_data = readBlobFromHDFS( _hdfsFileName );
else if( getRDDHandle() != null )
_data = readBlobFromRDD( getRDDHandle(), new MutableBoolean() );
else if(!federatedWrite)
_data = readBlobFromFederated( getFedMapping() );
setDirty(false);
refreshMetaData(); //e.g., after unknown csv read
}
catch (IOException e) {
throw new DMLRuntimeException("Reading of " + _hdfsFileName + " ("+hashCode()+") failed.", e);
}
}
//get object from cache
if(!federatedWrite) {
if( _data == null )
getCache();

if(_data == null && isEmpty(false)){
// read data from HDFS if required (never read before),
// this applies only to pWrite w/ different output formats
// note: for large rdd outputs, we compile dedicated writespinstructions (no need to handle this here)
try {
if( getRDDHandle()==null || getRDDHandle().allowsShortCircuitRead() )
_data = readBlobFromHDFS( _hdfsFileName );
else if( getRDDHandle() != null )
_data = readBlobFromRDD( getRDDHandle(), new MutableBoolean() );
else if(!federatedWrite) // pull back from federated site.
_data = readBlobFromFederated( getFedMapping() );
setDirty(false);
refreshMetaData(); //e.g., after unknown csv read
}
catch (IOException e) {
throw new DMLRuntimeException("Reading of " + _hdfsFileName + " ("+hashCode()+") failed.", e);
}
}

acquire( false, _data==null ); //incl. read matrix if evicted
}

Expand All @@ -927,7 +929,7 @@ else if(!federatedWrite)
}
else if( pWrite ) // pwrite with same output format
{
//CASE 2: matrix already in same format but different file on hdfs (copy matrix to fname)
//CASE 2: matrix already in same format but different file on hdfs (copy to fname)
try
{
HDFSTool.deleteFileIfExistOnHDFS(fName);
Expand Down
Loading