Commita687976

committed

Remove assert-enabled-only variable, cosmetic fix for Assert

1 parent5103be5 commita687976Copy full SHA for a687976

File tree

-4

lines changed

-4

lines changed

Lines changed: 3 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -972,6 +972,7 @@ decompress_pos(char ptr, WordEntryPos pos)`
`972`	`972`	`else`
`973`	`973`	`{`
`974`	`974`	`delta \|= (v&LOWERMASK) <<i;`
	`975`	`+Assert(delta <=0x3fff);`
`975`	`976`	`*pos+=delta;`
`976`	`977`	`WEP_SETWEIGHT(*pos,v >>5);`
`977`	`978`	`returnptr;`
`@@ -991,7 +992,7 @@ count_pos(char *ptr, int len)`
`991`	`992`	`if (!(ptr[i]&HIGHBIT))`
`992`	`993`	`count++;`
`993`	`994`	`}`
`994`		`-Assert(!(ptr[i-1]&HIGHBIT));`
	`995`	`+Assert((ptr[i-1]&HIGHBIT)==0);`
`995`	`996`	`returncount;`
`996`	`997`	`}`
`997`	`998`
`@@ -2209,7 +2210,6 @@ rum_ts_join_pos(PG_FUNCTION_ARGS)`
`2209`	`2210`	`count2=count_pos(in2,VARSIZE_ANY_EXHDR(addInfo2)),`
`2210`	`2211`	`countRes=0;`
`2211`	`2212`	`inti1=0,i2=0;`
`2212`		`-intn_equals=0;`
`2213`	`2213`	`Sizesize;`
`2214`	`2214`	`WordEntryPospos1=0,`
`2215`	`2215`	`pos2=0,`
`@@ -2243,7 +2243,6 @@ rum_ts_join_pos(PG_FUNCTION_ARGS)`
`2243`	`2243`	`else`
`2244`	`2244`	`{`
`2245`	`2245`	`pos[countRes++]=pos1;`
`2246`		`-n_equals++;`
`2247`	`2246`	`i1++;`
`2248`	`2247`	`i2++;`
`2249`	`2248`	`if (i1<count1)`
`@@ -2276,7 +2275,7 @@ rum_ts_join_pos(PG_FUNCTION_ARGS)`
`2276`	`2275`	`}`
`2277`	`2276`	`}`
`2278`	`2277`
`2279`		`-Assert(countRes==count1+count2-n_equals);`
	`2278`	`+Assert(countRes<=count1+count2);`
`2280`	`2279`
`2281`	`2280`	`/*`
`2282`	`2281`	`* In some cases compressed positions may take more memory than`

Comments

(0)