update

Author: windancer79

R/RDolphinDB_impl.R

@@ -22,13 +22,7 @@ DDB_SetReceiveVectorNA <- function(vec, NAIndex) {
 #   which will be uploaded
 #   (Used for dealing with NULLs in C++)
 DDB_SetUploadVectorNA <- function(vec) {
-    NAIndex <- vector(mode = "integer", length = 0)
-    for (j in 1:length(vec)) {
-        if (is.na(vec[j]) == TRUE) {
-            NAIndex <- c(NAIndex, j-1)
-        }
-    }
-    return (NAIndex)
+    return (which(is.na(vec)))
 }
 
 # @Function
@@ -138,20 +132,20 @@ DDB_GetEntity <- function(xxdb_type) {
         if (ReturnScalarNA()) {
             result <- NA
         } else {
-            result <- ReturnScalarString()
+            result <- ReturnScalarDate()
         }
         Clear()
-        return (as.Date(result))
+        return (result)
 
     } else if (xxdb_type == 15) {
         # Scalar DateTime
         if (ReturnScalarNA()) {
             result <- NA
         } else {
-            result <- ReturnScalarString()
+            result <- ReturnScalarTime()
         }
         Clear()
-        return (as.POSIXct(result))
+        return (result)
 
     } else if (xxdb_type == 5) {
         # Logical Vector
@@ -182,17 +176,17 @@ DDB_GetEntity <- function(xxdb_type) {
 
     } else if (xxdb_type == 16) {
         # Vector Date
-        result <- ReturnVectorString()
+        result <- ReturnVectorDate()
         result <- DDB_SetReceiveVectorNA(result, ReturnVectorNAIndex())
         Clear()
-        return (as.Date(result))
+        return (result)
 
     } else if (xxdb_type == 17) {
         # Vector DateTime
-        result <- ReturnVectorString()
+        result <- ReturnVectorTime()
         result <- DDB_SetReceiveVectorNA(result, ReturnVectorNAIndex())
         Clear()
-        return(as.POSIXct(result))
+        return(result)
 
     } else if (xxdb_type == 9) {
         # Logical Matrix
@@ -272,20 +266,21 @@ DDB_GetEntity <- function(xxdb_type) {
                 result <- cbind(result, clm)
 
             } else if (typelist[i] == 16) {
-                clm <- ReturnTableColumnString(i)
+                clm <- ReturnTableColumnDate(i)
                 NAIndex <- ReturnTableColumnNAIndex(i)
                 for (j in NAIndex) {
                     clm[j] <- NA
-                }
-                result <- cbind(result, as.Date(clm))
+                } 
+                result <- cbind(result, clm)
 
             } else if (typelist[i] == 17) {
-                clm <- ReturnTableColumnString(i)
+                # date time
+                clm <- ReturnTableColumnTime(i)
                 NAIndex <- ReturnTableColumnNAIndex(i)
                 for (j in NAIndex) {
                     clm[j] <- NA
                 }
-                result <- cbind(result, as.POSIXct(clm))
+                result <- cbind(result, clm)
 
             } else {
                 print("error in DataFrame")
@@ -346,7 +341,7 @@ DDB_GetEntity <- function(xxdb_type) {
                 if (ReturnScalarNA(i)) {
                     result <- NA
                 } else {
-                    result <- ReturnScalarString(i)
+                    result <- ReturnScalarDate(i)
                 }
                 result <- as.Date(result)
 
@@ -355,7 +350,7 @@ DDB_GetEntity <- function(xxdb_type) {
                 if (ReturnScalarNA(i)) {
                     result <- NA
                 } else {
-                    result <- ReturnScalarString(i)
+                    result <- ReturnScalarTime(i)
                 }
                 result <- as.POSIXct(result)
 
@@ -380,15 +375,15 @@ DDB_GetEntity <- function(xxdb_type) {
 
             } else if (anytypelist[i] == 16) {
                 # Vector Date
-                result <- ReturnVectorString(i)
+                result <- ReturnVectorDate(i)
                 result <- DDB_SetReceiveVectorNA(result, ReturnVectorNAIndex(i))
-                result <- as.Date(result)
+                result <- result
 
             } else if (anytypelist[i] == 17) {
                 # Vector DateTime
-                result <- ReturnVectorString(i)
+                result <- ReturnVectorTime(i)
                 result <- DDB_SetReceiveVectorNA(result, ReturnVectorNAIndex(i))
-                result <- as.POSIXct(result)
+                result <- result
 
             } else if (anytypelist[i] == 9) {
                 # Logical Matrix
@@ -458,20 +453,20 @@ DDB_GetEntity <- function(xxdb_type) {
                         result <- cbind(result, clm)
 
                     } else if (typelist[k] == 16) {
-                        clm <- ReturnTableColumnString(k, i)
+                        clm <- ReturnTableColumnDate(k, i)
                         NAIndex <- ReturnTableColumnNAIndex(k, i)
                         for (j in NAIndex) {
                             clm[j] <- NA
                         }
-                        result <- cbind(result, as.Date(clm))
+                        result <- cbind(result, clm)
 
                     } else if (typelist[k] == 17) {
-                        clm <- ReturnTableColumnString(k, i)
+                        clm <- ReturnTableColumnTime(k, i)
                         NAIndex <- ReturnTableColumnNAIndex(k, i)
                         for (j in NAIndex) {
                             clm[j] <- NA
                         }
-                        result <- cbind(result, as.POSIXct(clm))
+                        result <- cbind(result, clm)
 
                     } else {
                         print("error in DataFrame")
@@ -539,12 +534,12 @@ DDB_UploadScalarDate <- function(date) {
 #   Parse a date type vector to C++ string vector to upload,
 #   at the same time, deal with NA in vector
 DDB_UploadVectorDate <- function(vec) {
-    date_str_vec <- vector(mode = "character", length = 0)
-    for (i in 1:length(vec)) {
-        date_str_vec <- c(date_str_vec, as.character(vec[i]))
-    }
+    #date_str_vec <- vector(mode = "character", length = 0)
+    #for (i in 1:length(vec)) {
+    #    date_str_vec <- c(date_str_vec, as.character(vec[i]))
+    #}
     NAIndex <- DDB_SetUploadVectorNA(vec)
-    UploadVectorDate(date_str_vec, NAIndex)
+    UploadVectorDate(vec, NAIndex)
 }
 
 # @Function
@@ -557,12 +552,12 @@ DDB_UploadScalarDateTime <- function(datetime) {
 #   Parse a datetime type vector to C++ string vector to upload
 #   at the same time, deal with NA in vector
 DDB_UploadVectorDateTime <- function(vec) {
-    date_time_str_vec <- vector(mode = "character", length = 0)
-    for (i in 1:length(vec)) {
-        date_time_str_vec <- c(date_time_str_vec, as.character(vec[i]))
-    }
+    #date_time_str_vec <- vector(mode = "character", length = 0)
+    #for (i in 1:length(vec)) {
+    #    date_time_str_vec <- c(date_time_str_vec, as.character(vec[i]))
+    #}
     NAIndex <- DDB_SetUploadVectorNA(vec)
-    UploadVectorDateTime(date_time_str_vec, NAIndex)
+    UploadVectorDateTime(vec, NAIndex)
 }
 
 # @Function
@@ -589,13 +584,25 @@ DDB_UploadVector <- function(vec) {
         NAIndex <- DDB_SetUploadVectorNA(vec)
         UploadVectorDouble(vec, NAIndex)
 
-    } else if (is.character(vec)) {
+    } else if (is.character(vec) || class(vec) == "factor") {
 
         NAIndex <- DDB_SetUploadVectorNA(vec)
         UploadVectorString(vec, NAIndex)
 
-    } else {
+    } else if (length(class(vec)) > 1 && 
+                class(vec)[1] == "POSIXct") {
+
+        NAIndex <- DDB_SetUploadVectorNA(vec)
+        UploadVectorDateTime(vec, NAIndex)
+
+    } else if (class(vec) == "Date") {
+        NAIndex <- DDB_SetUploadVectorNA(vec)
+        UploadVectorDate(vec, NAIndex)
+
+    }
+    else {
         print("[ERROR] Vector type not support yet.")
+        print("If you try to upload a dataframe, please add stringsAsFactors=FALSE")
         return (NULL)
     }
 
@@ -719,14 +726,10 @@ DDB_UploadEntity <- function(args) {
             DDB_UploadVector(args[[i]])
         } else if (is.vector(args[[i]]) && length(args[[i]]) == 1) {
             DDB_UploadScalar(args[[i]])
-        } else if (class(args[[i]]) == "Date" && length(args[[i]]) == 1) {
-            DDB_UploadScalarDate(args[[i]])
-        } else if (class(args[[i]]) == "Date" && length(args[[i]]) > 1) {
-            DDB_UploadVectorDate(args[[i]])
-        } else if (class(args[[i]]) == c("POSIXct", "POSIXt") && length(args[[i]]) == 1) {
-            DDB_UploadScalarDateTime(args[[i]])
-        } else if (class(args[[i]]) == c("POSIXct", "POSIXt") && length(args[[i]]) > 1) {
+        } else if (length(class(args[[i]])) == 2 && class(args[[i]])[1] == "POSIXct") {
             DDB_UploadVectorDateTime(args[[i]])
+        } else if (class(args[[i]]) == "Date") {
+            DDB_UploadVectorDate(args[[i]])
         } else {
             print("Data form not support yet")
             Clear()

R/RcppExports.R

@@ -141,6 +141,14 @@ ReturnScalarString <- function(index = -1L) {
     .Call('_RDolphinDB_ReturnScalarString', PACKAGE = 'RDolphinDB', index)
 }
 
+ReturnScalarTime <- function(index = -1L) {
+    .Call('_RDolphinDB_ReturnScalarTime', PACKAGE = 'RDolphinDB', index)
+}
+
+ReturnScalarDate <- function(index = -1L) {
+    .Call('_RDolphinDB_ReturnScalarDate', PACKAGE = 'RDolphinDB', index)
+}
+
 ReturnVectorBool <- function(index = -1L) {
     .Call('_RDolphinDB_ReturnVectorBool', PACKAGE = 'RDolphinDB', index)
 }
@@ -157,6 +165,14 @@ ReturnVectorString <- function(index = -1L) {
     .Call('_RDolphinDB_ReturnVectorString', PACKAGE = 'RDolphinDB', index)
 }
 
+ReturnVectorDate <- function(index = -1L) {
+    .Call('_RDolphinDB_ReturnVectorDate', PACKAGE = 'RDolphinDB', index)
+}
+
+ReturnVectorTime <- function(index = -1L) {
+    .Call('_RDolphinDB_ReturnVectorTime', PACKAGE = 'RDolphinDB', index)
+}
+
 ReturnVectorNAIndex <- function(index = -1L) {
     .Call('_RDolphinDB_ReturnVectorNAIndex', PACKAGE = 'RDolphinDB', index)
 }
@@ -233,6 +249,14 @@ ReturnTableColumnDouble <- function(index, entity_index = -1L) {
     .Call('_RDolphinDB_ReturnTableColumnDouble', PACKAGE = 'RDolphinDB', index, entity_index)
 }
 
+ReturnTableColumnTime <- function(index, entity_index = -1L) {
+    .Call('_RDolphinDB_ReturnTableColumnTime', PACKAGE = 'RDolphinDB', index, entity_index)
+}
+
+ReturnTableColumnDate <- function(index, entity_index = -1L) {
+    .Call('_RDolphinDB_ReturnTableColumnDate', PACKAGE = 'RDolphinDB', index, entity_index)
+}
+
 ReturnTableColumnString <- function(index, entity_index = -1L) {
     .Call('_RDolphinDB_ReturnTableColumnString', PACKAGE = 'RDolphinDB', index, entity_index)
 }

README.md

@@ -23,13 +23,15 @@ on _DolphinDB_ server, while receiving object from server in the form and type o
 
 ---
 
-### 2. How to use
+### 2. Install
 
 #### 2.1 Install _R_ Environment
 
 * For __Linux__ user
   * `sudo apt-get install r-base`
   * __OR__ download and install manually : https://www.r-project.org/
+* For __Windows__ user
+  * Download and install the r base packages and the rtools at https://www.r-project.org/
 
 #### 2.2 Get into _R_ CMD
 
@@ -46,6 +48,14 @@ on _DolphinDB_ server, while receiving object from server in the form and type o
 
 * In _R_ CMD, type `devtools::install_github("dolphindb/api-r")`.
 * This command will automatically download and install _RDolphinDB_ and its dependency package.
+* For __Windows__ user
+  * If the Installation failed with message: *Warning in system(cmd) : 'make' not found*. Just try: 
+  
+  ```R
+  Sys.setenv(PATH = paste("*InstallDirectory*/Rtools/bin", Sys.getenv("PATH"), sep=";"))
+  Sys.setenv(BINPREF = "*InstallDirectory*/Rtools/mingw_64/bin") 
+  ```
+  
 * After installation, the package will be compiled and linked by _g++_ automatically.
 
 #### 2.5 Use the _RDolphinDB_ Package
@@ -66,8 +76,8 @@ if (conn@connected) {
 dbClose(conn)
 ```
 
----
 
+---
 ### 3. Documentation
 
 #### 3.1 In _R_ CMD

SyncToy_76488167-23e1-4a60-b25a-aa9800bd571b.dat

@@ -1 +1,2 @@
-PKG_CXXFLAGS = -std=c++11 -D WINDOWS
+PKG_CXXFLAGS = -std=c++11 -D WINDOWS
+PKG_LIBS = $(LDFLAGS) -lwsock32 -lws2_32