Skip to content

Commit d61eecb

Browse files
adunstanadunstan
committed
Provide for MSVC config equivalents of recently added configure options. Remove
any hardcoding of those options. Along the way, reorder the expression used to calculate RELSEG_SIZE to make it slightly clearer. For now wal_segsize is only allowed to have a value of 1 on Windows - we can relax that when we get full large file support in the backend.
1 parent 4739159 commit d61eecb

File tree

5 files changed

+36
-27
lines changed

5 files changed

+36
-27
lines changed

‎configure

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2638,7 +2638,8 @@ fi
26382638

26392639

26402640
# this expression is set up to avoid unnecessary integer overflow
2641-
RELSEG_SIZE=`expr '(' 1024 '*' ${segsize} / ${blocksize} ')' '*' 1024`
2641+
# blocksize is already guaranteed to be a factor of 1024
2642+
RELSEG_SIZE=`expr '(' 1024 / ${blocksize} ')' '*' ${segsize} '*' 1024`
26422643
test $? -eq 0 || exit 1
26432644
{ echo "$as_me:$LINENO: result: ${segsize}GB" >&5
26442645
echo "${ECHO_T}${segsize}GB" >&6; }

‎configure.in

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $PostgreSQL: pgsql/configure.in,v 1.559 2008/05/02 19:52:37 tgl Exp $
2+
dnl $PostgreSQL: pgsql/configure.in,v 1.560 2008/05/03 00:24:05 adunstan Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -257,7 +257,8 @@ PGAC_ARG_REQ(with, segsize, [ --with-segsize=SEGSIZE set table segment size in
257257
[segsize=$withval],
258258
[segsize=1])
259259
# this expression is set up to avoid unnecessary integer overflow
260-
RELSEG_SIZE=`expr '(' 1024 '*' ${segsize} / ${blocksize} ')' '*' 1024`
260+
# blocksize is already guaranteed to be a factor of 1024
261+
RELSEG_SIZE=`expr '(' 1024 / ${blocksize} ')' '*' ${segsize} '*' 1024`
261262
test $? -eq 0 || exit 1
262263
AC_MSG_RESULT([${segsize}GB])
263264

‎src/include/pg_config.h.win32

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,6 @@
3737
/* The alignment requirement of a `short'. */
3838
#define ALIGNOF_SHORT 2
3939

40-
/* Size of a disk block --- this also limits the size of a tuple. You can set
41-
it bigger if you need bigger tuples (although TOAST should reduce the need
42-
to have large tuples, since fields can be spread across multiple tuples).
43-
BLCKSZ must be a power of 2. The maximum possible value of BLCKSZ is
44-
currently 2^15 (32768). This is determined by the 15-bit widths of the
45-
lp_off and lp_len fields in ItemIdData (see include/storage/itemid.h).
46-
Changing BLCKSZ requires an initdb. */
47-
#define BLCKSZ 8192
48-
4940
/* Define to the default TCP port number on which the server listens and to
5041
which clients will try to connect. This can be overridden at run-time, but
5142
it's convenient if your clients have the right default compiled in.
@@ -600,19 +591,6 @@
600591
your system. */
601592
/* #undef PTHREAD_CREATE_JOINABLE */
602593

603-
/* RELSEG_SIZE is the maximum number of blocks allowed in one disk file. Thus,
604-
the maximum size of a single file is RELSEG_SIZE * BLCKSZ; relations bigger
605-
than that are divided into multiple files. RELSEG_SIZE * BLCKSZ must be
606-
less than your OS' limit on file size. This is often 2 GB or 4GB in a
607-
32-bit operating system, unless you have large file support enabled. By
608-
default, we make the limit 1 GB to avoid any possible integer-overflow
609-
problems within the OS. A limit smaller than necessary only means we divide
610-
a large relation into more chunks than necessary, so it seems best to err
611-
in the direction of a small limit. A power-of-2 value is recommended to
612-
save a few cycles in md.c, but is not absolutely required. Changing
613-
RELSEG_SIZE requires an initdb. */
614-
#define RELSEG_SIZE 131072
615-
616594
/* The size of a `size_t', as computed by sizeof. */
617595
#define SIZEOF_SIZE_T 4
618596

‎src/tools/msvc/Solution.pm

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package Solution;
33
#
44
# Package that encapsulates a Visual C++ solution file generation
55
#
6-
# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.40 2008/04/21 18:37:28 mha Exp $
6+
# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.41 2008/05/03 00:24:06 adunstan Exp $
77
#
88
use Carp;
99
use strict;
@@ -34,6 +34,23 @@ sub new
3434
die "XML requires both XSLT and ICONV\n";
3535
}
3636
}
37+
$options->{blocksize} = 8
38+
unless $options->{blocksize}; # undef or 0 means default
39+
die "Bad blocksize $options->{blocksize}"
40+
unless grep {$_ == $options->{blocksize}} (1,2,4,8,16,32);
41+
$options->{segsize} = 1
42+
unless $options->{segsize}; # undef or 0 means default
43+
# only allow segsize 1 for now, as we can't do large files yet in windows
44+
die "Bad segsize $options->{segsize}"
45+
unless $options->{segsize} == 1;
46+
$options->{wal_blocksize} = 8
47+
unless $options->{wal_blocksize}; # undef or 0 means default
48+
die "Bad wal_blocksize $options->{wal_blocksize}"
49+
unless grep {$_ == $options->{wal_blocksize}} (1,2,4,8,16,32,64);
50+
$options->{wal_segsize} = 16
51+
unless $options->{wal_segsize}; # undef or 0 means default
52+
die "Bad wal_segsize $options->{wal_segsize}"
53+
unless grep {$_ == $options->{wal_segsize}} (1,2,4,8,16,32,64);
3754
return $self;
3855
}
3956

@@ -116,7 +133,16 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY
116133
print O "#define USE_LDAP 1\n" if ($self->{options}->{ldap});
117134
print O "#define HAVE_LIBZ 1\n" if ($self->{options}->{zlib});
118135
print O "#define USE_SSL 1\n" if ($self->{options}->{openssl});
119-
print O "#define ENABLE_NLS 1\n" if ($self->{options}->{nls});
136+
print O "#define ENABLE_NLS 1\n" if ($self->{options}->{nls});
137+
138+
print O "#define BLCKSZ ",1024 * $self->{options}->{blocksize},"\n";
139+
print O "#define RELSEG_SIZE ",
140+
(1024 / $self->{options}->{blocksize}) *
141+
$self->{options}->{segsize} * 1024, "\n";
142+
print O "#define XLOG_BLCKSZ ",
143+
1024 * $self->{options}->{wal_blocksize},"\n";
144+
print O "#define XLOG_SEG_SIZE (",
145+
$self->{options}->{wal_segsize}," * 1024 * 1024)\n";
120146

121147
if ($self->{options}->{float4byval})
122148
{

‎src/tools/msvc/config.pl

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
# integer_datetimes=>1, # --enable-integer-datetimes - on is now default
88
# float4byval=>1, # --disable-float4-byval, on by default
99
# float8byval=>0, # --disable-float8-byval, off by default
10+
# blocksize => 8, # --with-blocksize, 8kB by default
11+
# wal_blocksize => 8, # --with-wal-blocksize, 8kb by default
12+
# wal_segsize => 16, # --with-wal-segsize, 16MB by default
1013
nls=>undef, # --enable-nls=<path>
1114
tcl=>'c:\tcl', # --with-tls=<path>
1215
perl=>'c:\perl', # --with-perl

0 commit comments

Comments
 (0)