projects
/
SXSI
/
xpathcomp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
917081e
)
bug fix
author
Sebastian Maneth
<seba@sophisto.(none)>
Sun, 4 Nov 2012 18:37:57 +0000
(19:37 +0100)
committer
Sebastian Maneth
<seba@sophisto.(none)>
Sun, 4 Nov 2012 18:37:57 +0000
(19:37 +0100)
src/lexindex_stub.cpp
patch
|
blob
|
history
diff --git
a/src/lexindex_stub.cpp
b/src/lexindex_stub.cpp
index
ce18cd3
..
9f88afb
100644
(file)
--- a/
src/lexindex_stub.cpp
+++ b/
src/lexindex_stub.cpp
@@
-166,10
+166,10
@@
void VectorCountMergeJoin::mergeJoin(vector<pair<int32_t,int32_t>> v1, vector<pa
resultVector.push_back(v1[i1]);
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);