Skip to content

fix typos in cetop.c #1161

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop/7
Choose a base branch
from
Open

fix typos in cetop.c #1161

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 29 additions & 29 deletions libsrc/Wi/cetop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ extern int allow_non_unq_range;
int
itc_is_any_key (it_cursor_t * itc, int nth)
{
/* true if the nth key part is a any type col */
/* true if the nth key part is an ANY type col */
search_spec_t *sp = itc->itc_key_spec.ksp_spec_array;
int inx;
for (inx = 0; sp && inx < nth; inx++)
Expand Down Expand Up @@ -182,7 +182,7 @@ itc_dv_param (it_cursor_t * itc, int nth_key, db_buf_t ctmp)
col_dtp = itc->itc_insert_key->key_row_var[nth_key].cl_sqt.sqt_col_dtp;
dv = (db_buf_t) (ptrlong) i;
if (DV_ANY != col_dtp && DV_BOX_FLAGS == dv[0])
dv += 5; /* a box flags prefix in a dv for any col other than an any is dropped, not part of comparison */
dv += 5; /* a box flags prefix in a dv if any col other than an ANY is dropped; not part of comparison */
return dv;
}

Expand Down Expand Up @@ -335,7 +335,7 @@ itc_num_cast_search (it_cursor_t * itc, db_buf_t ce, int64 delta, int dtp_cmp, i
{
if (set == itc->itc_range_fill)
{
/* must be a leading eq situation because end of set and repeat of value are checked before getting new val */
/* must be a leading eq situation because end of set and repeat of value are checked before getting new val */
itc_range (itc, itc->itc_ranges[set - 1].r_end, COL_NO_ROW);
}
from = itc->itc_ranges[set].r_first - row_of_ce;
Expand Down Expand Up @@ -391,7 +391,7 @@ itc_num_cast_search (it_cursor_t * itc, db_buf_t ce, int64 delta, int dtp_cmp, i
itc->itc_ranges[set].r_first = range.r_first + itc->itc_row_of_ce;
if (COL_NO_ROW == range.r_end)
{
/* there was no gt in the scanned part of the ce. If range extends beyond, contimue search, else leave end unchanged and take next set */
/* there was no gt in the scanned part of the ce. If range extends beyond, continue search; else, leave end unchanged and take next set */
if (itc->itc_ranges[set].r_end <= row_of_ce + ce_rows)
return CE_NEXT_SET;
return CE_CONTINUES;
Expand Down Expand Up @@ -537,15 +537,15 @@ ce_bad_dtp (it_cursor_t * itc, db_buf_t ce, int set, row_no_t row_of_ce, int ce_
{
if (DVC_DTP_LESS == dtp_cmp && (!(nth_key && itc->itc_ranges[set].r_end <= row_of_ce)))
{
/* if range extends to the ce and the ce is dtp lt the previous ce then the index is out of order */
/* if range extends to the ce and the ce is dtp lt the previous ce, then the index is out of order */
if (!allow_non_unq_range)
{
itc->itc_reset_after_seg = col_ins_error = 1;
GPF_T1 ("can't have a range that shifts from compatble to less dtp in next ce");
GPF_T1 ("can't have a range that shifts from compatible to less dtp in next ce");
}
}
itc->itc_ranges[set].r_end = row_of_ce;
/* could be the same params repeat, so will need to replicate the just closed set for each repeat of nth_key first keys */
/* could be the same params repeat, so will need to replicate the just-closed set for each repeat of nth_key first keys */
for (;;)
{
if (set + itc->itc_col_first_set + 1 >= itc->itc_n_sets)
Expand Down Expand Up @@ -608,7 +608,7 @@ ce_bad_dtp (it_cursor_t * itc, db_buf_t ce, int set, row_no_t row_of_ce, int ce_
}
else
{
/* all in this ce are less. If range extends after the ce, take next ce, else the range starts at its end and we look at next set */
/* all in this ce are less. If range extends after the ce, take next ce; else, the range starts at its end, and we look at next set */
if (itc->itc_ranges[set].r_end > row_of_ce + ce_n_values)
{
itc->itc_ranges[set].r_first = COL_NO_ROW;
Expand Down Expand Up @@ -932,7 +932,7 @@ ce_body (db_buf_t ce, db_buf_t ce_first)
int64
itc_ce_value_offset (it_cursor_t * itc, db_buf_t ce, db_buf_t * body_ret, int *dtp_cmp)
{
/* take a rl, rld or bitmap or int delta. Decode 1st value in ce and return the int difference between this and the search param. Byte 0 of body is returned body_ret. If incomparable, body_ret is 0 and dtp_cmp is the orer of the dtps. *
/* take a rl, rld, bitmap, or int delta. Decode first value in ce, and return the int difference between this and the search param. Byte 0 of body is returned body_ret. If incomparable, body_ret is 0 and dtp_cmp is the orer of the dtps. *
* if int delta, consider that the last byte of val is length and special case with dv date */
uint32 delta;
dtp_t ctmp[MAX_FIXED_DV_BYTES];
Expand Down Expand Up @@ -1038,7 +1038,7 @@ itc_ce_value_offset (it_cursor_t * itc, db_buf_t ce, db_buf_t * body_ret, int *d
return 0;
}
/* Because the range of num dtps is not contiguous, when comparing num to non-num by dtp, consider all nums as ints.
* could get a < b and b < c and a > c if ,c num and b not num. */
* could get a < b and b < c and a > c, if c num and b not num. */
if (IS_NUM_DTP (ce_dtp))
ce_dtp = DV_LONG_INT;
if (IS_NUM_DTP (param_dtp))
Expand Down Expand Up @@ -1156,12 +1156,12 @@ ce_search_rld (it_cursor_t * itc, db_buf_t ce, row_no_t row_of_ce, int rc, int n
{
if (last_row + rl < at_or_above)
{
/* gt found before search range. No hit, insert point below 1st of range. */
/* gt found before search range. No hit, insert point below first of range. */
itc->itc_ranges[set].r_end = itc->itc_ranges[set].r_first;
}
else
{
/* if range given and falls in mid of a gt stretch, the insert point is first of range, else it is start of the gt run */
/* if range given and falls in mid of a gt stretch, the insert point is first of range; else, it is start of the gt run */
row_no_t end = MAX (itc->itc_ranges[set].r_first, last_row + row_of_ce);
if (COL_NO_ROW == end)
end = last_row + row_of_ce;
Expand Down Expand Up @@ -1237,7 +1237,7 @@ ce_search_rld (it_cursor_t * itc, db_buf_t ce, row_no_t row_of_ce, int rc, int n
itc->itc_ranges[set].r_end = COL_NO_ROW;
return CE_CONTINUES;
}
GPF_T1 ("not supposed to hity end with eq still looking for 1st");
GPF_T1 ("not supposed to hit end with eq still looking for first");
}
/* reached end without eq or gt. Means no hit and insertion point after last */
if (0 == nth_key && CE_FIND_FIRST == rc)
Expand Down Expand Up @@ -1272,7 +1272,7 @@ ce_search_rld (it_cursor_t * itc, db_buf_t ce, row_no_t row_of_ce, int rc, int n
itc->itc_ranges[set].r_end = itc->itc_ranges[set - 1].r_end;
goto next_set;
}
/* since key did not repeat, next set is to the right of the previous if 1. 1st key or initial range is eq */
/* since key did not repeat, next set is to the right of the previous if 1. first key or initial range is eq */
CE_END_CK;
NEW_VAL;
if (0 == nth_key)
Expand All @@ -1283,12 +1283,12 @@ ce_search_rld (it_cursor_t * itc, db_buf_t ce, row_no_t row_of_ce, int rc, int n
}
if (SET_LEADING_EQ == set_eq && itc->itc_range_fill == set)
{
/* non 1st key part opens new range because open ended in previous key parts */
/* non first key part opens new range because open ended in previous key parts */
itc_range (itc, COL_NO_ROW, COL_NO_ROW);
at_or_above = itc->itc_ranges[set - 1].r_end - row_of_ce;
if (at_or_above < 0)
at_or_above = 0;
itc->itc_ranges[set].r_first = at_or_above + row_of_ce; /* sure to be here or later, if were not set, here, we could get a lower number based on last row and rl since a matching run can start below the end of last range. The last range need not be a match, could also have been a bounded interval determined by prev key part with no match in this ce */
itc->itc_ranges[set].r_first = at_or_above + row_of_ce; /* sure to be here or later. if were not set here, we could get a lower number based on last row and rl, since a matching run can start below the end of last range. The last range need not be a match; it could also have been a bounded interval determined by prev key part with no match in this ce */
below = ce_n_values;
goto new_val;
}
Expand Down Expand Up @@ -1369,7 +1369,7 @@ ce_search_rl (it_cursor_t * itc, db_buf_t ce, row_no_t row_of_ce, int rc, int nt
itc_range (itc, row_of_ce, row_of_ce);
goto next_set;
}
/* gt found before search range. No hit, insert point below 1st of range. */
/* gt found before search range. No hit, insert point below first of range. */
start = row_of_ce;
if (itc->itc_ranges[set].r_first != COL_NO_ROW)
start = MAX (start, itc->itc_ranges[set].r_first);
Expand Down Expand Up @@ -1429,7 +1429,7 @@ ce_search_rl (it_cursor_t * itc, db_buf_t ce, row_no_t row_of_ce, int rc, int nt
itc->itc_ranges[set].r_end = itc->itc_ranges[set - 1].r_end;
goto next_set;
}
/* since key did not repeat, next set is to the right of the previous if 1. 1st key or initial range is eq */
/* since key did not repeat, next set is to the right of the previous if 1. first key or initial range is eq */
CE_END_CK;
NEW_VAL;
if (0 == nth_key)
Expand All @@ -1440,7 +1440,7 @@ ce_search_rl (it_cursor_t * itc, db_buf_t ce, row_no_t row_of_ce, int rc, int nt
}
if (SET_LEADING_EQ == set_eq && itc->itc_range_fill == set)
{
/* non 1st key part opens new range because open ended in previous key parts */
/* non first key part opens new range because open ended in previous key parts */
itc_range (itc, COL_NO_ROW, COL_NO_ROW);
at_or_above = itc->itc_ranges[set - 1].r_end - row_of_ce;
itc->itc_ranges[set].r_first = at_or_above + row_of_ce; /* could have a bounded range not matching followed by leading eq that matched and if so, start is end of last and not start of ce */
Expand Down Expand Up @@ -1586,7 +1586,7 @@ ce_search_bm (it_cursor_t * itc, db_buf_t ce, row_no_t row_of_ce, int rc, int nt
}
else
{
/* bit not set and in range on non 1st key. */
/* bit not set and in range on non first key. */
itc->itc_ranges[set].r_first = itc->itc_ranges[set].r_end = row_of_ce + nth;
goto next_set;
}
Expand Down Expand Up @@ -1625,13 +1625,13 @@ ce_search_bm (it_cursor_t * itc, db_buf_t ce, row_no_t row_of_ce, int rc, int nt
itc->itc_ranges[set].r_end = itc->itc_ranges[set].r_first;
goto next_set;
}
GPF_T1 ("bm match not in range yet 1st key part, so range is the whole bm");
GPF_T1 ("bm match not in range yet first key part, so range is the whole bm");
}
if (CE_FIND_LAST == rc)
{
if (nth >= itc->itc_ranges[set].r_end - row_of_ce)
goto next_set;
itc->itc_ranges[set].r_end = 1 == ce_n_values ? COL_NO_ROW : MAX (itc->itc_ranges[set].r_first, row_of_ce + 1); /* if 1 in ce and eq, continues, if more in ce, then 1st matched but 2nd always gt */
itc->itc_ranges[set].r_end = 1 == ce_n_values ? COL_NO_ROW : MAX (itc->itc_ranges[set].r_first, row_of_ce + 1); /* if 1 in ce and eq, continues; if more in ce, then first matched but 2nd always gt */
goto next_set;
}
if (nth < at_or_above)
Expand Down Expand Up @@ -1676,7 +1676,7 @@ ce_search_bm (it_cursor_t * itc, db_buf_t ce, row_no_t row_of_ce, int rc, int nt
itc->itc_ranges[set].r_end = itc->itc_ranges[set - 1].r_end;
goto next_set;
}
/* since key did not repeat, next set is to the right of the previous if 1. 1st key or initial range is eq */
/* since key did not repeat, next set is to the right of the previous if 1. first key or initial range is eq */
CE_END_CK;
NEW_VAL;
bm_bytes = n_bytes - (ce_first - ce_first_val);
Expand All @@ -1688,7 +1688,7 @@ ce_search_bm (it_cursor_t * itc, db_buf_t ce, row_no_t row_of_ce, int rc, int nt
}
if (SET_LEADING_EQ == set_eq && itc->itc_range_fill == set)
{
/* non 1st key part opens new range because open ended in previous key parts */
/* non first key part opens new range because open ended in previous key parts */
itc_range (itc, COL_NO_ROW, COL_NO_ROW);
at_or_above = itc->itc_ranges[set - 1].r_end - row_of_ce;
if (at_or_above < 0)
Expand Down Expand Up @@ -1819,7 +1819,7 @@ ce_search_int_delta (it_cursor_t * itc, db_buf_t ce, row_no_t row_of_ce, int rc,
{
uint32 n = SHORT_REF_CA (ce_first + 2 * inx);
if (0 && !CE_INTLIKE (flags))
n -= run1; /* the 1st run length is the last byte of the base val so compensate */
n -= run1; /* the first run length is the last byte of the base val so compensate */

first = base + n;

Expand Down Expand Up @@ -1891,7 +1891,7 @@ ce_search_int_delta (it_cursor_t * itc, db_buf_t ce, row_no_t row_of_ce, int rc,
if (last_row >= to)
{
if (!nth_key)
GPF_T1 ("normally not here for 1st key");
GPF_T1 ("normally not here for first key");
if (CE_FIND_FIRST == rc && value < first)
itc->itc_ranges[set].r_first = itc->itc_ranges[set].r_end;
goto next_set;
Expand All @@ -1912,7 +1912,7 @@ ce_search_int_delta (it_cursor_t * itc, db_buf_t ce, row_no_t row_of_ce, int rc,
itc->itc_ranges[set].r_end = COL_NO_ROW;
return CE_CONTINUES;
}
GPF_T1 ("not supposed to hit end with eq still looking for 1st");
GPF_T1 ("not supposed to hit end with eq still looking for first");
}
if (0 == nth_key && CE_FIND_FIRST == rc)
itc_range (itc, COL_NO_ROW, COL_NO_ROW);
Expand Down Expand Up @@ -1946,7 +1946,7 @@ ce_search_int_delta (it_cursor_t * itc, db_buf_t ce, row_no_t row_of_ce, int rc,
itc->itc_ranges[set].r_end = itc->itc_ranges[set - 1].r_end;
goto next_set;
}
/* since key did not repeat, next set is to the right of the previous if 1. 1st key or initial range is eq */
/* since key did not repeat, next set is to the right of the previous if 1. first key or initial range is eq */
CE_END_CK;
NEW_VAL;
if (0 == nth_key)
Expand All @@ -1960,7 +1960,7 @@ ce_search_int_delta (it_cursor_t * itc, db_buf_t ce, row_no_t row_of_ce, int rc,
}
if (SET_LEADING_EQ == set_eq && itc->itc_range_fill == set)
{
/* non 1st key part opens new range because open ended in previous key parts */
/* non first key part opens new range because open ended in previous key parts */
itc_range (itc, COL_NO_ROW, COL_NO_ROW);
at_or_above = itc->itc_ranges[set - 1].r_end - row_of_ce;
if (at_or_above < 0)
Expand Down