groonga-query-log 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '023904fd821f10549843a393066606dc362b18cf37a0fdf367dad9fa2112510b'
-  data.tar.gz: 13c88359ceff1ac99c0a56c9c53deac527c1fd2158c62ebaef70ade2a623b149
+  metadata.gz: 7420f29c336d80bf892fa8c8a5a8368ee6344f2e6d02846f7da1172daca83d7b
+  data.tar.gz: 0a6833bd88e699ea7e102a0466b4db7944d273a84adb6ccc7e9262795cf1e5c0
 SHA512:
-  metadata.gz: 981cb090997ecb1644b4e891e60bae06a985b0a84abb4c186ca69f053c3c024ea16cc7333a95b9f57d50392ad2fb00aca6633447a9e4b296ea6c6a1b02046792
-  data.tar.gz: 94c88472305982b6f1be3833d2dbc7a79223def680cfb7f424ce197edab06dc2360cc087c4221b038b3cbb2697d93bdfa97883d77db6c8fee22b4d4f61f94d20
+  metadata.gz: e4e4fbae0c9fb4b9fe3d6b474b2a77fb250f4a48c7a1775fd9aaed07a527a35c40e543fb21a250a4ef47ebadd75ef7626da17630462b52eef9395b9149ddef0a
+  data.tar.gz: 06fcd20a1e52b0edcd1697a4712ac8781b624a915fef57963518054fb501b1ec93c0b3d7195fbd3c898c5e6231139c5f1fd4781bf65fdb98c4a939057e620974

data/doc/text/news.md

@@ -1,5 +1,13 @@
 # News
 
+## 1.6.1: 2020-04-28
+
+### Improvements
+
+  * `run-regression-test`: Ensured using UTF-8 for `groonga.log`.
+
+  * `run-regression-test`: Added support for loading `.grn.zst`.
+
 ## 1.6.0: 2020-04-15
 
 ### Improvements

data/lib/groonga-query-log/command/run-regression-test.rb

@@ -556,12 +556,19 @@ module GroongaQueryLog
           if @options[:recreate_database]
             FileUtils.rm_rf(@database_path.dirname.to_s)
           end
-
           return if @database_path.exist?
+
           FileUtils.mkdir_p(@database_path.dirname.to_s)
-          system(@groonga, "-n", @database_path.to_s, "quit")
+          create_db_command = [@groonga, "-n", @database_path.to_s, "quit"]
+          unless system(*create_db_command)
+            create_db_command_line = create_db_command.join(" ")
+            raise "Failed to run: #{create_db_command_line}"
+          end
+
           load_files.each do |load_file|
-            if load_file.extname == ".rb"
+            filter_command = nil
+            case load_file.extname
+            when ".rb"
               env = {
                 "GROONGA_LOG_PATH" => log_path.to_s,
               }
@@ -570,6 +577,17 @@ module GroongaQueryLog
                 load_file.to_s,
                 @database_path.to_s,
               ]
+            when ".zst"
+              env = {}
+              command = [
+                @groonga,
+                "--log-path", log_path.to_s,
+                @database_path.to_s,
+              ]
+              filter_command = [
+                "zstdcat",
+                load_file.to_s,
+              ]
             else
               env = {}
               command = [
@@ -580,13 +598,36 @@ module GroongaQueryLog
               ]
             end
             command_line = command.join(" ")
+            if filter_command
+              filter_command_line = filter_command.join(" ")
+              command_line = "#{filter_command_line} | #{command_line}"
+            end
             puts("Running...: #{command_line}")
-            pid = spawn(env, *command)
-            begin
-              pid, status = Process.waitpid2(pid)
-            rescue Interrupt
-              Process.kill(:TERM, pid)
-              pid, status = Process.waitpid2(pid)
+            status = nil
+            if filter_command
+              IO.pipe do |input, output|
+                filter_pid = spawn(*filter_command, out: output)
+                output.close
+                pid = spawn(env, *command, in: input)
+                input.close
+                begin
+                  pid, status = Process.waitpid2(pid)
+                  filter_pid, filter_status = Process.waitpid2(filter_pid)
+                rescue Interrupt
+                  Process.kill(:TERM, pid)
+                  Process.kill(:TERM, filter_pid)
+                  pid, status = Process.waitpid2(pid)
+                  filter_pid, filter_status = Process.waitpid2(filter_pid)
+                end
+              end
+            else
+              pid = spawn(env, *command)
+              begin
+                pid, status = Process.waitpid2(pid)
+              rescue Interrupt
+                Process.kill(:TERM, pid)
+                pid, status = Process.waitpid2(pid)
+              end
             end
             unless status.success?
               raise "Failed to run: #{command_line}"
@@ -608,8 +649,9 @@ module GroongaQueryLog
 
         def n_leaked_objects
           n = 0
-          File.open(log_path) do |log|
+          File.open(log_path, encoding: "UTF-8") do |log|
             log.each_line do |line|
+              next unless line.valid_encoding?
               case line
               when /grn_fin \((\d+)\)/
                 n += Integer($1, 10)
@@ -652,15 +694,15 @@ module GroongaQueryLog
         end
 
         def schema_files
-          Pathname.glob("#{@input_directory}/schema/**/*.{grn,rb}").sort
+          Pathname.glob("#{@input_directory}/schema/**/*.{grn,grn.zst,rb}").sort
         end
 
         def index_files
-          Pathname.glob("#{@input_directory}/indexes/**/*.{grn,rb}").sort
+          Pathname.glob("#{@input_directory}/indexes/**/*.{grn,grn.zst,rb}").sort
         end
 
         def data_files
-          Pathname.glob("#{@input_directory}/data/**/*.{grn,rb}").sort
+          Pathname.glob("#{@input_directory}/data/**/*.{grn,grn.zst,rb}").sort
         end
       end
 

data/lib/groonga-query-log/version.rb

@@ -15,5 +15,5 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 module GroongaQueryLog
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-query-log
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2020-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: charty