From fab73dbdc319b252aa957daf3fcedd6f95425b07 Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@scylladb.com>
Date: Thu, 18 Jan 2018 14:36:58 +0200
Subject: [PATCH] cql3/restrictions: Fix multi_column_restriction::values()

Fix multi_column_restriction::values() similar to
single_column_primary_key_restrictions::values().
---
 cql3/restrictions/multi_column_restriction.hh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/cql3/restrictions/multi_column_restriction.hh b/cql3/restrictions/multi_column_restriction.hh
index 31f77bcfd2..45cab4cd76 100644
--- a/cql3/restrictions/multi_column_restriction.hh
+++ b/cql3/restrictions/multi_column_restriction.hh
@@ -71,10 +71,11 @@ public:
     virtual std::vector<bytes_opt> values(const query_options& options) const override  {
         auto src = values_as_keys(options);
         std::vector<bytes_opt> res;
-        std::transform(src.begin(), src.end(), std::back_inserter(res), [this] (auto&& r) {
-            auto view = r.representation();
-            return bytes(view.begin(), view.end());
-        });
+        for (const clustering_key_prefix& r : src) {
+            for (const auto& component : r.components()) {
+                res.emplace_back(component);
+            }
+        }
         return res;
     }