embulk-input-rethinkdb 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21aa87211af2414daa21a3b274500095fa379f7a
-  data.tar.gz: 2bca810caf3003b88f593bce79a458cbc000e045
+  metadata.gz: 0ca030b9fc584a0ae98be06b989981197951dace
+  data.tar.gz: 123d35f231b3ea02d62123f6b69a0840f4fb8e3f
 SHA512:
-  metadata.gz: 616d24bc4184ccaa8461a5cf593f6d14f3dda00c6bcdba0c69afeb8af80d4354e67abc977cc358c7b29d11dc39977aa173ae0493310b4729eb9810a9b1a8a083
-  data.tar.gz: 9fe40b9bed815b8b02dc095c8bf42a2f6e83db03a8933b5fc047126d80639e8c3832a3eb07fb1e74309d833685e1b980ac627c8ab4ce8d4fa35610521d146fcd
+  metadata.gz: 1c4845e091d29f00838c5add36ad2a31d94cc192f0b8de37a4e91a5c522954860f196f90ff04e5e8f60ea94187f48c1ff9187a82df4cb0035fcca3135874e13c
+  data.tar.gz: b7cdd6c44a36dcfbca1347ff2523b2914c375869e6876eb2e41245dd5c77f537c2fc2c390812ef6b5cc2b1cd33e6ee75f20648f598d4de6d137bc3563292704b

data/README.md

@@ -19,7 +19,10 @@ RethinkDB input plugin for Embulk loads records from RethinkDB.
 - **user**: database login user name (string, required)
 - **password**: database login password (string, required)
 - **cert_file**: path to TLS CA certificate file (string)
-- **query**: ReQL to run (string, required)
+- Select whether to write a query or specify only the table
+    - **query**: ReQL to run (string)
+    <br>or<br>
+    - **table**: table from which load data from (string)
 - **column_name**: column name used in outputs (string, default: `"record"`)
 
 ## ReQL for query option

data/build.gradle

@@ -13,7 +13,7 @@ configurations {
     provided
 }
 
-version = "0.1.1"
+version = "0.1.2"
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8

data/src/main/java/org/embulk/input/rethinkdb/RethinkdbInputPlugin.java

@@ -80,10 +80,17 @@ public class RethinkdbInputPlugin
         @ConfigDefault("null")
         Optional<String> getQuery();
 
+        @Config("table")
+        @ConfigDefault("null")
+        Optional<String> getTable();
+
         @Config("column_name")
         @ConfigDefault("\"record\"")
         String getColumnName();
 
+        String getReql();
+        void setReql(String ast);
+
         @ConfigInject
         BufferAllocator getBufferAllocator();
     }
@@ -102,9 +109,21 @@ public class RethinkdbInputPlugin
         if (!(task.getUser().isPresent() && task.getPassword().isPresent())) {
             throw new ConfigException("user and password are needed");
         }
-        if (!task.getQuery().isPresent()) {
-            throw new ConfigException("query is needed");
+
+        String reql;
+        if (task.getQuery().isPresent()) {
+            if (task.getTable().isPresent()) {
+                throw new ConfigException("only one of 'table' or 'query' parameter is needed");
+            }
+            reql = String.format("var ast = %s; var res = {ast: ast}; res;", task.getQuery().get());
         }
+        else {
+            if (!task.getTable().isPresent()) {
+                throw new ConfigException("'table' or 'query' parameter is needed");
+            }
+            reql = String.format("var ast = r.table('%s'); var res = {ast: ast}; res;", task.getTable().get());
+        }
+        task.setReql(reql);
 
         Schema schema = Schema.builder().add(task.getColumnName(), Types.JSON).build();
         int taskCount = 1;
@@ -141,12 +160,11 @@ public class RethinkdbInputPlugin
         RethinkDB r = RethinkDB.r;
         ReqlAst ast;
         try {
-            ast = compileReQL(r, task.getQuery().get());
+            ast = compileReQL(r, task.getReql());
         }
         catch (final ScriptException se) {
             throw new ConfigException("ReQL compile error");
         }
-
         Connection.Builder builder = r.connection()
                 .hostname(task.getHost())
                 .port(task.getPort())
@@ -185,14 +203,13 @@ public class RethinkdbInputPlugin
         return Exec.newConfigDiff();
     }
 
-    private ReqlAst compileReQL(RethinkDB r, String query) throws ScriptException
+    private ReqlAst compileReQL(RethinkDB r, String reql) throws ScriptException
     {
         ScriptEngineManager factory = new ScriptEngineManager();
         ScriptEngine engine = factory.getEngineByName("nashorn");
 
         engine.put("r", r);
 
-        String reql = String.format("var ast = %s; var res = {ast: ast}; res;", query);
         Bindings bindings = (Bindings) engine.eval(reql);
 
         return (ReqlAst) bindings.get("ast");

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-rethinkdb
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Koji Matsumoto
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2020-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ files:
 - LICENSE.txt
 - README.md
 - build.gradle
-- classpath/embulk-input-rethinkdb-0.1.1.jar
+- classpath/embulk-input-rethinkdb-0.1.2.jar
 - classpath/hamcrest-core-1.1.jar
 - classpath/json-simple-1.1.1.jar
 - classpath/junit-4.10.jar