Merge branch 'master' into dev

wangzhengquan

2020-10-13 32be9184bcab815ed1795889612a2c2c84a17334

 src/queue/shm_mm.c

@@ -11,6 +11,5 @@
}

int shm_alloc_key() {
   hashtable_t *hashtable = mm_get_hashtable();
   return  hashtable_alloc_key(hashtable);
   return mm_alloc_key();
}