database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

merge ndb api blobs, ready

Browse Source
This commit is contained in:
unknown
2004-06-10 16:25:13 +02:00
parent 68ab60694f
commit b40246ef5a
5 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ndb/include/ndbapi/NdbBlob.hpp
View File

@ -18,7 +18,6 @@
#define NdbBlob_H #define NdbBlob_H
#include <ndb_types.h> #include <ndb_types.h>
#include <AttrType.hpp>
#include <NdbDictionary.hpp> #include <NdbDictionary.hpp>
#include <NdbConnection.hpp> #include <NdbConnection.hpp>
#include <NdbError.hpp> #include <NdbError.hpp>

1
ndb/src/kernel/blocks/dbdict/Dbdict.cpp
View File

@ -4739,7 +4739,6 @@ void Dbdict::handleTabInfo(SimpleProperties::Reader & it,
/** /**
* Ignore incoming old-style type and recompute it. * Ignore incoming old-style type and recompute it.
*/ */
attrDesc.print(stdout);
bool translateOk = attrDesc.translateExtType(); bool translateOk = attrDesc.translateExtType();
tabRequire(translateOk, CreateTableRef::Inconsistency); tabRequire(translateOk, CreateTableRef::Inconsistency);

3
ndb/src/ndbapi/Makefile.am
View File

@ -35,7 +35,8 @@ libndbapi_la_SOURCES = \
NdbReceiver.cpp \ NdbReceiver.cpp \
NdbDictionary.cpp \ NdbDictionary.cpp \
NdbDictionaryImpl.cpp \ NdbDictionaryImpl.cpp \
DictCache.cpp DictCache.cpp \
NdbBlob.cpp
INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmapi INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmapi

26
ndb/src/ndbapi/NdbBlob.cpp
View File

@ -32,7 +32,7 @@
} while (0) } while (0)
#define EXE() assert(theNdbCon->executeNoBlobs(NoCommit) == 0) #define EXE() assert(theNdbCon->executeNoBlobs(NoCommit) == 0)
#else #else
#undef DBG(x) #define DBG(x)
#endif #endif
/* /*
@ -209,48 +209,48 @@ inline bool
NdbBlob::isKeyOp() NdbBlob::isKeyOp()
{ {
return return
theNdbOp->theOperationType == InsertRequest || theNdbOp->theOperationType == NdbOperation::InsertRequest ||
theNdbOp->theOperationType == UpdateRequest || theNdbOp->theOperationType == NdbOperation::UpdateRequest ||
theNdbOp->theOperationType == ReadRequest || theNdbOp->theOperationType == NdbOperation::ReadRequest ||
theNdbOp->theOperationType == ReadExclusive || theNdbOp->theOperationType == NdbOperation::ReadExclusive ||
theNdbOp->theOperationType == DeleteRequest; theNdbOp->theOperationType == NdbOperation::DeleteRequest;
} }
inline bool inline bool
NdbBlob::isReadOp() NdbBlob::isReadOp()
{ {
return return
theNdbOp->theOperationType == ReadRequest || theNdbOp->theOperationType == NdbOperation::ReadRequest ||
theNdbOp->theOperationType == ReadExclusive; theNdbOp->theOperationType == NdbOperation::ReadExclusive;
} }
inline bool inline bool
NdbBlob::isInsertOp() NdbBlob::isInsertOp()
{ {
return return
theNdbOp->theOperationType == InsertRequest; theNdbOp->theOperationType == NdbOperation::InsertRequest;
} }
inline bool inline bool
NdbBlob::isUpdateOp() NdbBlob::isUpdateOp()
{ {
return return
theNdbOp->theOperationType == UpdateRequest; theNdbOp->theOperationType == NdbOperation::UpdateRequest;
} }
inline bool inline bool
NdbBlob::isDeleteOp() NdbBlob::isDeleteOp()
{ {
return return
theNdbOp->theOperationType == DeleteRequest; theNdbOp->theOperationType == NdbOperation::DeleteRequest;
} }
inline bool inline bool
NdbBlob::isScanOp() NdbBlob::isScanOp()
{ {
return return
theNdbOp->theOperationType == OpenScanRequest || theNdbOp->theOperationType == NdbOperation::OpenScanRequest ||
theNdbOp->theOperationType == OpenRangeScanRequest; theNdbOp->theOperationType == NdbOperation::OpenRangeScanRequest;
} }
// computations (inline) // computations (inline)

4
ndb/test/ndbapi/Makefile.am
View File

@ -14,6 +14,7 @@ flexTT \
testBackup \ testBackup \
testBasic \ testBasic \
testBasicAsynch \ testBasicAsynch \
testBlobs \
testDataBuffers \ testDataBuffers \
testDict \ testDict \
testIndex \ testIndex \
@ -47,7 +48,7 @@ flexTT_SOURCES = flexTT.cpp
testBackup_SOURCES = testBackup.cpp testBackup_SOURCES = testBackup.cpp
testBasic_SOURCES = testBasic.cpp testBasic_SOURCES = testBasic.cpp
testBasicAsynch_SOURCES = testBasicAsynch.cpp testBasicAsynch_SOURCES = testBasicAsynch.cpp
#testBlobs_SOURCES = testBlobs.cpp testBlobs_SOURCES = testBlobs.cpp
testDataBuffers_SOURCES = testDataBuffers.cpp testDataBuffers_SOURCES = testDataBuffers.cpp
testDict_SOURCES = testDict.cpp testDict_SOURCES = testDict.cpp
testIndex_SOURCES = testIndex.cpp testIndex_SOURCES = testIndex.cpp
@ -77,3 +78,4 @@ testBackup_LDADD = $(LDADD) bank/libbank.a
# Don't update the files from bitkeeper # Don't update the files from bitkeeper
%::SCCS/s.% %::SCCS/s.%