From 3a11ac532478794f7ae91cb658ce1c1d306d9917 Mon Sep 17 00:00:00 2001 From: Ashish Tiwari Date: Fri, 17 Jan 2025 14:10:29 +0530 Subject: [PATCH] revert: adding lj-releng file (#11881) --- .gitignore | 1 + .licenserc.yaml | 1 - utils/lj-releng | 221 ------------------------------------------------ 3 files changed, 1 insertion(+), 222 deletions(-) delete mode 100755 utils/lj-releng diff --git a/.gitignore b/.gitignore index 549d9384a541..94669c34502a 100644 --- a/.gitignore +++ b/.gitignore @@ -56,6 +56,7 @@ uwsgi_temp proxy_temp fastcgi_temp client_body_temp +utils/lj-releng utils/reindex *.etcd/ t/lib/dubbo*/**/target/ diff --git a/.licenserc.yaml b/.licenserc.yaml index 570155fbc249..edb970dc74b4 100644 --- a/.licenserc.yaml +++ b/.licenserc.yaml @@ -55,6 +55,5 @@ header: - '.luacheckrc' # Exclude file contains certificate revocation information - 't/certs/ocsp/index.txt' - - 'utils/lj-releng' comment: on-failure diff --git a/utils/lj-releng b/utils/lj-releng deleted file mode 100755 index b2c5040d0f09..000000000000 --- a/utils/lj-releng +++ /dev/null @@ -1,221 +0,0 @@ -#!/usr/bin/env perl -# Copyright (c) 2011-2017, Yichun "agentzh" Zhang (章亦春) agentzh@gmail.com, OpenResty Inc. - -# This module is licensed under the terms of the BSD license. - -# Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -# Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -# Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -use strict; -use warnings; - -use Getopt::Std; - -my (@luas, @tests); - -my $hits = 0; -my $RED = "\033[1;31m"; -my $NC = "\033[0m"; # No Color - -my %opts; -getopts('Lse', \%opts) or die "Usage: lj-releng [-L] [-s] [-e] [files]\n"; - -my $silent = $opts{s}; -my $stop_on_error = $opts{e}; -my $no_long_line_check = $opts{L}; - -my $check_lua_ver = "luajit -v | awk '{print\$2}'| grep 2.1"; -my $output = `$check_lua_ver`; -if ($output eq '') { - die "ERROR: lj-releng ONLY supports LuaJIT 2.1!\n"; -} - -if ($#ARGV != -1) { - @luas = @ARGV; - -} else { - @luas = split /\n/, `find . -name '*.lua'`; - if (-d 't') { - @tests = map glob, qw{ t/*.t t/*/*.t t/*/*/*.t }; - } -} - -for my $f (sort @luas) { - process_file($f); -} - -for my $t (@tests) { - blank(qq{grep -H -n --color -E '\\--- ?(ONLY|LAST)' $t}); -} - -if ($hits) { - exit 1; -} - -# p: prints a string to STDOUT appending \n -# w: prints a string to STDERR appending \n -# Both respect the $silent value -sub p { print "$_[0]\n" if (!$silent) } -sub w { warn "$_[0]\n" if (!$silent) } - -# blank: runs a command and looks at the output. If the output is not -# blank it is printed (and the program dies if stop_on_error is 1) -sub blank { - my ($command) = @_; - if ($stop_on_error) { - my $output = `$command`; - if ($output ne '') { - die $output; - } - } else { - system($command); - } -} - -my $version; -sub process_file { - my $file = shift; - # Check the sanity of each .lua file - open my $in, $file or - die "ERROR: Can't open $file for reading: $!\n"; - my $found_ver; - while (<$in>) { - my ($ver, $skipping); - if (/(?x) (?:_VERSION|version) \s* = .*? ([\d\.]*\d+) (.*? SKIP)?/) { - my $orig_ver = $ver = $1; - $found_ver = 1; - $skipping = $2; - $ver =~ s{^(\d+)\.(\d{3})(\d{3})$}{join '.', int($1), int($2), int($3)}e; - print("$file: $orig_ver ($ver)\n"); - last; - - } elsif (/(?x) (?:_VERSION|version) \s* = \s* ([a-zA-Z_]\S*)/) { - print("$file: $1\n"); - $found_ver = 1; - last; - } - - if ($ver and $version and !$skipping) { - if ($version ne $ver) { - die "$file: $ver != $version\n"; - } - } elsif ($ver and !$version) { - $version = $ver; - } - } - # if (!$found_ver) { - # w("WARNING: No \"_VERSION\" or \"version\" field found in `$file`."); - # } - close $in; - - #p("Checking use of Lua global variables in file $file..."); - #p("op no. line opcode args ; code"); - my $cmd = "luajit -bL $file"; - open $in, "$cmd|" - or die "cannot open output pipe for \"$cmd\": $!"; - my @sections; - my $sec; - while (<$in>) { - - #warn "line: $_"; - - if (/^-- BYTECODE -- \S.*?:(\d+)-\d+$/) { - my $def_line = $1; - #warn "$file: $line"; - if (defined $sec) { - push @sections, $sec; - - } - $sec = { - def_line => $def_line, - gsets => [], - ggets => [], - }; - next; - } - - if (/^ \d+ \s+ \[ (\d+) \] \s+ (?: \W+ \s+ )? G([GS])ET \s+ .*? ; \s+ \"([^"]+)" $/x) { - my ($line, $op, $name) = ($1, $2, $3); - - #warn "found: $line $op $name"; - if ($op eq 'S') { - push @{ $sec->{gsets} }, [$line, $name]; - } else { - push @{ $sec->{ggets} }, [$line, $name]; - } - - next; - } - - if (/^ \d+ \s+ \[ \d+ \] \s+ (G[GS]ET) \s+ $/x) { - die "bad $1 instruction: $_"; - } - } - close $in; - - if (defined $sec) { - push @sections, $sec; - } - - my $last_idx = $#sections; - my $i = 0; - for my $sec (@sections) { - my $def_line = $sec->{def_line}; - - my $gsets = $sec->{gsets}; - my $ggets = $sec->{ggets}; - - for my $gset (@$gsets) { - $hits++; - my ($line, $name) = @$gset; - warn "${RED}ERROR${NC}: $file: line $line: setting the Lua global ", - "\"$name\"\n"; - } - - if ($i == $last_idx) { - # being the top-level chunk - - for my $gget (@$ggets) { - my ($line, $name) = @$gget; - - if ($name =~ /^ (?: require|type|tostring|error|ngx|ndk|jit - |setmetatable|getmetatable|string|table|io - |os|print|tonumber|math|pcall|xpcall|unpack - |pairs|ipairs|assert|module|package - |coroutine|[gs]etfenv|next|rawget|rawset - |loadstring|dofile|collectgarbage|load - |rawlen|select|arg|bit|debug|ngx|ndk|newproxy)$/x) - { - next; - } - - $hits++; - warn "${RED}ERROR${NC}: $file: line $line: getting the Lua ", - "global \"$name\"\n"; - } - - next; - } - - for my $gget (@$ggets) { - $hits++; - my ($line, $name) = @$gget; - warn "${RED}ERROR${NC}: $file: line $line: getting the Lua ", - "global \"$name\"\n"; - } - - } continue { - $i++; - } - - if ($stop_on_error && $hits > 0) { - exit 1 - } - - unless ($no_long_line_check) { - p("Checking line length exceeding 100..."); - blank("grep -H -n -E --color '.{101}' $file | awk '{ print \"ERROR:\" \$0 }'"); - } -}