Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Bug fix/issues 2019 05 06 (#8913)

This commit is contained in:
Jan 2019-05-07 12:17:16 +02:00 committed by GitHub
parent eed6729789
commit 976dc2b726
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 99 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/Agency/AgencyComm.cpp
View File

@ -72,7 +72,7 @@ static void addEmptyVPackObject(std::string const& name, VPackBuilder& builder)
}
const std::vector<std::string> AgencyTransaction::TypeUrl(
{"/read", "/write", "/transact", "/transient", "/config"});
{"/read", "/write", "/transact", "/transient"});
// -----------------------------------------------------------------------------
// --SECTION-- AgencyPrecondition

5
arangod/Aql/Ast.cpp
View File

@ -3502,8 +3502,9 @@ AstNode* Ast::nodeFromVPack(VPackSlice const& slice, bool copyStringValues) {
node->members.reserve(static_cast<size_t>(it.size()));
while (it.valid()) {
auto current = (*it);
VPackValueLength nameLength;
char const* attributeName = it.key().getString(nameLength);
char const* attributeName = current.key.getString(nameLength);
if (copyStringValues) {
// create a copy of the string value
@ -3513,7 +3514,7 @@ AstNode* Ast::nodeFromVPack(VPackSlice const& slice, bool copyStringValues) {
node->addMember(
createNodeObjectElement(attributeName, static_cast<size_t>(nameLength),
nodeFromVPack(it.value(), copyStringValues)));
nodeFromVPack(current.value, copyStringValues)));
it.next();
}

2
arangod/Cluster/CreateCollection.cpp
View File

@ -99,7 +99,7 @@ CreateCollection::CreateCollection(MaintenanceFeature& feature, ActionDescriptio
}
}
CreateCollection::~CreateCollection(){};
CreateCollection::~CreateCollection() {}
bool CreateCollection::first() {
auto const& database = _description.get(DATABASE);

4
arangod/Cluster/CreateCollection.h
View File

@ -39,9 +39,9 @@ class CreateCollection : public ActionBase {
virtual ~CreateCollection();
virtual bool first() override final;
bool first() override final;
virtual void setState(ActionState state) override final;
void setState(ActionState state) override final;
};
} // namespace maintenance

4
arangod/Cluster/SynchronizeShard.h
View File

@ -44,9 +44,9 @@ class SynchronizeShard : public ActionBase {
virtual ~SynchronizeShard();
virtual bool first() override final;
bool first() override final;
virtual void setState(ActionState state) override final;
void setState(ActionState state) override final;
private:
arangodb::Result getReadLock(std::string const& endpoint, std::string const& database,

6
arangod/IResearch/IResearchRocksDBRecoveryHelper.cpp
View File

@ -275,8 +275,8 @@ void IResearchRocksDBRecoveryHelper::handleDeleteCF(uint32_t column_family_id,
}
void IResearchRocksDBRecoveryHelper::DeleteRangeCF(uint32_t column_family_id,
const rocksdb::Slice& end_key,
const rocksdb::Slice& begin_key) {
const rocksdb::Slice& begin_key,
const rocksdb::Slice& end_key) {
// not needed for anything atm
}
@ -317,4 +317,4 @@ void IResearchRocksDBRecoveryHelper::LogData(const rocksdb::Slice& blob) {
// -----------------------------------------------------------------------------
// --SECTION-- END-OF-FILE
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------

8
arangod/MMFiles/MMFilesCollection.cpp
View File

@ -641,13 +641,7 @@ MMFilesCollection::MMFilesCollection(LogicalCollection& logical,
_path = mmfiles._path;
_doCompact = mmfiles._doCompact;
_maxTick = mmfiles._maxTick;
/*
// Copy over index definitions
_indexes.reserve(mmfiles._indexes.size());
for (auto const& idx : mmfiles._indexes) {
_indexes.emplace_back(idx);
}
*/
TRI_ASSERT(!ServerState::instance()->isCoordinator());
setCompactionStatus("compaction not yet started");
// not copied

13
arangod/RestHandler/RestUploadHandler.cpp
View File

@ -61,18 +61,7 @@ RestStatus RestUploadHandler::execute() {
}
}
std::string relativeString;
{
char* relative = TRI_GetFilename(filename.c_str());
if (relative == nullptr) {
THROW_ARANGO_EXCEPTION(TRI_ERROR_OUT_OF_MEMORY);
}
relativeString.append(relative);
TRI_FreeString(relative);
}
std::string relativeString = TRI_GetFilename(filename);
arangodb::velocypack::StringRef bodyStr = _request->rawPayload();
char const* body = bodyStr.data();
size_t bodySize = bodyStr.size();

14
arangod/Scheduler/Scheduler.cpp
View File

@ -145,17 +145,19 @@ Scheduler::WorkHandle Scheduler::queueDelay(RequestLane lane, clock::duration de
if (delay < std::chrono::milliseconds(1)) {
// execute directly
queue(lane, [handler]() { handler(false); });
queue(lane, [handler = std::move(handler)]() { handler(false); });
return nullptr;
}
auto item = std::make_shared<WorkItem>(std::move(handler), lane, this);
std::unique_lock<std::mutex> guard(_cronQueueMutex);
_cronQueue.emplace(clock::now() + delay, item);
{
std::unique_lock<std::mutex> guard(_cronQueueMutex);
_cronQueue.emplace(clock::now() + delay, item);
if (delay < std::chrono::milliseconds(50)) {
// wakeup thread
_croncv.notify_one();
if (delay < std::chrono::milliseconds(50)) {
// wakeup thread
_croncv.notify_one();
}
}
return item;

22
arangod/StorageEngine/PhysicalCollection.cpp
View File

@ -193,22 +193,23 @@ Result PhysicalCollection::mergeObjectsForUpdate(
{
VPackObjectIterator it(newValue, true);
while (it.valid()) {
arangodb::velocypack::StringRef key(it.key());
if (!key.empty() && key[0] == '_' &&
auto current = *it;
arangodb::velocypack::StringRef key(current.key);
if (key.size() >= 3 && key[0] == '_' &&
(key == StaticStrings::KeyString || key == StaticStrings::IdString ||
key == StaticStrings::RevString ||
key == StaticStrings::FromString || key == StaticStrings::ToString)) {
// note _from and _to and ignore _id, _key and _rev
if (isEdgeCollection) {
if (key == StaticStrings::FromString) {
fromSlice = it.value();
fromSlice = current.value;
} else if (key == StaticStrings::ToString) {
toSlice = it.value();
toSlice = current.value;
}
} // else do nothing
} else {
// regular attribute
newValues.emplace(key, it.value());
newValues.emplace(key, current.value);
}
it.next();
@ -269,9 +270,10 @@ Result PhysicalCollection::mergeObjectsForUpdate(
{
VPackObjectIterator it(oldValue, true);
while (it.valid()) {
arangodb::velocypack::StringRef key(it.key());
auto current = (*it);
arangodb::velocypack::StringRef key(current.key);
// exclude system attributes in old value now
if (!key.empty() && key[0] == '_' &&
if (key.size() >= 3 && key[0] == '_' &&
(key == StaticStrings::KeyString || key == StaticStrings::IdString ||
key == StaticStrings::RevString ||
key == StaticStrings::FromString || key == StaticStrings::ToString)) {
@ -283,12 +285,12 @@ Result PhysicalCollection::mergeObjectsForUpdate(
if (found == newValues.end()) {
// use old value
b.addUnchecked(key.data(), key.size(), it.value());
} else if (mergeObjects && it.value().isObject() && (*found).second.isObject()) {
b.addUnchecked(key.data(), key.size(), current.value);
} else if (mergeObjects && current.value.isObject() && (*found).second.isObject()) {
// merge both values
auto& value = (*found).second;
if (keepNull || (!value.isNone() && !value.isNull())) {
VPackBuilder sub = VPackCollection::merge(it.value(), value, true, !keepNull);
VPackBuilder sub = VPackCollection::merge(current.value, value, true, !keepNull);
b.addUnchecked(key.data(), key.size(), sub.slice());
}
// clear the value in the map so its not added again

6
arangod/Transaction/Methods.cpp
View File

@ -861,19 +861,19 @@ transaction::Methods::Methods(std::shared_ptr<transaction::Context> const& ctx,
Result res;
for (auto const& it : exclusiveCollections) {
res = addCollection(it, AccessMode::Type::EXCLUSIVE);
res = Methods::addCollection(it, AccessMode::Type::EXCLUSIVE);
if (res.fail()) {
THROW_ARANGO_EXCEPTION(res);
}
}
for (auto const& it : writeCollections) {
res = addCollection(it, AccessMode::Type::WRITE);
res = Methods::addCollection(it, AccessMode::Type::WRITE);
if (res.fail()) {
THROW_ARANGO_EXCEPTION(res);
}
}
for (auto const& it : readCollections) {
res = addCollection(it, AccessMode::Type::READ);
res = Methods::addCollection(it, AccessMode::Type::READ);
if (res.fail()) {
THROW_ARANGO_EXCEPTION(res);
}

25
arangod/VocBase/vocbase.cpp
View File

@ -1744,14 +1744,10 @@ bool TRI_vocbase_t::IsAllowedName(bool allowSystem,
for (char const* ptr = name.data(); length < name.size(); ++ptr, ++length) {
bool ok;
if (length == 0) {
if (allowSystem) {
ok = (*ptr == '_') || ('a' <= *ptr && *ptr <= 'z') || ('A' <= *ptr && *ptr <= 'Z');
} else {
ok = ('a' <= *ptr && *ptr <= 'z') || ('A' <= *ptr && *ptr <= 'Z');
}
ok = ('a' <= *ptr && *ptr <= 'z') || ('A' <= *ptr && *ptr <= 'Z') || (allowSystem && *ptr == '_');
} else {
ok = (*ptr == '_') || (*ptr == '-') || ('0' <= *ptr && *ptr <= '9') ||
('a' <= *ptr && *ptr <= 'z') || ('A' <= *ptr && *ptr <= 'Z');
ok = ('a' <= *ptr && *ptr <= 'z') || ('A' <= *ptr && *ptr <= 'Z') ||
(*ptr == '_') || (*ptr == '-') || ('0' <= *ptr && *ptr <= '9');
}
if (!ok) {
@ -1759,12 +1755,7 @@ bool TRI_vocbase_t::IsAllowedName(bool allowSystem,
}
}
// invalid name length
if (length == 0 || length > TRI_COL_NAME_LENGTH) {
return false;
}
return true;
return (length > 0 && length <= TRI_COL_NAME_LENGTH);
}
/// @brief determine whether a collection name is a system collection name
@ -1914,7 +1905,7 @@ TRI_voc_rid_t TRI_ExtractRevisionId(VPackSlice slice) {
VPackSlice r(slice.get(StaticStrings::RevString));
if (r.isString()) {
VPackValueLength l;
char const* p = r.getString(l);
char const* p = r.getStringUnchecked(l);
return TRI_StringToRid(p, l, false);
}
if (r.isInteger()) {
@ -1940,7 +1931,8 @@ void TRI_SanitizeObject(VPackSlice const slice, VPackBuilder& builder) {
VPackObjectIterator it(slice);
while (it.valid()) {
arangodb::velocypack::StringRef key(it.key());
if (key.empty() || key[0] != '_' ||
// _id, _key, _rev. minimum size here is 3
if (key.size() < 3 || key[0] != '_' ||
(key != StaticStrings::KeyString && key != StaticStrings::IdString &&
key != StaticStrings::RevString)) {
builder.add(key.data(), key.size(), it.value());
@ -1956,7 +1948,8 @@ void TRI_SanitizeObjectWithEdges(VPackSlice const slice, VPackBuilder& builder)
VPackObjectIterator it(slice, true);
while (it.valid()) {
arangodb::velocypack::StringRef key(it.key());
if (key.empty() || key[0] != '_' ||
// _id, _key, _rev, _from, _to. minimum size here is 3
if (key.size() < 3 || key[0] != '_' ||
(key != StaticStrings::KeyString && key != StaticStrings::IdString &&
key != StaticStrings::RevString && key != StaticStrings::FromString &&
key != StaticStrings::ToString)) {

65
lib/Basics/StringUtils.cpp
View File

@ -263,8 +263,8 @@ std::string escapeUnicode(std::string const& name, bool escapeSlash) {
bool corrupted = false;
char* buffer = new char[6 * len + 1];
char* qtr = buffer;
auto buffer = std::make_unique<char[]>(6 * len + 1);
char* qtr = buffer.get();
char const* ptr = name.c_str();
char const* end = ptr + len;
@ -430,12 +430,10 @@ std::string escapeUnicode(std::string const& name, bool escapeSlash) {
*qtr = '\0';
std::string result(buffer, qtr - buffer);
delete[] buffer;
std::string result(buffer.get(), qtr - buffer.get());
if (corrupted) {
LOG_TOPIC("4c231", WARN, arangodb::Logger::FIXME)
LOG_TOPIC("4c231", DEBUG, arangodb::Logger::FIXME)
<< "escaped corrupted unicode string";
}
@ -449,8 +447,8 @@ std::vector<std::string> split(std::string const& source, char delim, char quote
return result;
}
char* buffer = new char[source.size() + 1];
char* p = buffer;
auto buffer = std::make_unique<char[]>(source.size() + 1);
char* p = buffer.get();
char const* q = source.c_str();
char const* e = source.c_str() + source.size();
@ -458,9 +456,8 @@ std::vector<std::string> split(std::string const& source, char delim, char quote
if (quote == '\0') {
for (; q < e; ++q) {
if (*q == delim) {
*p = '\0';
result.push_back(std::string(buffer, p - buffer));
p = buffer;
result.emplace_back(buffer.get(), p - buffer.get());
p = buffer.get();
} else {
*p++ = *q;
}
@ -472,20 +469,15 @@ std::vector<std::string> split(std::string const& source, char delim, char quote
*p++ = *++q;
}
} else if (*q == delim) {
*p = '\0';
result.push_back(std::string(buffer, p - buffer));
p = buffer;
result.emplace_back(buffer.get(), p - buffer.get());
p = buffer.get();
} else {
*p++ = *q;
}
}
}
*p = '\0';
result.push_back(std::string(buffer, p - buffer));
delete[] buffer;
result.emplace_back(buffer.get(), p - buffer.get());
return result;
}
@ -497,8 +489,8 @@ std::vector<std::string> split(std::string const& source,
return result;
}
char* buffer = new char[source.size() + 1];
char* p = buffer;
auto buffer = std::make_unique<char[]>(source.size() + 1);
char* p = buffer.get();
char const* q = source.c_str();
char const* e = source.c_str() + source.size();
@ -506,9 +498,8 @@ std::vector<std::string> split(std::string const& source,
if (quote == '\0') {
for (; q < e; ++q) {
if (delim.find(*q) != std::string::npos) {
*p = '\0';
result.push_back(std::string(buffer, p - buffer));
p = buffer;
result.emplace_back(buffer.get(), p - buffer.get());
p = buffer.get();
} else {
*p++ = *q;
}
@ -520,20 +511,15 @@ std::vector<std::string> split(std::string const& source,
*p++ = *++q;
}
} else if (delim.find(*q) != std::string::npos) {
*p = '\0';
result.push_back(std::string(buffer, p - buffer));
p = buffer;
result.emplace_back(buffer.get(), p - buffer.get());
p = buffer.get();
} else {
*p++ = *q;
}
}
}
*p = '\0';
result.push_back(std::string(buffer, p - buffer));
delete[] buffer;
result.emplace_back(buffer.get(), p - buffer.get());
return result;
}
@ -664,7 +650,8 @@ std::string replace(std::string const& sourceStr, std::string const& fromStr,
// is length of sourceStr
maxLength = (std::max)(maxLength, sourceLength) + 1;
char* result = new char[maxLength];
auto result = std::make_unique<char[]>(maxLength);
char* ptr = result.get();
size_t k = 0;
for (size_t j = 0; j < sourceLength; ++j) {
@ -678,26 +665,20 @@ std::string replace(std::string const& sourceStr, std::string const& fromStr,
}
if (!match) {
result[k] = sourceStr[j];
ptr[k] = sourceStr[j];
++k;
continue;
}
for (size_t i = 0; i < toLength; ++i) {
result[k] = toStr[i];
ptr[k] = toStr[i];
++k;
}
j += (fromLength - 1);
}
result[k] = '\0';
std::string retStr(result);
delete[] result;
return retStr;
return std::string(ptr, k);
}
void tolowerInPlace(std::string* str) {

19
lib/Basics/files.cpp
View File

@ -317,7 +317,6 @@ static bool IsSymbolicLink(char const* path, struct stat* stbuf) {
return (res == 0) && ((stbuf->st_mode & S_IFMT) == S_IFLNK);
}
static void deleteBuf(char* p) { std::free(p); };
} // namespace
std::string TRI_ResolveSymbolicLink(std::string path, bool& hadError, bool recursive) {
@ -1343,20 +1342,12 @@ int TRI_DestroyLockFile(char const* filename) {
/// @brief return the filename component of a file (without path)
////////////////////////////////////////////////////////////////////////////////
char* TRI_GetFilename(char const* filename) {
char const* p;
char const* s;
p = s = filename;
while (*p != '\0') {
if (*p == '\\' || *p == '/' || *p == ':') {
s = p + 1;
}
p++;
std::string TRI_GetFilename(std::string const& filename) {
size_t pos = filename.find_last_of("\\/:");
if (pos == std::string::npos) {
return filename;
}
return TRI_DuplicateString(s);
return filename.substr(pos + 1);
}
////////////////////////////////////////////////////////////////////////////////

2
lib/Basics/files.h
View File

@ -233,7 +233,7 @@ int TRI_DestroyLockFile(char const* filename);
/// @brief return the filename component of a file (without path)
////////////////////////////////////////////////////////////////////////////////
char* TRI_GetFilename(char const*);
std::string TRI_GetFilename(std::string const&);
////////////////////////////////////////////////////////////////////////////////
/// @brief return the absolute path of a file

6
lib/Basics/tri-zip.cpp
View File

@ -163,13 +163,15 @@ static int ExtractCurrentFile(unzFile uf, void* buffer, size_t const bufferSize,
// create target directory recursively
std::string tmp = basics::FileUtils::buildFilename(outPath, filenameInZip);
int res = TRI_CreateRecursiveDirectory(tmp.c_str(), systemError, errorMessage);
// write back the original value
// cppcheck-suppress *
*(filenameWithoutPath - 1) = c;
if (res != TRI_ERROR_NO_ERROR) {
return res;
}
*(filenameWithoutPath - 1) = c;
// try again
fout = TRI_FOPEN(fullPath.c_str(), "wb");
} else if (fout == nullptr) {

6
lib/Endpoint/EndpointIp.h
View File

@ -45,9 +45,9 @@ class EndpointIp : public Endpoint {
TRI_socket_t connectSocket(addrinfo const*, double, double);
public:
TRI_socket_t connect(double, double) override;
virtual void disconnect() override;
virtual bool initIncoming(TRI_socket_t) override;
TRI_socket_t connect(double, double) override final;
void disconnect() override final;
bool initIncoming(TRI_socket_t) override final;
int port() const override { return _port; }
std::string host() const override { return _host; }

2
lib/Maskings/Maskings.h
View File

@ -76,7 +76,7 @@ class Maskings {
void addMaskedObject(Collection& collection, VPackBuilder& builder,
std::vector<std::string>& path, VPackSlice const& data);
void addMasked(Collection& collection, VPackBuilder& builder, VPackSlice const& data);
void addMasked(Collection& collection, basics::StringBuffer&, VPackSlice const& data);
void addMasked(Collection& collection, basics::StringBuffer& data, VPackSlice const& slice);
private:
std::map<std::string, Collection> _collections;

16
tests/Basics/files-test.cpp
View File

@ -392,6 +392,22 @@ SECTION("tst_normalize") {
#endif
}
SECTION("tst_getfilename") {
CHECK("" == TRI_GetFilename(""));
CHECK("." == TRI_GetFilename("."));
CHECK("" == TRI_GetFilename("/"));
CHECK("haxxmann" == TRI_GetFilename("haxxmann"));
CHECK("haxxmann" == TRI_GetFilename("/haxxmann"));
CHECK("haxxmann" == TRI_GetFilename("/tmp/haxxmann"));
CHECK("haxxmann" == TRI_GetFilename("/a/b/c/haxxmann"));
CHECK("haxxmann" == TRI_GetFilename("c:/haxxmann"));
CHECK("haxxmann" == TRI_GetFilename("c:/tmp/haxxmann"));
CHECK("foo" == TRI_GetFilename("c:/tmp/haxxmann/foo"));
CHECK("haxxmann" == TRI_GetFilename("\\haxxmann"));
CHECK("haxxmann" == TRI_GetFilename("\\a\\haxxmann"));
CHECK("haxxmann" == TRI_GetFilename("\\a\\b\\haxxmann"));
}
}
////////////////////////////////////////////////////////////////////////////////