1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NdbScanOperation.hpp, NdbScanOperation.cpp, ha_ndbcluster.cc:

Browse Source 
bug#25821  Excessive partition pruning for multi-range index scan in NDB API: added multi_range error checking in end_of_bound
ha_ndbcluster.h:
  Removed stray mthod declaration
This commit is contained in:
mskold/marty@mysql.com/linux.site 2007-02-07 11:36:34 +01:00
parent 259d3dce26
commit 2d0bd82a06
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ndb/include/ndbapi/NdbScanOperation.hpp
View File

@ -38,7 +38,8 @@ class NdbScanOperation : public NdbOperation {
public: public:
/** /**
* Scan flags. OR-ed together and passed as second argument to * Scan flags. OR-ed together and passed as second argument to
* readTuples. * readTuples. Note that SF_MultiRange has to be set if several
* ranges (bounds) are to be passed.
*/ */
enum ScanFlag { enum ScanFlag {
SF_TupScan = (1 << 16), // scan TUP SF_TupScan = (1 << 16), // scan TUP

10
ndb/src/ndbapi/NdbScanOperation.cpp
View File

@ -1718,6 +1718,12 @@ NdbIndexScanOperation::reset_bounds(bool forceSend){
int int
NdbIndexScanOperation::end_of_bound(Uint32 no) NdbIndexScanOperation::end_of_bound(Uint32 no)
{ {
DBUG_ENTER("end_of_bound");
DBUG_PRINT("info", ("Range number %u", no));
/* Check that SF_MultiRange has been specified if more
than one range is specified */
if (no > 0 && !m_multi_range)
DBUG_RETURN(-1);
if(no < (1 << 13)) // Only 12-bits no of ranges if(no < (1 << 13)) // Only 12-bits no of ranges
{ {
Uint32 bound_head = * m_first_bound_word; Uint32 bound_head = * m_first_bound_word;
@ -1726,9 +1732,9 @@ NdbIndexScanOperation::end_of_bound(Uint32 no)
m_first_bound_word = theKEYINFOptr + theTotalNrOfKeyWordInSignal;; m_first_bound_word = theKEYINFOptr + theTotalNrOfKeyWordInSignal;;
m_this_bound_start = theTupKeyLen; m_this_bound_start = theTupKeyLen;
return 0; DBUG_RETURN(0);
} }
return -1; DBUG_RETURN(-1);
} }
int int

6
sql/ha_ndbcluster.cc
View File

@ -1996,8 +1996,7 @@ int ha_ndbcluster::set_bounds(NdbIndexScanOperation *op,
DBUG_PRINT("error", ("key %d unknown flag %d", j, p.key->flag)); DBUG_PRINT("error", ("key %d unknown flag %d", j, p.key->flag));
DBUG_ASSERT(FALSE); DBUG_ASSERT(FALSE);
// Stop setting bounds but continue with what we have // Stop setting bounds but continue with what we have
op->end_of_bound(range_no); DBUG_RETURN(op->end_of_bound(range_no));
DBUG_RETURN(0);
} }
} }
} }
@ -2044,8 +2043,7 @@ int ha_ndbcluster::set_bounds(NdbIndexScanOperation *op,
tot_len+= part_store_len; tot_len+= part_store_len;
} }
op->end_of_bound(range_no); DBUG_RETURN(op->end_of_bound(range_no));
DBUG_RETURN(0);
} }
/* /*

1
sql/ha_ndbcluster.h
View File

@ -661,7 +661,6 @@ private:
const NdbOperation *first, const NdbOperation *first,
const NdbOperation *last, const NdbOperation *last,
uint errcode); uint errcode);
bool key_fields_not_in_write_set(THD *thd, const KEY* key_info);
int peek_indexed_rows(const byte *record, bool check_pk); int peek_indexed_rows(const byte *record, bool check_pk);
int unique_index_read(const byte *key, uint key_len, int unique_index_read(const byte *key, uint key_len,
byte *buf); byte *buf);