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

pages for mac

This commit is contained in:
Frank Celler 2012-03-15 17:32:54 +01:00
parent b7e6c26ce3
commit 997f009b72
3 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
V8/v8-vocbase.cpp
View File

@ -2351,7 +2351,7 @@ static v8::Handle<v8::Value> JS_HashSelectAql (v8::Arguments const& argv) {
static bool CheckWhereSkiplistOperators(size_t fieldCount, TRI_sl_operator_t* slOperator) {
TRI_sl_logical_operator_t* logicalOperator;
TRI_sl_relation_operator_t* relationOperator;
bool ok;
bool ok = false;
logicalOperator = (TRI_sl_logical_operator_t*)(slOperator);
relationOperator = (TRI_sl_relation_operator_t*)(slOperator);

31
V8Client/shell.cpp
View File

@ -162,6 +162,20 @@ static bool noAutoComplete = false;
/// @{
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
/// @brief print to pager
////////////////////////////////////////////////////////////////////////////////
static void internalPrint (const char *format, const char *str = 0) {
if (str) {
fprintf(PAGER, format, str);
}
else {
fprintf(PAGER, "%s", format);
}
}
////////////////////////////////////////////////////////////////////////////////
/// @brief outputs the arguments
///
@ -181,7 +195,7 @@ static v8::Handle<v8::Value> JS_PagerOutput (v8::Arguments const& argv) {
string str = TRI_ObjectToString(val);
fprintf(PAGER, "%s", str.c_str());
internalPrint(str.c_str());
}
return v8::Undefined();
@ -192,8 +206,13 @@ static v8::Handle<v8::Value> JS_PagerOutput (v8::Arguments const& argv) {
////////////////////////////////////////////////////////////////////////////////
static v8::Handle<v8::Value> JS_StartOutputPager (v8::Arguments const& argv) {
usePager = true;
printf("Using pager '%s' for output buffering.\n", OutputPager.c_str());
if (usePager) {
internalPrint("Using pager already.\n");
}
else {
usePager = true;
internalPrint("Using pager '%s' for output buffering.\n", OutputPager.c_str());
}
return v8::Undefined();
}
@ -202,6 +221,12 @@ static v8::Handle<v8::Value> JS_StartOutputPager (v8::Arguments const& argv) {
////////////////////////////////////////////////////////////////////////////////
static v8::Handle<v8::Value> JS_StopOutputPager (v8::Arguments const& argv) {
if (usePager) {
internalPrint("Stopping pager.\n");
}
else {
internalPrint("Pager not running.\n");
}
usePager = false;
return v8::Undefined();
}

3
VocBase/query.c
View File

@ -1330,9 +1330,6 @@ static void FilterDataSLQuery(collection_cursor_t* cursor,TRI_query_t* query,
TRI_qry_where_skiplist_const_t* where;
TRI_sim_collection_t* collection;
TRI_skiplist_iterator_t* skiplistIterator;
TRI_doc_mptr_t* wtr;
TRI_doc_mptr_t* doc;
size_t j;
cursor->base._context = context;
cursor->base._select = query->_select->clone(query->_select);