fix(bug):fix offpage assertion failed

Issues:#627

Author: ShannonBase

mysql-test/suite/secondary_engine/r/shannon_case7.result

@@ -111,6 +111,24 @@ id	col_char	col_varchar	text_preview	longtext_length	col_enum
 3				0	small
 4	new	ad		0	small
 5	as	we	fs	4	small
+INSERT INTO test_string_types VALUES (6, 'new', 'ads', 'sa', 'mysql', 'ws', 'longtext_test_long test', 'small');
+EXPLAIN SELECT id, col_char, col_varchar, LEFT(col_text, 20) as text_preview,
+LENGTH(col_longtext) as longtext_length, col_enum
+FROM test_string_types ORDER BY id;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
+1	SIMPLE	test_string_types	NULL	ALL	NULL	NULL	NULL	NULL	6	100.00	Using filesort; Using secondary engine Rapid
+Warnings:
+Note	1003	/* select#1 */ select `sh_test7`.`test_string_types`.`id` AS `id`,`sh_test7`.`test_string_types`.`col_char` AS `col_char`,`sh_test7`.`test_string_types`.`col_varchar` AS `col_varchar`,left(`sh_test7`.`test_string_types`.`col_text`,20) AS `text_preview`,length(`sh_test7`.`test_string_types`.`col_longtext`) AS `longtext_length`,`sh_test7`.`test_string_types`.`col_enum` AS `col_enum` from `sh_test7`.`test_string_types` order by `sh_test7`.`test_string_types`.`id`
+SELECT id, col_char, col_varchar, LEFT(col_text, 20) as text_preview,
+LENGTH(col_longtext) as longtext_length, col_enum
+FROM test_string_types ORDER BY id;
+id	col_char	col_varchar	text_preview	longtext_length	col_enum
+1	char	varchar text	text text text text 	5000	medium
+2	test	another varchar	text content	10000	large
+3				0	small
+4	new	ad		0	small
+5	as	we	fs	4	small
+6	new	ads	sa	23	small
 SELECT 
 CONCAT(col_char, '-', col_varchar) as concatenated,
 UPPER(col_enum) as enum_upper,

mysql-test/suite/secondary_engine/t/shannon_case7.test

@@ -102,6 +102,15 @@ SELECT id, col_char, col_varchar, LEFT(col_text, 20) as text_preview,
        LENGTH(col_longtext) as longtext_length, col_enum
 FROM test_string_types ORDER BY id;
 
+INSERT INTO test_string_types VALUES (6, 'new', 'ads', 'sa', 'mysql', 'ws', 'longtext_test_long test', 'small');
+EXPLAIN SELECT id, col_char, col_varchar, LEFT(col_text, 20) as text_preview,
+       LENGTH(col_longtext) as longtext_length, col_enum
+FROM test_string_types ORDER BY id;
+
+SELECT id, col_char, col_varchar, LEFT(col_text, 20) as text_preview,
+       LENGTH(col_longtext) as longtext_length, col_enum
+FROM test_string_types ORDER BY id;
+
 SELECT 
     CONCAT(col_char, '-', col_varchar) as concatenated,
     UPPER(col_enum) as enum_upper,

storage/rapid_engine/handler/ha_shannon_rapid.cc

@@ -917,42 +917,23 @@ void NotifyDropTable(Table_ref *tab) {
  */
 static void read_off_page_data(TABLE *table,
                                ShannonBase::Populate::change_record_buff_t::off_page_data_t &off_page_data) {
-  const uint field_count = table->s->fields;
-  Field **fields = table->field;
-  for (uint idx = 0; idx < field_count; idx++) {
-    Field *fld = fields[idx];
-    uchar *base_ptr = fld->field_ptr();
+  for (uint idx = 0; idx < table->s->fields; idx++) {
+    Field *fld = *(table->field + idx);
+    if (!bitmap_is_set(table->read_set, idx) || fld->is_flag_set(NOT_SECONDARY_FLAG)) continue;
+
     if (likely(((fld->type() != MYSQL_TYPE_BLOB) && (fld->type() != MYSQL_TYPE_TINY_BLOB) &&
                 (fld->type() != MYSQL_TYPE_MEDIUM_BLOB) && (fld->type() != MYSQL_TYPE_LONG_BLOB))))
       continue;
+    if (fld->is_null()) continue;
 
     auto bfld = down_cast<Field_blob *>(fld);
-    uint pack_len = bfld->pack_length_no_ptr();
-    size_t data_len = 0;
-    switch (pack_len) {
-      case 1:
-        data_len = *base_ptr;
-        break;
-      case 2:
-        data_len = uint2korr(base_ptr);
-        break;
-      case 3:
-        data_len = uint3korr(base_ptr);
-        break;
-      case 4:
-        data_len = uint4korr(base_ptr);
-        break;
-      default:
-        continue;
-    }
-    uchar *blob_data_ptr = base_ptr + pack_len;
-    uchar *actual_blob_data = nullptr;
-    memcpy(&actual_blob_data, blob_data_ptr, sizeof(uchar *));
-    if (actual_blob_data && data_len > 0) {
-      std::shared_ptr<uchar[]> blob_copy(new uchar[data_len]);
-      std::memcpy(blob_copy.get(), actual_blob_data, data_len);
-      off_page_data.emplace(idx, std::make_pair(data_len, std::move(blob_copy)));
-    }
+    const size_t data_len = bfld->get_length();
+    const uchar *actual_blob_data = bfld->get_blob_data();
+    if (actual_blob_data == nullptr) continue;
+
+    std::shared_ptr<uchar[]> blob_copy(new uchar[data_len ? data_len : 1]);
+    std::memcpy(blob_copy.get(), actual_blob_data, data_len);
+    off_page_data.emplace(idx, std::make_pair(data_len, std::move(blob_copy)));
   }
 }
 

storage/rapid_engine/imcs/row0row.cpp

@@ -298,27 +298,10 @@ RowBuffer::FieldDataInfo RowBuffer::extract_field_data(const Rapid_load_context
         info.data_ptr = it->second.second.get();
       } else {  // parsed from record[0],record[1] by `load` operation.
         auto bfld = down_cast<Field_blob *>(fld);
-        uint pack_len = bfld->pack_length_no_ptr();
-        switch (pack_len) {
-          case 1:
-            info.data_len = *base_ptr;
-            break;
-          case 2:
-            info.data_len = uint2korr(base_ptr);
-            break;
-          case 3:
-            info.data_len = uint3korr(base_ptr);
-            break;
-          case 4:
-            info.data_len = uint4korr(base_ptr);
-            break;
-        }
-        // Advance past length prefix
-        base_ptr += pack_len;
-        // BLOB data maybe not in the page. stores off the page. Dereference blob pointer
-        uchar *blob_ptr = nullptr;
-        memcpy(&blob_ptr, base_ptr, sizeof(uchar *));
-        info.data_ptr = blob_ptr;
+        const size_t data_len = bfld->get_length();
+        auto *actual_blob_data = bfld->get_blob_data();
+        info.data_ptr = actual_blob_data;
+        info.data_len = data_len;
       }
       break;
     }