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

Commite36d164

Browse files
committed
Fix svace warnings + cosmetic
1 parentbc917c9 commite36d164

File tree

6 files changed

+19
-16
lines changed

6 files changed

+19
-16
lines changed

‎src/btree_rum.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ rum_btree_extract_query(FunctionCallInfo fcinfo,
112112
caseBTGreaterEqualStrategyNumber:
113113
caseBTGreaterStrategyNumber:
114114
*ptr_partialmatch= true;
115+
/*FALLTHROUGH*/
115116
caseBTEqualStrategyNumber:
116117
caseRUM_DISTANCE:
117118
caseRUM_LEFT_DISTANCE:

‎src/rum_ts_utils.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ PG_FUNCTION_INFO_V1(rum_ts_join_pos);
5353

5454
PG_FUNCTION_INFO_V1(tsquery_to_distance_query);
5555

56-
staticintcount_pos(char*ptr,intlen);
56+
staticunsignedintcount_pos(char*ptr,intlen);
5757
staticchar*decompress_pos(char*ptr,WordEntryPos*pos);
5858
staticDatumbuild_tsvector_entry(TSVectorvector,WordEntry*we);
5959
staticDatumbuild_tsvector_hash_entry(TSVectorvector,WordEntry*we);
@@ -354,7 +354,7 @@ rum_tsquery_timestamp_consistent(PG_FUNCTION_ARGS)
354354
#defineSIXTHBIT 0x20
355355
#defineLOWERMASK 0x1F
356356

357-
staticint
357+
staticunsignedint
358358
compress_pos(char*target,WordEntryPos*pos,intnpos)
359359
{
360360
inti;
@@ -414,7 +414,7 @@ decompress_pos(char *ptr, WordEntryPos *pos)
414414
}
415415
}
416416

417-
staticint
417+
staticunsignedint
418418
count_pos(char*ptr,intlen)
419419
{
420420
intcount=0,

‎src/rumdatapage.c

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ static BlockNumber dataGetRightMostPage(RumBtree btree, Page page);
2020

2121
/* Does datatype allow packing into the 1-byte-header varlena format? */
2222
#defineTYPE_IS_PACKABLE(typlen,typstorage) \
23-
((typlen) == -1 && (typstorage) !='p')
23+
((typlen) == -1 && (typstorage) !=TYPSTORAGE_PLAIN)
2424

2525
/*
2626
* Increment data_length by the space needed by the datum, including any
@@ -99,7 +99,7 @@ rumDatumWrite(Pointer ptr, Datum datum, bool typbyval, char typalign,
9999
elog(ERROR,"unsupported byval length: %d", (int) (typlen));
100100
}
101101

102-
data_length=typlen;
102+
data_length=(Size)typlen;
103103
}
104104
elseif (typlen==-1)
105105
{
@@ -149,7 +149,7 @@ rumDatumWrite(Pointer ptr, Datum datum, bool typbyval, char typalign,
149149
/* fixed-length pass-by-reference */
150150
ptr= (char*)att_align_nominal(ptr,typalign);
151151
Assert(typlen>0);
152-
data_length=typlen;
152+
data_length=(Size)typlen;
153153
memmove(ptr,DatumGetPointer(datum),data_length);
154154
}
155155

@@ -736,7 +736,7 @@ RumDataPageAddItem(Page page, void *data, OffsetNumber offset)
736736
if (offset <=maxoff)
737737
memmove(ptr+sizeof(PostingItem),
738738
ptr,
739-
(maxoff-offset+1)*sizeof(PostingItem));
739+
((uint16_t)(maxoff-offset+1))*sizeof(PostingItem));
740740
}
741741
memcpy(ptr,data,sizeof(PostingItem));
742742
RumPageGetOpaque(page)->maxoff++;
@@ -763,7 +763,7 @@ RumPageDeletePostingItem(Page page, OffsetNumber offset)
763763
char*dstptr=RumDataPageGetItem(page,offset),
764764
*sourceptr=RumDataPageGetItem(page,offset+1);
765765

766-
memmove(dstptr,sourceptr,sizeof(PostingItem)* (maxoff-offset));
766+
memmove(dstptr,sourceptr,sizeof(PostingItem)* (uint16_t)(maxoff-offset));
767767
}
768768

769769
RumPageGetOpaque(page)->maxoff--;
@@ -1229,7 +1229,7 @@ dataSplitPageInternal(RumBtree btree, Buffer lbuf, Buffer rbuf,
12291229
RumItem*bound;
12301230
PagenewlPage=PageGetTempPageCopy(BufferGetPage(lbuf));
12311231
RumItemoldbound=*RumDataPageGetRightBound(newlPage);
1232-
intsizeofitem=sizeof(PostingItem);
1232+
unsignedintsizeofitem=sizeof(PostingItem);
12331233
OffsetNumbermaxoff=RumPageGetOpaque(newlPage)->maxoff;
12341234
SizepageSize=PageGetPageSize(newlPage);
12351235
SizefreeSpace;
@@ -1246,7 +1246,7 @@ dataSplitPageInternal(RumBtree btree, Buffer lbuf, Buffer rbuf,
12461246
Assert(!RumPageIsLeaf(newlPage));
12471247
ptr=vector+ (off-1)*sizeofitem;
12481248
if (maxoff+1-off!=0)
1249-
memmove(ptr+sizeofitem,ptr, (maxoff-off+1)*sizeofitem);
1249+
memmove(ptr+sizeofitem,ptr, (uint16_t)(maxoff-off+1)*sizeofitem);
12501250
memcpy(ptr,&(btree->pitem),sizeofitem);
12511251

12521252
maxoff++;
@@ -1273,7 +1273,7 @@ dataSplitPageInternal(RumBtree btree, Buffer lbuf, Buffer rbuf,
12731273

12741274
ptr=RumDataPageGetItem(rPage,FirstOffsetNumber);
12751275
memcpy(ptr,vector+separator*sizeofitem,
1276-
(maxoff-separator)*sizeofitem);
1276+
(uint16_t)(maxoff-separator)*sizeofitem);
12771277
RumPageGetOpaque(rPage)->maxoff=maxoff-separator;
12781278
/* Adjust pd_lower */
12791279
((PageHeader)rPage)->pd_lower= (ptr+
@@ -1501,6 +1501,7 @@ rumInsertItemPointers(RumState * rumstate,
15011501
RumItem*items,uint32nitem,
15021502
GinStatsData*buildStats)
15031503
{
1504+
Assert(gdi->stack);
15041505
BlockNumberrootBlkno=gdi->stack->blkno;
15051506

15061507
gdi->btree.items=items;

‎src/rumentrypage.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ static IndexTuple
112112
getRightMostTuple(Pagepage)
113113
{
114114
OffsetNumbermaxoff=PageGetMaxOffsetNumber(page);
115+
Assert(maxoff!=InvalidOffsetNumber);
115116

116117
return (IndexTuple)PageGetItem(page,PageGetItemId(page,maxoff));
117118
}

‎src/rumget.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ startScanEntry(RumState * rumstate, RumScanEntry entry, Snapshot snapshot)
687687
elseif (RumGetNPosting(itup)>0)
688688
{
689689
entry->nlist=RumGetNPosting(itup);
690-
entry->predictNumberResult=entry->nlist;
690+
entry->predictNumberResult=(uint32_t)entry->nlist;
691691
entry->list= (RumItem*)palloc(sizeof(RumItem)*entry->nlist);
692692

693693
rumReadTuple(rumstate,entry->attnum,itup,entry->list, true);
@@ -1104,7 +1104,7 @@ entryGetNextItemList(RumState * rumstate, RumScanEntry entry, Snapshot snapshot)
11041104
elseif (RumGetNPosting(itup)>0)
11051105
{
11061106
entry->nlist=RumGetNPosting(itup);
1107-
entry->predictNumberResult=entry->nlist;
1107+
entry->predictNumberResult=(uint32_t)entry->nlist;
11081108
entry->list= (RumItem*)palloc(sizeof(RumItem)*entry->nlist);
11091109

11101110
rumReadTuple(rumstate,entry->attnum,itup,entry->list, true);

‎src/rumscan.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -469,12 +469,12 @@ lookupScanDirection(RumState *state, AttrNumber attno, StrategyNumber strategy)
469469
inti;
470470
RumConfig*rumConfig=state->rumConfig+attno-1;
471471

472-
for(i=0;rumConfig->strategyInfo[i].strategy!=InvalidStrategy&&
473-
i<MAX_STRATEGIES;i++)
472+
for(i=0;i<MAX_STRATEGIES;i++)
474473
{
474+
if (rumConfig->strategyInfo[i].strategy!=InvalidStrategy)
475+
break;
475476
if (rumConfig->strategyInfo[i].strategy==strategy)
476477
returnrumConfig->strategyInfo[i].direction;
477-
478478
}
479479

480480
returnNoMovementScanDirection;

0 commit comments

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