fixed big-endian swap issue

Author: dipterix

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: filearray
 Type: Package
 Title: File-Backed Array for Out-of-Memory Computation
-Version: 0.1.5.9002
+Version: 0.1.5.9003
 Language: en-US
 Encoding: UTF-8
 License: LGPL-3

R/header.R

@@ -74,6 +74,7 @@ read_header <- function(fid){
     } else {
         if( ENDIANNESS == "little" ){
             endian <- 'big'
+            # TODO: support big-endian file? maybe not
             stop("The file endianess is not little?")
         } else {
             endian <- "little"

src/map.cpp

@@ -196,6 +196,7 @@ SEXP FARR_buffer_map(
                 }
             }
             convert_as2(tmp, tmp_val, out_array_type);
+            
             UNPROTECT(1); // tmp
 
             FARR_subset_assign_sequential_bare(

src/save.cpp

@@ -22,6 +22,8 @@ SEXP FARR_subset_assign_sequential_bare(
 ) {
     R_xlen_t len = Rf_xlength(value_);
 
+    // print(wrap(unit_partlen));
+    // print(cum_partsizes);
     // print(value_);
 
     int file_buffer_elemsize = file_element_size(array_type);
@@ -152,7 +154,12 @@ SEXP FARR_subset_assign_sequential_bare(
                 break;
             }
             case INTSXP: {
+                // const unsigned char *buffer_src = (const unsigned char*)(INTEGER(value_) + nwrite);
+                // const unsigned char *buffer_dst = (const unsigned char*)(begin);
                 lendian_assign(begin, INTEGER(value_) + nwrite, file_buffer_elemsize, write_len);
+                // for( size_t tt = 0 ; tt < file_buffer_elemsize * write_len ; tt++ ) {
+                //     Rcout << (int)*(buffer_src + tt) << " - " << (int)*(buffer_dst + tt) << "\n";
+                // }
                 // lendian_fwrite(INTEGER(value_) + nwrite, file_buffer_elemsize, write_len, conn);
                 break;
             }

src/serialize.cpp

@@ -128,9 +128,9 @@ void lendian_assign(void* dst, const void* src, const size_t& elem_size, const s
         const unsigned char *buffer_src = (const unsigned char*)src;
         unsigned char *buffer_dst = (unsigned char*)dst;
         size_t i = 0;
-        for(size_t idx = 0; idx < nelems; idx++, buffer_dst++){
-            for(i = 0; i < elem_size; i++){
-                *(buffer_dst + i) = *(buffer_src + (elem_size - i - 1));
+        for(size_t idx = 0; idx < nelems; idx++){
+            for(i = 0; i < elem_size; i++, buffer_dst++){
+                *buffer_dst = *(buffer_src + (idx * elem_size + elem_size - i - 1));
             }
         }
     } else {

tests/testthat/test-method_subsetAssign.R

@@ -15,6 +15,7 @@ test_that("subset-assign filearray-proxy", {
     expect_equal(x[idx1, idx2], x0[idx1, idx2])
     expect_equal(y[1,1:12, dimnames = NULL], rep(0L, 12))
     expect_equal(y[1:10,1, dimnames = NULL], rep(0L, 10))
+    expect_equal(y[2:10,2:10], x0[2:10,2:10] + 1L)
     expect_equal(z[, idx2], 2 * y[, idx2])
 
     expect_equal(y[2:10, 2:12], x[2:10, 2:12] + 1)