database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

- Make storing and sorting values using less memory allocation

Browse Source 
(while doing indexed UPDATE/DELETE)
modified:
  storage/connect/array.cpp
  storage/connect/filamtxt.cpp

- Force unix like line endings
modified:
  storage/connect/tabvct.h
This commit is contained in:
Olivier Bertrand
2014-08-25 18:34:51 +02:00
parent 22e8ab422c
commit da69d41a29
3 changed files with 149 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
storage/connect/array.cpp
View File

@@ -127,6 +127,10 @@ PARRAY MakeValueArray(PGLOBAL g, PPARM pp)
case TYPE_PCHAR: case TYPE_PCHAR:
par->AddValue(g, parmp->Value); par->AddValue(g, parmp->Value);
break; break;
case TYPE_VOID:
// Integer stored inside pp->Value
par->AddValue(g, (int)parmp->Value);
break;
} // endswitch valtyp } // endswitch valtyp
/*********************************************************************/ /*********************************************************************/
@@ -152,14 +156,17 @@ ARRAY::ARRAY(PGLOBAL g, int type, int size, int length, int prec)
Xsize = -1; Xsize = -1;
Len = 1; Len = 1;
switch ((Type = type)) { switch (type) {
case TYPE_STRING: case TYPE_STRING:
Len = length; Len = length;
break;
case TYPE_SHORT: case TYPE_SHORT:
case TYPE_INT: case TYPE_INT:
case TYPE_DOUBLE: case TYPE_DOUBLE:
case TYPE_PCHAR: case TYPE_PCHAR:
Type = type;
break;
case TYPE_VOID:
Type = TYPE_INT;
break; break;
#if 0 #if 0
case TYPE_TOKEN: case TYPE_TOKEN:

27
storage/connect/filamtxt.cpp
View File

@@ -282,14 +282,17 @@ bool TXTFAM::AddListValue(PGLOBAL g, int type, void *val, PPARM *top)
PPARM pp = (PPARM)PlugSubAlloc(g, NULL, sizeof(PARM)); PPARM pp = (PPARM)PlugSubAlloc(g, NULL, sizeof(PARM));
switch (type) { switch (type) {
case TYPE_INT: // case TYPE_INT:
pp->Value = PlugSubAlloc(g, NULL, sizeof(int)); // pp->Value = PlugSubAlloc(g, NULL, sizeof(int));
*((int*)pp->Value) = *((int*)val); // *((int*)pp->Value) = *((int*)val);
break; // break;
case TYPE_STRING: case TYPE_VOID:
pp->Value = PlugSubAlloc(g, NULL, strlen((char*)val) + 1); pp->Value = (void*)*(int*)val;
strcpy((char*)pp->Value, (char*)val);
break; break;
// case TYPE_STRING:
// pp->Value = PlugSubAlloc(g, NULL, strlen((char*)val) + 1);
// strcpy((char*)pp->Value, (char*)val);
// break;
case TYPE_PCHAR: case TYPE_PCHAR:
pp->Value = val; pp->Value = val;
break; break;
@@ -310,18 +313,22 @@ bool TXTFAM::AddListValue(PGLOBAL g, int type, void *val, PPARM *top)
int TXTFAM::StoreValues(PGLOBAL g, bool upd) int TXTFAM::StoreValues(PGLOBAL g, bool upd)
{ {
int pos = GetPos(); int pos = GetPos();
bool rc = AddListValue(g, TYPE_INT, &pos, &To_Pos); bool rc = AddListValue(g, TYPE_VOID, &pos, &To_Pos);
if (!rc) { if (!rc) {
pos = GetNextPos(); pos = GetNextPos();
rc = AddListValue(g, TYPE_INT, &pos, &To_Sos); rc = AddListValue(g, TYPE_VOID, &pos, &To_Sos);
} // endif rc } // endif rc
if (upd && !rc) { if (upd && !rc) {
char *buf;
if (Tdbp->PrepareWriting(g)) if (Tdbp->PrepareWriting(g))
return RC_FX; return RC_FX;
rc = AddListValue(g, TYPE_STRING, Tdbp->GetLine(), &To_Upd); buf = (char*)PlugSubAlloc(g, NULL, strlen(Tdbp->GetLine()) + 1);
strcpy(buf, Tdbp->GetLine());
rc = AddListValue(g, TYPE_PCHAR, buf, &To_Upd);
} // endif upd } // endif upd
return rc ? RC_FX : RC_OK; return rc ? RC_FX : RC_OK;