Fix the setting of NVMEvicted flag.

Author: linmagit

src/ee/anticache/AntiCacheEvictionManager.cpp

@@ -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
 {

src/ee/storage/persistenttable.cpp

@@ -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

src/ee/storage/table.cpp

@@ -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);

src/ee/storage/table.h

@@ -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--;