greg/stasis-bLSM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

misc cleanups, removed old comments

Browse source 
git-svn-id: svn+ssh://svn.corp.yahoo.com/yahoo/yrl/labs/pnuts/code/logstore@1152 8dad8b1f-cf64-0410-95b6-bcf113ffbcfe
This commit is contained in:
sears 2010-09-15 22:53:30 +00:00
parent 3e8ffcbd7f
commit 5bd187c481
4 changed files with 21 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sherpa/LSMPersistentParentImpl.cc
View file

@ -3,10 +3,6 @@
#include "TabletMetadata.h"
#include "tcpclient.h"
// XXX for getpid...
#include <sys/types.h>
#include <unistd.h>
#include <fstream>
#include <iostream>
@ -81,7 +77,6 @@ public:
free(start_tup);
free(end_tup);
ordered.filestr << "getTabletMappingList B conn = " << ordered.l_ << std::endl;
pid_t pid = getpid();
uint8_t rcode = logstore_client_op_returns_many(ordered.l_, OP_SCAN, starttup, endtup, 0); // 0 = no limit.
ordered.filestr << "getTabletMappingList A'" << std::endl;

102
sherpa/LSMPersistentStoreImpl.cc
View file

@ -122,27 +122,6 @@ private:
//static log4cpp::Category &log =
// log4cpp::Category::getInstance("dht.su."__FILE__);
//unsigned char* LSMPersistentStoreImpl::TabletMetadataToString(const TabletMetadata&m, size_t* len) {
// return my_strcat(m.table(), m.tablet(), "", len);
//}
//unsigned char* LSMPersistentStoreImpl::TabletMetadataToKey(const TabletMetadata&m, size_t* keylen) {
//
// std::string metadata_table = std::string("ydht_metadata_table");
// std::string metadata_tablet= std::string("0");
//
// size_t len;
// // note: we could call getTabletId instead, but might have to adjust the callers...
// const char * tablet_name = (const char*)TabletMetadataToString(m, &len);
// // XXX memory leak?
// std::string keystr = std::string(tablet_name, len);
//
// unsigned char * ret = my_strcat(metadata_table, metadata_tablet, tablet_name, keylen);
//
// filestr << "TabletMetadataToKey returns " << (char *) ret << std::endl;
//
// return ret;
//
//}
void LSMPersistentStoreImpl::buf_metadata(unsigned char ** buf, size_t *len, const TabletMetadata &m) {
std::string ydht_metadata_table = std::string("ydht_metadata_table");
std::string zero = std::string("0");
@ -155,7 +134,6 @@ void LSMPersistentStoreImpl::buf_metadata(unsigned char ** buf, size_t *len, con
void LSMPersistentStoreImpl::metadata_buf(TabletMetadata &m, const unsigned char * buf, size_t len) {
// Metadata table key format:
// ydht_metadata_table[low_eos]0[low_eos]table[low_eos]tablet[low_eos][low_eos]
std::string ydht_metadata_table, zero, tmp, table, tablet, empty;
@ -298,10 +276,6 @@ LSMPersistentStoreImpl::val_buf(StorageRecord& ret,
memcpy(&metadata_len, buf, sizeof(metadata_len)); buf += sizeof(metadata_len);
memcpy(&dataBlob_len, buf, sizeof(dataBlob_len)); buf += sizeof(dataBlob_len);
// DHT_DEBUG_STREAM() << "read storage record buf_len " << buf_len << " expiryTime " << expiryTime << " metadata len " << metadata_len << " datalen " << dataBlob_len << " sum " << (sizeof(expiryTime) + sizeof(dataBlob_len) + sizeof(metadata_len) + metadata_len + dataBlob_len) << std::endl;
//
// DHT_DEBUG_STREAM() << " buffer contents " << buf << std::endl;
// Is there room in ret?
assert(buf_len >= sizeof(expiryTime) + sizeof(dataBlob_len) + sizeof(metadata_len) + metadata_len + dataBlob_len);
@ -309,7 +283,7 @@ LSMPersistentStoreImpl::val_buf(StorageRecord& ret,
if(ret.metadata().bufSize() < metadata_len ||
ret.dataBlob().bufSize() < dataBlob_len) {
return SuCode::PStoreDataTruncated; // RCS: This is what the mysql implementation does.
// it's someewhat misleading, as we don't truncate anything.
// it's somewhat misleading, as we don't truncate anything.
}
// Copy the data into ret.
@ -326,8 +300,6 @@ LSMPersistentStoreImpl::val_buf(StorageRecord& ret,
LSMPersistentStoreImpl::
LSMPersistentStoreImpl(bool isOrdered) : isOrdered_(isOrdered), l_(NULL), scan_l_(NULL) {
filestr.open(isOrdered? "/tmp/lsm-log" : "/tmp/lsm-log-hashed", std::fstream::out | std::fstream::app);
l_ = logstore_client_open("localhost", 32432, 60); // XXX hardcode none of these values
scan_l_ = logstore_client_open("localhost", 32432, 60); // XXX hardcode none of these values
filestr << "LSMP constructor called" << std::endl;
}
@ -335,8 +307,8 @@ LSMPersistentStoreImpl::
~LSMPersistentStoreImpl()
{
filestr << "LSMP destructor called" << std::endl;
logstore_client_close(l_);
logstore_client_close(scan_l_);
if(l_) logstore_client_close(l_);
if(scan_l_) logstore_client_close(scan_l_);
}
SuCode::ResponseCode LSMPersistentStoreImpl::initMetadataMetadata(TabletMetadata& m) {
@ -356,7 +328,10 @@ SuCode::ResponseCode LSMPersistentStoreImpl::
init(const SectionConfig &config)
{
filestr << "LSMP init called" << std::endl;
// if(!l_) // workaround bug 2870547
if(!l_) { // workaround bug 2870547
l_ = logstore_client_open("localhost", 32432, 60); // XXX hardcode none of these values
scan_l_ = logstore_client_open("localhost", 32432, 60); // XXX hardcode none of these values
}
return l_ ? SuCode::SuOk : FwCode::NotFound;
}
@ -385,46 +360,6 @@ addEmptyTablet(TabletMetadata& tabletMeta)
return SuCode::SuOk;
}
}
// size_t keylen;
// unsigned char * key;
// buf_metadata(&key, &keylen, tabletMeta);
// //unsigned char * key = TabletMetadataToKey(tabletMeta, &keylen);
// std::string tmp((char*)key, keylen-1);
// filestr << "add tablet [" << tmp << "]" << std::endl;
// datatuple * tup = datatuple::create(key, keylen, "", 1);
// // XXX lookup tuple, if it exists, return SuCode::PStoreTabletAlreadyExists
// datatuple * result = logstore_client_op(l_, OP_INSERT, tup);
// datatuple::freetuple(tup);
//
// if(!result) {
// datatuple::freetuple(result);
// filestr << "ERROR inserting tuple in addEmptyTablet";
// abort();
// free(key);
// return SuCode::PStoreUnexpectedError;
// } else {
// metadata_buf(tabletMeta, key, keylen);
// std::string s((char*)key, keylen - 1);
// free(key);
// filestr << "Tablet " << s << " added" << std::endl;
// return SuCode::SuOk;
// }
/*
std::string newLSMTableName;
SuCode::ResponseCode rc;
if ((rc = mySQLCoreImpl_.addEmptyTablet(tabletMeta.table(),
tabletMeta.tablet(),
newLSMTableName,
isOrdered_)) !=
SuCode::SuOk) {
return rc;
}
//Save the mysql table name back in TabletMetadata
tabletMeta.setTabletId(newLSMTableName); */
}
SuCode::ResponseCode LSMPersistentStoreImpl::
@ -453,16 +388,6 @@ dropTablet(TabletMetadata& tabletMeta)
ret = SuCode::SuOk;
}
return ret;
/* SuCode::ResponseCode rc;
const std::string& mySQLTableName = tabletMeta.getTabletId();
if ((rc = mySQLCoreImpl_.cleanupTablet(mySQLTableName)) != SuCode::SuOk) {
return SuCode::PStoreTabletCleanupFailed;
}
tabletMeta.setTabletId("");
DHT_DEBUG_STREAM() << "successfully dropped table from mysql"; */
}
// alternate to dropTablet() for when a tablet has been split and the underlying
@ -473,12 +398,9 @@ clearTabletRange(TabletMetadata& tabletMeta, uint32_t removalLimit)
{
filestr << "LSMP clearTabletRange called" << std::endl;
DHT_DEBUG_STREAM() << "clear tablet range is unimplemented. ignoring request";
// const std::string& mySQLTableName = tabletMeta.getTabletId();
// return mySQLCoreImpl_.deleteRange(mySQLTableName, tabletMeta.tablet(), removalLimit);
return SuCode::SuOk;
}
SuCode::ResponseCode LSMPersistentStoreImpl::
getApproximateTableSize(std::string tabletMeta,
int64_t& tableSize,
@ -487,8 +409,6 @@ getApproximateTableSize(std::string tabletMeta,
DHT_DEBUG_STREAM() << "get approximate table size is unimplemented. returning dummy values";
tableSize = 1024 * 1024 * 1024;
rowCount = 1024 * 1024;
// const std::string& mySQLTableName = tabletMeta.getTabletId();
// return mySQLCoreImpl_.getApproximateTableSize(mySQLTableName, tableSize, rowCount);
return SuCode::SuOk;
}
SuCode::ResponseCode LSMPersistentStoreImpl::
@ -692,8 +612,10 @@ getIncomingCopyProgress(const TabletMetadata& metadata,
//This will be a problem when we have more than 1
//exporter/importer type. We will have to store the
//snapshot version somewhere in tablet metadata
/* const std::string& mySQLTableName = metadata.getTabletId();
current = 1024*1024*1024;
estimated = 1024*1024*1024;
/* const std::string& mySQLTableName = metadata.getTabletId();
return LSMSnapshotExporter::
getIncomingCopyProgress(mySQLTableName,
snapshotId,
@ -710,7 +632,9 @@ getOutgoingCopyProgress(const TabletMetadata& metadata,
{
*const_cast<std::fstream*>(&filestr) << "LSMP getOutgoingCopyProgress called" << std::endl;
fprintf(stderr, "unsupported method getOutgoingCopyProgrees called\n");
return 1;
current = 1024*1024*1024;
estimated = 1024*1024*1024;
return SuCode::SuOk;
// return LSMSnapshotExporter::
// getOutgoingCopyProgress(snapshotId,
// current,

3
sherpa/LSMPersistentStoreImpl.h
View file

@ -169,9 +169,6 @@ private:
LSMPersistentStoreImpl(LSMPersistentStoreImpl &);
LSMPersistentStoreImpl operator=(LSMPersistentStoreImpl &);
// unsigned char* TabletMetadataToString(const TabletMetadata&m, size_t* keylen);
// unsigned char* TabletMetadataToKey(const TabletMetadata&m, size_t *key_len);
void metadata_buf(TabletMetadata &m, const unsigned char * buf, size_t len);
void buf_metadata(unsigned char ** buf, size_t *len, const TabletMetadata &m);
protected:

11
sherpa/Makefile
View file

@ -1,6 +1,13 @@
# yinst i log4cpp_y_dev-1.4.2
CPPFLAGS=-Wall -I/homes/sears/svndev/trunk/dht/common/include -I/homes/sears/svndev/trunk/dht/storage/handler/src -I/homes/sears/svndev/trunk/dht/storage/handler/include/ -I/homes/sears/svndev/trunk/dht/framework/base/include/ -I /homes/sears/svndev/trunk/dht/externals/fwcore/include -I /home/y/include -I .. -c -fPIC
SHERPA_DIR = /homes/sears/svndev/trunk/dht
CPPFLAGS=-Wall -I${SHERPA_DIR}/common/include \
-I${SHERPA_DIR}/storage/handler/src \
-I${SHERPA_DIR}/storage/handler/include/ \
-I${SHERPA_DIR}/framework/base/include/ \
-I${SHERPA_DIR}/externals/fwcore/include \
-I /home/y/include -I .. -c -fPIC
CXXFLAGS=-m32
CFLAGS=-m32
@ -8,8 +15,6 @@ libsherpalogstore.so : LSMPersistentStoreImpl.o tcpclient.o LSMPersistentParentI
gcc -m32 -shared -Wl,-soname,libsherpalogstore.so -o libsherpalogstore.so LSMPersistentStoreImpl.o tcpclient.o LSMPersistentParentImpl.o
cp libsherpalogstore.so /homes/sears/sherpa-so/
#LSMPersistentStoreImpl.o : LSMPersistentStoreImpl.cc
tcpclient.cpp : ../tcpclient.cpp
ln -s ../tcpclient.cpp