Skip to content

[BUGFIX] fix md5 hash for wid #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yannick-gafner wants to merge 3 commits into
base: 10.4
Choose a base branch
from
Open

[BUGFIX] fix md5 hash for wid #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6af6e0
[BUGFIX] fix md5 hash for wid
yannick-gafner Jan 31, 2023
2976bfe
[BUGFIX] prepare tables for larger hash
yannick-gafner Feb 3, 2023
ee9ea84
[BUGFIX] impede negative hashs
yannick-gafner Feb 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions Classes/Utility/IndexedSearchUtility.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,20 @@ public static function isTableUsed($tableName)
}

/**
* md5 integer hash
* Using 7 instead of 8 just because that makes the integers lower than 32 bit (28 bit) and so they do not interfere with UNSIGNED integers or PHP-versions which has varying output from the hexdec function.
* crc32 integer hash
*
* @param string $stringToHash String to hash
* @return int Integer interpretation of the md5 hash of input string.
*/
public static function md5inthash($stringToHash)
{
return hexdec(substr(md5($stringToHash), 0, 7));
$hash = current(unpack('l', pack('l', crc32($stringToHash))));
if($hash === abs($hash)) {
$hash = abs($hash) * 10;
} else {
$hash = abs($hash) * 10 + 1;
}
return $hash;
}

/**
Expand Down
30 changes: 15 additions & 15 deletions ext_tables.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
# Table structure for table 'index_phash'
#
CREATE TABLE index_phash (
phash int(11) DEFAULT '0' NOT NULL,
phash_grouping int(11) DEFAULT '0' NOT NULL,
phash bigint(20) DEFAULT '0' NOT NULL,
phash_grouping bigint(20) DEFAULT '0' NOT NULL,
static_page_arguments blob,
data_filename varchar(1024) DEFAULT '' NOT NULL,
data_page_id int(11) unsigned DEFAULT '0' NOT NULL,
Expand All @@ -17,7 +17,7 @@ CREATE TABLE index_phash (
item_mtime int(11) DEFAULT '0' NOT NULL,
tstamp int(11) unsigned DEFAULT '0' NOT NULL,
item_size int(11) DEFAULT '0' NOT NULL,
contentHash int(11) DEFAULT '0' NOT NULL,
contentHash bigint(20) DEFAULT '0' NOT NULL,
crdate int(11) DEFAULT '0' NOT NULL,
parsetime int(11) DEFAULT '0' NOT NULL,
sys_language_uid int(11) DEFAULT '0' NOT NULL,
Expand All @@ -35,7 +35,7 @@ CREATE TABLE index_phash (
# Table structure for table 'index_fulltext'
#
CREATE TABLE index_fulltext (
phash int(11) DEFAULT '0' NOT NULL,
phash bigint(20) DEFAULT '0' NOT NULL,
fulltextdata mediumtext,
metaphonedata mediumtext NOT NULL,
PRIMARY KEY (phash)
Expand All @@ -45,8 +45,8 @@ CREATE TABLE index_fulltext (
# Table structure for table 'index_rel'
#
CREATE TABLE index_rel (
phash int(11) DEFAULT '0' NOT NULL,
wid int(11) DEFAULT '0' NOT NULL,
phash bigint(20) DEFAULT '0' NOT NULL,
wid bigint(20) DEFAULT '0' NOT NULL,
count tinyint(3) unsigned DEFAULT '0' NOT NULL,
first int(11) unsigned DEFAULT '0' NOT NULL,
freq smallint(5) unsigned DEFAULT '0' NOT NULL,
Expand All @@ -59,9 +59,9 @@ CREATE TABLE index_rel (
# Table structure for table 'index_words'
#
CREATE TABLE index_words (
wid int(11) DEFAULT '0' NOT NULL,
wid bigint(20) DEFAULT '0' NOT NULL,
baseword varchar(60) DEFAULT '' NOT NULL,
metaphone int(11) DEFAULT '0' NOT NULL,
metaphone bigint(20) DEFAULT '0' NOT NULL,
is_stopword tinyint(3) DEFAULT '0' NOT NULL,
PRIMARY KEY (wid),
KEY baseword (baseword),
Expand All @@ -72,8 +72,8 @@ CREATE TABLE index_words (
# Table structure for table 'index_section'
#
CREATE TABLE index_section (
phash int(11) DEFAULT '0' NOT NULL,
phash_t3 int(11) DEFAULT '0' NOT NULL,
phash bigint(20) DEFAULT '0' NOT NULL,
phash_t3 bigint(20) DEFAULT '0' NOT NULL,
rl0 int(11) unsigned DEFAULT '0' NOT NULL,
rl1 int(11) unsigned DEFAULT '0' NOT NULL,
rl2 int(11) unsigned DEFAULT '0' NOT NULL,
Expand All @@ -90,9 +90,9 @@ CREATE TABLE index_section (
# Table structure for table 'index_grlist'
#
CREATE TABLE index_grlist (
phash int(11) DEFAULT '0' NOT NULL,
phash_x int(11) DEFAULT '0' NOT NULL,
hash_gr_list int(11) DEFAULT '0' NOT NULL,
phash bigint(20) DEFAULT '0' NOT NULL,
phash_x bigint(20) DEFAULT '0' NOT NULL,
hash_gr_list bigint(20) DEFAULT '0' NOT NULL,
gr_list varchar(255) DEFAULT '' NOT NULL,
uniqid int(11) NOT NULL auto_increment,
PRIMARY KEY (uniqid),
Expand All @@ -108,7 +108,7 @@ CREATE TABLE index_stat_search (
searchstring varchar(255) DEFAULT '' NOT NULL,
searchoptions blob,
tstamp int(11) DEFAULT '0' NOT NULL,
feuser_id int(11) unsigned DEFAULT '0' NOT NULL,
feuser_id bigint(20) unsigned DEFAULT '0' NOT NULL,
cookie varchar(32) DEFAULT '' NOT NULL,
IP varchar(255) DEFAULT '' NOT NULL,
hits int(11) DEFAULT '0' NOT NULL,
Expand All @@ -119,7 +119,7 @@ CREATE TABLE index_stat_search (
# Table structure for table 'index_debug'
#
CREATE TABLE index_debug (
phash int(11) DEFAULT '0' NOT NULL,
phash bigint(20) DEFAULT '0' NOT NULL,
debuginfo mediumtext,
PRIMARY KEY (phash)
);
Expand Down