embulk-input-datastore 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 53505b8a02cac9d813abb07a6781f48efcada3b0
-  data.tar.gz: 971f8c945301c7d4be69a67a400f6eefead29179
+SHA256:
+  metadata.gz: fb4d8225c41ef045739963c1dc302f052f2eccde963a3c53809fd7d9716143b6
+  data.tar.gz: 3ab43445f15ba9b2a19f3bf200de824cd5260dc3ab1df2bec449fa421de82b98
 SHA512:
-  metadata.gz: 081ca0244210c7fd2f3d36750fb0fa0ef7eef24d35ae0ef32ce588fecbdacb9c53a0eacf732ad325e8982876f55305f92b18b6947690360709477b5b1ba7e55a
-  data.tar.gz: 207f15f6cb3b6027a84e303d22d5415299af847f126a348837a7c82213cd77fb9367c44805acf98d7c940fbce636fa525ad7e9394f411af417bb6633b9d828bc
+  metadata.gz: 88355309b23f98ff603a890f8908d8ae9f9a748e69e5c786c0b5f0b7213b0a030b64f1e91c7b4ce8d1e2d2b27936cdde81a67ec3ac65af3af50b647ad6805839
+  data.tar.gz: fbf1a095f19d8c4adc6182ea1e60d5149c83b8ea152fcbb545b425f7906115370f80a6966b25bee8b50d560b8e710e024bc7f2eaffaf9a67e128aa2adf341e6a

data/examples/datastore2stdout.yaml

@@ -6,9 +6,9 @@ in:
 
 out:
   type: stdout
-  #type: file
-  #path_prefix: out
-  #file_ext: json
-  #formatter:
-  #  type: single_value
-  #  column_name: "record"
+  # type: file
+  # path_prefix: out
+  # file_ext: json
+  # formatter:
+  #   type: single_value
+  #   column_name: "record"

data/src/main/java/org/embulk/input/datastore/DatastoreInputPlugin.kt

@@ -10,13 +10,13 @@ import org.embulk.config.TaskSource
 import org.embulk.spi.*
 import org.embulk.spi.json.JsonParser
 import org.embulk.spi.type.Types
-import org.msgpack.value.ValueFactory
 import java.io.FileInputStream
 import java.util.Base64
 
 class DatastoreInputPlugin(doLogging: Boolean = true) : InputPlugin {
     // number of run() method calls
     private val TASK_COUNT = 1
+    private val KEY_KEY = "__key__"
 
     private val logger = if (doLogging) {
         Exec.getLogger(javaClass)
@@ -70,7 +70,6 @@ class DatastoreInputPlugin(doLogging: Boolean = true) : InputPlugin {
                 .forEach { entity ->
                     logger?.debug(entity.toString())
 
-
                     val json = when (entity) {
                         is FullEntity<*> -> entityToJsonObject(entity)
                         is ProjectionEntity -> entityToJsonObject(entity)
@@ -123,7 +122,14 @@ class DatastoreInputPlugin(doLogging: Boolean = true) : InputPlugin {
             val strVal = valueToField(dsValue)
             strVal?.let { listOf("\"${name}\":${it}") } ?: listOf()
         }
-        return "{" + fields.joinToString() + "}"
+
+        // Append KEY values if it exists
+        val keyFields = getEntityKey(entity)?.let {
+            listOf("\"${KEY_KEY}\":${it}")
+        } ?: listOf()
+        val decoratedFields = fields.plus(keyFields)
+
+        return "{" + decoratedFields.joinToString() + "}"
     }
 
     /**
@@ -184,4 +190,22 @@ class DatastoreInputPlugin(doLogging: Boolean = true) : InputPlugin {
             Query.ResultType.PROJECTION_ENTITY
         }
     }
+
+    /**
+     * Get KEY info string (with calling private method ...)
+     */
+    private fun getEntityKey(entity: BaseEntity<*>): String? {
+        if (entity.hasKey()) {
+            val key = entity.key
+
+            // NOTE: getLeaf() is not public ...
+            val mirror = BaseKey::class.java.getDeclaredMethod("getLeaf")
+            mirror.isAccessible = true
+            val pe = mirror.invoke(key) as PathElement
+
+            return "{\"kind\":\"${pe.kind}\",\"id\":\"${pe.id}\",\"name\":\"${pe.name}\"}"
+        } else {
+            return null
+        }
+    }
 }

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: embulk-input-datastore
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - syucream
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-26 00:00:00.000000000 Z
+date: 2018-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-  name: bundler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Loads records from datastore.
@@ -45,17 +45,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - LICENSE
 - Makefile
 - README.md
 - build.gradle
-- examples/datastore2stdout.yaml
-- gradle.properties
-- lib/embulk/input/datastore.rb
-- src/main/java/org/embulk/input/datastore/DatastoreInputPlugin.kt
-- src/main/java/org/embulk/input/datastore/PluginTask.kt
-- src/test/java/org/embulk/input/datastore/DatastoreInputPluginSpec.kt
 - classpath/annotations-13.0.jar
 - classpath/api-common-1.5.0.jar
 - classpath/commons-codec-1.3.jar
@@ -96,28 +90,34 @@ files:
 - classpath/protobuf-java-3.5.1.jar
 - classpath/protobuf-java-util-3.5.1.jar
 - classpath/threetenbp-1.3.3.jar
+- examples/datastore2stdout.yaml
+- gradle.properties
+- lib/embulk/input/datastore.rb
+- src/main/java/org/embulk/input/datastore/DatastoreInputPlugin.kt
+- src/main/java/org/embulk/input/datastore/PluginTask.kt
+- src/test/java/org/embulk/input/datastore/DatastoreInputPluginSpec.kt
 homepage: https://github.com/syucream/embulk-input-datastore
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.1.9
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.7.7
+signing_key: 
 specification_version: 4
 summary: Datastore input plugin for Embulk
 test_files: []