embulk-guess-csv_verify 0.10.29-java → 0.10.33-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 560fef03cacdda19b9365be2a7352d5a00c47b415fb89cd1f7ae6664d0603091
-  data.tar.gz: 79ab9de8f15c812cd3093207329674370d37563bdc05360f2652072a15afe12c
+  metadata.gz: 40cc783b511fc230dedfb3877bbb8b18145af7cdd4734f850ba62473abe938bb
+  data.tar.gz: 7f3cd4f2b44de1cb774ef60880b7bd71d4e2398f2cccb7a9a7c3975d1e2d8628
 SHA512:
-  metadata.gz: ced3fb4071fa98eb20d4411272184217e9fc28e2c19e29192830d9fbcc158b67cdb87cfa7191c3fdf78794017009feef25982f60ae34bbae7cee08dc9257eafb
-  data.tar.gz: 357413c30817f29b0d2bdd1e22f093387374d4b1affff93e4ff88463f3468dfcfba4d1115da4f0f8daf48eb7f3a511ac012b0173af16a867fb1f2c63d9272bb6
+  metadata.gz: 8ee6497b9ba694d4cde20d6c496016717859830d1b5182ec2b63d3bd48bab865d19c1294122134c0bc207818ca6d0638cbbf90039dfb3074560b025aa4497ac0
+  data.tar.gz: ec299af34e8159d7f0276aa466fe63114b0c5b0d9ec29f25624cb855de4d3dc02ed85ff1915920be828b0fbbc2c90a8ae2ba6df8e445f04480fd8fd096fcdd4c

data/LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/lib/embulk/guess/csv_verify.rb

@@ -23,15 +23,14 @@ module Embulk
 
       CLASSLOADER = create_classloader
       CONFIG_MAPPER_FACTORY_CLASS = CLASSLOADER.loadClass("org.embulk.util.config.ConfigMapperFactory").ruby_class
-      TYPE_MODULE_CLASS = CLASSLOADER.loadClass("org.embulk.util.config.modules.TypeModule").ruby_class
-      CONFIG_MAPPER_FACTORY = CONFIG_MAPPER_FACTORY_CLASS.builder.addDefaultModules.addModule(TYPE_MODULE_CLASS.new).build
-      PLUGIN_TASK_CLASS = CLASSLOADER.loadClass("org.embulk.parser.csv.CsvParserPlugin$PluginTask")
+      CONFIG_MAPPER_FACTORY = CONFIG_MAPPER_FACTORY_CLASS.builder.addDefaultModules.build
+      LEGACY_PLUGIN_TASK_CLASS = CLASSLOADER.loadClass("org.embulk.standards.CsvParserPlugin$PluginTask").ruby_class
       LIST_FILE_INPUT_CLASS = CLASSLOADER.loadClass("org.embulk.util.file.ListFileInput").ruby_class
       LINE_DECODER_CLASS = CLASSLOADER.loadClass("org.embulk.util.text.LineDecoder").ruby_class
       CSV_GUESS_PLUGIN_CLASS = CLASSLOADER.loadClass("org.embulk.guess.csv.CsvGuessPlugin").ruby_class
-      CSV_TOKENIZER_CLASS = CLASSLOADER.loadClass("org.embulk.parser.csv.CsvTokenizer").ruby_class
-      TOO_FEW_COLUMNS_EXCEPTION_CLASS = CLASSLOADER.loadClass("org.embulk.parser.csv.CsvTokenizer$TooFewColumnsException").ruby_class
-      INVALID_VALUE_EXCEPTION_CLASS = CLASSLOADER.loadClass("org.embulk.parser.csv.CsvTokenizer$InvalidValueException").ruby_class
+      LEGACY_CSV_TOKENIZER_CLASS = CLASSLOADER.loadClass("org.embulk.standards.CsvTokenizer").ruby_class
+      LEGACY_TOO_FEW_COLUMNS_EXCEPTION_CLASS = CLASSLOADER.loadClass("org.embulk.standards.CsvTokenizer$TooFewColumnsException").ruby_class
+      LEGACY_INVALID_VALUE_EXCEPTION_CLASS = CLASSLOADER.loadClass("org.embulk.standards.CsvTokenizer$InvalidValueException").ruby_class
 
       DELIMITER_CANDIDATES = [
         ",", "\t", "|", ";"
@@ -71,7 +70,9 @@ module Embulk
           end
           guessed_ruby_converted = config_to_java(guessed_ruby)
           if !guessed_java.equals(guessed_ruby_converted)
-            raise_and_log_guess_diff(guessed_ruby, guessed_java)
+            log_guess_diff(guessed_ruby, guessed_java, "decoders")
+            log_guess_diff(guessed_ruby, guessed_java, "parser")
+            raise "embulk-guess-csv has difference between Java/Ruby."
           end
         rescue Exception => e
           # Any error from the Java-based guess plugin should pass-through just with logging.
@@ -237,34 +238,23 @@ module Embulk
 
       private
 
-      def raise_and_log_guess_diff(guessed_ruby_entire, guessed_java_entire)
-        guessed_ruby = guessed_ruby_entire["parser"] || {}
-        guessed_java = guessed_java_entire.getNestedOrGetEmpty("parser")
-
-        require 'set'
-        keys = Set.new(guessed_ruby.keys) + Set.new(guessed_java.getAttributeNames)
+      def log_guess_diff(guessed_ruby_entire, guessed_java_entire, key)
+        guessed_ruby = guessed_ruby_entire[key] || {}
+        guessed_java = guessed_java_entire.getNestedOrGetEmpty(key)
 
         begin
           require 'json'
         rescue LoadError
-          Embulk.logger.warn "The 'json' gem is not installed. No details compared."
-          guessed_java_hash = nil
+          raise "The 'json' gem is not installed. No details compared."
         else
           guessed_java_hash = JSON.parse(guessed_java.toJson)
         end
 
-        diffs = []
-        keys.each do |key|
-          if !guessed_ruby.has_key?(key)
-            diffs << "Only embulk-guess-csv (Java) has: \"#{key}\""
-          elsif !guessed_java.has(key.to_java)
-            diffs << "Only embulk-guess-csv (Ruby) has: \"#{key}\""
-          elsif guessed_java_hash && guessed_ruby[key] != guessed_java_hash[key]
-            diffs << "embulk-guess-csv has difference between Java/Ruby: \"#{key}\""
-          end
+        if guessed_java_hash && guessed_ruby != guessed_java_hash
+          Embulk.logger.error "[Embulk CSV guess verify] '#{key}' has difference."
+          Embulk.logger.error "[Embulk CSV guess verify] Java => #{guessed_java_hash.to_json}"
+          Embulk.logger.error "[Embulk CSV guess verify] Ruby => #{guessed_ruby.to_json}"
         end
-
-        raise "embulk-guess-csv has difference between Java/Ruby: #{diffs.inspect}"
       end
 
       def config_to_java(config_ruby)
@@ -289,12 +279,11 @@ module Embulk
       def split_lines(parser_config, skip_empty_lines, sample_lines, delim, extra_config)
         null_string = parser_config["null_string"]
         config = parser_config.merge(extra_config).merge({"charset" => "UTF-8", "columns" => []})
-        parser_task = CONFIG_MAPPER_FACTORY.createConfigMapper.map(config_to_java(parser_config), PLUGIN_TASK_CLASS)
+        parser_task = config.load_config(LEGACY_PLUGIN_TASK_CLASS)
         data = sample_lines.map {|line| line.force_encoding('UTF-8') }.join(parser_task.getNewline.getString.encode('UTF-8'))
         sample = Buffer.from_ruby_string(data)
-        decoder = LINE_DECODER_CLASS.of(
-          LIST_FILE_INPUT_CLASS.new([[sample.to_java]]), parser_task.getCharset, parser_task.getLineDelimiterRecognized.orElse(nil))
-        tokenizer = CSV_TOKENIZER_CLASS.new(decoder, parser_task)
+        decoder = Java::LineDecoder.new(Java::ListFileInput.new([[sample.to_java]]), parser_task)
+        tokenizer = LEGACY_CSV_TOKENIZER_CLASS.new(decoder, parser_task)
         rows = []
         while tokenizer.nextFile
           while tokenizer.nextRecord(skip_empty_lines)
@@ -308,12 +297,12 @@ module Embulk
                     column = nil
                   end
                   columns << column
-                rescue TOO_FEW_COLUMNS_EXCEPTION_CLASS
+                rescue LEGACY_TOO_FEW_COLUMNS_EXCEPTION_CLASS
                   rows << columns
                   break
                 end
               end
-            rescue INVALID_VALUE_EXCEPTION_CLASS
+            rescue LEGACY_INVALID_VALUE_EXCEPTION_CLASS
               # TODO warning
               tokenizer.skipCurrentLine
             end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: embulk-guess-csv_verify
 version: !ruby/object:Gem::Version
-  version: 0.10.29
+  version: 0.10.33
 platform: java
 authors:
 - Sadayuki Furuhashi
@@ -10,34 +10,39 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-07 00:00:00.000000000 Z
+date: 2021-08-24 00:00:00.000000000 Z
 dependencies: []
 description: Verification-purpose Embulk CSV guess plugin to compare the old Ruby-based
-  one and the new Java-based one (not for your production use)
+  one and the new Java-based one (not for your production use; note that 'decoders'
+  and 'parser' sections in your configuration can be logged even if they contain confidential
+  information)
 email:
 - dmikurube@treasure-data.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- classpath/embulk-guess-csv-0.10.29.jar
-- classpath/embulk-guess-csv_verify-0.10.29.jar
-- classpath/embulk-parser-csv-0.10.29.jar
-- classpath/embulk-util-config-0.2.1.jar
+- LICENSE
+- classpath/embulk-guess-csv-0.10.33.jar
+- classpath/embulk-guess-csv_verify-0.10.33.jar
+- classpath/embulk-parser-csv-0.10.33.jar
+- classpath/embulk-util-config-0.3.1.jar
 - classpath/embulk-util-file-0.1.3.jar
-- classpath/embulk-util-guess-0.1.1.jar
-- classpath/embulk-util-json-0.1.0.jar
+- classpath/embulk-util-guess-0.1.2.jar
+- classpath/embulk-util-json-0.1.1.jar
 - classpath/embulk-util-rubytime-0.3.2.jar
-- classpath/embulk-util-text-0.1.0.jar
+- classpath/embulk-util-text-0.1.1.jar
 - classpath/embulk-util-timestamp-0.2.1.jar
+- classpath/guava-18.0.jar
 - classpath/icu4j-54.1.1.jar
 - classpath/jackson-annotations-2.6.7.jar
 - classpath/jackson-core-2.6.7.jar
 - classpath/jackson-databind-2.6.7.jar
+- classpath/jackson-datatype-guava-2.6.7.jar
 - classpath/jackson-datatype-jdk8-2.6.7.jar
 - classpath/validation-api-1.1.0.Final.jar
 - lib/embulk/guess/csv_verify.rb
-homepage: https://github.com/embulk/embulk
+homepage: https://github.com/embulk/embulk-guess-csv_verify
 licenses:
 - Apache-2.0
 metadata: {}