fix parsing index definitions for new tarantool

tarantool · Oct 31, 2015 · 0911a59 · 0911a59
1 parent f61adb5
commit 0911a59
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/lib/tarantool16/db.rb b/lib/tarantool16/db.rb
@@ -114,7 +114,14 @@ def _fill_spaces(rows)
 
     def _fill_indices(spaces, rows)
       rows.
-        map{|row| [row[0], [row[2], row[1], row[3], 6.step(row.size-1, 2).map{|i| row[i]}]]}.
+        map{|row|
+          if row[4].is_a? Hash
+            # new format
+            [row[0], [row[2], row[1], row[3], row[5].map(&:first)]]
+          else
+            [row[0], [row[2], row[1], row[3], 6.step(row.size-1, 2).map{|i| row[i]}]]
+          end
+        }.
         group_by{|sid, _| sid}.
         each do |sid, inds|
           sp = spaces[sid]