This is an automated email from the ASF dual-hosted git repository.

baunsgaard pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/systemds.git


The following commit(s) were added to refs/heads/master by this push:
     new 19266fd  [MINOR] Fix federated write
19266fd is described below

commit 19266fdeffd622c7d10eaeae217d53791e87d9e3
Author: baunsgaard <[email protected]>
AuthorDate: Thu Oct 29 17:02:13 2020 +0100

    [MINOR] Fix federated write
    
    Unfortunately the last fix made the previous fix break.
    This commit should now finally make the write work for federated.
---
 .../org/apache/sysds/runtime/controlprogram/caching/CacheableData.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/src/main/java/org/apache/sysds/runtime/controlprogram/caching/CacheableData.java
 
b/src/main/java/org/apache/sysds/runtime/controlprogram/caching/CacheableData.java
index a646d64..cb7e096 100644
--- 
a/src/main/java/org/apache/sysds/runtime/controlprogram/caching/CacheableData.java
+++ 
b/src/main/java/org/apache/sysds/runtime/controlprogram/caching/CacheableData.java
@@ -784,7 +784,7 @@ public abstract class CacheableData<T extends CacheBlock> 
extends Data
                        // a) get the matrix
                        boolean federatedWrite = (outputFormat != null ) &&  
outputFormat.contains("federated");
 
-                       if( isEmpty(true))
+                       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) 
@@ -978,6 +978,7 @@ public abstract class CacheableData<T extends CacheBlock> 
extends Data
 
        // Federated read
        protected T readBlobFromFederated(FederationMap fedMap) throws 
IOException {
+               LOG.info("Pulling data from federated sites");
                MetaDataFormat iimd = (MetaDataFormat) _metaData;
                DataCharacteristics dc = iimd.getDataCharacteristics();
                return readBlobFromFederated(fedMap, dc.getDims());

Reply via email to