diff --git a/lib/data/chunk_reader.ex b/lib/data/chunk_reader.ex index 7375e6d..8e5b151 100644 --- a/lib/data/chunk_reader.ex +++ b/lib/data/chunk_reader.ex @@ -190,7 +190,7 @@ defmodule Bigtable.ChunkReader do {:error, "received new row key #{cc.row_key} during existing row #{cr.cur_key}"} family?(cc) and !qualifier?(cc) -> - {:error, "family name #{cc.family_name} specified without a qualifier"} + {:error, "family name #{cc.family_name.value} specified without a qualifier"} true -> :ok diff --git a/mix.exs b/mix.exs index 77fa1f7..be4ee7b 100644 --- a/mix.exs +++ b/mix.exs @@ -120,7 +120,7 @@ defmodule Bigtable.MixProject do {:lens, "~> 0.8.0"}, {:poison, "~> 3.1"}, {:poolboy, "~> 1.5"}, - {:protobuf, "~> 0.5.3"}, + {:protobuf, "~> 0.6.3"}, # Dev Deps {:credo, "~> 1.0.0", only: [:dev, :test, :ci], runtime: false}, {:dialyxir, "~> 1.0.0-rc.6", only: [:dev], runtime: false}, diff --git a/mix.lock b/mix.lock index cdf6674..9614694 100644 --- a/mix.lock +++ b/mix.lock @@ -17,7 +17,7 @@ "google_protos": {:hex, :google_protos, "0.1.0", "c6b9e12092d17571b093d4156d004494ca143b65dbbcbfc3ffff463ea03467c0", [:mix], [{:protobuf, "~> 0.5", [hex: :protobuf, repo: "hexpm", optional: false]}], "hexpm"}, "goth": {:hex, :goth, "0.11.1", "edabbb776de8a9973cfea235d4e4c16481a28bfc4ff648472020a5a5af1044d0", [:mix], [{:httpoison, "~> 0.11 or ~> 1.0", [hex: :httpoison, repo: "hexpm", optional: false]}, {:json_web_token, "~> 0.2.10", [hex: :json_web_token, repo: "hexpm", optional: false]}, {:poison, "~> 2.1 or ~> 3.0", [hex: :poison, repo: "hexpm", optional: false]}], "hexpm"}, "grpc": {:hex, :grpc, "0.3.1", "bba240631f1a262db865d9bc620b3e3abc0acfab27a922ad47727d057a734ab3", [:mix], [{:cowboy, "~> 2.5", [hex: :cowboy, repo: "hexpm", optional: false]}, {:gun, "~> 1.2", [hex: :gun, repo: "hexpm", optional: false]}, {:protobuf, "~> 0.5", [hex: :protobuf, repo: "hexpm", optional: false]}], "hexpm"}, - "gun": {:hex, :gun, "1.3.0", "18e5d269649c987af95aec309f68a27ffc3930531dd227a6eaa0884d6684286e", [:rebar3], [{:cowlib, "~> 2.6.0", [hex: :cowlib, repo: "hexpm", optional: false]}], "hexpm"}, + "gun": {:hex, :gun, "1.3.1", "1489fd96018431b89f401041a9ce0b02b45265247f0fdcf71273bf087c64ea4f", [:rebar3], [{:cowlib, "~> 2.6.0", [hex: :cowlib, repo: "hexpm", optional: false]}], "hexpm"}, "hackney": {:hex, :hackney, "1.15.0", "287a5d2304d516f63e56c469511c42b016423bcb167e61b611f6bad47e3ca60e", [:rebar3], [{:certifi, "2.4.2", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "6.0.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "1.0.1", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "1.1.4", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm"}, "httpoison": {:hex, :httpoison, "1.5.0", "71ae9f304bdf7f00e9cd1823f275c955bdfc68282bc5eb5c85c3a9ade865d68e", [:mix], [{:hackney, "~> 1.8", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm"}, "idna": {:hex, :idna, "6.0.0", "689c46cbcdf3524c44d5f3dde8001f364cd7608a99556d8fbd8239a5798d4c10", [:rebar3], [{:unicode_util_compat, "0.4.1", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm"}, @@ -37,7 +37,7 @@ "poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], [], "hexpm"}, "poolboy": {:hex, :poolboy, "1.5.2", "392b007a1693a64540cead79830443abf5762f5d30cf50bc95cb2c1aaafa006b", [:rebar3], [], "hexpm"}, "pre_commit": {:hex, :pre_commit, "0.3.4", "e2850f80be8090d50ad8019ef2426039307ff5dfbe70c736ad0d4d401facf304", [:mix], [], "hexpm"}, - "protobuf": {:hex, :protobuf, "0.5.4", "2e1b8eec211aff034ad8a14e3674220b0158bfb9a3c7128ac9d2a1ed1b3724d3", [:mix], [], "hexpm"}, + "protobuf": {:hex, :protobuf, "0.6.3", "742e9034c20532534ca96d7a7ee1251e0f2327dcf8ea6de0dd3eb3e054b236a7", [:mix], [], "hexpm"}, "ranch": {:hex, :ranch, "1.6.2", "6db93c78f411ee033dbb18ba8234c5574883acb9a75af0fb90a9b82ea46afa00", [:rebar3], [], "hexpm"}, "ssl_verify_fun": {:hex, :ssl_verify_fun, "1.1.4", "f0eafff810d2041e93f915ef59899c923f4568f4585904d010387ed74988e77b", [:make, :mix, :rebar3], [], "hexpm"}, "unicode_util_compat": {:hex, :unicode_util_compat, "0.4.1", "d869e4c68901dd9531385bb0c8c40444ebf624e60b6962d95952775cac5e90cd", [:rebar3], [], "hexpm"}, diff --git a/test/google_acceptance/read-rows-acceptance.json b/test/google_acceptance/read-rows-acceptance.json index 180892b..3ccc2ca 100644 --- a/test/google_acceptance/read-rows-acceptance.json +++ b/test/google_acceptance/read-rows-acceptance.json @@ -3,8 +3,8 @@ "name": "invalid - no commit", "chunks": [{ "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL", "commit_row": false @@ -52,13 +52,13 @@ "name": "invalid - new col family must specify qualifier", "chunks": [{ "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 99, "value": "value-VAL_1", "commit_row": false }, { - "family_name": "B", + "family_name": {"value": "B"}, "timestamp_micros": 98, "value": "value-VAL_2", "commit_row": true @@ -76,8 +76,8 @@ "name": "bare commit implies ts=0", "chunks": [{ "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL", "commit_row": false @@ -107,8 +107,8 @@ "name": "simple row with timestamp", "chunks": [{ "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL", "commit_row": true @@ -126,8 +126,8 @@ "name": "missing timestamp, implied ts=0", "chunks": [{ "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "value": "value-VAL", "commit_row": true }], @@ -144,8 +144,8 @@ "name": "empty cell value", "chunks": [{ "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "commit_row": true }], "results": [{ @@ -161,8 +161,8 @@ "name": "two unsplit cells", "chunks": [{ "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 99, "value": "value-VAL_1", "commit_row": false @@ -194,21 +194,21 @@ "name": "two qualifiers", "chunks": [{ "row_key": "RK", - "family_name": "A", - "qualifier": "C", - "timestamp_micros": 99, + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, + "timestamp_micros": 99, "value": "value-VAL_1", "commit_row": false }, { - "qualifier": "D", - "timestamp_micros": 98, + "qualifier": {"value": "D"}, + "timestamp_micros": 98, "value": "value-VAL_2", "commit_row": true }], "results": [{ "rk": "RK", "fm": "A", - "qual": "C", + "qual": "C", "ts": 99, "value": "value-VAL_1", "label": "", @@ -228,16 +228,16 @@ "name": "two families", "chunks": [{ "row_key": "RK", - "family_name": "A", - "qualifier": "C", - "timestamp_micros": 99, + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, + "timestamp_micros": 99, "value": "value-VAL_1", "commit_row": false }, { - "family_name": "B", - "qualifier": "E", - "timestamp_micros": 98, + "family_name": {"value": "B"}, + "qualifier": {"value": "E"}, + "timestamp_micros": 98, "value": "value-VAL_2", "commit_row": true } @@ -245,7 +245,7 @@ "results": [{ "rk": "RK", "fm": "A", - "qual": "C", + "qual": "C", "ts": 99, "value": "value-VAL_1", "label": "", @@ -265,8 +265,8 @@ "name": "split cell, bare commit", "chunks": [{ "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "v", "value_size": 9, @@ -302,8 +302,8 @@ "name": "split cell", "chunks": [{ "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "v", "value_size": 9, @@ -325,8 +325,8 @@ "name": "split four ways", "chunks": [{ "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "labels": "L", "value": "v", @@ -358,8 +358,8 @@ "name": "two split cells", "chunks": [{ "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 99, "value": "v", "value_size": 11, @@ -400,8 +400,8 @@ "name": "multi-qualifier splits", "chunks": [{ "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 99, "value": "v", "value_size": 11, @@ -410,7 +410,7 @@ "value": "alue-VAL_1", "commit_row": false }, { - "qualifier": "D", + "qualifier": {"value": "D"}, "timestamp_micros": 98, "value": "v", "value_size": 11, @@ -443,8 +443,8 @@ "name": "multi-qualifier multi-split", "chunks": [{ "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 99, "value": "v", "value_size": 11, @@ -460,7 +460,7 @@ "commit_row": false }, { - "qualifier": "D", + "qualifier": {"value": "D"}, "timestamp_micros": 98, "value": "v", "value_size": 11, @@ -500,8 +500,8 @@ "name": "multi-family split", "chunks": [{ "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 99, "value": "v", "value_size": 11, @@ -511,8 +511,8 @@ "value": "alue-VAL_1", "commit_row": false }, { - "family_name": "B", - "qualifier": "E", + "family_name": {"value": "B"}, + "qualifier": {"value": "E"}, "timestamp_micros": 98, "value": "v", "value_size": 11, @@ -547,15 +547,15 @@ "name": "invalid - no commit between rows", "chunks": [{ "row_key": "RK_1", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL", "commit_row": false }, { "row_key": "RK_2", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL", "commit_row": false @@ -574,15 +574,15 @@ "name": "invalid - no commit after first row", "chunks": [{ "row_key": "RK_1", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL", "commit_row": false }, { "row_key": "RK_2", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL", "commit_row": true @@ -601,15 +601,15 @@ "name": "invalid - last row missing commit", "chunks": [{ "row_key": "RK_1", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL", "commit_row": true }, { "row_key": "RK_2", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL", "commit_row": false @@ -638,15 +638,15 @@ "name": "invalid - duplicate row key", "chunks": [{ "row_key": "RK_1", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL", "commit_row": true }, { "row_key": "RK_1", - "family_name": "B", - "qualifier": "D", + "family_name": {"value": "B"}, + "qualifier": {"value": "D"}, "timestamp_micros": 100, "value": "value-VAL", "commit_row": true @@ -675,8 +675,8 @@ "name": "invalid - new row missing row key", "chunks": [{ "row_key": "RK_1", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL", "commit_row": true @@ -709,15 +709,15 @@ "name": "two rows", "chunks": [{ "row_key": "RK_1", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL", "commit_row": true }, { "row_key": "RK_2", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL", "commit_row": true @@ -746,14 +746,14 @@ "name": "two rows implicit timestamp", "chunks": [{ "row_key": "RK_1", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "value": "value-VAL", "commit_row": true }, { "row_key": "RK_2", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL", "commit_row": true @@ -782,13 +782,13 @@ "name": "two rows empty value", "chunks": [{ "row_key": "RK_1", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "commit_row": true }, { "row_key": "RK_2", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL", "commit_row": true @@ -817,8 +817,8 @@ "name": "two rows, one with multiple cells", "chunks": [{ "row_key": "RK_1", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 99, "value": "value-VAL_1", "commit_row": false @@ -828,8 +828,8 @@ "commit_row": true }, { "row_key": "RK_2", - "family_name": "B", - "qualifier": "D", + "family_name": {"value": "B"}, + "qualifier": {"value": "D"}, "timestamp_micros": 97, "value": "value-VAL_3", "commit_row": true @@ -867,25 +867,25 @@ "name": "two rows, multiple cells", "chunks": [{ "row_key": "RK_1", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 99, "value": "value-VAL_1", "commit_row": false }, { - "qualifier": "D", + "qualifier": {"value": "D"}, "timestamp_micros": 98, "value": "value-VAL_2", "commit_row": true }, { "row_key": "RK_2", - "family_name": "B", - "qualifier": "E", + "family_name": {"value": "B"}, + "qualifier": {"value": "E"}, "timestamp_micros": 97, "value": "value-VAL_3", "commit_row": false }, { - "qualifier": "F", + "qualifier": {"value": "F"}, "timestamp_micros": 96, "value": "value-VAL_4", "commit_row": true @@ -932,27 +932,27 @@ "name": "two rows, multiple cells, multiple families", "chunks": [{ "row_key": "RK_1", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 99, "value": "value-VAL_1", "commit_row": false }, { - "family_name": "B", - "qualifier": "E", + "family_name": {"value": "B"}, + "qualifier": {"value": "E"}, "timestamp_micros": 98, "value": "value-VAL_2", "commit_row": true }, { "row_key": "RK_2", - "family_name": "M", - "qualifier": "O", + "family_name": {"value": "M"}, + "qualifier": {"value": "O"}, "timestamp_micros": 97, "value": "value-VAL_3", "commit_row": false }, { - "family_name": "N", - "qualifier": "P", + "family_name": {"value": "N"}, + "qualifier": {"value": "P"}, "timestamp_micros": 96, "value": "value-VAL_4", "commit_row": true @@ -999,8 +999,8 @@ "name": "two rows, four cells, 2 labels", "chunks": [{ "row_key": "RK_1", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 99, "labels": "L_1", "value": "value-VAL_1", @@ -1011,8 +1011,8 @@ "commit_row": true }, { "row_key": "RK_2", - "family_name": "B", - "qualifier": "D", + "family_name": {"value": "B"}, + "qualifier": {"value": "D"}, "timestamp_micros": 97, "labels": "L_3", "value": "value-VAL_3", @@ -1064,9 +1064,9 @@ "name": "two rows with splits, same timestamp", "chunks": [{ "row_key": "RK_1", - "family_name": "A", - "qualifier": "C", - "timestamp_micros": 100, + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, + "timestamp_micros": 100, "value": "v", "value_size": 11, "commit_row": false @@ -1075,8 +1075,8 @@ "commit_row": true }, { "row_key": "RK_2", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "v", "value_size": 11, @@ -1128,8 +1128,8 @@ "reset_row": true }, { "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL", "commit_row": false @@ -1148,8 +1148,8 @@ "name": "invalid - missing key after reset", "chunks": [{ "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL", "commit_row": false @@ -1174,8 +1174,8 @@ "name": "no data after reset", "chunks": [{ "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL", "commit_row": false @@ -1188,8 +1188,8 @@ "name": "simple reset", "chunks": [{ "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL", "commit_row": false @@ -1197,8 +1197,8 @@ "reset_row": true }, { "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL", "commit_row": true @@ -1217,8 +1217,8 @@ "name": "reset to new val", "chunks": [{ "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL_1", "commit_row": false @@ -1226,8 +1226,8 @@ "reset_row": true }, { "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL_2", "commit_row": true @@ -1246,8 +1246,8 @@ "name": "reset to new qual", "chunks": [{ "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL_1", "commit_row": false @@ -1255,8 +1255,8 @@ "reset_row": true }, { "row_key": "RK", - "family_name": "A", - "qualifier": "D", + "family_name": {"value": "A"}, + "qualifier": {"value": "D"}, "timestamp_micros": 100, "value": "value-VAL_1", "commit_row": true @@ -1275,8 +1275,8 @@ "name": "reset with splits", "chunks": [{ "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL_1", "commit_row": false @@ -1288,8 +1288,8 @@ "reset_row": true }, { "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL_2", "commit_row": true @@ -1308,8 +1308,8 @@ "name": "reset two cells", "chunks": [{ "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL_1", "commit_row": false @@ -1317,8 +1317,8 @@ "reset_row": true }, { "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL_2", "commit_row": false @@ -1351,8 +1351,8 @@ "name": "two resets", "chunks": [{ "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL_1", "commit_row": false @@ -1360,8 +1360,8 @@ "reset_row": true }, { "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL_2", "commit_row": false @@ -1369,8 +1369,8 @@ "reset_row": true }, { "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL_3", "commit_row": true @@ -1389,8 +1389,8 @@ "name": "reset then two cells", "chunks": [{ "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL_1", "commit_row": false @@ -1398,13 +1398,13 @@ "reset_row": true }, { "row_key": "RK", - "family_name": "B", - "qualifier": "C", + "family_name": {"value": "B"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL_2", "commit_row": false }, { - "qualifier": "D", + "qualifier": {"value": "D"}, "timestamp_micros": 97, "value": "value-VAL_3", "commit_row": true @@ -1433,8 +1433,8 @@ "name": "reset to new row", "chunks": [{ "row_key": "RK_1", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL_1", "commit_row": false @@ -1442,8 +1442,8 @@ "reset_row": true }, { "row_key": "RK_2", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL_2", "commit_row": true @@ -1462,8 +1462,8 @@ "name": "reset in between chunks", "chunks": [{ "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "labels": "" }, { "value": "v", "value_size": 10, "commit_row": false }, @@ -1471,8 +1471,8 @@ "reset_row": true }, { "row_key": "RK_1", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL_1", "commit_row": true @@ -1492,8 +1492,8 @@ "name": "invalid - reset with chunk", "chunks": [{ "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "labels": "" }, { "value": "v", "value_size": 10, "commit_row": false }, @@ -1517,8 +1517,8 @@ "name": "invalid - commit with chunk", "chunks": [{ "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "labels": "", "value": "v", @@ -1545,8 +1545,8 @@ "name": "empty cell chunk", "chunks": [{ "row_key": "RK", - "family_name": "A", - "qualifier": "C", + "family_name": {"value": "A"}, + "qualifier": {"value": "C"}, "timestamp_micros": 100, "value": "value-VAL", "commit_row": false diff --git a/test/google_acceptance/read_rows_acceptance_test.exs b/test/google_acceptance/read_rows_acceptance_test.exs index 6ae3038..d91a062 100644 --- a/test/google_acceptance/read_rows_acceptance_test.exs +++ b/test/google_acceptance/read_rows_acceptance_test.exs @@ -5,8 +5,8 @@ defmodule TestResult do def from_chunk(row_key, %ReadCell{} = ri) do %{ rk: row_key, - fm: ri.family_name, - qual: ri.qualifier, + fm: ri.family_name.value, + qual: ri.qualifier.value, ts: ri.timestamp, value: ri.value, error: false,