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

Commit58fdae0

Browse files
committed
Fix for indexing problems.
1 parent557d295 commit58fdae0

File tree

7 files changed

+15
-33
lines changed

7 files changed

+15
-33
lines changed

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

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.25 1998/09/01 04:26:55 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/access/index/indexam.c,v 1.26 1998/09/02 23:05:21 momjian Exp $
1111
*
1212
* INTERFACE ROUTINES
1313
*index_open- open an index relation by relationId
@@ -190,23 +190,7 @@ index_insert(Relation relation,
190190
specificResult= (InsertIndexResult)
191191
fmgr(procedure,relation,datum,nulls,heap_t_ctid,heapRel,NULL);
192192

193-
/* ----------------
194-
*the insert proc is supposed to return a "specific result" and
195-
*this routine has to return a "general result" so after we get
196-
*something back from the insert proc, we allocate a
197-
*"general result" and copy some crap between the two.
198-
*
199-
*As far as I'm concerned all this result shit is needlessly c
200-
*omplicated and should be eliminated. -cim 1/19/91
201-
*
202-
*mao concurs. regardless of how we feel here, however, it is
203-
*important to free memory we don't intend to return to anyone.
204-
*2/28/91
205-
*
206-
*this "general result" crap is now gone. -ay 3/6/95
207-
* ----------------
208-
*/
209-
193+
/* must be pfree'ed */
210194
returnspecificResult;
211195
}
212196

‎src/backend/catalog/indexing.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.29 1998/09/01 16:21:47 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/catalog/indexing.c,v 1.30 1998/09/02 23:05:23 momjian Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -109,12 +109,12 @@ CatalogIndexInsert(Relation *idescs,
109109
HeapTupleindex_tup;
110110
TupleDescheapDescriptor;
111111
Form_pg_indexindex_form;
112-
Datumdatum;
112+
Datumdatum[INDEX_MAX_KEYS];
113+
charnulls[INDEX_MAX_KEYS];
113114
intnatts;
114115
AttrNumber*attnumP;
115116
FuncIndexInfofinfo,
116117
*finfoP;
117-
charnulls[INDEX_MAX_KEYS];
118118
inti;
119119

120120
heapDescriptor=RelationGetDescr(heapRelation);
@@ -152,11 +152,11 @@ CatalogIndexInsert(Relation *idescs,
152152
(AttrNumber*)index_form->indkey,
153153
heapTuple,
154154
heapDescriptor,
155-
&datum,
155+
datum,
156156
nulls,
157157
finfoP);
158158

159-
indexRes=index_insert(idescs[i],&datum,nulls,
159+
indexRes=index_insert(idescs[i],datum,nulls,
160160
&heapTuple->t_ctid,heapRelation);
161161
if (indexRes)
162162
pfree(indexRes);

‎src/backend/commands/vacuum.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.80 1998/09/01 04:28:05 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.81 1998/09/02 23:05:25 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1156,7 +1156,7 @@ failed to add item with len = %u to page %u (free space %u, nusd %u, noff %u)",
11561156
iresult=index_insert(Irel[i],
11571157
idatum,
11581158
inulls,
1159-
&(newtup->t_ctid),
1159+
&newtup->t_ctid,
11601160
onerel);
11611161
if (iresult)
11621162
pfree(iresult);

‎src/backend/parser/parse_target.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.27 1998/09/01 04:30:37 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/parser/parse_target.c,v 1.28 1998/09/02 23:05:27 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -467,7 +467,6 @@ MakeTargetEntryAttr(ParseState *pstate,
467467
intresdomno;
468468
List*attrs=att->attrs;
469469
TargetEntry*tent;
470-
Oidrelid;
471470

472471
attrname=strVal(lfirst(att->attrs));
473472

‎src/backend/storage/ipc/ipc.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.33 1998/09/01 04:31:47 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/storage/ipc/ipc.c,v 1.34 1998/09/02 23:05:30 momjian Exp $
1111
*
1212
* NOTES
1313
*
@@ -65,7 +65,6 @@ static struct ONEXIT
6565

6666
staticinton_proc_exit_index,
6767
on_shmem_exit_index;
68-
staticvoidIpcConfigTip(void);
6968

7069
typedefstruct_PrivateMemStruct
7170
{
@@ -739,10 +738,12 @@ LockIsFree(int lockid)
739738

740739
#endif/* HAS_TEST_AND_SET */
741740

741+
#ifdefNOT_USED
742742
staticvoid
743743
IpcConfigTip(void)
744744
{
745745
fprintf(stderr,"This type of error is usually caused by improper\n");
746746
fprintf(stderr,"shared memory or System V IPC semaphore configuration.\n");
747747
fprintf(stderr,"See the FAQ for more detailed information\n");
748748
}
749+
#endif

‎src/backend/tcop/pquery.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.18 1998/09/01 04:32:14 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.19 1998/09/02 23:05:34 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -210,7 +210,7 @@ ProcessQueryDesc(QueryDesc *queryDesc)
210210
Query*parseTree;
211211
Plan*plan;
212212
intoperation;
213-
char*tag;
213+
char*tag=NULL;
214214
EState*state;
215215
TupleDescattinfo;
216216

‎src/backend/utils/misc/trace.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ static char *opt_names[] = {
8181
*/
8282
intpg_options[NUM_PG_OPTIONS]= {0};
8383

84-
staticintopenlog_done=0;
85-
8684
/*
8785
* Print a timestamp and a message to stdout if the trace flag
8886
* indexed by the flag value is set.

0 commit comments

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