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

remove unused attributeExcludeHandler (#8760)

This commit is contained in:
Jan 2019-04-15 18:55:59 +02:00 committed by GitHub
parent 1d175f446d
commit c4d8091f45
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arangod/V8Server/v8-collection.cpp
View File

@ -1903,7 +1903,6 @@ static void InsertVocbaseCol(v8::Isolate* isolate,
// copy default options (and set exclude handler in copy)
VPackOptions vpackOptions = VPackOptions::Defaults;
vpackOptions.attributeExcludeHandler = basics::VelocyPackHelper::getExcludeHandler();
VPackBuilder builder(&vpackOptions);
auto doOneDocument = [&](v8::Handle<v8::Value> obj) -> void {

33
lib/Basics/VelocyPackHelper.cpp
View File

@ -57,7 +57,6 @@ static arangodb::velocypack::StringRef const idRef("id");
static arangodb::velocypack::StringRef const cidRef("cid");
static std::unique_ptr<VPackAttributeTranslator> translator;
static std::unique_ptr<VPackAttributeExcludeHandler> excludeHandler;
static std::unique_ptr<VPackCustomTypeHandler>customTypeHandler;
template<bool useUtf8, typename Comparator>
@ -168,30 +167,6 @@ struct DefaultCustomTypeHandler final : public VPackCustomTypeHandler {
}
};
// attribute exclude handler for skipping over system attributes
struct SystemAttributeExcludeHandler final : public VPackAttributeExcludeHandler {
bool shouldExclude(VPackSlice const& key, int nesting) override final {
VPackValueLength keyLength;
char const* p = key.getString(keyLength);
if (p == nullptr || *p != '_' || keyLength < 3 || keyLength > 5 || nesting > 0) {
// keep attribute
return true;
}
// exclude these attributes (but not _key!)
if ((keyLength == 3 && memcmp(p, "_id", static_cast<size_t>(keyLength)) == 0) ||
(keyLength == 4 && memcmp(p, "_rev", static_cast<size_t>(keyLength)) == 0) ||
(keyLength == 3 && memcmp(p, "_to", static_cast<size_t>(keyLength)) == 0) ||
(keyLength == 5 && memcmp(p, "_from", static_cast<size_t>(keyLength)) == 0)) {
return true;
}
// keep attribute
return false;
}
};
/// @brief static initializer for all VPack values
void VelocyPackHelper::initialize() {
LOG_TOPIC("bbce8", TRACE, arangodb::Logger::FIXME) << "initializing vpack";
@ -245,9 +220,6 @@ void VelocyPackHelper::initialize() {
StaticStrings::FromString);
TRI_ASSERT(VPackSlice(::translator->translate(ToAttribute - AttributeBase)).copyString() ==
StaticStrings::ToString);
// initialize exclude handler for system attributes
::excludeHandler.reset(new SystemAttributeExcludeHandler);
}
/// @brief turn off assembler optimizations in vpack
@ -255,11 +227,6 @@ void VelocyPackHelper::disableAssemblerFunctions() {
arangodb::velocypack::disableAssemblerFunctions();
}
/// @brief return the (global) attribute exclude handler instance
arangodb::velocypack::AttributeExcludeHandler* VelocyPackHelper::getExcludeHandler() {
return ::excludeHandler.get();
}
/// @brief return the (global) attribute translator instance
arangodb::velocypack::AttributeTranslator* VelocyPackHelper::getTranslator() {
return ::translator.get();

1
lib/Basics/VelocyPackHelper.h
View File

@ -81,7 +81,6 @@ class VelocyPackHelper {
static void initialize();
static void disableAssemblerFunctions();
static arangodb::velocypack::AttributeExcludeHandler* getExcludeHandler();
static arangodb::velocypack::AttributeTranslator* getTranslator();
struct VPackHash {