Fix some debug level compilation.

apavlo · Apr 12, 2016 · e970182 · e970182
1 parent 4ccd1db
commit e970182
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/ee/anticache/AntiCacheEvictionManager.cpp b/src/ee/anticache/AntiCacheEvictionManager.cpp
@@ -1341,8 +1341,8 @@ bool AntiCacheEvictionManager::readEvictedBlock(PersistentTable *table, int32_t
     //AntiCacheDB* antiCacheDB = table->getAntiCacheDB();
 
     try {
-        VOLT_DEBUG("BLOCK %u %d - unevicted blocks size is %d - alreadyUevicted %d",
-                   _block_id, block_id, static_cast<int>(table->unevictedBlocksSize()), already_unevicted);
+        VOLT_DEBUG("BLOCK %u %d - unevicted blocks size is %d",
+                   _block_id, block_id, static_cast<int>(table->unevictedBlocksSize()));
         AntiCacheBlock* value = antiCacheDB->readBlock(_block_id, 0);
 
         // allocate the memory for this block
@@ -1765,8 +1765,8 @@ bool AntiCacheEvictionManager::mergeUnevictedTuples(PersistentTable *table) {
         int32_t block_id = table->getBlockID(index);
         uint32_t _block_id = (uint32_t)(block_id & 0x0FFFFFFF);
         int16_t ACID = (int16_t)((block_id & 0xE0000000) >> 29);
-        VOLT_DEBUG("block_id: %8x ACID: %d _block_id: %d blocking: %d\n", block_id, ACID, _block_id, (int)blocking);
         AntiCacheDB* antiCacheDB = m_db_lookup[ACID]; 
+        VOLT_DEBUG("block_id: %8x ACID: %d _block_id: %d blocking: %d\n", block_id, ACID, _block_id, antiCacheDB->isBlocking());
 
         int count = 0;
         for (std::vector<std::string>::iterator it = tableNames.begin() ; it != tableNames.end(); ++it){

diff --git a/src/ee/executors/nestloopindexexecutor.cpp b/src/ee/executors/nestloopindexexecutor.cpp
@@ -388,7 +388,7 @@ bool NestLoopIndexExecutor::p_execute(const NValueArray &params, ReadWriteTracke
                 if (inner_tuple.isNullTuple()) {
                     VOLT_INFO("We've got a null tuple for some reason");
                 }
-                VOLT_TRACE("Merged Tuple: %s", m_tuple.debug(m_targetTable->name()).c_str());
+                VOLT_TRACE("Merged Tuple: %s", inner_tuple.debug(inner_table->name()).c_str());
             }
             #endif