Skip to content

Commit f3c085f

Browse files
authored
Merge pull request #2 from mrDrivingDuck/master
Updated to v0.8
2 parents 1b56f86 + 1f59e60 commit f3c085f

28 files changed

+1705
-491
lines changed

DESCRIPTION

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
Package: RDolphinDB
22
Type: Package
33
Title: Connecting to DolphinDB server with R
4-
Version: 0.6.1
5-
Date: 2018-08-02
6-
Author: Jingtang Zhang
7-
Maintainer: xxx <xxx@dolphindb.com>
4+
Version: 0.8.0
5+
Date: 2018-08-17
6+
Author: mrDrivingDuck
7+
Maintainer: mrDrivingDuck <jingtang.zhang@dolphindb.com>
88
Description: The R API of DolphinDB.
99
You can use R connecting to DolphinDB with IP address and port,
1010
and then running scripts or functions and geting result in R form.
1111
License: GPL (>= 2)
1212
Depends: R (>= 3.2.0)
1313
Imports: Rcpp (>= 0.12.17)
1414
LinkingTo: Rcpp
15-
RoxygenNote: 6.0.1
15+
RoxygenNote: 6.1.0

R/Package_doc.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# @Author -- Jingtang Zhang
44
# @Date -- 2018.7.31
5-
# @Update -- 2018.8.2
5+
# @Update -- 2018.8.17
66
#
77
# The document commet of package 'RDolphinDB'
88
# The dynamic library declaration of package if using Rcpp
@@ -17,7 +17,7 @@
1717
#' @description You can use R connecting to DolphinDB with IP address and port,
1818
#' @description and then running scripts or functions and geting result in R form.
1919
#'
20-
#' @author xxx <xxx@dolphindb.com>
20+
#' @author mrDrivingDuck <jingtang.zhang@dolphindb.com>
2121
#' @section RDolphinDB functions:
2222
#' DolphinDB()
2323
#' dbConnect()

R/RDolphinDB.R

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,16 @@ setMethod(
9595
signature(conn = "RDolphinDB"),
9696
function(conn, script) {
9797
type <- RunScript(script)
98-
DDB_GetEntity(type)
98+
entity <- DDB_GetEntity(type)
99+
return (entity)
99100
}
100101
)
101102

102103
#' @title dbRpc
103104
#'
104105
#' @description Method of running remote procedure call.
105106
#' @param conn The connector object.
106-
#' @param func The function name running the DolphinDB server.
107+
#' @param func The function name running on the DolphinDB server.
107108
#' @param args The list containing all arguments needed to be uploaded to server.
108109
#' @return Return the excuted result of function from server in R type.
109110
#' @export
@@ -219,11 +220,11 @@ obj <- new("RDolphinDB")
219220
#' @description Method to getting an object of connector.
220221
#' @export
221222
#' @examples
222-
#' conn <- DolphinDB()
223-
#' conn <- dbConnect(conn, "localhost", 8848)
224-
#'
225-
#' # Recommanded
226223
#' conn <- dbConnect(DolphinDB(), "localhost", 8848)
224+
#' if (conn@connected == TRUE) {
225+
#' # TO DO ...
226+
#' # dbRun(...)
227+
#' }
227228
DolphinDB <- function() {
228229
return (obj)
229230
}

0 commit comments

Comments
 (0)