embulk-filter-column 0.5.4 → 0.6.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0cad32bb6df05ff04fb0501b8b893812d999969e
-  data.tar.gz: 7c0047d6f7dc5542195abd36a63e50aebdaa405a
+  metadata.gz: 8ca161d763f10dc37da758c3bac6d0384a3b4edf
+  data.tar.gz: dfe8251c7268898b6ba42c4aa0da2298b2242ba7
 SHA512:
-  metadata.gz: 1da990ff7ca9e14bbb7e385998309a979ef8376b3c25d8a117296ea121c82a91bf7cca8ee18439cf3b895b83a54901e37bcb6696ae618d4ee1c71755c1b92fc2
-  data.tar.gz: dbb3eb97dc117998562791b05ff846078be14cc365f754312e575ad8d0a576fe6575c3c471c6d55cd7fa8884146191cf56faa7e3b0f6a519c8f14d855ab23158
+  metadata.gz: c03b1816ca0d300c3b9260dea666d3a361ce9413e685e4ac419923ad27ca925428031969888c7a9d8f25cd511ae127acb987194b761b608044319fee96653ea8
+  data.tar.gz: 37d963fc19b1c78028ce043810b3c88badba92b8a72d116e2b30e208dcacdd85a88d2d55a6379cfd9fffff7d234fbd50b306c40d9a3adc74316e7cc522b295bb

data/.travis.yml

@@ -4,4 +4,4 @@ jdk:
   - oraclejdk7
   - oraclejdk8
 script:
-  - ./gradlew test
+  - travis_retry ./gradlew test

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.6.0 (2016-10-01)
+
+Enhancements: 
+
+* Support bracket notation in json path (thanks to @kysnm)
+
 # 0.5.4 (2016-08-05)
 
 Enhancements: 

data/README.md

@@ -117,6 +117,7 @@ For type: json column, you can specify [JSONPath](http://goessner.net/articles/J
 - {name: $.payload.key1}
 - {name: "$.payload.array[0]"}
 - {name: "$.payload.array[*]"}
+- {name: $['payload']['key1.key2']}
 ```
 
 EXAMPLE:

data/build.gradle

@@ -15,13 +15,14 @@ configurations {
     provided
 }
 
-version = "0.5.4"
+version = "0.6.0.pre1"
 sourceCompatibility = 1.7
 targetCompatibility = 1.7
 
 dependencies {
     compile  "org.embulk:embulk-core:0.8.+"
     provided "org.embulk:embulk-core:0.8.+"
+    compile  'com.dena.analytics:JsonPathCompiler:0.0.6'
 
     testCompile "junit:junit:4.+"
     testCompile "org.embulk:embulk-core:0.8.+:tests"

data/example/bracket_notations.yml

@@ -0,0 +1,40 @@
+in:
+  type: file
+  path_prefix: example/example.csv
+  parser:
+    type: csv
+    charset: UTF-8
+    newline: CRLF
+    null_string: 'NULL'
+    skip_header_lines: 1
+    comment_line_marker: '#'
+    columns:
+      - {name: time,  type: timestamp, format: "%Y-%m-%d"}
+      - {name: id, type: long}
+      - {name: name, type: string}
+      - {name: score, type: double}
+      - {name: json, type: json}
+filters:
+  - type: column
+    add_columns:
+      - {name: "$['json']['array.a']", type: json, default: "[{\"a\":\"a0\"},{\"a\":\"a1\"}]"}
+      - {name: "$['json']['array_b']", type: json, default: "[{\"b\":\"b\"},{\"b\":\"b\"}]"}
+  - type: column
+    columns:
+      - {name: time, default: "2015-07-13", format: "%Y-%m-%d"}
+      - {name: name, default: "foo"}
+      - {name: foo,  default: 1, type: long}
+      - {name: id}
+      - {name: copy_score, src: score}
+      - {name: json, default: "{\"foo\":\"FOO\",\"array.a\":[{\"a\":\"default0\"},{\"a\":\"default1\"}],\"array_b\":[{\"b\":\"default\"},{\"b\":\"default\"}]}"}
+      - {name: "$['json']['foo']"}
+      - {name: "$['json']['copy_foo']", src: "$['json']['foo']"}
+      - {name: "$['json']['drop_foo']", src: "$['json']['foo']"}
+      - {name: "$['json']['array_a']", src: "$['json']['array.a']"}
+      - {name: "$['json']['array_a'][0]"}
+      - {name: "$['json']['array_b']"}
+  - type: column
+    drop_columns:
+      - {name: "$['json']['drop_foo']"}
+out:
+  type: stdout

data/example/edgecase.tsv

@@ -0,0 +1,4 @@
+json
+{"phone']Num\"]ber":"foo","bar":"bar","foo\\']\"]foo":"baz"}
+{"phone']Num\"]ber":"foo2","bar":"bar2","foo\\']\"]foo":"baz2"}
+NULL

data/example/edgecase.yml

@@ -0,0 +1,22 @@
+in:
+  type: file
+  path_prefix: example/edgecase.tsv
+  parser:
+    type: csv
+    delimiter: \t
+    charset: UTF-8
+    newline: CRLF
+    null_string: 'NULL'
+    skip_header_lines: 1
+    comment_line_marker: '#'
+    columns:
+      - {name: json, type: json}
+filters:
+  - type: column
+    columns:
+      - {name: json, default: "{\"phone']Num\\\"]ber\":\"FOO\"}"}
+      - {name: "$.json[\"phone']Num\\\"]ber\"]"}
+      - {name: $.json.copy_foo, src: "$.json[\"phone']Num\\\"]ber\"]"}
+      - {name: "$.json['foo\\']\"]foo']"}
+out:
+  type: stdout

data/src/main/java/org/embulk/filter/column/ColumnFilterPlugin.java

@@ -27,6 +27,8 @@ import org.slf4j.Logger;
 
 import java.util.List;
 
+import com.dena.analytics.jsonpathcompiler.expressions.path.PathCompiler;
+
 public class ColumnFilterPlugin implements FilterPlugin
 {
     private static final Logger logger = Exec.getLogger(ColumnFilterPlugin.class);
@@ -117,7 +119,7 @@ public class ColumnFilterPlugin implements FilterPlugin
                 boolean matched = false;
                 for (ColumnConfig dropColumn : dropColumns) {
                     // skip json path notation to build outputSchema
-                    if (dropColumn.getName().startsWith("$.")) {
+                    if (PathCompiler.isProbablyJsonPath(dropColumn.getName())) {
                         continue;
                     }
                     if (dropColumn.getName().equals(name)) {
@@ -134,10 +136,10 @@ public class ColumnFilterPlugin implements FilterPlugin
         else if (columns.size() > 0) {
             for (ColumnConfig column : columns) {
                 // skip json path notation to build output schema
-                if (column.getName().startsWith("$.")) {
+                if (PathCompiler.isProbablyJsonPath(column.getName())) {
                     continue;
                 }
-                if (column.getSrc().isPresent() && column.getSrc().get().startsWith("$.")) {
+                if (column.getSrc().isPresent() && PathCompiler.isProbablyJsonPath(column.getSrc().get())) {
                     continue;
                 }
 
@@ -178,10 +180,10 @@ public class ColumnFilterPlugin implements FilterPlugin
         if (addColumns.size() > 0) {
             for (ColumnConfig column : addColumns) {
                 // skip json path notation to build output schema
-                if (column.getName().startsWith("$.")) {
+                if (PathCompiler.isProbablyJsonPath(column.getName())) {
                     continue;
                 }
-                if (column.getSrc().isPresent() && column.getSrc().get().startsWith("$.")) {
+                if (column.getSrc().isPresent() && PathCompiler.isProbablyJsonPath(column.getSrc().get())) {
                     continue;
                 }
 

data/src/main/java/org/embulk/filter/column/ColumnVisitorImpl.java

@@ -1,5 +1,6 @@
 package org.embulk.filter.column;
 
+import com.dena.analytics.jsonpathcompiler.expressions.Utils;
 import com.google.common.base.Throwables;
 
 import org.embulk.filter.column.ColumnFilterPlugin.ColumnConfig;
@@ -244,13 +245,13 @@ public class ColumnVisitorImpl implements ColumnVisitor
                 pageBuilder.setNull(outputColumn);
             }
             else {
-                String jsonPath = new StringBuilder("$.").append(outputColumn.getName()).toString();
+                String jsonPath = new StringBuilder("$['").append(Utils.escape(outputColumn.getName(), true)).append("']").toString();
                 pageBuilder.setJson(outputColumn, jsonVisitor.visit(jsonPath, defaultValue));
             }
         }
         else {
             Value value = pageReader.getJson(inputColumn);
-            String jsonPath = new StringBuilder("$.").append(outputColumn.getName()).toString();
+            String jsonPath = new StringBuilder("$['").append(Utils.escape(outputColumn.getName(), true)).append("']").toString();
             pageBuilder.setJson(outputColumn, jsonVisitor.visit(jsonPath, value));
         }
     }

data/src/main/java/org/embulk/filter/column/JsonColumn.java

@@ -1,5 +1,12 @@
 package org.embulk.filter.column;
 
+import com.dena.analytics.jsonpathcompiler.expressions.Path;
+import com.dena.analytics.jsonpathcompiler.expressions.path.ArrayIndexOperation;
+import com.dena.analytics.jsonpathcompiler.expressions.path.ArrayPathToken;
+import com.dena.analytics.jsonpathcompiler.expressions.path.PathCompiler;
+import com.dena.analytics.jsonpathcompiler.expressions.path.PathToken;
+import com.dena.analytics.jsonpathcompiler.expressions.path.RootPathToken;
+import com.dena.analytics.jsonpathcompiler.expressions.path.PropertyPathToken;
 import org.embulk.config.ConfigException;
 import org.embulk.spi.type.Type;
 import org.msgpack.value.StringValue;
@@ -15,17 +22,15 @@ public class JsonColumn
 
     private StringValue pathValue = null;
     private String parentPath = null;
-    private String baseName = null;
-    private Long baseIndex = null;
+    private Long tailIndex = null;
     private StringValue parentPathValue = null;
-    private StringValue baseNameValue = null;
+    private Value tailNameValue = null;
 
     private StringValue srcValue = null;
     private String srcParentPath = null;
-    private String srcBaseName = null;
-    private Long srcBaseIndex = null;
+    private Long srcTailIndex = null;
     private StringValue srcParentPathValue = null;
-    private StringValue srcBaseNameValue = null;
+    private Value srcTailNameValue = null;
 
     public JsonColumn(String path, Type type)
     {
@@ -39,33 +44,67 @@ public class JsonColumn
 
     public JsonColumn(String path, Type type, Value defaultValue, String src)
     {
-        this.path = path;
+        Path compiledPath = PathCompiler.compile(path);
+        Path compiledSrc = src == null ? compiledPath : PathCompiler.compile(src);
+        RootPathToken compiledRoot = (RootPathToken) compiledPath.getRoot();
+        RootPathToken compiledSrcRoot = (RootPathToken) compiledSrc.getRoot();
+        this.path = compiledPath.toString();
         this.type = type;
         this.defaultValue = (defaultValue == null ? ValueFactory.newNil() : defaultValue);
-        this.src = (src == null ? path : src);
+        this.src = compiledSrc.toString();
 
         this.pathValue = ValueFactory.newString(path);
-        this.parentPath = parentPath(path);
-        this.baseName = baseName(path);
-        if (this.baseName.equals("[*]")) {
+        this.parentPath = compiledPath.getParentPath();
+
+        if (compiledRoot.getTailPath().equals("[*]")) {
             throw new ConfigException(String.format("%s wrongly ends with [*], perhaps you can remove the [*]", path));
         }
-        this.baseIndex = baseIndex(path);
+        this.tailIndex = tailIndex(compiledRoot);
         this.parentPathValue = ValueFactory.newString(parentPath);
-        this.baseNameValue = ValueFactory.newString(baseName);
+        String tailName = getTailName(compiledRoot);
+        this.tailNameValue = tailName == null ? ValueFactory.newNil() : ValueFactory.newString(tailName);
 
         this.srcValue = ValueFactory.newString(this.src);
-        this.srcParentPath = parentPath(this.src);
-        this.srcBaseName = baseName(this.src);
-        this.srcBaseIndex = baseIndex(this.src);
+        this.srcParentPath = compiledSrc.getParentPath();
+        this.srcTailIndex = tailIndex(compiledSrcRoot);
         this.srcParentPathValue = ValueFactory.newString(this.srcParentPath);
-        this.srcBaseNameValue = ValueFactory.newString(this.srcBaseName);
+        String srcTailName = getTailName(compiledSrcRoot);
+        this.srcTailNameValue = srcTailName == null ? ValueFactory.newNil() : ValueFactory.newString(srcTailName);
 
-        if (! srcParentPath.equals(parentPath)) {
+        if (!srcParentPath.equals(parentPath)) {
             throw new ConfigException(String.format("The branch (parent path) of src \"%s\" must be same with of name \"%s\" yet", src, path));
         }
     }
 
+    // $['foo'] or $.foo => foo
+    // $['foo'][0] or $.foo[0] or $['foo'][*] or $.foo[*] => null
+    private String getTailName(RootPathToken root)
+    {
+        PathToken pathToken = root.getTail();
+        if (pathToken instanceof PropertyPathToken) {
+            if (!((PropertyPathToken) pathToken).singlePropertyCase()) {
+                throw new ConfigException(String.format("Multiple property is not supported \"%s\"", root.toString()));
+            }
+            return ((PropertyPathToken) pathToken).getProperties().get(0);
+        }
+        else {
+            return null;
+        }
+    }
+
+    private Long tailIndex(RootPathToken root)
+    {
+        PathToken tail = root.getTail();
+        if (tail instanceof ArrayPathToken) {
+            ArrayIndexOperation arrayIndexOperation = ((ArrayPathToken) tail).getArrayIndexOperation();
+            PathTokenUtil.assertSupportedArrayPathToken(arrayIndexOperation, path);
+            return arrayIndexOperation.indexes().get(0).longValue();
+        }
+        else {
+            return null;
+        }
+    }
+
     public String getPath()
     {
         return path;
@@ -96,14 +135,9 @@ public class JsonColumn
         return parentPath;
     }
 
-    public String getBaseName()
-    {
-        return baseName;
-    }
-
-    public Long getBaseIndex()
+    public Long tailIndex()
     {
-        return baseIndex;
+        return tailIndex;
     }
 
     public StringValue getParentPathValue()
@@ -111,9 +145,9 @@ public class JsonColumn
         return parentPathValue;
     }
 
-    public StringValue getBaseNameValue()
+    public Value getTailNameValue()
     {
-        return baseNameValue;
+        return tailNameValue;
     }
 
     public StringValue getSrcValue()
@@ -126,14 +160,9 @@ public class JsonColumn
         return srcParentPath;
     }
 
-    public String getSrcBaseName()
-    {
-        return srcBaseName;
-    }
-
-    public Long getSrcBaseIndex()
+    public Long getSrcTailIndex()
     {
-        return srcBaseIndex;
+        return srcTailIndex;
     }
 
     public StringValue getSrcParentPathValue()
@@ -141,51 +170,36 @@ public class JsonColumn
         return srcParentPathValue;
     }
 
-    public StringValue getSrcBaseNameValue()
+    public Value getSrcTailNameValue()
     {
-        return srcBaseNameValue;
+        return srcTailNameValue;
     }
 
     // like File.dirname
     public static String parentPath(String path)
     {
-        String[] parts = path.split("\\.");
-        StringBuilder builder = new StringBuilder();
-        for (int i = 0; i < parts.length - 1; i++) {
-            builder.append(".").append(parts[i]);
-        }
-        if (parts[parts.length - 1].contains("[")) {
-            String[] arrayParts = parts[parts.length - 1].split("\\[");
-            builder.append(".").append(arrayParts[0]);
-            for (int j = 1; j < arrayParts.length - 1; j++) {
-                builder.append("[").append(arrayParts[j]);
-            }
-        }
-        return builder.deleteCharAt(0).toString();
+        return PathCompiler.compile(path).getParentPath();
     }
 
-    public static String baseName(String path)
+    public static String tailName(String path)
     {
-        String[] parts = path.split("\\.");
-        String[] arrayParts = parts[parts.length - 1].split("\\[");
-        if (arrayParts.length == 1) { // no [i]
-            return arrayParts[arrayParts.length - 1];
-        }
-        else {
-            return "[" + arrayParts[arrayParts.length - 1];
-        }
+        return ((RootPathToken) PathCompiler.compile(path).getRoot()).getTailPath();
     }
 
-    public static Long baseIndex(String path)
+    public static Long tailIndex(String path)
     {
-        String baseName = baseName(path);
-        if (baseName.startsWith("[") && baseName.endsWith("]")) {
-            String baseIndex = baseName.substring(1, baseName.length() - 1);
-            try {
-                return Long.parseLong(baseIndex);
+        Path compiledPath = PathCompiler.compile(path);
+        PathToken tail = ((RootPathToken) compiledPath.getRoot()).getTail();
+        if (tail instanceof ArrayPathToken) {
+            ArrayIndexOperation arrayIndexOperation = ((ArrayPathToken) tail).getArrayIndexOperation();
+            if (arrayIndexOperation == null) {
+                throw new ConfigException(String.format("Array Slice Operation is not supported \"%s\"", path));
+            }
+            if (arrayIndexOperation.isSingleIndexOperation()) {
+                return arrayIndexOperation.indexes().get(0).longValue();
             }
-            catch (NumberFormatException e) {
-                return null;
+            else {
+                throw new ConfigException(String.format("Multi Array Indexes is not supported \"%s\"", path));
             }
         }
         else {

data/src/main/java/org/embulk/filter/column/JsonVisitor.java

@@ -1,5 +1,8 @@
 package org.embulk.filter.column;
 
+import com.dena.analytics.jsonpathcompiler.expressions.Path;
+import com.dena.analytics.jsonpathcompiler.expressions.path.PathCompiler;
+import com.dena.analytics.jsonpathcompiler.expressions.path.PathToken;
 import org.embulk.config.ConfigException;
 import org.embulk.filter.column.ColumnFilterPlugin.ColumnConfig;
 import org.embulk.filter.column.ColumnFilterPlugin.PluginTask;
@@ -80,29 +83,32 @@ public class JsonVisitor
 
     private void jsonColumnsPut(String path, JsonColumn value)
     {
-        String parentPath = JsonColumn.parentPath(path);
+        Path compiledPath = PathCompiler.compile(path);
+        String parentPath = compiledPath.getParentPath();
         if (! jsonColumns.containsKey(parentPath)) {
             jsonColumns.put(parentPath, new LinkedHashMap<String, JsonColumn>());
         }
-        jsonColumns.get(parentPath).put(path, value);
+        jsonColumns.get(parentPath).put(compiledPath.toString(), value);
     }
 
     private void jsonAddColumnsPut(String path, JsonColumn value)
     {
-        String parentPath = JsonColumn.parentPath(path);
+        Path compiledPath = PathCompiler.compile(path);
+        String parentPath = compiledPath.getParentPath();
         if (! jsonAddColumns.containsKey(parentPath)) {
             jsonAddColumns.put(parentPath, new LinkedHashMap<String, JsonColumn>());
         }
-        jsonAddColumns.get(parentPath).put(path, value);
+        jsonAddColumns.get(parentPath).put(compiledPath.toString(), value);
     }
 
     private void jsonDropColumnsPut(String path)
     {
-        String parentPath = JsonColumn.parentPath(path);
+        Path compiledPath = PathCompiler.compile(path);
+        String parentPath = compiledPath.getParentPath();
         if (! jsonDropColumns.containsKey(parentPath)) {
             jsonDropColumns.put(parentPath, new HashSet<String>());
         }
-        jsonDropColumns.get(parentPath).add(path);
+        jsonDropColumns.get(parentPath).add(compiledPath.toString());
     }
 
     // build jsonColumns, jsonAddColumns, and jsonDropColumns
@@ -117,7 +123,7 @@ public class JsonVisitor
             for (ColumnConfig dropColumn : dropColumns) {
                 String name = dropColumn.getName();
                 // skip NON json path notation to build output schema
-                if (! name.startsWith("$.")) {
+                if (! PathCompiler.isProbablyJsonPath(name)) {
                     continue;
                 }
                 jsonDropColumnsPut(name);
@@ -127,7 +133,7 @@ public class JsonVisitor
             for (ColumnConfig column : columns) {
                 String name = column.getName();
                 // skip NON json path notation to build output schema
-                if (! name.startsWith("$.")) {
+                if (! PathCompiler.isProbablyJsonPath(name)) {
                     continue;
                 }
                 if (column.getSrc().isPresent()) {
@@ -151,7 +157,7 @@ public class JsonVisitor
             for (ColumnConfig column : addColumns) {
                 String name = column.getName();
                 // skip NON json path notation to build output schema
-                if (! name.startsWith("$.")) {
+                if (! PathCompiler.isProbablyJsonPath(name)) {
                     continue;
                 }
                 if (column.getSrc().isPresent()) {
@@ -179,26 +185,19 @@ public class JsonVisitor
 
         for (ColumnConfig columnConfig : columnConfigs) {
             String name = columnConfig.getName();
-            if (!name.startsWith("$.")) {
+            if (!PathCompiler.isProbablyJsonPath(name)) {
                 continue;
             }
-            String[] parts = name.split("\\.");
+            Path path = PathCompiler.compile(name);
+            PathToken parts = path.getRoot();
+            int count = parts.getTokenCount();
             StringBuilder partialPath = new StringBuilder("$");
-            for (int i = 1; i < parts.length; i++) {
-                if (parts[i].contains("[")) {
-                    String[] arrayParts = parts[i].split("\\[");
-                    partialPath.append(".").append(arrayParts[0]);
-                    this.shouldVisitSet.add(partialPath.toString());
-                    for (int j = 1; j < arrayParts.length; j++) {
-                        // Simply add [0] or [*] here
-                        partialPath.append("[").append(arrayParts[j]);
-                        this.shouldVisitSet.add(partialPath.toString());
-                    }
-                }
-                else {
-                    partialPath.append(".").append(parts[i]);
-                    this.shouldVisitSet.add(partialPath.toString());
-                }
+            // skip "$"
+            for (int i = 1; i < count; i++) {
+                parts = parts.next();
+                PathTokenUtil.assertSupportedPathToken(parts, name);
+                partialPath.append(parts.getPathFragment().toString());
+                this.shouldVisitSet.add(partialPath.toString());
             }
         }
     }
@@ -220,7 +219,7 @@ public class JsonVisitor
     String newMapJsonPath(String rootPath, Value elementPathValue)
     {
         String elementPath = elementPathValue.asStringValue().asString();
-        String newPath = new StringBuilder(rootPath).append(".").append(elementPath).toString();
+        String newPath = new StringBuilder(rootPath).append("['").append(elementPath).append("']").toString();
         return newPath;
     }
 
@@ -241,14 +240,14 @@ public class JsonVisitor
         }
         else if (this.jsonColumns.containsKey(rootPath)) {
             for (JsonColumn jsonColumn : this.jsonColumns.get(rootPath).values()) {
-                int src = jsonColumn.getSrcBaseIndex().intValue();
+                int src = jsonColumn.getSrcTailIndex().intValue();
                 Value v = (src < arrayValue.size() ? arrayValue.get(src) : null);
                 if (v == null) {
                     v = jsonColumn.getDefaultValue();
                 }
                 String newPath = jsonColumn.getPath();
                 Value visited = visit(newPath, v);
-                // int i = jsonColumn.getBaseIndex().intValue();
+                // int i = jsonColumn.tailIndex().intValue();
                 // index is shifted, so j++ is used.
                 newValue.add(j++, visited == null ? ValueFactory.newNil() : visited);
             }
@@ -262,7 +261,7 @@ public class JsonVisitor
         }
         if (this.jsonAddColumns.containsKey(rootPath)) {
             for (JsonColumn jsonColumn : this.jsonAddColumns.get(rootPath).values()) {
-                int src = jsonColumn.getSrcBaseIndex().intValue();
+                int src = jsonColumn.getSrcTailIndex().intValue();
                 Value v = (src < arrayValue.size() ? arrayValue.get(src) : null);
                 if (v == null) {
                     v = jsonColumn.getDefaultValue();
@@ -297,14 +296,14 @@ public class JsonVisitor
         else if (this.jsonColumns.containsKey(rootPath)) {
             Map<Value, Value> map = mapValue.map();
             for (JsonColumn jsonColumn : this.jsonColumns.get(rootPath).values()) {
-                Value src = jsonColumn.getSrcBaseNameValue();
+                Value src = jsonColumn.getSrcTailNameValue();
                 Value v = map.get(src);
                 if (v == null) {
                     v = jsonColumn.getDefaultValue();
                 }
                 String newPath = jsonColumn.getPath();
                 Value visited = visit(newPath, v);
-                newValue.add(i++, jsonColumn.getBaseNameValue());
+                newValue.add(i++, jsonColumn.getTailNameValue());
                 newValue.add(i++, visited == null ? ValueFactory.newNil() : visited);
             }
         }
@@ -321,14 +320,14 @@ public class JsonVisitor
         if (this.jsonAddColumns.containsKey(rootPath)) {
             Map<Value, Value> map = mapValue.map();
             for (JsonColumn jsonColumn : this.jsonAddColumns.get(rootPath).values()) {
-                Value src = jsonColumn.getSrcBaseNameValue();
+                Value src = jsonColumn.getSrcTailNameValue();
                 Value v = map.get(src);
                 if (v == null) {
                     v = jsonColumn.getDefaultValue();
                 }
                 String newPath = jsonColumn.getPath();
                 Value visited = visit(newPath, v);
-                newValue.add(i++, jsonColumn.getBaseNameValue());
+                newValue.add(i++, jsonColumn.getTailNameValue());
                 newValue.add(i++, visited == null ? ValueFactory.newNil() : visited);
             }
         }