Skip to content

Commit

Permalink
rename qserver->rkdb
Browse files Browse the repository at this point in the history
  • Loading branch information
Sergey Vidyuk committed Jun 6, 2017
1 parent 69db073 commit 467ae65
Show file tree
Hide file tree
Showing 12 changed files with 22 additions and 24 deletions.
12 changes: 6 additions & 6 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
Package: qserver
Package: rkdb
Version: 0.9.0
Title: R client for kdb+
Title: R client for 'kdb+'
Description: 'kdb+' driver and interface for R. Connect and execute queries against 'kdb+' databse and analytics platform from 'Kx Systems'(https://kx.com).
Authors@R: c(
person("Sergey","Vidyuk", role=c("aut","cre"), email="[email protected]"),
person("Chris","Burke", role=c("ctb")),
Expand All @@ -9,10 +10,9 @@ Authors@R: c(
)
Depends: R (>= 3.0.0)
Suggests: ggplot2 (>= 0.9.0)
Description: Execute kdb+ queries from R for advanced high-performance analytics.
License: file LICENSE
URL: https://github.com/KxSystems/qserver
BugReports: https://github.com/KxSystems/qserver/issues
License: Apache License 2.0 | file LICENSE
URL: https://github.com/KxSystems/rkdb
BugReports: https://github.com/KxSystems/rkdb/issues
MailingList: [email protected]
SystemRequirements: GNU make
RoxygenNote: 6.0.1
4 changes: 2 additions & 2 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
useDynLib(qserver, .registration=TRUE)
useDynLib(rkdb, .registration=TRUE)

export(open_connection)
export(execute)
export(close_connection)
export(test.qserver)
export(test.rkdb)
File renamed without changes.
2 changes: 1 addition & 1 deletion R/test.qserver.R → R/test.rkdb.R
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#' Run simple series of tests for qserver
#' Note: Start kdb+ instance on localhost:5000 before running this function
#' @export
test.qserver <- function() {
test.rkdb <- function() {
h=open_connection() # default is localhost:5000

execute (h,"sp:([]s:10?`3;p:10?`1;qty:100*10?10)")
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ See also [Kx wiki](http://code.kx.com/q/interfaces/with-r/).
Using `devtools` package

```
devtools::install_github('kxsystems/qserver')
devtools::install_github('kxsystems/rkdb')
```

To test, assuming a local q instance listening on port `5000`, try in R:
```
> library(qserver)
> test.qserver()
> library(rkdb)
> test.rkdb()
```
## API

Expand All @@ -28,6 +28,6 @@ Note that open_connection takes 3 arguments with defaults of `host='localhost'`,


## Want to contribute?
- Prepare qserver to be published to CRAN
- Prepare rkdb to be published to CRAN
- Pass R objects directly to execute
- Any open issues or documentation improvements
2 changes: 1 addition & 1 deletion man/close_connection.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/execute.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/open_connection.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions man/test.qserver.Rd → man/test.rkdb.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
2 changes: 1 addition & 1 deletion src/Makevars
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ PKG_LIBS=$(addsuffix /c.o,$(QARCH))
ifeq ($(OS),Windows_NT)
PKG_LIBS += -lws2_32
endif
OBJECTS=qserver.o
OBJECTS=rkdb.o
4 changes: 1 addition & 3 deletions src/qserver.c → src/rkdb.c
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
/*
* This library provides a Q server for R
* This library provides a R client for kdb+
*
* See kx wiki https://code.kx.com/trac/wiki/Cookbook/IntegratingWithR
*/

#include <errno.h>
#include <string.h>
#include <R.h>
Expand Down

0 comments on commit 467ae65

Please sign in to comment.