Renew operations

build.gradle

@@ -27,6 +27,8 @@ dependencies {
 
     compile "com.amazonaws:aws-java-sdk-dynamodb:1.11.711"
     compile "com.amazonaws:aws-java-sdk-sts:1.11.711"
+    // For @delegate macro.
+    compile "dev.zio:zio-macros-core_2.13:0.6.2"
 
     testCompile "junit:junit:4.+"
     testCompile "org.embulk:embulk-standards:0.9.23"
@@ -35,6 +37,17 @@ dependencies {
     testCompile "org.embulk:embulk-test:0.9.23"
 }
 
+compileScala {
+    scalaCompileOptions.additionalParameters = [
+        "-Ymacro-annotations"
+    ]
+}
+
+test {
+    jvmArgs '-Xms4g', '-Xmx4g', '-XX:MaxMetaspaceSize=1g'
+    maxHeapSize = "4g"
+}
+
 spotless {
     scala {
         scalafmt('2.3.2').configFile('.scalafmt.conf')

example/config-deprecated.yml

@@ -0,0 +1,20 @@
+in:
+  type: dynamodb
+  region: us-east-1
+  endpoint: http://localhost:8000
+  operation: scan
+  table: embulk-input-dynamodb_example
+  auth_method: basic
+  access_key_id: dummy
+  secret_access_key: dummy
+  columns:
+    - {name: primary-key,  type: string}
+    - {name: sort-key, type: long}
+    - {name: doubleValue, type: double}
+    - {name: boolValue, type: boolean}
+    - {name: listValue, type: json}
+    - {name: mapValue, type: json}
+
+out:
+  type: stdout
+

example/config-query-as-json.yml

@@ -0,0 +1,18 @@
+in:
+  type: dynamodb
+  region: us-east-1
+  endpoint: http://localhost:8000
+  query:
+    key_condition_expression: "#x = :v"
+    expression_attribute_names:
+      "#x": primary-key
+    expression_attribute_values:
+      ":v": {S: key-1}
+  table: embulk-input-dynamodb_example
+  auth_method: basic
+  access_key_id: dummy
+  secret_access_key: dummy
+
+out:
+  type: stdout
+

example/config-query.yml

@@ -0,0 +1,22 @@
+in:
+  type: dynamodb
+  region: us-east-1
+  endpoint: http://localhost:8000
+  query:
+    key_condition_expression: "#x = :v"
+    expression_attribute_names:
+      "#x": primary-key
+    expression_attribute_values:
+      ":v": {S: key-1}
+  table: embulk-input-dynamodb_example
+  auth_method: basic
+  access_key_id: dummy
+  secret_access_key: dummy
+  columns:
+    - {name: primary-key,  type: string}
+    - {name: sort-key, type: long}
+    - {name: value, type: string}
+
+out:
+  type: stdout
+

example/config-scan.yml

@@ -0,0 +1,18 @@
+in:
+  type: dynamodb
+  region: us-east-1
+  endpoint: http://localhost:8000
+  scan:
+    total_segment: 20
+  table: embulk-input-dynamodb_example
+  auth_method: basic
+  access_key_id: dummy
+  secret_access_key: dummy
+  columns:
+    - {name: primary-key,  type: string}
+    - {name: sort-key, type: long}
+    - {name: value, type: string}
+
+out:
+  type: stdout
+

example/prepare_dynamodb_table.sh

@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+
+if aws dynamodb describe-table --table-name='embulk-input-dynamodb_example'  --endpoint-url http://localhost:8000 --region us-east-1 2>/dev/null; then
+    aws dynamodb delete-table --table-name='embulk-input-dynamodb_example' \
+        --endpoint-url http://localhost:8000 \
+        --region us-east-1
+fi
+
+aws dynamodb create-table \
+    --table-name='embulk-input-dynamodb_example' \
+    --attribute-definitions='[
+        {"AttributeName":"primary-key","AttributeType":"S"},
+        {"AttributeName":"sort-key","AttributeType":"N"}
+    ]' \
+    --key-schema='[
+        {"AttributeName":"primary-key","KeyType":"HASH"},
+        {"AttributeName":"sort-key","KeyType":"RANGE"}
+    ]' \
+    --provisioned-throughput='{"ReadCapacityUnits":5, "WriteCapacityUnits":5}' \
+    --endpoint-url http://localhost:8000 \
+    --region us-east-1
+
+aws dynamodb put-item \
+    --table-name='embulk-input-dynamodb_example' \
+    --item='{
+        "primary-key" : { "S" : "key-1" },
+        "sort-key" : { "N" : "0" },
+        "doubleValue" : { "N" : "42.195" },
+        "boolValue" : { "BOOL" : true },
+        "listValue" : { "L":
+            [
+                { "S" : "list-value"},
+                { "N" : "123"}
+            ]
+        },
+        "mapValue" : { "M":
+            {
+                "map-key-1" : { "S" : "map-value-1" },
+                "map-key-2" : { "N" : "456" }
+            }
+        }
+    }' \
+    --endpoint-url http://localhost:8000 \
+    --region us-east-1
+
+aws dynamodb put-item \
+    --table-name='embulk-input-dynamodb_example' \
+    --item='{
+        "primary-key" : { "S" : "key-1" },
+        "sort-key" : { "N" : "1" },
+        "doubleValue" : { "NULL" : true },
+        "boolValue" : { "N" : "1" },
+        "listValue" : { "L":
+            [
+                { "NULL" : true},
+                { "N" : "123"}
+            ]
+        },
+        "mapValue" : { "M":
+            {
+                "map-key-1" : { "S" : "map-value-1" },
+                "map-key-2" : { "N" : "456" }
+            }
+        }
+    }' \
+    --endpoint-url http://localhost:8000 \
+    --region us-east-1

src/main/scala/org/embulk/input/dynamodb/DeprecatedDynamodbInputPlugin.scala

@@ -0,0 +1,73 @@
+package org.embulk.input.dynamodb
+
+import java.util.{List => JList}
+
+import org.embulk.config.{
+  ConfigDiff,
+  ConfigException,
+  ConfigSource,
+  TaskReport,
+  TaskSource
+}
+import org.embulk.input.dynamodb.aws.Aws
+import org.embulk.input.dynamodb.deprecated.ope.{QueryOperation, ScanOperation}
+import org.embulk.spi.{Exec, InputPlugin, PageOutput, Schema}
+
+@deprecated(since = "0.3.0")
+object DeprecatedDynamodbInputPlugin extends InputPlugin {
+
+  override def transaction(
+      config: ConfigSource,
+      control: InputPlugin.Control
+  ): ConfigDiff = {
+    val task: PluginTask = PluginTask.load(config)
+    val schema: Schema = task.getColumns.toSchema
+    if (schema.isEmpty)
+      throw new ConfigException("\"columns\" option must be set.")
+    val taskCount: Int = 1
+
+    control.run(task.dump(), schema, taskCount)
+    Exec.newConfigDiff()
+  }
+
+  override def resume(
+      taskSource: TaskSource,
+      schema: Schema,
+      taskCount: Int,
+      control: InputPlugin.Control
+  ): ConfigDiff = {
+    throw new UnsupportedOperationException
+  }
+
+  override def run(
+      taskSource: TaskSource,
+      schema: Schema,
+      taskIndex: Int,
+      output: PageOutput
+  ): TaskReport = {
+    val task: PluginTask = PluginTask.load(taskSource)
+
+    Aws(task).withDynamodb { dynamodb =>
+      task.getOperation.ifPresent { ope =>
+        val o = ope.toLowerCase match {
+          case "scan"  => new ScanOperation(dynamodb)
+          case "query" => new QueryOperation(dynamodb)
+        }
+        o.execute(task, schema, output)
+      }
+    }
+
+    Exec.newTaskReport()
+  }
+
+  override def cleanup(
+      taskSource: TaskSource,
+      schema: Schema,
+      taskCount: Int,
+      successTaskReports: JList[TaskReport]
+  ): Unit = {}
+
+  override def guess(config: ConfigSource): ConfigDiff = {
+    throw new UnsupportedOperationException
+  }
+}

src/main/scala/org/embulk/input/dynamodb/DynamodbInputPlugin.scala

@@ -2,65 +2,97 @@ package org.embulk.input.dynamodb
 
 import java.util.{List => JList}
 
-import org.embulk.config._
+import org.embulk.config.{ConfigDiff, ConfigSource, TaskReport, TaskSource}
 import org.embulk.input.dynamodb.aws.Aws
-import org.embulk.input.dynamodb.ope.{QueryOperation, ScanOperation}
-import org.embulk.spi._
+import org.embulk.input.dynamodb.item.DynamodbItemSchema
+import org.embulk.input.dynamodb.operation.DynamodbOperationProxy
+import org.embulk.spi.{Exec, InputPlugin, PageBuilder, PageOutput, Schema}
 
 class DynamodbInputPlugin extends InputPlugin {
 
-  def transaction(
+  override def transaction(
       config: ConfigSource,
       control: InputPlugin.Control
   ): ConfigDiff = {
-    val task: PluginTask = config.loadConfig(classOf[PluginTask])
+    val task: PluginTask = PluginTask.load(config)
+    if (isDeprecatedOperationRequired(task))
+      return DeprecatedDynamodbInputPlugin.transaction(config, control)
 
-    val schema: Schema = task.getColumns.toSchema
-    val taskCount: Int = 1
+    val schema: Schema = DynamodbItemSchema(task).getEmbulkSchema
+    val taskCount: Int = DynamodbOperationProxy(task).getEmbulkTaskCount
 
-    resume(task.dump(), schema, taskCount, control)
+    control.run(task.dump(), schema, taskCount)
+    Exec.newConfigDiff()
   }
 
-  def resume(
+  override def resume(
       taskSource: TaskSource,
       schema: Schema,
       taskCount: Int,
       control: InputPlugin.Control
   ): ConfigDiff = {
-    control.run(taskSource, schema, taskCount)
-    Exec.newConfigDiff()
+    val task: PluginTask = PluginTask.load(taskSource)
+    if (isDeprecatedOperationRequired(task))
+      return DeprecatedDynamodbInputPlugin.resume(
+        taskSource,
+        schema,
+        taskCount,
+        control
+      )
+    throw new UnsupportedOperationException
   }
 
-  def run(
+  override def run(
       taskSource: TaskSource,
       schema: Schema,
       taskIndex: Int,
       output: PageOutput
   ): TaskReport = {
-    val task: PluginTask = taskSource.loadTask(classOf[PluginTask])
+    val task: PluginTask = PluginTask.load(taskSource)
+    if (isDeprecatedOperationRequired(task))
+      return DeprecatedDynamodbInputPlugin.run(
+        taskSource,
+        schema,
+        taskIndex,
+        output
+      )
 
-    Aws(task).withDynamoDB { dynamodb =>
-      val ope = task.getOperation.toLowerCase match {
-        case "scan"  => new ScanOperation(dynamodb)
-        case "query" => new QueryOperation(dynamodb)
-      }
-      ope.execute(task, schema, output)
-    }
+    val pageBuilder = new PageBuilder(task.getBufferAllocator, schema, output)
 
+    Aws(task).withDynamodb { dynamodb =>
+      DynamodbOperationProxy(task).run(
+        dynamodb,
+        taskIndex,
+        DynamodbItemSchema(task).getItemsConsumer(pageBuilder)
+      )
+    }
+    pageBuilder.finish()
     Exec.newTaskReport()
   }
 
-  def cleanup(
+  override def cleanup(
       taskSource: TaskSource,
       schema: Schema,
       taskCount: Int,
       successTaskReports: JList[TaskReport]
   ): Unit = {
-    // TODO
+    val task: PluginTask = PluginTask.load(taskSource)
+    if (isDeprecatedOperationRequired(task))
+      DeprecatedDynamodbInputPlugin.cleanup(
+        taskSource,
+        schema,
+        taskCount,
+        successTaskReports
+      )
   }
 
-  def guess(config: ConfigSource): ConfigDiff = {
-    // TODO
-    null
+  override def guess(config: ConfigSource): ConfigDiff = {
+    val task: PluginTask = PluginTask.load(config)
+    if (isDeprecatedOperationRequired(task))
+      return DeprecatedDynamodbInputPlugin.guess(config)
+    throw new UnsupportedOperationException
   }
+
+  private def isDeprecatedOperationRequired(task: PluginTask): Boolean =
+    task.getOperation.isPresent
 }