From: Tom Lane <tgl@sss.pgh.pa.us>
To: Amit Kapila <amit.kapila16@gmail.com>
cc: Peter Eisentraut <peter.eisentraut@enterprisedb.com>,
        Andres Freund <andres@anarazel.de>,
        David Rowley <dgrowleyml@gmail.com>,
        pgsql-hackers <pgsql-hackers@postgresql.org>
Subject: Re: automatically generating node support functions
In-reply-to: 
 <CAA4eK1L_BZG2SJCO8kKp7q0d3v=x6gJT5N5k9h3CFWDc4ab61A@mail.gmail.com>
References: <1294462.1656875649@sss.pgh.pa.us>
 <57df9f30-d2cf-9126-28d4-ae40a2e733a9@enterprisedb.com>
 <1593978.1656953960@sss.pgh.pa.us>
 <b53b92e0-1153-a31a-8c52-157fa2e07771@enterprisedb.com>
 <2592455.1657140387@sss.pgh.pa.us> <3302658.1657288366@sss.pgh.pa.us>
 <3488143.1657310625@sss.pgh.pa.us>
 <11148777-fbe2-5188-195d-48f5083573c5@enterprisedb.com>
 <20220710214622.haiektrjzisob6rl@awork3.anarazel.de>
 <815831.1657494597@sss.pgh.pa.us>
 <45f508cb-e30b-c252-e081-4548deafa34c@enterprisedb.com>
 <1116889.1657553859@sss.pgh.pa.us> <1201553.1657562258@sss.pgh.pa.us>
 <101171fc-da4c-7799-991d-65ad84f53d7d@enterprisedb.com>
 <CAA4eK1KQk4vP-3mTAz26h-PRUZaGu8Fc=q-ZKSajsAthH0A15w@mail.gmail.com>
 <2963323.1659534404@sss.pgh.pa.us>
 <CAA4eK1+xMj83Uz8jQq-Yf2ezyN_nqkUcmnL3sAPXNgtje2Shwg@mail.gmail.com>
 <243301.1659883752@sss.pgh.pa.us>
 <CAA4eK1L_BZG2SJCO8kKp7q0d3v=x6gJT5N5k9h3CFWDc4ab61A@mail.gmail.com>
Comments: In-reply-to Amit Kapila <amit.kapila16@gmail.com>
	message dated "Mon, 08 Aug 2022 12:23:25 +0530"
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="----- =_aaaaaaaaaa0"
Content-ID: <643882.1659981926.0@sss.pgh.pa.us>
Date: Mon, 08 Aug 2022 14:06:00 -0400
Message-ID: <643912.1659981960@sss.pgh.pa.us>
Archived-At: 
 <https://www.postgresql.org/message-id/643912.1659981960%40sss.pgh.pa.us>
Precedence: bulk

------- =_aaaaaaaaaa0
Content-Type: text/plain; charset="us-ascii"
Content-ID: <643882.1659981926.1@sss.pgh.pa.us>

Amit Kapila <amit.kapila16@gmail.com> writes:
> On Sun, Aug 7, 2022 at 8:19 PM Tom Lane <tgl@sss.pgh.pa.us> wrote:
>> Meh ... it's not checking the data files themselves.  Here's
>> a patch based on the logic for invoking genbki.  Completely
>> untested, would somebody try it?

> I tried it on commit a69959fab2 just before the commit (1349d2790b)
> which was causing problems for me. On running "perl mkvcbuild.pl", I
> got the below error:
> wrong number of input files, expected nodes/nodes.h nodes/primnodes.h
> nodes/parsenodes.h nodes/pathnodes.h nodes/plannodes.h
> nodes/execnodes.h access/amapi.h access/sdir.h access/tableam.h
> access/tsmapi.h commands/event_trigger.h commands/trigger.h
> executor/tuptable.h foreign/fdwapi.h nodes/extensible.h
> nodes/lockoptions.h nodes/replnodes.h nodes/supportnodes.h
> nodes/value.h utils/rel.h

Ah.  It'd help if that complaint said what the command input actually
is :-(.  But on looking closer, I missed stripping the empty strings
that "split" will produce at the ends of the array.  I think the
attached will do the trick, and I really do want to get rid of this
copy of the file list if possible.

			regards, tom lane


------- =_aaaaaaaaaa0
Content-Type: text/x-diff;
	name="msvc-check-for-obsolete-node-support-3.patch";
	charset="us-ascii"
Content-ID: <643882.1659981926.2@sss.pgh.pa.us>
Content-Description: msvc-check-for-obsolete-node-support-3.patch
Content-Transfer-Encoding: quoted-printable

diff --git a/src/backend/nodes/gen_node_support.pl b/src/backend/nodes/gen=
_node_support.pl
index 86cf1b39d0..b707a09f56 100644
--- a/src/backend/nodes/gen_node_support.pl
+++ b/src/backend/nodes/gen_node_support.pl
@@ -174,7 +174,7 @@ push @scalar_types, qw(QualCost);
 =

 =

 ## check that we have the expected number of files on the command line
-die "wrong number of input files, expected @all_input_files\n"
+die "wrong number of input files, expected:\n@all_input_files\ngot:\n@ARG=
V\n"
   if ($#ARGV !=3D $#all_input_files);
 =

 ## read input
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index 383b8a7c62..cc82668457 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -797,36 +797,30 @@ EOF
 		close($chs);
 	}
 =

-	if (IsNewer(
-			'src/backend/nodes/node-support-stamp',
-			'src/backend/nodes/gen_node_support.pl'))
+	my $nmf =3D Project::read_file('src/backend/nodes/Makefile');
+	$nmf =3D~ s{\\\r?\n}{}g;
+	$nmf =3D~ /^node_headers\s*:?=3D(.*)$/gm
+	  || croak "Could not find node_headers in Makefile\n";
+	my @node_headers =3D split /\s+/, $1;
+	@node_headers =3D grep { $_ ne '' } @node_headers;
+	my @node_files =3D map { "src/include/$_" } @node_headers;
+
+	my $need_node_support =3D 0;
+	foreach my $nodefile (@node_files)
 	{
-		# XXX duplicates node_headers list in src/backend/nodes/Makefile
-		my @node_headers =3D qw(
-		  nodes/nodes.h
-		  nodes/primnodes.h
-		  nodes/parsenodes.h
-		  nodes/pathnodes.h
-		  nodes/plannodes.h
-		  nodes/execnodes.h
-		  access/amapi.h
-		  access/sdir.h
-		  access/tableam.h
-		  access/tsmapi.h
-		  commands/event_trigger.h
-		  commands/trigger.h
-		  executor/tuptable.h
-		  foreign/fdwapi.h
-		  nodes/extensible.h
-		  nodes/lockoptions.h
-		  nodes/replnodes.h
-		  nodes/supportnodes.h
-		  nodes/value.h
-		  utils/rel.h
-		);
-
-		my @node_files =3D map { "src/include/$_" } @node_headers;
+		if (IsNewer('src/backend/nodes/node-support-stamp', $nodefile))
+		{
+			$need_node_support =3D 1;
+			last;
+		}
+	}
+	$need_node_support =3D 1
+	  if IsNewer(
+		'src/backend/nodes/node-support-stamp',
+		'src/backend/nodes/gen_node_support.pl');
 =

+	if ($need_node_support)
+	{
 		system("perl src/backend/nodes/gen_node_support.pl --outdir src/backend=
/nodes @node_files");
 		open(my $f, '>', 'src/backend/nodes/node-support-stamp')
 		  || confess "Could not touch node-support-stamp";

------- =_aaaaaaaaaa0--