mirror of
https://github.com/MariaDB/server.git
synced 2025-08-08 11:22:35 +03:00
Merge branch '10.5' into 10.6
This commit is contained in:
@@ -19,7 +19,7 @@ MY_ADD_TESTS(bitmap base64 my_atomic my_rdtsc lf my_malloc my_getopt dynstring
|
||||
MY_ADD_TESTS(my_vsnprintf LINK_LIBRARIES strings mysys)
|
||||
MY_ADD_TESTS(aes LINK_LIBRARIES mysys mysys_ssl)
|
||||
ADD_DEFINITIONS(${SSL_DEFINES})
|
||||
INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
|
||||
INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIRS})
|
||||
MY_ADD_TESTS(ma_dyncol LINK_LIBRARIES mysys)
|
||||
|
||||
IF(WIN32)
|
||||
|
@@ -1,4 +1,4 @@
|
||||
/* Copyright (c) MariaDB 2020
|
||||
/* Copyright (c) MariaDB 2020, 2024
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public License as
|
||||
@@ -19,51 +19,127 @@
|
||||
#include <tap.h>
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
#include <zlib.h>
|
||||
|
||||
/*
|
||||
Check that optimized crc32 (ieee, or ethernet polynomical) returns the same
|
||||
result as zlib (not so well optimized, yet, but trustworthy)
|
||||
The following lookup table oriented computation of CRC-32
|
||||
is based on the Public Domain / Creative Commons CC0 Perl code from
|
||||
http://billauer.co.il/blog/2011/05/perl-crc32-crc-xs-module/
|
||||
*/
|
||||
#define DO_TEST_CRC32(crc,str) \
|
||||
ok(crc32(crc,(const Bytef *)str,(uint)(sizeof(str)-1)) == my_checksum(crc, str, sizeof(str)-1), "crc32 '%s'",str)
|
||||
|
||||
/* Check that CRC32-C calculation returns correct result*/
|
||||
#define DO_TEST_CRC32C(crc,str,expected) \
|
||||
do { \
|
||||
unsigned int v = my_crc32c(crc, str, sizeof(str)-1); \
|
||||
printf("crc32(%u,'%s',%zu)=%u\n",crc,str,sizeof(str)-1,v); \
|
||||
ok(expected == my_crc32c(crc, str, sizeof(str)-1),"crc32c '%s'",str); \
|
||||
}while(0)
|
||||
/** Lookup tables */
|
||||
static uint32 tab_3309[256], tab_castagnoli[256];
|
||||
|
||||
/** Initialize a lookup table for a CRC-32 polynomial */
|
||||
static void init_lookup(uint32 *tab, uint32 polynomial)
|
||||
{
|
||||
unsigned i;
|
||||
for (i= 0; i < 256; i++)
|
||||
{
|
||||
uint32 x= i;
|
||||
unsigned j;
|
||||
for (j= 0; j < 8; j++)
|
||||
if (x & 1)
|
||||
x= (x >> 1) ^ polynomial;
|
||||
else
|
||||
x>>= 1;
|
||||
tab[i]= x;
|
||||
}
|
||||
}
|
||||
|
||||
#define LONG_STR "1234567890234568900212345678901231213123321212123123123123123"\
|
||||
"............................................................................." \
|
||||
"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" \
|
||||
"yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy" \
|
||||
"zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz"
|
||||
/** Compute a CRC-32 one octet at a time based on a lookup table */
|
||||
static uint crc_(uint32 crc, const void *buf, size_t len, const uint32 *tab)
|
||||
{
|
||||
const unsigned char *b= buf;
|
||||
const unsigned char *const end = b + len;
|
||||
crc^= 0xffffffff;
|
||||
while (b != end)
|
||||
crc= ((crc >> 8) & 0xffffff) ^ tab[(crc ^ *b++) & 0xff];
|
||||
crc^= 0xffffffff;
|
||||
return crc;
|
||||
}
|
||||
|
||||
static uint crc32(uint32 crc, const void *buf, size_t len)
|
||||
{ return crc_(crc, buf, len, tab_3309); }
|
||||
static uint crc32c(uint32 crc, const void *buf, size_t len)
|
||||
{ return crc_(crc, buf, len, tab_castagnoli); }
|
||||
|
||||
static char buf[16384];
|
||||
|
||||
typedef uint (*check)(uint32, const void*, size_t);
|
||||
|
||||
static size_t test_buf(check c1, check c2)
|
||||
{
|
||||
size_t s;
|
||||
for (s= sizeof buf; s; s--)
|
||||
if (c1(0, buf, s) != c2(0, buf, s))
|
||||
break;
|
||||
return s;
|
||||
}
|
||||
|
||||
#define DO_TEST_CRC32(crc,str,len) \
|
||||
ok(crc32(crc,str,len) == my_checksum(crc, str, len), \
|
||||
"crc32(%u,'%.*s')", crc, (int) len, str)
|
||||
|
||||
/* Check that CRC-32C calculation returns correct result*/
|
||||
#define DO_TEST_CRC32C(crc,str,len) \
|
||||
ok(crc32c(crc,str,len) == my_crc32c(crc, str, len), \
|
||||
"crc32c(%u,'%.*s')", crc, (int) len, str)
|
||||
|
||||
static const char STR[]=
|
||||
"123456789012345678900212345678901231213123321212123123123123123"
|
||||
"..........................................................................."
|
||||
"xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
|
||||
"yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy"
|
||||
"zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz";
|
||||
|
||||
int main(int argc __attribute__((unused)),char *argv[])
|
||||
{
|
||||
MY_INIT(argv[0]);
|
||||
plan(14);
|
||||
init_lookup(tab_3309, 0xedb88320);
|
||||
init_lookup(tab_castagnoli, 0x82f63b78);
|
||||
|
||||
plan(36);
|
||||
printf("%s\n",my_crc32c_implementation());
|
||||
DO_TEST_CRC32(0,"");
|
||||
DO_TEST_CRC32(1,"");
|
||||
DO_TEST_CRC32(0,"12345");
|
||||
DO_TEST_CRC32(1,"12345");
|
||||
DO_TEST_CRC32(0,"1234567890123456789");
|
||||
DO_TEST_CRC32(0, LONG_STR);
|
||||
DO_TEST_CRC32(0,STR,0);
|
||||
DO_TEST_CRC32(1,STR,0);
|
||||
DO_TEST_CRC32(0,STR,3);
|
||||
DO_TEST_CRC32(0,STR,5);
|
||||
DO_TEST_CRC32(1,STR,5);
|
||||
DO_TEST_CRC32(0,STR,15);
|
||||
DO_TEST_CRC32(0,STR,16);
|
||||
DO_TEST_CRC32(0,STR,19);
|
||||
DO_TEST_CRC32(0,STR,32);
|
||||
DO_TEST_CRC32(0,STR,63);
|
||||
DO_TEST_CRC32(0,STR,64);
|
||||
DO_TEST_CRC32(0,STR,65);
|
||||
DO_TEST_CRC32(0,STR,255);
|
||||
DO_TEST_CRC32(0,STR,256);
|
||||
DO_TEST_CRC32(0,STR,257);
|
||||
DO_TEST_CRC32(0,STR,(sizeof(STR)-1));
|
||||
ok(0 == my_checksum(0, NULL, 0) , "crc32 data = NULL, length = 0");
|
||||
|
||||
DO_TEST_CRC32C(0,"", 0);
|
||||
DO_TEST_CRC32C(1,"", 1);
|
||||
DO_TEST_CRC32C(0, "12345", 416359221);
|
||||
DO_TEST_CRC32C(1, "12345", 549473433);
|
||||
DO_TEST_CRC32C(0, "1234567890123456789", 2366987449U);
|
||||
DO_TEST_CRC32C(0, LONG_STR, 3009234172U);
|
||||
DO_TEST_CRC32C(0,STR,0);
|
||||
DO_TEST_CRC32C(1,STR,0);
|
||||
DO_TEST_CRC32C(0,STR,3);
|
||||
DO_TEST_CRC32C(0,STR,5);
|
||||
DO_TEST_CRC32C(1,STR,5);
|
||||
DO_TEST_CRC32C(0,STR,15);
|
||||
DO_TEST_CRC32C(0,STR,16);
|
||||
DO_TEST_CRC32C(0,STR,19);
|
||||
DO_TEST_CRC32C(0,STR,32);
|
||||
DO_TEST_CRC32C(0,STR,63);
|
||||
DO_TEST_CRC32C(0,STR,64);
|
||||
DO_TEST_CRC32C(0,STR,65);
|
||||
DO_TEST_CRC32C(0,STR,255);
|
||||
DO_TEST_CRC32C(0,STR,256);
|
||||
DO_TEST_CRC32C(0,STR,257);
|
||||
DO_TEST_CRC32C(0,STR,(sizeof(STR)-1));
|
||||
ok(0 == my_crc32c(0, NULL, 0), "crc32c data = NULL, length = 0");
|
||||
|
||||
memset(buf, 0x5a, sizeof buf);
|
||||
ok(0 == test_buf(my_checksum, crc32), "crc32 with various lengths");
|
||||
ok(0 == test_buf(my_crc32c, crc32c), "crc32c with various lengths");
|
||||
|
||||
my_end(0);
|
||||
return exit_status();
|
||||
}
|
||||
|
Reference in New Issue
Block a user