fix issue 17

Author: ddcw

README.md

@@ -188,6 +188,7 @@ python3 main.py --sdi-table /data/mysql_3314/mysqldata/ibd2sql/ddcw_alltype_tabl
 6. [默认值为时间戳](https://github.com/ddcw/ibd2sql/issues/8) : 支持默认值为时间戳, blob等字段的前缀索引
 7. [8.0.12 无hidden](https://github.com/ddcw/ibd2sql/issues/10) : 取消hidden检查
 8. [ONLINE DDL instant](https://github.com/ddcw/ibd2sql/issues/12) : record 1-2 bit is instant flag
+9. [mysql 5.7 解析无数据](https://github.com/ddcw/ibd2sql/issues/17) : mysql 5.7无SDI PAGE, INODE不需要去掉第一个INDEX
 
 
 

ibd2sql/ibd2sql.py

@@ -131,17 +131,12 @@ def init(self):
 		#inode page
 		self.debug(f'ANALYZE PAGE INODE (PAGE_ID=2) (for get index)')
 		self.PAGE_ID = 2 #inode
-		if self.MYSQL5:
-			self.first_leaf_page = 2
-		else:
-			self.inode = inode(self.read())
-			self.debug("FIRST INDEX (Non-leaf and leaf page) :",self.inode.index_page[0]," (-1 is None)")
-			self.first_no_leaf_page = self.inode.index_page[0][0]
-			self.first_leaf_page = self.inode.index_page[0][1] 
+		self.inode = inode(self.read(),MYSQL5=self.MYSQL5)
+		self.debug("FIRST INDEX (Non-leaf and leaf page) :",self.inode.index_page[0]," (-1 is None)")
+		self.first_no_leaf_page = self.inode.index_page[0][0]
+		self.first_leaf_page = self.inode.index_page[0][1] 
 		#self.debug("START FIND FIRST LEAF PAGE")
-		if self.MYSQL5:
-			self.first_leaf_page = 4
-		elif self.first_leaf_page < 3 or self.first_leaf_page >= 4294967295 or True:
+		if self.first_leaf_page < 3 or self.first_leaf_page >= 4294967295 or True:
 			self.init_first_leaf_page()
 		self.debug("FIRST LEAF PAGE ID:",self.first_leaf_page )
 		self.debug("#############################################################################")

ibd2sql/innodb_page_inode.py

@@ -28,6 +28,7 @@ def __init__(self,*args,**kwargs):
 		super().__init__(*args,**kwargs)
 		if self.FIL_PAGE_TYPE != 3:
 			return False
+		self.MYSQL5 = kwargs['MYSQL5']
 		self.page_name = 'INODE'
 		self.EXTRA_PAGE = True #假装还有额外的Inode page
 		self._init_inodeinfo()
@@ -56,7 +57,8 @@ def _segment(self):
 			}
 
 	def _init_segment(self):
-		self.FSEG_SDI = (self._segment(),self._segment())
+		if not self.MYSQL5: # fix issue 17   mysql57没得sdi信息, 就不用去掉第一个index了
+			self.FSEG_SDI = (self._segment(),self._segment())
 		self.FSEG = [] #(non_leaf_page, leaf_page)
 		for x in range(85):
 			_fseg = self._segment()