@@ -68,7 +68,7 @@ typedef struct
6868DocRepresentation * end ;
6969}Extention ;
7070
71- static float weights []= {0 .1f0 .2f0 .4f1.0f };
71+ static float weights []= {1.0 / 0 .1f1.0 / 0 .2f1.0 / 0 .4f1.0 / 1.0f };
7272
7373/* A dummy WordEntryPos array to use when haspos is false */
7474static WordEntryPosVector POSNULL = {
@@ -702,11 +702,9 @@ get_docrep_addinfo(bool *check, QueryRepresentation *qr, int *map_item_operand,
702702int len = qr -> query -> size * 4 ,
703703cur = 0 ;
704704DocRepresentation * doc ;
705- char * operand ;
706705char * ptrt ;
707706
708707doc = (DocRepresentation * )palloc (sizeof (DocRepresentation )* len );
709- operand = GETOPERAND (qr -> query );
710708
711709for (i = 0 ;i < qr -> query -> size ;i ++ )
712710{
@@ -726,10 +724,7 @@ get_docrep_addinfo(bool *check, QueryRepresentation *qr, int *map_item_operand,
726724ptrt = (char * )VARDATA_ANY (addInfo [keyN ]);
727725}
728726else
729- {
730- dimt = POSNULL .npos ;
731- ptrt = (char * )POSNULL .pos ;
732- }
727+ continue ;
733728
734729while (cur + dimt >=len )
735730{
@@ -754,20 +749,16 @@ get_docrep_addinfo(bool *check, QueryRepresentation *qr, int *map_item_operand,
754749
755750for (k = 0 ;k < qr -> query -> size ;k ++ )
756751{
757- QueryOperand * kptr = & item [k ].qoperand ;
758- QueryOperand * iptr = & item [i ].qoperand ;
759-
760752if (k == i ||
761- (item [k ].type == QI_VAL &&
762- compareQueryOperand ( & kptr , & iptr , operand ) == 0 ))
753+ (item [k ].type == QI_VAL && map_item_operand [ i ] ==
754+ map_item_operand [ k ] ))
763755{
764756/*
765757 * if k == i, we've already checked above that
766758 * it's type == Q_VAL
767759 */
768760doc [cur ].item [doc [cur ].nitem ]= item + k ;
769761doc [cur ].nitem ++ ;
770- QR_SET_OPERAND_EXISTS (qr ,item + k );
771762}
772763}
773764}
@@ -963,7 +954,6 @@ calc_score_docr(float4 *arrdata, DocRepresentation *doc, uint32 doclen,
963954int32 i ;
964955Extention ext ;
965956double Wdoc = 0.0 ;
966- double invws [lengthof (weights )];
967957double SumDist = 0.0 ,
968958PrevExtPos = 0.0 ,
969959CurExtPos = 0.0 ;
@@ -975,16 +965,6 @@ calc_score_docr(float4 *arrdata, DocRepresentation *doc, uint32 doclen,
975965double * cover_ranks = (double * )palloc (0 );
976966int ncovers = 0 ;
977967
978- for (i = 0 ;i < lengthof (weights );i ++ )
979- {
980- invws [i ]= ((double ) ((arrdata [i ] >=0 ) ?arrdata [i ] :weights [i ]));
981- if (invws [i ]> 1.0 )
982- ereport (ERROR ,
983- (errcode (ERRCODE_INVALID_PARAMETER_VALUE ),
984- errmsg ("weight out of range" )));
985- invws [i ]= 1.0 /invws [i ];
986- }
987-
988968MemSet (& ext ,0 ,sizeof (Extention ));
989969while (Cover (doc ,doclen ,qr ,& ext ))
990970{
@@ -1000,7 +980,7 @@ calc_score_docr(float4 *arrdata, DocRepresentation *doc, uint32 doclen,
1000980
1001981while (ptr <=ext .end )
1002982{
1003- InvSum += invws [ptr -> wclass ];
983+ InvSum += arrdata [ptr -> wclass ];
1004984/* SK: Quick and dirty hash key. Hope collisions will be not too frequent. */
1005985new_cover_key = new_cover_key <<1 ;
1006986new_cover_key += (int )(uintptr_t )ptr -> item ;
