Skip to content

Improve --regex-limit logic #70

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

Merged
miya0001 merged 6 commits into from
Feb 18, 2018
Merged

Improve --regex-limit logic #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fb17561
reverse order of arguments, to keep bc
Feb 17, 2018
e559ecf
add default value for regex_limit
Feb 17, 2018
cb0cbf3
change option description as per comment
Feb 17, 2018
abc8f4c
validate and assign regex_limit
Feb 17, 2018
77adaac
use preg_replace count
Feb 17, 2018
8038f09
revert unneeded changes
Feb 17, 2018
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
34 changes: 15 additions & 19 deletions src/Search_Replace_Command.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ class Search_Replace_Command extends WP_CLI_Command {
private $dry_run;
private $export_handle = false;
private $export_insert_size;
private $regex_limit;
private $recurse_objects;
private $regex;
private $regex_flags;
private $regex_delimiter;
private $regex_limit = 1;
private $skip_tables;
private $skip_columns;
private $include_columns;
Expand Down Expand Up @@ -109,7 +109,7 @@ class Search_Replace_Command extends WP_CLI_Command {
* : The delimiter to use for the regex. It must be escaped if it appears in the search string. The default value is the result of `chr(1)`.
*
* [--regex-limit=<regex-limit>]
* : The maximum possible replacements for each pattern in each subject string. Defaults to `-1` (no limit).
* : The maximum possible replacements for the regex in each unserialized data bit per row. Defaults to `-1` (no limit).
*
* [--format=<format>]
* : Render output in a particular format.
Expand Down Expand Up @@ -172,10 +172,6 @@ public function __invoke( $args, $assoc_args ) {
$this->recurse_objects = \WP_CLI\Utils\get_flag_value( $assoc_args, 'recurse-objects', true );
$this->verbose = \WP_CLI\Utils\get_flag_value( $assoc_args, 'verbose' );
$this->format = \WP_CLI\Utils\get_flag_value( $assoc_args, 'format' );
$this->regex_limit = \WP_CLI\Utils\get_flag_value( $assoc_args, 'regex-limit', -1 );
if ( 0 === intval( $this->regex_limit ) ) {
WP_CLI::error( '`--regex-limit` expects integer.' );
}

if ( ( $this->regex = \WP_CLI\Utils\get_flag_value( $assoc_args, 'regex', false ) ) ) {
$this->regex_flags = \WP_CLI\Utils\get_flag_value( $assoc_args, 'regex-flags', false );
Expand Down Expand Up @@ -204,6 +200,12 @@ public function __invoke( $args, $assoc_args ) {
}
WP_CLI::error( $msg );
}
if ( ( $regex_limit = (int) \WP_CLI\Utils\get_flag_value( $assoc_args, 'regex-limit', - 1 ) ) > - 1 ) {
if ( ! preg_match( '/^[0-9]+$/', $regex_limit ) ) {
WP_CLI::error( '`--regex-limit` expects a positive integer.' );
}
$this->regex_limit = $regex_limit;
}
}

$this->skip_columns = explode( ',', \WP_CLI\Utils\get_flag_value( $assoc_args, 'skip-columns' ) );
Expand Down Expand Up @@ -412,7 +414,7 @@ private function php_export_table( $table, $old, $new ) {
'chunk_size' => $chunk_size
);

$replacer = new \WP_CLI\SearchReplacer( $old, $new, $this->recurse_objects, $this->regex, $this->regex_flags, $this->regex_delimiter, $this->regex_limit );
$replacer = new \WP_CLI\SearchReplacer( $old, $new, $this->recurse_objects, $this->regex, $this->regex_flags, $this->regex_delimiter, false, $this->regex_limit );
$col_counts = array_fill_keys( $all_columns, 0 );
if ( $this->verbose && 'table' === $this->format ) {
$this->start_time = microtime( true );
Expand Down Expand Up @@ -486,7 +488,7 @@ private function php_handle_col( $col, $primary_keys, $table, $old, $new ) {
global $wpdb;

$count = 0;
$replacer = new \WP_CLI\SearchReplacer( $old, $new, $this->recurse_objects, $this->regex, $this->regex_flags, $this->regex_delimiter, $this->regex_limit, null !== $this->log_handle );
$replacer = new \WP_CLI\SearchReplacer( $old, $new, $this->recurse_objects, $this->regex, $this->regex_flags, $this->regex_delimiter, null !== $this->log_handle, $this->regex_limit );

$table_sql = self::esc_sql_ident( $table );
$col_sql = self::esc_sql_ident( $col );
Expand Down Expand Up @@ -808,16 +810,12 @@ private function log_bits( $search_regex, $old_data, $old_matches, $new ) {
$diff += strlen( $new ) - strlen( $old_matches[0][ $i ][0] );
$i++;
return $new;
}, $old_data, $this->regex_limit );
}, $old_data, $this->regex_limit, $match_cnt );

$old_bits = $new_bits = array();
$append_next = false;
$last_old_offset = $last_new_offset = 0;
$match_cnt = count( $old_matches[0] );
for ( $i = 0; $i < $match_cnt; $i++ ) {
if ( empty( $old_matches[0][ $i ] ) || empty( $new_matches[0][ $i ] ) ) {
continue;
}
$old_match = $old_matches[0][ $i ][0];
$old_offset = $old_matches[0][ $i ][1];
$new_match = $new_matches[0][ $i ][0];
Expand All @@ -841,12 +839,10 @@ private function log_bits( $search_regex, $old_data, $old_matches, $new ) {
$new_after = \cli\safe_substr( substr( $new_data, $new_end_offset ), 0, $this->log_after_context, false /*is_width*/, $encoding );
// To lessen context duplication in output, shorten the after context if it overlaps with the next match.
if ( $i + 1 < $match_cnt && $old_end_offset + strlen( $old_after ) > $old_matches[0][ $i + 1 ][1] ) {
if ( ! empty( $old_matches[0][ $i + 1 ] ) && ! empty( $new_matches[0][ $i + 1 ] ) ) {
$old_after = substr( $old_after, 0, $old_matches[0][ $i + 1 ][1] - $old_end_offset );
$new_after = substr( $new_after, 0, $new_matches[0][ $i + 1 ][1] - $new_end_offset );
$after_shortened = true;
// On the next iteration, will append with no before context.
}
$old_after = substr( $old_after, 0, $old_matches[0][ $i + 1 ][1] - $old_end_offset );
$new_after = substr( $new_after, 0, $new_matches[0][ $i + 1 ][1] - $new_end_offset );
$after_shortened = true;
// On the next iteration, will append with no before context.
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/WP_CLI/SearchReplacer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class SearchReplacer {
* @param integer $regex_limit The maximum possible replacements for each pattern in each subject string.
* @param bool $logging Whether logging.
*/
function __construct( $from, $to, $recurse_objects = false, $regex = false, $regex_flags = '', $regex_delimiter = '/', $regex_limit = -1, $logging = false ) {
function __construct( $from, $to, $recurse_objects = false, $regex = false, $regex_flags = '', $regex_delimiter = '/', $logging = false, $regex_limit = -1 ) {
$this->from = $from;
$this->to = $to;
$this->recurse_objects = $recurse_objects;
Expand Down