X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=src%2Flexindex_stub.cpp;h=f597a41b76d2c4d92941f30f6c70aff35f948feb;hb=d31315cfd8d95205dc0debf430bfa7ce762d9974;hp=ce18cd38b8b624a9c5af249c8e8f65e7c96846cb;hpb=917081e29a802845511267a8ba73d011e1aebc37;p=SXSI%2Fxpathcomp.git

diff --git a/src/lexindex_stub.cpp b/src/lexindex_stub.cpp
index ce18cd3..f597a41 100644
--- a/src/lexindex_stub.cpp
+++ b/src/lexindex_stub.cpp
@@ -156,20 +156,22 @@ void VectorCountMergeJoin::mergeJoin(vector<pair<int32_t,int32_t>> v1, vector<pa
   int comp=0;
   int i1=0;
   int i2=0;
-  int k;
+  int k,j;
   while((i1<v1.size()) && (i2<v2.size())){
     k = strcmp((const char*) tree->get_text(v1[i1].first),
 	       (const char*) tree->get_text(v2[i2].first));
     comp++;
     if (k==0) 
       {
-	resultVector.push_back(v1[i1]);
-	i1++; //advance left
+	for(j=0; j<v1[i1].second ; j++)
+	  resultVector.push_back(v1[i1+j]);
+	i1=i1+j;
+	//	i1++; //advance left
       }
-    else if (k<0) i1++; //advance left
-    //    else if (k<0) i1=i1+v1[i1].second; //advance left
-    else i2++; //advance right
-    //    else i2=i2+v2[i2].second; //advance right
+    //    else if (k<0) i1++; //advance left
+    else if (k<0) i1=i1+v1[i1].second; //advance left
+    //    else i2++; //advance right
+    else i2=i2+v2[i2].second; //advance right
 
   }
   printf("Number of comparisons during MergeJoin: %i\n",comp);