embulk-filter-base58 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f5608649f72f4f3f5aff5519f536738ada5b39f
-  data.tar.gz: 991a3136a80c49ca86b7bd38e75052fa74731d46
+  metadata.gz: b6646b2971f7197bf9636fad6b586f32637f1afa
+  data.tar.gz: 79e3ed639b082594ce38d77c27a11ede5accf05b
 SHA512:
-  metadata.gz: 75116c9073702c6afd9c7cd3120ff5dd408bfe9aee974a31fe0215723631d19aa10eb895b200e0656561e0aa2c1106dd98e808ecdd31fe2504a3cd3eabd919ca
-  data.tar.gz: 59a0b0fb1e295484db667b88c7dbf160ca395c22f0ca9ced0d9f19a79e4e916088155e624de130a205890a7af9e52dcf52783a8e7d4f8ab82a6690a06eebd1b4
+  metadata.gz: 3c2bffac02a0f2191df9fb6c1974e24c74bc7df002ab87ca6fa4f947b87c2abbc2db7e03a67c357999dc71a8e6fe02d5cb0b0b30392c2306f52a015c44beb339
+  data.tar.gz: 34e7d6ad1d928a30ea939695b0f73b2999d02e7ff8e43f5cea1c51e9ef4e177632bb1de49d52dd9d200a021235a22578b70bc2ef99766df4e2cff9b7fa060e0b

data/build.gradle

@@ -14,7 +14,7 @@ configurations {
     provided
 }
 
-version = "0.1.1"
+version = "0.1.2"
 
 dependencies {
     compile  "org.embulk:embulk-core:0.8.+"

data/src/main/java/org/embulk/filter/base58/Base58FilterPlugin.java

@@ -19,6 +19,7 @@ import org.embulk.spi.Schema;
 import org.embulk.spi.type.Types;
 import org.slf4j.Logger;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -86,7 +87,7 @@ public class Base58FilterPlugin implements FilterPlugin {
                            final Schema outputSchema, final PageOutput output) {
 
         final PluginTask task = taskSource.loadTask(PluginTask.class);
-        final Map<String, Base58Column> base58ColumnMap = convertBase58ColumnListToMap(task.getColumns());
+        final Map<String, List<Base58Column>> base58ColumnMap = convertBase58ColumnListToMap(task.getColumns());
         final Map<String, Column> outputColumnMap = convertColumnListToMap(outputSchema.getColumns());
 
         return new PageOutput() {
@@ -114,47 +115,49 @@ public class Base58FilterPlugin implements FilterPlugin {
         };
     }
 
-    void setValue(final Map<String, Base58Column> base58ColumnMap, final Map<String, Column> outputColumnMap, final PageReader reader, final Schema outputSchema, final PageBuilder builder) {
+    void setValue(final Map<String, List<Base58Column>> base58ColumnMap, final Map<String, Column> outputColumnMap, final PageReader reader, final Schema outputSchema, final PageBuilder builder) {
 
         // Do base58 conversions ahead of iterating output columns
-        final Map<String, String> base58OutputMap = new HashMap<>();;
-        for (Base58Column column : base58ColumnMap.values()) {
-            String inputValue, convertedValue = null;
-
-            // If the original column is not a string, then forget about it (it should be hex)
-            Column originalColumn = outputColumnMap.get(column.getName());
-            if (Types.STRING.equals(originalColumn.getType())) {
-                inputValue = reader.getString(originalColumn);
-            } else {
-                logger.error("cannot convert base58 value of non-string values. name: {}, type: {}, index: {}",
-                        originalColumn.getName(),
-                        originalColumn.getType(),
-                        originalColumn.getIndex());
-                throw new DataException("Unexpected string type in column `"+originalColumn.getName()+"`. Got: " + originalColumn.getType());
-            }
+        final Map<String, String> base58OutputMap = new HashMap<>();
+        for (List<Base58Column> columnSet : base58ColumnMap.values()) {
+            for (Base58Column column : columnSet) {
+                String inputValue, convertedValue = null;
+
+                // If the original column is not a string, then forget about it (it should be hex)
+                Column originalColumn = outputColumnMap.get(column.getName());
+                if (Types.STRING.equals(originalColumn.getType())) {
+                    inputValue = reader.getString(originalColumn);
+                } else {
+                    logger.error("cannot convert base58 value of non-string values. name: {}, type: {}, index: {}",
+                            originalColumn.getName(),
+                            originalColumn.getType(),
+                            originalColumn.getIndex());
+                    throw new DataException("Unexpected string type in column `" + originalColumn.getName() + "`. Got: " + originalColumn.getType());
+                }
 
-            // Convert the value
-            try {
-                convertedValue = convertValue(inputValue, column.getIsEncode().or(true), column.getPrefix().or(""));
-            } catch (Exception e) {
-                // Failed to do the conversion. Probably misconfigured or malformed value
-                logger.error("failed to encode/decode base58 column value. name: {}, type: {}, index: {}, value: {}, method: {}, prefix: {}, target_name: {}",
-                        originalColumn.getName(),
-                        originalColumn.getType(),
-                        originalColumn.getIndex(),
-                        inputValue,
-                        column.getIsEncode().get() ? "encode" : "decode",
-                        column.getPrefix(),
-                        column.getNewName().or(column.getName()));
-                logger.error("base58 conversion exception", e);
-                // Don't crash the import if a single value is screwed up. Just log it for now
-            }
+                // Convert the value
+                try {
+                    convertedValue = convertValue(inputValue, column.getIsEncode().or(true), column.getPrefix().or(""));
+                } catch (Exception e) {
+                    // Failed to do the conversion. Probably misconfigured or malformed value
+                    logger.error("failed to encode/decode base58 column value. name: {}, type: {}, index: {}, value: {}, method: {}, prefix: {}, target_name: {}",
+                            originalColumn.getName(),
+                            originalColumn.getType(),
+                            originalColumn.getIndex(),
+                            inputValue,
+                            column.getIsEncode().get() ? "encode" : "decode",
+                            column.getPrefix(),
+                            column.getNewName().or(column.getName()));
+                    logger.error("base58 conversion exception", e);
+                    // Don't crash the import if a single value is screwed up. Just log it for now
+                }
 
-            // Add it to the output mappings
-            if (column.getNewName().isPresent()) {
-                base58OutputMap.put(column.getNewName().get(), convertedValue);
-            } else {
-                base58OutputMap.put(column.getName(), convertedValue);
+                // Add it to the output mappings
+                if (column.getNewName().isPresent()) {
+                    base58OutputMap.put(column.getNewName().get(), convertedValue);
+                } else {
+                    base58OutputMap.put(column.getName(), convertedValue);
+                }
             }
         }
 
@@ -208,10 +211,13 @@ public class Base58FilterPlugin implements FilterPlugin {
         }
     }
 
-    static Map<String, Base58Column> convertBase58ColumnListToMap(List<Base58Column> base58Columns) {
-        Map<String, Base58Column> result = new HashMap<>();
+    static Map<String, List<Base58Column>> convertBase58ColumnListToMap(List<Base58Column> base58Columns) {
+        Map<String, List<Base58Column>> result = new HashMap<>();
         for (Base58Column base58Column : base58Columns) {
-            result.put(base58Column.getName(), base58Column);
+            if (!result.containsKey(base58Column.getName())) {
+                result.put(base58Column.getName(), new ArrayList<>());
+            }
+            result.get(base58Column.getName()).add(base58Column);
         }
         return result;
     }

data/src/test/java/org/embulk/filter/base58/TestBase58FilterImpl.java

@@ -56,7 +56,7 @@ public class TestBase58FilterImpl {
         Schema outputSchema = plugin.buildOutputSchema(task, inputSchema);
         PageBuilder pageBuilder = new PageBuilder(runtime.getBufferAllocator(), outputSchema, output);
         PageReader pageReader = new PageReader(inputSchema);
-        final Map<String, Base58FilterPlugin.Base58Column> base58ColumnMap = Base58FilterPlugin.convertBase58ColumnListToMap(task.getColumns());
+        final Map<String, List<Base58FilterPlugin.Base58Column>> base58ColumnMap = Base58FilterPlugin.convertBase58ColumnListToMap(task.getColumns());
         final Map<String, Column> outputColumnMap = Base58FilterPlugin.convertColumnListToMap(outputSchema.getColumns());
 
         List<Page> pages = PageTestUtils.buildPage(runtime.getBufferAllocator(), inputSchema, objects);
@@ -247,6 +247,33 @@ public class TestBase58FilterImpl {
         }
     }
 
+    @Test
+    public void basicEncodingWithPrefixAndNewNameWithMultipleDestinations()
+    {
+        PluginTask task = taskFromYamlString(
+                "type: base58",
+                "columns:",
+                "  - {name: _id, prefix: obj_, new_name: public_id}",
+                "  - {name: _id, prefix: old_, new_name: old_public_id}");
+        Schema inputSchema = Schema.builder()
+                .add("_id", STRING)
+                .build();
+
+        List<Object[]> records = filter(task, inputSchema,
+                "00f5f8b37c158c2f12ee1c64");
+
+        assertEquals(1, records.size());
+
+        Object[] record;
+        {
+            record = records.get(0);
+            assertEquals(3, record.length);
+            assertEquals("00f5f8b37c158c2f12ee1c64", record[0]);
+            assertEquals("obj_123zhNEUWPr5ogRQP", record[1]);
+            assertEquals("old_123zhNEUWPr5ogRQP", record[2]);
+        }
+    }
+
     @Test
     public void basicDecodingWithPrefixAndNewName()
     {
@@ -272,6 +299,33 @@ public class TestBase58FilterImpl {
         }
     }
 
+    @Test
+    public void basicDecodingWithPrefixAndNewNameWithMultipleDestinations()
+    {
+        PluginTask task = taskFromYamlString(
+                "type: base58",
+                "columns:",
+                "  - {name: public_id, encode: false, prefix: obj_, new_name: _id}",
+                "  - {name: public_id, encode: false, prefix: obj_, new_name: old_id}");
+        Schema inputSchema = Schema.builder()
+                .add("public_id", STRING)
+                .build();
+
+        List<Object[]> records = filter(task, inputSchema,
+                "obj_123zhNEUWPr5ogRQP");
+
+        assertEquals(1, records.size());
+
+        Object[] record;
+        {
+            record = records.get(0);
+            assertEquals(3, record.length);
+            assertEquals("obj_123zhNEUWPr5ogRQP", record[0]);
+            assertEquals("00f5f8b37c158c2f12ee1c64", record[1]);
+            assertEquals("00f5f8b37c158c2f12ee1c64", record[2]);
+        }
+    }
+
     @Test
     public void badBase58DecodeTurnsColumnValueNull()
     {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embulk-filter-base58
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Kevin Fitzgerald
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-07-17 00:00:00.000000000 Z
+date: 2017-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ files:
 - src/main/java/org/embulk/filter/base58/Base58FilterPlugin.java
 - src/test/java/org/embulk/filter/base58/TestBase58FilterImpl.java
 - src/test/java/org/embulk/filter/base58/TestBase58FilterPlugin.java
-- classpath/embulk-filter-base58-0.1.1.jar
+- classpath/embulk-filter-base58-0.1.2.jar
 homepage: https://github.com/kfitzgerald/embulk-filter-base58
 licenses:
 - MIT