Permalink
Browse files

Fix the setting of NVMEvicted flag.

  • Loading branch information...
1 parent 074da8d commit 37b36382632e59eb07508cc28eadb7e81bdbf475 @malin1993ml malin1993ml committed Nov 29, 2015
@@ -47,8 +47,8 @@
#include <time.h>
#include <stdlib.h>
// FIXME: This is relatively small. 2500 might be a better guess
-//#define MAX_EVICTED_TUPLE_SIZE 1060
-#define MAX_EVICTED_TUPLE_SIZE 2500
+#define MAX_EVICTED_TUPLE_SIZE 1060
+//#define MAX_EVICTED_TUPLE_SIZE 2500
namespace voltdb
{
@@ -545,6 +545,7 @@ bool PersistentTable::insertTuple(TableTuple &source) {
m_tmpTarget1.copyForPersistentInsert(source, NULL); // tuple in freelist must be already cleared
m_tmpTarget1.setDeletedFalse();
m_tmpTarget1.setEvictedFalse();
+ m_tmpTarget1.setNVMEvictedFalse();
/**
* Inserts never "dirty" a tuple since the tuple is new, but... The
@@ -544,6 +544,7 @@ void Table::loadTuplesFromNoHeader(bool allowExport,
m_tmpTarget1.setDeletedFalse();
m_tmpTarget1.setDirtyFalse();
m_tmpTarget1.setEvictedFalse();
+ m_tmpTarget1.setNVMEvictedFalse();
m_tmpTarget1.deserializeFrom(serialize_io, stringPool);
processLoadedTuple( allowExport, m_tmpTarget1);
@@ -594,6 +594,7 @@ inline void Table::deleteTupleStorage(TableTuple &tuple) {
inline void Table::deleteTupleStorage(TableTuple &tuple) {
tuple.setDeletedTrue(); // does NOT free strings
tuple.setEvictedFalse();
+ tuple.setNVMEvictedFalse();
// add to the free list
m_tupleCount--;

0 comments on commit 37b3638

Please sign in to comment.