Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit024d5f7

Browse files
committed
index strategy cleanup
1 parentf22c6f9 commit024d5f7

File tree

3 files changed

+5
-17
lines changed

3 files changed

+5
-17
lines changed

‎src/backend/access/index/istrat.c

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.22 1998/08/10 14:32:44 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/access/index/Attic/istrat.c,v 1.23 1998/08/11 19:32:36 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -148,10 +148,7 @@ StrategyTermIsValid(StrategyTerm term,
148148
{
149149
if (!StrategyOperatorIsValid(&term->operatorData[index],
150150
maxStrategy))
151-
{
152-
153151
return false;
154-
}
155152
}
156153

157154
return true;
@@ -574,8 +571,7 @@ IndexSupportInitialize(IndexStrategy indexStrategy,
574571
break;
575572
}
576573

577-
operatorClassObjectId[attributeIndex]
578-
=iform->indclass[attributeIndex];
574+
operatorClassObjectId[attributeIndex]=iform->indclass[attributeIndex];
579575
}
580576

581577
heap_endscan(scan);
@@ -592,14 +588,11 @@ IndexSupportInitialize(IndexStrategy indexStrategy,
592588
ScanKeyEntryInitialize(&entry[1],0,Anum_pg_amproc_amopclaid,
593589
F_OIDEQ,0);
594590

595-
/*relation = heap_openr(Name_pg_amproc); */
596591
relation=heap_openr(AccessMethodProcedureRelationName);
597592

598-
599593
for (attributeNumber=maxAttributeNumber;attributeNumber>0;
600594
attributeNumber--)
601595
{
602-
603596
int16support;
604597
Form_pg_amprocform;
605598
RegProcedure*loc;

‎src/backend/optimizer/path/indxpath.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.27 1998/08/10 04:49:37 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/optimizer/path/indxpath.c,v 1.28 1998/08/11 19:32:37 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -953,11 +953,10 @@ clause_pred_clause_test(Expr *predicate, Node *clause)
953953
/*
954954
* 1. Find a "btree" strategy number for the pred_op
955955
*/
956-
/* XXX - hardcoded amopid value 403 to find "btree" operator classes */
957956
ScanKeyEntryInitialize(&entry[0],0,
958957
Anum_pg_amop_amopid,
959958
F_OIDEQ,
960-
ObjectIdGetDatum(403));
959+
ObjectIdGetDatum(BTREE_AM_OID));
961960

962961
ScanKeyEntryInitialize(&entry[1],0,
963962
Anum_pg_amop_amopopr,

‎src/include/access/strat.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
* Copyright (c) 1994, Regents of the University of California
99
*
10-
* $Id: strat.h,v 1.9 1998/02/26 04:40:28 momjian Exp $
10+
* $Id: strat.h,v 1.10 1998/08/11 19:32:39 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -74,11 +74,7 @@ typedef StrategyEvaluationData *StrategyEvaluation;
7474
#defineStrategyTransformMapIsValid(transform) PointerIsValid(transform)
7575

7676

77-
#ifndefCorrectStrategies/* XXX this should be removable */
78-
#defineAMStrategies(foo)12
79-
#else/* !defined(CorrectStrategies) */
8077
#defineAMStrategies(foo)(foo)
81-
#endif/* !defined(CorrectStrategies) */
8278

8379
typedefstructStrategyMapData
8480
{

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp