[tarantool-patches] Re: [PATCH 2/2] vinyl: zap upsert_format

  • From: Vladimir Davydov <vdavydov.dev@xxxxxxxxx>
  • To: "v.shpilevoy@xxxxxxxxxxxxx" <v.shpilevoy@xxxxxxxxxxxxx>
  • Date: Mon, 2 Apr 2018 14:06:12 +0300

On Mon, Apr 02, 2018 at 01:58:36PM +0300, v.shpilevoy@xxxxxxxxxxxxx wrote:

1. This functions seems to be unused. Can you delete it, please?

Already did, in a separate patch:

  
https://www.freelists.org/post/tarantool-patches/PATCH-0712-vinyl-zap-vy-mem-update-formats

void
vy_mem_update_formats(struct vy_mem *mem, struct tuple_format *new_format,
-                 struct tuple_format *new_format_with_colmask,
-                 struct tuple_format *new_upsert_format)
+                 struct tuple_format *new_format_with_colmask)
{
    assert(mem->count.rows == 0);
    tuple_format_unref(mem->format);
    tuple_format_unref(mem->format_with_colmask);
-   tuple_format_unref(mem->upsert_format);
    mem->format = new_format;
    mem->format_with_colmask = new_format_with_colmask;
-   mem->upsert_format = new_upsert_format;
    tuple_format_ref(mem->format);
    tuple_format_ref(mem->format_with_colmask);
-   tuple_format_ref(mem->upsert_format);
}

void
diff --git a/src/box/vy_run.c b/src/box/vy_run.c
index da6d5872..637f63fa 100644
--- a/src/box/vy_run.c
+++ b/src/box/vy_run.c
@@ -2205,7 +2202,6 @@ vy_run_rebuild_index(struct vy_run *run, const char 
*dir,

2. Please, update a comment - it seems to be very out of date: user_key_def 
is omitted,
and bloom_fpr is already removed.

OK. And it looks like this function should use disk_format instead of
mem_format. I'll update it in a separate patch.


                 const struct key_def *cmp_def,
                 const struct key_def *key_def,
                 struct tuple_format *mem_format,
-                struct tuple_format *upsert_format,
                 const struct index_opts *opts)
{
    assert(run->info.bloom == NULL);

Other related posts:

  1. Home
  2. tarantool-patches
  3. Archive
  4. 04-2018