Commit b40246ef authored by unknown's avatar unknown
Browse files

merge ndb api blobs, ready

parent 68ab6069

ndb/include/ndbapi/NdbBlob.hpp

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#define NdbBlob_H



#include <ndb_types.h>

#include <AttrType.hpp>

#include <NdbDictionary.hpp>

#include <NdbConnection.hpp>

#include <NdbError.hpp>

ndb/src/kernel/blocks/dbdict/Dbdict.cpp

+0 −1
Original line number Diff line number Diff line
@@ -4739,7 +4739,6 @@ void Dbdict::handleTabInfo(SimpleProperties::Reader & it, 
    /**

     * Ignore incoming old-style type and recompute it.

     */

    attrDesc.print(stdout);

    bool translateOk = attrDesc.translateExtType();

    tabRequire(translateOk, CreateTableRef::Inconsistency);

ndb/src/ndbapi/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ libndbapi_la_SOURCES = \ 
        NdbReceiver.cpp \

        NdbDictionary.cpp \

        NdbDictionaryImpl.cpp \

        DictCache.cpp

        DictCache.cpp \

	NdbBlob.cpp



INCLUDES_LOC = -I$(top_srcdir)/ndb/src/mgmapi

ndb/src/ndbapi/NdbBlob.cpp

+13 −13
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
  } while (0)

#define EXE() assert(theNdbCon->executeNoBlobs(NoCommit) == 0)

#else

#undef DBG(x)

#define DBG(x)

#endif



/*
@@ -209,48 +209,48 @@ inline bool 
NdbBlob::isKeyOp()

{

  return

    theNdbOp->theOperationType == InsertRequest ||

    theNdbOp->theOperationType == UpdateRequest ||

    theNdbOp->theOperationType == ReadRequest ||

    theNdbOp->theOperationType == ReadExclusive ||

    theNdbOp->theOperationType == DeleteRequest;

    theNdbOp->theOperationType == NdbOperation::InsertRequest ||

    theNdbOp->theOperationType == NdbOperation::UpdateRequest ||

    theNdbOp->theOperationType == NdbOperation::ReadRequest ||

    theNdbOp->theOperationType == NdbOperation::ReadExclusive ||

    theNdbOp->theOperationType == NdbOperation::DeleteRequest;

}



inline bool

NdbBlob::isReadOp()

{

  return

    theNdbOp->theOperationType == ReadRequest ||

    theNdbOp->theOperationType == ReadExclusive;

    theNdbOp->theOperationType == NdbOperation::ReadRequest ||

    theNdbOp->theOperationType == NdbOperation::ReadExclusive;

}



inline bool

NdbBlob::isInsertOp()

{

  return

    theNdbOp->theOperationType == InsertRequest;

    theNdbOp->theOperationType == NdbOperation::InsertRequest;

}



inline bool

NdbBlob::isUpdateOp()

{

  return

    theNdbOp->theOperationType == UpdateRequest;

    theNdbOp->theOperationType == NdbOperation::UpdateRequest;

}



inline bool

NdbBlob::isDeleteOp()

{

  return

    theNdbOp->theOperationType == DeleteRequest;

    theNdbOp->theOperationType == NdbOperation::DeleteRequest;

}



inline bool

NdbBlob::isScanOp()

{

  return

    theNdbOp->theOperationType == OpenScanRequest ||

    theNdbOp->theOperationType == OpenRangeScanRequest;

    theNdbOp->theOperationType == NdbOperation::OpenScanRequest ||

    theNdbOp->theOperationType == NdbOperation::OpenRangeScanRequest;

}



// computations (inline)

ndb/test/ndbapi/Makefile.am

+3 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ flexTT \ 
testBackup \

testBasic \

testBasicAsynch \

testBlobs \

testDataBuffers \

testDict \

testIndex \
@@ -47,7 +48,7 @@ flexTT_SOURCES = flexTT.cpp 
testBackup_SOURCES = testBackup.cpp

testBasic_SOURCES = testBasic.cpp

testBasicAsynch_SOURCES = testBasicAsynch.cpp

#testBlobs_SOURCES = testBlobs.cpp

testBlobs_SOURCES = testBlobs.cpp

testDataBuffers_SOURCES = testDataBuffers.cpp

testDict_SOURCES = testDict.cpp

testIndex_SOURCES = testIndex.cpp
@@ -77,3 +78,4 @@ testBackup_LDADD = $(LDADD) bank/libbank.a 


# Don't update the files from bitkeeper

%::SCCS/s.%