Skip to content

Commit 984bcb2

Browse files
Return back test for zstd compression
Fixed sqlite tests Update readme
1 parent 601717c commit 984bcb2

9 files changed

+37
-9
lines changed

README.en.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ Required modules for full php testing:
2727
- memcache
2828
- redis
2929
- sqlite3
30+
- mysql/mysqli
31+
- pgsql
3032

3133
Usually they are already installed or "compiled" in php.
3234

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
- memcache
2828
- redis
2929
- sqlite3
30+
- mysql/mysqli
31+
- pgsql
3032

3133
Обычно они уже установлены или "вкомпилированны" в php.
3234

bench.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2018,7 +2018,7 @@ function print_results_common()
20182018
. str_pad("bz2", $padInfo, ' ', STR_PAD_LEFT) . " : $has_bz2\n"
20192019
. str_pad("lz4", $padInfo, ' ', STR_PAD_LEFT) . " : $has_lz4\n"
20202020
. str_pad("snappy", $padInfo, ' ', STR_PAD_LEFT) . " : $has_snappy\n"
2021-
. str_pad("zstd", $padInfo, ' ', STR_PAD_LEFT) . " : $has_zstd, version: ".LIBZSTD_VERSION_STRING."\n"
2021+
. str_pad("zstd", $padInfo, ' ', STR_PAD_LEFT) . " : $has_zstd, version: ".LIBZSTD_VERSION_STRING.";\n"
20222022
. str_pad("brotli", $padInfo, ' ', STR_PAD_LEFT) . " : $has_brotli\n"
20232023
. str_pad("uuid", $padInfo, ' ', STR_PAD_LEFT) . " : $has_uuid\n"
20242024
. str_pad("-affecting->", $padInfo, ' ', STR_PAD_LEFT) . "\n"

compression-zstd.inc

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?php
2+
/**
3+
* php test functions for compression by brotli
4+
* Php 5.2+
5+
*/
6+
7+
/** ---------------------------------- Tests functions -------------------------------------------- */
8+
9+
function test_36_zstd_compress()
10+
{
11+
global $stringTest, $emptyResult, $testsLoopLimits, $totalOps, $stringTest;
12+
13+
if (!function_exists('zstd_compress')) {
14+
return $emptyResult;
15+
}
16+
17+
$count = $testsLoopLimits['36_zstd_compress'];
18+
$time_start = get_microtime();
19+
for ($i = 0; $i < $count; $i++) {
20+
$r = zstd_compress($stringTest, 1);
21+
}
22+
$totalOps += $count;
23+
return format_result_test(get_microtime() - $time_start, $count, mymemory_usage());
24+
}

kv-pgsql.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ function test_47_kvs_pgsql()
3939
$time_start = get_microtime();
4040

4141
for ($i = 0; $i < $count; $i++) {
42-
$num = $i / 100.;
42+
$num = number_format($i / 100., 2, '.', '');
4343
$kvstorage->set($i, $num);
4444
$v=$kvstorage->get($i);
4545
$kvstorage->del($i);

kv-sqlite3-devshm-file.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ function test_39_08_kvs_sqlite3_devshm_file()
3939
$time_start = get_microtime();
4040

4141
for ($i = 0; $i < $count; $i++) {
42-
$num = $i / 100.;
42+
$num = number_format($i / 100., 2, '.', '');
4343
$kvstorage->set($i, $num);
4444
$v=$kvstorage->get($i);
45-
if ($v===$num) $kvstorage->del($i);
45+
$kvstorage->del($i);
4646
}
4747
$kvstorage->close();
4848
$totalOps += $count;

kv-sqlite3-generic-file.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ function test_39_07_kvs_sqlite3_generic_file()
3939
$time_start = get_microtime();
4040

4141
for ($i = 0; $i < $count; $i++) {
42-
$num = $i / 100.;
42+
$num = number_format($i / 100., 2, '.', '');
4343
$kvstorage->set($i, $num);
4444
$v=$kvstorage->get($i);
45-
if ($v===$num) $kvstorage->del($i);
45+
$kvstorage->del($i);
4646
}
4747
$kvstorage->close();
4848
$totalOps += $count;

kv-sqlite3-memory-file.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ function test_39_09_kvs_sqlite3_memory_file()
3939
$time_start = get_microtime();
4040

4141
for ($i = 0; $i < $count; $i++) {
42-
$num = $i / 100.;
42+
$num = number_format( $i / 100., 2, '.', '');
4343
$kvstorage->set($i, $num);
4444
$v=$kvstorage->get($i);
45-
if ($v===$num) $kvstorage->del($i);
45+
$kvstorage->del($i);
4646
}
4747
$kvstorage->close();
4848
$totalOps += $count;

kvstorage-sqlite3.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class KVStorageSqlite3
5959

6060
public function del($key){
6161
if (!$this->available) return 0;
62-
$this->db->exec("DELETE {$this->tableName} WHERE key=$key;");
62+
$this->db->exec("DELETE FROM {$this->tableName} WHERE key=$key;");
6363
return $this->db->changes();
6464
}
6565

0 commit comments

Comments
 (0)