farrokhi/pg_repack
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

work around for 9.1.

Browse Source
This commit is contained in:
Takahiro Itagaki
2011-03-03 01:21:40 +00:00
parent 8ec3a085ad
commit 830ef422ad
4 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pgut/pgut-be.h
View File

@ -155,6 +155,9 @@ extern void tuplestore_putvalues(Tuplestorestate *state, TupleDesc tdesc,
#define ATExecChangeOwner(relationOid, newOwnerId, recursing, lockmode) \ #define ATExecChangeOwner(relationOid, newOwnerId, recursing, lockmode) \
ATExecChangeOwner((relationOid), (newOwnerId), (recursing)) ATExecChangeOwner((relationOid), (newOwnerId), (recursing))
#define deleteDependencyRecordsFor(classId, objectId, skipExtensionDeps) \
deleteDependencyRecordsFor((classId), (objectId))
#endif #endif
#if PG_VERSION_NUM < 80300 #if PG_VERSION_NUM < 80300

6
lib/reorg.c
View File

@ -1121,7 +1121,8 @@ swap_heap_or_index_files(Oid r1, Oid r2)
if (relform1->reltoastrelid) if (relform1->reltoastrelid)
{ {
count = deleteDependencyRecordsFor(RelationRelationId, count = deleteDependencyRecordsFor(RelationRelationId,
relform1->reltoastrelid); relform1->reltoastrelid,
false);
if (count != 1) if (count != 1)
elog(ERROR, "expected one dependency record for TOAST table, found %ld", elog(ERROR, "expected one dependency record for TOAST table, found %ld",
count); count);
@ -1129,7 +1130,8 @@ swap_heap_or_index_files(Oid r1, Oid r2)
if (relform2->reltoastrelid) if (relform2->reltoastrelid)
{ {
count = deleteDependencyRecordsFor(RelationRelationId, count = deleteDependencyRecordsFor(RelationRelationId,
relform2->reltoastrelid); relform2->reltoastrelid,
false);
if (count != 1) if (count != 1)
elog(ERROR, "expected one dependency record for TOAST table, found %ld", elog(ERROR, "expected one dependency record for TOAST table, found %ld",
count); count);

20
msvc/bin.2010.vcxproj
View File

@ -92,17 +92,17 @@
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='9.0|Win32'">$(SolutionDir)/bin/$(Platform)/$(Configuration)/bin/</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='9.0|Win32'">$(SolutionDir)/bin/x86/$(Configuration)/bin/</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='9.0|x64'">$(SolutionDir)/bin/$(Platform)/$(Configuration)/bin/</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='9.0|x64'">$(SolutionDir)/bin/$(Platform)/$(Configuration)/bin/</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='8.4|Win32'">$(SolutionDir)/bin/$(Platform)/$(Configuration)/bin/</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='8.4|Win32'">$(SolutionDir)/bin/x86/$(Configuration)/bin/</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='8.4|x64'">$(SolutionDir)/bin/$(Platform)/$(Configuration)/bin/</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='8.4|x64'">$(SolutionDir)/bin/$(Platform)/$(Configuration)/bin/</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='8.3|Win32'">$(SolutionDir)/bin/$(Platform)/$(Configuration)/bin/</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='8.3|Win32'">$(SolutionDir)/bin/x86/$(Configuration)/bin/</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='8.3|x64'">$(SolutionDir)/bin/$(Platform)/$(Configuration)/bin/</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='8.3|x64'">$(SolutionDir)/bin/$(Platform)/$(Configuration)/bin/</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='9.0|Win32'">$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='9.0|Win32'">$(SolutionDir)/obj/x86/$(Configuration)/$(ProjectName)/</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='9.0|x64'">$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='9.0|x64'">$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='8.4|Win32'">$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='8.4|Win32'">$(SolutionDir)/obj/x86/$(Configuration)/$(ProjectName)/</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='8.4|x64'">$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='8.4|x64'">$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='8.3|Win32'">$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='8.3|Win32'">$(SolutionDir)/obj/x86/$(Configuration)/$(ProjectName)/</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='8.3|x64'">$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='8.3|x64'">$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='9.0|Win32'">false</LinkIncremental> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='9.0|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='9.0|x64'">false</LinkIncremental> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='9.0|x64'">false</LinkIncremental>
@ -146,7 +146,7 @@
<DisableSpecificWarnings>4005;4996;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4005;4996;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>kernel32.lib;advapi32.lib;ws2_32.lib;libpq.lib;libpgport.lib;libintl-8.lib</AdditionalDependencies> <AdditionalDependencies>advapi32.lib;ws2_32.lib;libpq.lib;libpgport.lib;libintl-8.lib</AdditionalDependencies>
<OutputFile>$(OutDir)/$(TargetFileName)</OutputFile> <OutputFile>$(OutDir)/$(TargetFileName)</OutputFile>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
@ -176,7 +176,7 @@
<DisableSpecificWarnings>4005;4996;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4005;4996;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>kernel32.lib;advapi32.lib;ws2_32.lib;libpq.lib;libpgport.lib;libintl.lib</AdditionalDependencies> <AdditionalDependencies>advapi32.lib;ws2_32.lib;libpq.lib;libpgport.lib;libintl.lib</AdditionalDependencies>
<OutputFile>$(OutDir)/$(TargetFileName)</OutputFile> <OutputFile>$(OutDir)/$(TargetFileName)</OutputFile>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
@ -205,7 +205,7 @@
<DisableSpecificWarnings>4005;4996;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4005;4996;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>kernel32.lib;advapi32.lib;ws2_32.lib;libpq.lib;libpgport.lib;libintl-8.lib</AdditionalDependencies> <AdditionalDependencies>advapi32.lib;ws2_32.lib;libpq.lib;libpgport.lib;libintl-8.lib</AdditionalDependencies>
<OutputFile>$(OutDir)/$(TargetFileName)</OutputFile> <OutputFile>$(OutDir)/$(TargetFileName)</OutputFile>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
@ -264,7 +264,7 @@
<DisableSpecificWarnings>4005;4996;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4005;4996;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>kernel32.lib;advapi32.lib;ws2_32.lib;libpq.lib;libpgport.lib;libintl-8.lib</AdditionalDependencies> <AdditionalDependencies>advapi32.lib;ws2_32.lib;libpq.lib;libpgport.lib;libintl-8.lib</AdditionalDependencies>
<OutputFile>$(OutDir)/$(TargetFileName)</OutputFile> <OutputFile>$(OutDir)/$(TargetFileName)</OutputFile>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>

24
msvc/lib.2010.vcxproj
View File

@ -106,17 +106,17 @@
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup> <PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='9.0|Win32'">$(SolutionDir)/bin/$(Platform)/$(Configuration)/lib/</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='9.0|Win32'">$(SolutionDir)/bin/x86/$(Configuration)/lib/</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='9.0|x64'">$(SolutionDir)/bin/$(Platform)/$(Configuration)/lib/</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='9.0|x64'">$(SolutionDir)/bin/$(Platform)/$(Configuration)/lib/</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='8.4|Win32'">$(SolutionDir)/bin/$(Platform)/$(Configuration)/lib/</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='8.4|Win32'">$(SolutionDir)/bin/x86/$(Configuration)/lib/</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='8.4|x64'">$(SolutionDir)/bin/$(Platform)/$(Configuration)/lib/</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='8.4|x64'">$(SolutionDir)/bin/$(Platform)/$(Configuration)/lib/</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='8.3|Win32'">$(SolutionDir)/bin/$(Platform)/$(Configuration)/lib/</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='8.3|Win32'">$(SolutionDir)/bin/x86/$(Configuration)/lib/</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='8.3|x64'">$(SolutionDir)/bin/$(Platform)/$(Configuration)/lib/</OutDir> <OutDir Condition="'$(Configuration)|$(Platform)'=='8.3|x64'">$(SolutionDir)/bin/$(Platform)/$(Configuration)/lib/</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='9.0|Win32'">$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='9.0|Win32'">$(SolutionDir)/obj/x86/$(Configuration)/$(ProjectName)/</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='9.0|x64'">$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='9.0|x64'">$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='8.4|Win32'">$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='8.4|Win32'">$(SolutionDir)/obj/x86/$(Configuration)/$(ProjectName)/</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='8.4|x64'">$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='8.4|x64'">$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='8.3|Win32'">$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='8.3|Win32'">$(SolutionDir)/obj/x86/$(Configuration)/$(ProjectName)/</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='8.3|x64'">$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/</IntDir> <IntDir Condition="'$(Configuration)|$(Platform)'=='8.3|x64'">$(SolutionDir)/obj/$(Platform)/$(Configuration)/$(ProjectName)/</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='9.0|Win32'">false</LinkIncremental> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='9.0|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='9.0|x64'">false</LinkIncremental> <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='9.0|x64'">false</LinkIncremental>
@ -160,7 +160,7 @@
<DisableSpecificWarnings>4005;4996;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4005;4996;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>kernel32.lib;advapi32.lib;ws2_32.lib;postgres.lib</AdditionalDependencies> <AdditionalDependencies>postgres.lib</AdditionalDependencies>
<OutputFile>$(OutDir)/$(TargetFileName)</OutputFile> <OutputFile>$(OutDir)/$(TargetFileName)</OutputFile>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
@ -186,7 +186,7 @@
<DisableSpecificWarnings>4005;4996;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4005;4996;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>kernel32.lib;advapi32.lib;ws2_32.lib;postgres.lib</AdditionalDependencies> <AdditionalDependencies>postgres.lib</AdditionalDependencies>
<OutputFile>$(OutDir)/$(TargetFileName)</OutputFile> <OutputFile>$(OutDir)/$(TargetFileName)</OutputFile>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
@ -211,7 +211,7 @@
<DisableSpecificWarnings>4005;4996;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4005;4996;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>kernel32.lib;advapi32.lib;ws2_32.lib;postgres.lib;libpq.lib</AdditionalDependencies> <AdditionalDependencies>postgres.lib</AdditionalDependencies>
<OutputFile>$(OutDir)/$(TargetFileName)</OutputFile> <OutputFile>$(OutDir)/$(TargetFileName)</OutputFile>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
@ -237,7 +237,7 @@
<DisableSpecificWarnings>4005;4996;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4005;4996;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>kernel32.lib;advapi32.lib;ws2_32.lib;postgres.lib;libpq.lib</AdditionalDependencies> <AdditionalDependencies>postgres.lib</AdditionalDependencies>
<OutputFile>$(OutDir)/$(TargetFileName)</OutputFile> <OutputFile>$(OutDir)/$(TargetFileName)</OutputFile>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
@ -262,7 +262,7 @@
<DisableSpecificWarnings>4005;4996;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4005;4996;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>kernel32.lib;advapi32.lib;ws2_32.lib;postgres.lib;libpq.lib</AdditionalDependencies> <AdditionalDependencies>postgres.lib</AdditionalDependencies>
<OutputFile>$(OutDir)/$(TargetFileName)</OutputFile> <OutputFile>$(OutDir)/$(TargetFileName)</OutputFile>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>
@ -288,7 +288,7 @@
<DisableSpecificWarnings>4005;4996;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings> <DisableSpecificWarnings>4005;4996;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>kernel32.lib;advapi32.lib;ws2_32.lib;postgres.lib;libpq.lib</AdditionalDependencies> <AdditionalDependencies>postgres.lib</AdditionalDependencies>
<OutputFile>$(OutDir)/$(TargetFileName)</OutputFile> <OutputFile>$(OutDir)/$(TargetFileName)</OutputFile>
<GenerateDebugInformation>false</GenerateDebugInformation> <GenerateDebugInformation>false</GenerateDebugInformation>
<SubSystem>Console</SubSystem> <SubSystem>Console</SubSystem>