groonga-query-log 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 285c9ab6fc720b1f13bab6a59875e7a29829cfc12a2ba1220d78621391b88b44
-  data.tar.gz: 26547ca64e0ff435a54b94e2b5a65d38e7d31f1dfbb7f4a040bf7cf9ffef8fab
+  metadata.gz: 15ee5ce18ea1e8a51a67e888adb04e370b3a1925ecd026c108da514cc3b51016
+  data.tar.gz: 6ff5205f282c77e3ccbe0b3b75df9e87f0dc5f253c0da552fca321cef9795e41
 SHA512:
-  metadata.gz: 9814687fd086b19c731d938f274f690b94322716a26e1a4672f2e3d63ff2c579a1f9a667163da559df0c45afd9cdaa9af20760b916042f06787c39a7dad1474e
-  data.tar.gz: e705b82a38091ac40eae7e36228b5423b162e65088316065019a72b9153543dab4f2570c9a81ee6ec3535cf9281ba8515c138ab3ee9dc1a65e983d5c623e7509
+  metadata.gz: 43b3d1ad97d7d65daa54f82e5acef19b3e6798f4254955ee92ea061b0bb6a5db2239757ae49509b5f11e2c4605e6a3a69e2b7fd890c4fab45577176e5abe0551
+  data.tar.gz: 37a2505063f45afa95d16c7cbe596fdef5d1d383fa9046ca90aa5f760ee601c16157b6bc3d8a6bef9272e1d6eebf6927402077cce4e714d891642f1266d710e5

data/doc/text/news.md

@@ -1,5 +1,11 @@
 # News
 
+## 1.4.2: 2019-05-13
+
+### Improvements
+
+  * Added support for `drilldowns[LABEL].columns[LABEL]`.
+
 ## 1.4.1: 2019-05-09
 
 ### Improvements

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

@@ -121,7 +121,7 @@ module GroongaQueryLog
                        \ 
                        (?<raw_message>
                          (?<name>[a-zA-Z._-]+)
-                         (?<sub_name_before>\[.+?\](?:[a-zA-Z._-]*))?
+                         (?<sub_name_before>\[.+?\][^(]*)?
                          (?:\((?<n_records>\d+)\))?
                          (?<sub_name_after>\[.+?\])?
                          (?::\ (?<extra>.*))?

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.4.1"
+  VERSION = "1.4.2"
 end

data/test/test-parser.rb

@@ -326,6 +326,49 @@ class ParserTest < Test::Unit::TestCase
       ]
       assert_equal(expected, operations)
     end
+
+    def test_labeled_drilldown_columns
+      statistics = parse(<<-LOG)
+2019-05-13 17:56:57.353124|0x7ffe678ba4e0|>logical_select Logs   --shard_key timestamp   --output_columns _id   --limit 0   --drilldowns[item].keys items   --drilldowns[item].sort_keys price   --drilldowns[item].output_columns _key,_nsubrecs,price,price_with_tax   --drilldowns[item].columns[price_with_tax].stage initial   --drilldowns[item].columns[price_with_tax].type UInt32   --drilldowns[item].columns[price_with_tax].flags COLUMN_SCALAR   --drilldowns[item].columns[price_with_tax].value 'price * 1.08'   --drilldowns[real_price].table item   --drilldowns[real_price].keys price_with_tax --output_type json
+2019-05-13 17:56:57.355173|0x7ffe678ba4e0|:000000002051683 select(2)[Logs_20170315]
+2019-05-13 17:56:57.355191|0x7ffe678ba4e0|:000000002068357 select(2)[Logs_20170316]
+2019-05-13 17:56:57.355204|0x7ffe678ba4e0|:000000002081732 select(2)[Logs_20170317]
+2019-05-13 17:56:57.355420|0x7ffe678ba4e0|:000000002298949 drilldowns[item](6)
+2019-05-13 17:56:57.355571|0x7ffe678ba4e0|:000000002449229 drilldowns[item].columns[price_with_tax](6)
+2019-05-13 17:56:57.355671|0x7ffe678ba4e0|:000000002548867 drilldowns[real_price](3)
+2019-05-13 17:56:57.355723|0x7ffe678ba4e0|:000000002600511 output(0)
+2019-05-13 17:56:57.355780|0x7ffe678ba4e0|:000000002657685 drilldowns[item].sort(6): price
+2019-05-13 17:56:57.355842|0x7ffe678ba4e0|:000000002720445 output.drilldowns[item](6)
+2019-05-13 17:56:57.355878|0x7ffe678ba4e0|:000000002755476 output.drilldowns[real_price](3)
+2019-05-13 17:56:57.355981|0x7ffe678ba4e0|<000000002859294 rc=0
+      LOG
+      operations = statistics.first.operations.collect do |operation|
+        [operation[:name], operation[:raw_message]]
+      end
+      expected = [
+        ["select[Logs_20170315]",
+         "select(2)[Logs_20170315]"],
+        ["select[Logs_20170316]",
+         "select(2)[Logs_20170316]"],
+        ["select[Logs_20170317]",
+         "select(2)[Logs_20170317]"],
+        ["drilldowns[item]",
+         "drilldowns[item](6)"],
+        ["drilldowns[item].columns[price_with_tax]",
+         "drilldowns[item].columns[price_with_tax](6)"],
+        ["drilldowns[real_price]",
+         "drilldowns[real_price](3)"],
+        ["output",
+         "output(0)"],
+        ["drilldowns[item].sort",
+         "drilldowns[item].sort(6): price"],
+        ["output.drilldowns[item]",
+         "output.drilldowns[item](6)"],
+        ["output.drilldowns[real_price]",
+         "output.drilldowns[real_price](3)"]
+      ]
+      assert_equal(expected, operations)
+    end
   end
 
   class ExtraFieldTest < self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: groonga-query-log
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Kouhei Sutou
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-09 00:00:00.000000000 Z
+date: 2019-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: groonga-command-parser