Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
8,840 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

1170 Commits

Author SHA1 Message Date
Frank Celler 49b5507b73 fixed issue #489: Bug in aal.install 
Conflicts:
	Makefile.in
 2013-05-05 21:10:14 +02:00
Guido Reina 2f4319b31a [Small improvements] In the function ResizeAssociativeArray(), array->_table is already initialized to '\0's, so there is no need to call clearElement() for each element. 
An associative array is only used by PQIndex and MasterTable_t.
For PQIndex the function ClearElementPQIndex() will be used, which sets the whole element to '\0's.
For MasterTable_t the function tablePositionClearElement() will be used, which sets all but one field to 0/NULL (the only field which is not set is _vectorNum).
If the clearElement() should be called, maybe TRI_Allocate() could be called with false, to avoid double initialization.
When copying elements, the for loop stops when the number of elements is the same as the original number of elements.

In the function TRI_FindByKeyAssociativeArray(), there is no need to check whether the element is not empty and is equal key element, only if it is not empty (as it is done in the function TRI_InsertKeyAssociativeArray()).
In the function TRI_FindByElementAssociativeArray(), there is no need to check whether the element is not empty and is equal element element, only if it is not empty (as it is done in the function TRI_InsertElementAssociativeArray()).
 2013-05-05 18:10:37 +02:00
Guido Reina 4ac19a99fc Typos. 2013-05-05 16:12:17 +02:00
Frank Celler 51cefb18bf fixed issue 505: statistics not populated on MacOS 
Conflicts:
	CHANGELOG
 2013-05-04 21:54:22 +02:00
Jan Steemann 911084a3ad removed now superfluous comment 2013-05-03 16:57:42 +02:00
Jan Steemann 83b525c5d6 changed name of value in statistics 2013-05-03 12:09:57 +02:00
Jan Steemann eef611b1da fixed some compiler & jslint warnings 2013-05-03 11:09:45 +02:00
Jan Steemann ee7ab712d6 issue #495 2013-05-03 11:08:58 +02:00
Jan Steemann 2c381d5d6a issue #498 2013-05-02 12:27:06 +02:00
Frank Celler f85b1c5a21 Merge pull request #499 from guidoreina/experiment 
Minor changes
 2013-05-01 05:27:07 -07:00
Guido Reina 4c5494c67d In the functions TRI_VerifyLockFile (Linux and Windows), the buffer 'buffer' was initialized to 0 right before calling TRI_UInt32String(), making TRI_UInt32String() return always 0, instead of the PID. 2013-05-01 11:05:20 +02:00
Guido Reina 528bb85b30 Implemented function for shutting down the statistics. 
The new function is called by ShutdownRest() and releases the memory allocated by TRI_InitialiseStatistics().
 2013-05-01 11:03:40 +02:00
Guido Reina 3c352b9ab2 The comment for the method reserve() was wrong (it was copied from the method annihilate()). 2013-05-01 11:01:35 +02:00
a-brandt 43aec7e76b Merge branch 'devel' of github.com:triAGENS/ArangoDB into multiple_databases 2013-04-30 10:05:53 +02:00
Oreste Panaia 115d87196c sync windows dev 2013-04-29 23:13:06 +08:00
Oreste Panaia c42c0bf565 sync dev for windows 2013-04-29 21:49:28 +08:00
Oreste Panaia 532c7eae8e windows dev update 2013-04-29 21:24:57 +08:00
a-brandt 6839fe7701 Merge branch 'devel' of github.com:triAGENS/ArangoDB into multiple_databases 2013-04-24 17:46:36 +02:00
Jan Steemann fc83d9abe6 fixed documentation for -c 2013-04-24 10:55:12 +02:00
Frank Celler e1bafcef3c zip.c is now tri-zip.c 2013-04-23 19:04:27 +02:00
Oreste Panaia ee339ffd9f windows 1.3 changes 2013-04-23 19:03:08 +02:00
Frank Celler fb8d8799c3 moved document of console to JSModuleConsole, added packages and node 2013-04-23 18:39:25 +02:00
Oreste Panaia 1ddbd2e4d9 update 2013-04-23 19:02:46 +08:00
Oreste Panaia b83d90f021 skiplist transaction support 2013-04-23 18:56:26 +08:00
a-brandt 234b1460f8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into multiple_databases 2013-04-23 09:55:08 +02:00
Frank Celler cbc2ab93ba fixed _shallowCopy, fixed creating of unknown attributes 2013-04-22 16:48:36 +02:00
a-brandt 7a0a9ff3b4 Merge branch 'devel' of github.com:triAGENS/ArangoDB into multiple_databases 2013-04-22 14:53:33 +02:00
a-brandt 8f52b8916b vocbase handling 2013-04-22 14:52:46 +02:00
Jan Steemann b61aac7879 higher precision for statistics values, added "sum" attribute for statistics 2013-04-22 13:24:08 +02:00
Jan Steemann c9f3bdac33 added TODO 2013-04-22 08:41:12 +02:00
Jan Steemann 3d44116609 changed description of startup attribute 2013-04-22 08:38:29 +02:00
Jan Steemann 4527348f71 changed text on startup 2013-04-22 08:38:08 +02:00
Frank Celler bab92e9c04 fixed help messages 2013-04-21 22:12:58 +02:00
Frank Celler df03d38ee2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-04-21 21:46:00 +02:00
Frank Celler a75736a148 added Buffer from node 2013-04-21 21:45:39 +02:00
Frank Celler d2ea4e9bd2 added SlowBuffer from node 2013-04-21 21:32:32 +02:00
Jan Steemann e1dae88f7b improved description for log.filter command line option 2013-04-19 12:05:49 +02:00
Jan Steemann 8ea6915b55 added IndexedPropertyGetter for ShapedJson 2013-04-19 11:35:55 +02:00
a-brandt 7c0e5fb16f Merge branch 'devel' of github.com:triAGENS/ArangoDB into multiple_databases 2013-04-18 12:01:47 +02:00
Jan Steemann b0bd55adbe fixed downloads 2013-04-18 12:00:49 +02:00
a-brandt 58de325e98 Merge branch 'devel' of github.com:triAGENS/ArangoDB into multiple_databases 2013-04-17 16:58:23 +02:00
a-brandt fcae2b2961 added RequestContext 2013-04-17 16:56:48 +02:00
Jan Steemann b667e458fc fixed error messages 2013-04-16 11:55:17 +02:00
Jan Steemann f6c4589852 fixed type 2013-04-16 11:39:07 +02:00
Jan Steemann dee5adb9f5 added client side API for transactions 2013-04-12 23:18:48 +02:00
a-brandt 0a44b019db Merge branch 'devel' into multiple_databases 2013-04-12 14:16:25 +02:00
a-brandt aa216c2edb changes for multiple databases 2013-04-12 14:15:06 +02:00
Jan Steemann 9b5849f650 updated documentation 2013-04-12 00:42:02 +02:00
Jan Steemann 229893c086 documentation for transactions 2013-04-12 00:03:05 +02:00
Jan Steemann b6925a7b7b transactions 2013-04-11 19:06:55 +02:00
Frank Celler 2135e2633e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-04-11 13:55:43 +02:00
Frank Celler 142cc08704 replaced more deprecated calls 2013-04-11 13:55:33 +02:00
a-brandt 3e80cb0071 fixed typo 2013-04-11 09:04:35 +02:00
Frank Celler f373615268 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	arangod/V8Server/v8-actions.cpp
 2013-04-10 21:47:51 +02:00
Frank Celler 828b939053 fixed isolates, made ArangoError internal 2013-04-10 21:22:09 +02:00
a-brandt 012f4eab35 added cookie keys 2013-04-10 17:43:32 +02:00
a-brandt 4675dcc036 added negative expire time 2013-04-10 17:09:14 +02:00
a-brandt 2d8c547fc8 added cookie support 2013-04-10 16:23:42 +02:00
Jan Steemann 7f1cd2681c added functions to add to front 2013-04-10 08:50:49 +02:00
Jan Steemann 5f5ee7e5e1 added error code 2013-04-10 08:50:13 +02:00
Frank Celler c567f0a81d Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-04-06 21:58:05 +02:00
Frank Celler 0600cc852e fixed mem error 2013-04-06 21:57:58 +02:00
Frank Celler a0278476da Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	lib/Basics/StringUtils.cpp
 2013-04-06 10:19:09 +02:00
Frank Celler 1d7ee507e2 added TRI_ERROR_ARANGO_DOCUMENT_KEY_MISSING 2013-04-06 10:18:29 +02:00
Jan Steemann 3a8783b26a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-04-05 15:35:23 +02:00
Jan Steemann edf513551f error handling 2013-04-05 15:35:08 +02:00
Frank Celler 97e61c77d5 added escape check 2013-04-05 14:47:58 +02:00
Frank Celler ab38a0543a fixed missing length 2013-04-05 14:47:45 +02:00
Jan Steemann ed10d9b6aa AQL user functions 2013-04-05 12:50:44 +02:00
Jan Steemann ce4ec381fc updated list of HTTP status codes 2013-04-05 11:28:06 +02:00
Jan Steemann 1417def879 disallow create/drop/rename operations inside transactions 2013-04-04 09:41:44 +02:00
Frank Celler 553ccf099c remove addtogroup blocks 2013-04-03 18:20:37 +02:00
Frank Celler 0ba6329a12 added trace 2013-04-03 16:32:04 +02:00
Jan Steemann f7a5cf4cf3 transactions 2013-04-03 14:40:23 +02:00
Frank Celler f810711a79 FreeBSD port 2013-04-02 18:43:10 +02:00
Frank Celler 717dd6e289 safer string building 2013-04-02 18:01:32 +02:00
Frank Celler 42b92c794f fixed error messages and tests 2013-04-02 17:46:19 +02:00
Frank Celler cb5427cbce replaced throwing of strings by real objects 2013-04-02 11:27:31 +02:00
Frank Celler 0a0f4ee4ec use error object to get stack trace 2013-03-31 12:24:51 +02:00
Frank Celler 5bee550aa7 added plattform 2013-03-31 00:10:47 +01:00
Frank Celler 31a9a71050 fixed unzip and create of parent directory 2013-03-28 20:31:04 +01:00
Jan Steemann 007cae87e6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-28 14:42:19 +01:00
Jan Steemann ba0d608a25 renamed function 2013-03-28 14:13:11 +01:00
Lucas Dohmen f1b5f20fab Foxx: Also using ArangoDB Mimetype Lookup for the other way around 2013-03-28 14:01:04 +01:00
Lucas Dohmen 8261a46577 Added a Mimetype 2013-03-28 13:25:30 +01:00
Frank Celler 0be696bac1 treat undefined as null when saving 2013-03-27 15:53:18 +01:00
Frank Celler d8159a990e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-27 11:32:52 +01:00
Frank Celler be971602f2 added install and uninstall of FOXX apps 2013-03-27 11:32:39 +01:00
Jan Steemann 3fd4fd984b mimetypes w/ charsets 2013-03-27 10:31:30 +01:00
Jan Steemann 909c316e22 added mimetype generation file 2013-03-27 10:11:56 +01:00
Jan Steemann 771b03ced3 fixed exception handling in ArangoSh 2013-03-26 16:01:05 +01:00
Jan Steemann ed4fa9361b fixed senseless wait for body in http head 2013-03-26 15:36:40 +01:00
Jan Steemann 3bb251000c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	lib/V8/v8-utils.cpp
 2013-03-26 14:13:41 +01:00
Jan Steemann 1492118545 added test cases for "fs" module 2013-03-26 14:09:20 +01:00
Frank Celler 557184631d more fox-manager, added files section 2013-03-26 13:58:00 +01:00
Frank Celler 0f6e48a38b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/server/modules/org/arangodb/foxx.js
 2013-03-26 10:01:39 +01:00
Jan Steemann a0460b5991 issue #120: added examples for endpoint syntax in `arangod --help` 
Now showing: `--server.endpoint <string>    endpoint for client requests (e.g. "tcp://127.0.0.1:8529", or "ssl://192.168.1.1:8529")`
 2013-03-25 15:52:02 +01:00
Frank Celler 877066392e foxx manager cleanup 2013-03-25 14:10:10 +01:00
Jan Steemann da998a3e65 fixed mruby build 2013-03-25 10:06:05 +01:00
Jan Steemann 75d2d05b04 added comment 2013-03-24 18:58:05 +01:00
Jan Steemann af4be86cef fixed doxygen errors 2013-03-24 18:31:23 +01:00
Jan Steemann 124d7cb29f fixed file uploads 2013-03-24 18:13:13 +01:00
Jan Steemann 071144ecc0 temporary file functons 2013-03-24 14:32:09 +01:00
Jan Steemann d9595caaf5 added upload API 2013-03-24 13:17:50 +01:00
Jan Steemann f58e1a4b9a sendFile 2013-03-24 11:44:29 +01:00
Frank Celler 1736221bac fixed cyclic objects 2013-03-24 10:57:44 +01:00
Jan Steemann 76a86a853f fixed build? 2013-03-24 10:43:55 +01:00
Jan Steemann 37f364e70e added internal.download() 2013-03-24 01:04:26 +01:00
Jan Steemann 91fbb454f3 added zipFile() 2013-03-23 22:32:59 +01:00
Jan Steemann faf450e570 added zip functionality 2013-03-23 20:55:19 +01:00
Jan Steemann d97954e466 unzip 2013-03-23 20:52:33 +01:00
Jan Steemann fd446bac1a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-03-23 19:14:02 +01:00
Jan Steemann 5cf913b2ca zlib 2013-03-23 19:13:31 +01:00
Frank Celler d1dab99248 more debug info 2013-03-23 18:07:37 +01:00
Frank Celler a1429ef749 more debug info 2013-03-23 18:03:17 +01:00
Frank Celler 961552b753 added trace for failed conversion 2013-03-23 17:32:32 +01:00
Jan Steemann 0d2fdcae58 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/common/bootstrap/module-fs.js
 2013-03-23 14:36:45 +01:00
Jan Steemann 6cd509c8e5 added fs.isFile() 2013-03-23 14:27:10 +01:00
Frank Celler 8a54df7419 added .arangosh.rc, added /_admin/execute 2013-03-23 14:04:08 +01:00
Frank Celler 38a5cf6a2d added development-mode 2013-03-22 17:33:25 +01:00
Jan Steemann 40199d64b7 fixed handling of empty and reserved attribute names in documents 
specifying an empty attribute name in a document may have led to segmentation faults
when the document was unpacked later.
 2013-03-20 11:48:33 +01:00
Frank Celler 734a0350e4 fixed wrong cast 2013-03-19 14:17:29 +01:00
Jan Steemann 54d05e35e6 const 2013-03-19 11:32:27 +01:00
Jan Steemann 95d78faa3c fixed doxygen errors 2013-03-18 20:07:31 +01:00
Oreste Panaia 081ad862a6 CAS modifications 2013-03-18 19:52:53 +08:00
Oreste Panaia 8333858eac CAS modifications 2013-03-18 19:11:18 +08:00
Jan Steemann b6f680cd46 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/VocBase/document-collection.c
 2013-03-15 18:16:36 +01:00
Jan Steemann 312b5fda64 some refactoring of document CRUD operations 2013-03-15 17:58:56 +01:00
Frank Celler 71fbdf87cd Mac fixes 2013-03-15 15:46:17 +01:00
Frank Celler f9ba951999 fixed comments 2013-03-15 13:42:52 +01:00
Frank Celler b0fc77d83d Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-15 11:37:59 +01:00
Frank Celler c773a0e825 replaced union by CONST_CAST 2013-03-15 11:37:49 +01:00
Oreste Panaia c8ea7ddc8b prepartion for skiplist transactions 2013-03-15 18:26:15 +08:00
Oreste Panaia 36733eb19f preparation for skiplists supporting transactions 2013-03-15 18:12:20 +08:00
Jan Steemann 0216883e36 add warning on exception 2013-03-14 17:28:13 +01:00
Jan Steemann 12a0bc787c empty string optimisations 2013-03-14 16:41:28 +01:00
Jan Steemann ab14179ee7 made fsync configurable when writing json files 2013-03-14 12:33:25 +01:00
Frank Celler 891cac01b2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	arangod/VocBase/collection.c
 2013-03-13 17:05:59 +01:00
Frank Celler 1aa5109fa3 updated disclaimer 2013-03-13 17:03:18 +01:00
a-brandt 62b72d17a1 #344 added missing support of array-url-parameters 2013-03-13 14:20:01 +01:00
Achim Brandt eb8855d37a removed <mach/shared_memory_server.h> for MacOSX 2013-03-12 16:54:45 +01:00
Jan Steemann 71b2587d96 added assertions for debugging 2013-03-12 12:55:52 +01:00
Jan Steemann 270de94a77 log out of memory errors 2013-03-12 09:27:44 +01:00
Frank Celler 9543bbcba0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-11 09:50:12 +01:00
Frank Celler c915bfa5ff cleanup of indexes, fix for compaction (hash, cap, geo) 
Conflicts:
	arangod/VocBase/compactor.c
	arangod/VocBase/document-collection.c
	arangod/VocBase/synchroniser.c
	arangod/VocBase/vocbase.c
 2013-03-11 09:49:58 +01:00
Jan Steemann cd5a675f62 fixed making arangoirb 2013-03-11 09:39:42 +01:00
Jan Steemann b66a7492b9 addendum for issue #443 2013-03-08 22:30:35 +01:00
Jan Steemann b7086fe93d removed unused fe-configuration handler 2013-03-08 20:26:06 +01:00
Jan Steemann 1a7e6b2d5b colorize! 2013-03-08 18:36:11 +01:00
Jan Steemann 99630450c2 removed checks for TRI_HAVE_ICU because ICU is a prerequisite for using ArangoDB 2013-03-08 16:03:54 +01:00
Jan Steemann 1ea4c1c4b0 issue #443 2013-03-08 15:16:29 +01:00
Jan Steemann 0a883f4076 merged some changes from trx branch into devel 2013-03-08 14:22:25 +01:00
Jan Steemann 5631314bc7 issue #212: added auto-increment support for collections 
the feature can be used by creating a collection with the extra `keyOptions`
attribute as follows:

    db._create("mycollection", { keyOptions: { type: "autoincrement", offset: 1, increment: 10, allowUserKeys: true } });

The `type` attribute will make sure the keys will be auto-generated if no `_key` attribute is specified for a document.
The `allowUserKeys` attribute determines whether users might still supply own `_key` values with documents or if this
is considered an error.
The `increment` value determines the actual increment value, whereas the `offset` value can be used to seed to value
sequence with a specific starting value. This will be useful later in a multi-master setup, when multiple servers can use
different auto-increment seed values and thus generate non-conflicting auto-increment values.

The default values currently are:

- `allowUserKeys`: `true`
- `offset`: `0`
- `increment`: `1`

The only other available key generator type currently is `traditional`. The `traditional` key generator
will auto-generate keys in a fashion as ArangoDB always did (some increasing integer value, with a more or less unpredictable
increment value).

Note that for the `traditional` key generator there is no the option to disallow user-supplied keys and give the
server the sole responsibility for key generation.
 2013-03-08 11:54:03 +01:00
Jan Steemann b307e4cd6d completed auto-increment key generator 2013-03-08 10:51:50 +01:00
Jan Steemann 092327058b potential solution for #438 (non-windows) 2013-03-07 10:50:40 +01:00
Jan Steemann 424ab3e759 removed redundant function 2013-03-07 01:30:34 +01:00
Jan Steemann a716f300a1 less strlen() calls 2013-03-07 00:58:08 +01:00
Jan Steemann a73d32c553 initialise lists to the correct size 2013-03-07 00:46:27 +01:00
Jan Steemann 0fb397eabd adjusted startup output to be more compact, less verbose 2013-03-06 19:05:17 +01:00
Jan Steemann 8f48edb6d6 set minimum number of open files to 256 at server start 2013-03-06 18:26:31 +01:00
a-brandt 18c05bdac6 added session errors 2013-03-06 14:05:42 +01:00
a-brandt d4875c8afb Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-05 16:20:37 +01:00
Frank Celler dd15025c1c fixed tests, add missing prefix = false to statistics call 2013-03-05 13:32:58 +01:00
a-brandt e41847c336 moved random generators and nonce functions to internal and crypto module 2013-03-04 16:18:00 +01:00
a-brandt 58148f33a4 changed nonce handling 2013-03-04 14:03:22 +01:00
a-brandt 16aef17808 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-04 10:33:01 +01:00
Jan Steemann 390916c417 fix stringbuffer appending for special numeric values 2013-03-04 09:09:31 +01:00
a-brandt d6392971bf Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-04 09:06:45 +01:00
Frank Celler dd96bb4abd Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-03-03 22:40:55 +01:00
Frank Celler 60037971dc rewrote statistics 2013-03-03 22:39:41 +01:00
a-brandt c4bdb201b5 added Nonce.cpp 2013-03-01 16:49:22 +01:00
a-brandt 8d78bb1c60 added rondom generator and nonce support 2013-03-01 16:48:37 +01:00
Frank Celler 7abeda64b8 fixed process statistics for MacOSX 2013-03-01 13:37:44 +01:00
Oreste Panaia 586a10ef2c final merge errors 2013-03-01 18:19:30 +08:00
Oreste Panaia 0f5717cd61 more merge conflicts fixes 2013-02-28 21:36:14 +08:00
Oreste Panaia fc5e1ba623 merge conflicts with devel 2013-02-28 19:42:58 +08:00
Oreste Panaia a48696ec28 network modifications required for windows 2013-02-28 17:43:39 +08:00
Frank Celler a79279445a Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-02-26 18:20:27 +01:00
Jan Steemann ebc653a0bd issue #435 2013-02-26 12:11:13 +01:00
Frank Celler 85d2e87154 added new package option 2013-02-25 18:15:32 +01:00
Jan Steemann 54449494bc issue #432: added option to turn off statistics gathering 
without recompilation
 2013-02-25 17:43:13 +01:00
Jan Steemann 74798c4fb1 more verbose option help texts 2013-02-25 09:20:20 +01:00
Jan Steemann f74da805ec fixed typo in option names 2013-02-25 09:17:36 +01:00
Jan Steemann 845fada5fe downgraded log message about unknown suffices 2013-02-23 01:59:28 +01:00
Jan Steemann cd6c4c99a5 adjust log buffers for frontend 
now the log level & date are not redundantly stored in the log message
 2013-02-23 01:29:51 +01:00
Jan Steemann d3b332e2a5 removed variant objects, switched to JSON instead 2013-02-23 01:19:00 +01:00
Jan Steemann 8e5919b597 return error if oom 2013-02-23 01:16:21 +01:00
Jan Steemann 971a6a352d removed variant 2013-02-22 17:36:36 +01:00
Jan Steemann 81f79315d1 removed configure option --enable-zone-debug 2013-02-22 15:54:14 +01:00
Oreste Panaia 9e69106c90 Merge branch '1.2' of https://github.com/triAGENS/ArangoDB into 1.2 2013-02-22 16:58:06 +08:00
Oreste Panaia ea601a23b3 Socket changes for windows libev 2013-02-22 16:51:13 +08:00
Frank Celler 1b69e1bb6c regenerated files 2013-02-21 14:27:31 +01:00
Frank Celler fe9f10af8d Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.2 
Conflicts:
	CHANGELOG
	Documentation/Manual/arangodb_1.2_shell_reference_card.pdf
	Makefile.in
	aclocal.m4
	config/compile
	config/config.guess
	config/config.sub
	config/depcomp
	config/missing
	configure
	lib/JsonParser/json-parser.c
 2013-02-21 14:21:59 +01:00
Frank Celler 2553b572ab fixed mode 2013-02-21 14:14:20 +01:00
Jan Steemann 53b41e7832 get rid of Valgrind warnings due to libev re-alloc behavior 2013-02-20 19:33:32 +01:00
Jan Steemann e1da2c45fd added TRI_ShutdownMemory() to free core reserve on clean shutdown 2013-02-20 19:11:33 +01:00
Jan Steemann 3fdebb38ee issue #393, issue #128 
Added a REST API for user management
The REST API exposes the functionality available in module "users" for HTTP access.

The following methods are available:
* GET /_api/user/username: fetch user information
* POST /_api/user: create new user
* PUT /_api/user: replace an existing user
* PATCH /_api/user: (partially) update an existing user
* DELETE /_api/user: remove an existing user

Additionally, a module "crypto" is introduced and exposed for Javascript actions.
The crypto module provides the following functions:
* require("org/arangodb/crypto").md5();
* require("org/arangodb/crypto").sha256();
* require("org/arangodb/crypto").rand();
 2013-02-20 11:56:26 +01:00
Oreste Panaia 2c12f63d7f libev interface 2013-02-19 20:58:21 +08:00
Jan Steemann 4f37fada0d some mini-modifications for slightly higher throughput 2013-02-19 09:54:36 +01:00
Jan Steemann 382047dbd6 issue #404 2013-02-18 14:28:19 +01:00
Jan Steemann 86a64db15d suppress warnings for unknown content-types 2013-02-18 13:37:57 +01:00
Frank Celler 2ac556d0f1 changed default 2013-02-18 10:06:36 +01:00
Frank Celler ced7b05cca added fix for TRI_ENABLE_LOGGING from Jan 2013-02-16 14:03:35 +01:00
Frank Celler 78ba7acb17 generated files 2013-02-15 13:22:02 +01:00
Frank Celler 45c815b7eb fixed issue #403: Usage of exit() etc. 2013-02-15 12:19:09 +01:00
Frank Celler 7b92dcc9bc fixed issue #405: 1.2 compile warnings 2013-02-15 11:57:35 +01:00
Frank Celler cf9a942417 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
 2013-02-15 11:52:53 +01:00
Frank Celler e4d1c8a6bd partly fix for issue #333: [debian] Group arangodb is not used when starting vie init.d script 2013-02-15 11:50:05 +01:00
Jan Steemann c64208de25 disable some statistics that are never queried 2013-02-15 11:36:53 +01:00
Jan Steemann d321f32523 moved some const value out of loop 2013-02-15 11:35:48 +01:00
Jan Steemann 8b7a5d2649 slighty optimise duplicates check 2013-02-15 10:22:47 +01:00
Jan Steemann 637ed65e09 expose reserve function 2013-02-15 10:22:31 +01:00
Frank Celler dd1657a1f8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-02-14 16:47:45 +01:00
Frank Celler 069dcdfc94 changed logging of fatal errors 2013-02-14 16:47:35 +01:00
Jan Steemann 831b84ab2e fixed issue #348 2013-02-14 15:19:08 +01:00
Jan Steemann 8b79f6e2b6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-02-13 18:05:44 +01:00
Jan Steemann 5c922cca02 fixed compile warnings with conditional compilation 2013-02-13 18:00:35 +01:00
Frank Celler 83ef8421c0 fixed padding for 32bit systems 2013-02-13 15:33:20 +01:00
Jan Steemann 332da75bcb fixed invalid number to string conversion for edge cases 2013-02-13 11:35:34 +01:00
Jan Steemann 8365c4294c small mods 2013-02-12 18:16:23 +01:00
Jan Steemann 052ae2f76f no zero-prefilling for structs that do not need it 2013-02-12 16:34:53 +01:00
Frank Celler 9bf9862f2b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-02-09 13:15:34 +01:00
Frank Celler 8cca06127c moved .dox to .md 2013-02-09 13:15:28 +01:00
a-brandt 6147a1d9c0 unset the escape codes for windows 2013-02-08 15:39:52 +01:00
a-brandt 4daf9d618b added "v8::V8::LowMemoryNotification()" before "while (!v8::V8::IdleNotification())" to trigger V8 GC 2013-02-08 14:20:12 +01:00
Jan Steemann f16f88a2e6 added docs for CONTAINS(), added LIKE() 2013-02-06 11:40:45 +01:00
Jan Steemann 5e6b73e2d3 do not close descriptors 2013-02-06 10:16:57 +01:00
Jan Steemann 3fd6373c2f removed error 1520, replaced with standard error 1203 2013-02-04 23:04:37 +01:00
Jan Steemann 6c64dbd105 some more cleanup 2013-02-01 15:29:37 +01:00
Jan Steemann 621f0dbb2c test remove 2013-02-01 10:49:18 +01:00
Jan Steemann ca0074f3c0 test add 2013-02-01 10:48:25 +01:00
Jan Steemann a36805857b test remove 2013-02-01 10:47:59 +01:00
Jan Steemann 089ac0a7b7 test add 2013-02-01 10:46:45 +01:00
Jan Steemann 5c55f6bf97 test remove 2013-02-01 10:46:09 +01:00
Jan Steemann e489c7380c test 2013-02-01 10:43:56 +01:00
Jan Steemann 8330f2d12a test 2013-02-01 10:33:24 +01:00
Jan Steemann 767c4fb3bb test 2013-02-01 10:31:28 +01:00
Jan Steemann 4f4e0e7a9a test 2013-02-01 10:27:28 +01:00
Jan Steemann 8b523873d5 test 2013-02-01 10:26:24 +01:00
Jan Steemann 8927da8020 test 2013-02-01 10:24:53 +01:00
Jan Steemann 424d284961 test 2013-02-01 10:20:25 +01:00
Jan Steemann 98e8e24604 test 2013-02-01 10:18:59 +01:00
Jan Steemann d9b572bfb0 test 2013-02-01 10:16:21 +01:00
Jan Steemann e9ff3b7749 test 2013-02-01 10:14:59 +01:00
Jan Steemann bae7bfd588 test 2013-02-01 10:14:01 +01:00
Jan Steemann ee3c534b7f test 2013-02-01 10:12:28 +01:00
Jan Steemann 9b7245373f test commit 2013-02-01 09:26:22 +01:00
Jan Steemann d43e9b89ca issue #381: lifted restrictions on usernames 2013-01-31 13:20:39 +01:00
Oreste Panaia 741510e8cb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-31 17:33:36 +08:00
Jan Steemann 2d7f0a7979 removed an unnecessary file 2013-01-31 10:33:16 +01:00
Jan Steemann 8d501f75e4 test commit hook 2013-01-31 10:30:43 +01:00
Jan Steemann 2c82dae6d8 test commit hook 2013-01-31 10:30:19 +01:00
Oreste Panaia 95f6b0dc9c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-31 16:22:41 +08:00
Jan Steemann 843453a76c test for infinite values to prevent endless while loops in number value printing 2013-01-30 19:26:43 +01:00
Oreste Panaia 3c8093849a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-31 00:07:19 +08:00
Oreste Panaia e0b7fbbf8d windows icu 2013-01-31 00:04:20 +08:00
Jan Steemann fe74508299 return a hard-coded string in case no error message is known for a particular error 2013-01-30 16:44:25 +01:00
Jan Steemann 47ad5e1139 removed dead configure option for 1.2 2013-01-30 13:19:20 +01:00
Frank Celler 0feb82dfa8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-29 15:48:06 +01:00
Jan Steemann e9e7f96cf6 do not authenticate HTTP OPTIONS requests 2013-01-29 15:43:39 +01:00
Jan Steemann ae9aa990f3 issue #358: fixed credentialing in CORS-non-preflight requests, fixed CORS keep-alive issue 2013-01-29 14:32:10 +01:00
Frank Celler 307b125035 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/actions/system/api-graph.js
 2013-01-29 14:17:13 +01:00
Frank Celler 6bd4bc5525 client side graph 2013-01-29 14:15:35 +01:00
Jan Steemann 9773a88cf9 prevent endless loops for inf double values being appended to string buffer 2013-01-29 12:07:30 +01:00
Jan Steemann 18dfd61d57 issue #358 2013-01-29 10:32:35 +01:00
Jan Steemann e8b0a548d6 removed tabs 2013-01-28 13:48:20 +01:00
Jan Steemann 57403527a9 issue #374 2013-01-28 11:26:58 +01:00
Jan Steemann 085c03609f issue #358 2013-01-28 09:49:35 +01:00
Jan Steemann b30f5bde68 issue #358: added support for CORS 2013-01-26 03:50:28 +01:00
Jan Steemann ac12e98480 wrong type for thread id. this caused potentially wrong thread ids on 32 bits... 2013-01-26 01:35:40 +01:00
Jan Steemann 17098dd4ef added support for HTTP OPTIONS method, pt 1 2013-01-25 19:11:33 +01:00
Jan Steemann 17530a5e45 added number of shapes in return value of figures() 2013-01-25 10:19:02 +01:00
Jan Steemann a27387e2ca comment about HTTP HEAD response 2013-01-23 18:03:34 +01:00
Jan Steemann 5d093576e2 fix a few -pedantic errors 2013-01-23 08:58:54 +01:00
Oreste Panaia bb54d606ad Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-22 23:06:39 +08:00
Oreste Panaia c4f6465ee7 attempt to link icu libraries into arango 2013-01-22 23:04:16 +08:00
Jan Steemann 376c264281 take precautions to prevent issue #365 2013-01-22 11:58:08 +01:00
Jan Steemann 9a003247d0 removed the _bidirectional attribute for edges 
This will be reimplemented later on collection, and not on individual edges level.
Lucas & the others were sure directed & undirected edges should not be mixed in the same collection
 2013-01-18 17:02:30 +01:00
Frank Celler 61c6433c1c fixed building of html/admin/js files 2013-01-18 10:27:25 +01:00
Jan Steemann 52309cf188 fixed tests & segfault during tests 2013-01-18 00:58:14 +01:00
Frank Celler 670dc221ab Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/client/client.js
	js/common/bootstrap/module-internal.js
	js/common/modules/org/arangodb/simple-query-common.js
	js/server/ahuacatl.js
 2013-01-17 23:56:31 +01:00
Frank Celler 3c21a87366 more cleanup 2013-01-17 16:01:15 +01:00
Jan Steemann 913480e881 make revision ids strings so they do not clip in clients that do not support 64 bit integers 2013-01-17 15:02:55 +01:00
Jan Steemann f1fbb4796e fixed anonymous mmap for MacOS 2013-01-16 12:32:28 +01:00
Jan Steemann a20cb437e1 some macros for zone debug 2013-01-16 01:58:41 +01:00
Jan Steemann 0686cfdbd0 fixed error messages in simplehttpclient 2013-01-15 18:33:07 +01:00
Jan Steemann 6fde7e2f27 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-15 16:45:54 +01:00
Jan Steemann 7a6db16241 added db._version() 2013-01-15 16:44:48 +01:00
Frank Celler 244d258fe7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-15 15:51:32 +01:00
Frank Celler 7380ddfabe Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	arangosh/V8Client/arangosh.cpp
	bin/arango32.msi
	bin/arango64.msi
	lib/BasicsC/win-utils.c
 2013-01-15 15:50:47 +01:00
Jan Steemann 4712e1637e optionally do not check element equality when inserting into the associative multi index 
this might speed up insertion a lot if we know that the same element cannot be in the index already
 2013-01-15 15:11:16 +01:00
Jan Steemann 682d22bfb0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-15 14:35:19 +01:00
Jan Steemann 2058700697 issue #353 2013-01-15 14:35:05 +01:00
a-brandt f2288b5900 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-15 09:08:28 +01:00
Oreste Panaia cdb9055cf4 shell and import 2013-01-14 20:23:56 +08:00
Oreste Panaia c01a5c6275 arango shell and import 2013-01-14 20:16:09 +08:00
Jan Steemann 8d4fb1d8ff tried to fix connection states 2013-01-12 03:15:11 +01:00
Jan Steemann b57f1bb63f mark connection as failed in case too big chunk was read 2013-01-12 02:59:16 +01:00
Jan Steemann 6ccd27a37f fixed randomly hanging connections in arangosh on MacOS. 2013-01-10 18:12:21 +01:00
Frank Celler 33e3031380 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	Makefile.in
	VERSION
	arangod/V8Server/v8-query.cpp
	build_posix.h
	configure
	configure.ac
 2013-01-10 18:00:25 +01:00
a-brandt c1fec4c5b0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-10 14:48:26 +01:00
Jan Steemann 41eb634cd2 potential fix for hanging connections in arangosh 2013-01-10 11:00:39 +01:00
Frank Celler 03f85fae23 added 'any' call for collections 2013-01-10 10:39:43 +01:00
Jan Steemann 8e2cf1e4b3 reset reconnect counter 2013-01-09 23:00:47 +01:00
Frank Celler 128cb67c8b Merge remote-tracking branch 'origin/1.1' into devel 
Conflicts:
	Documentation/Examples/shell-read-document-bad-handle
	Makefile.in
	arangod/Documentation/shell-document.dox
	configure
	js/actions/system/api-collection.js
	js/actions/system/api-index.js
	js/actions/system/api-system.js
	js/common/bootstrap/modules.js
	js/common/bootstrap/print.js
	js/server/ArangoCollection.js
	lib/V8/v8-utils.cpp
 2013-01-09 15:30:21 +01:00
Oreste Panaia afa0268e70 Merge branch '1.1' of https://github.com/triAGENS/ArangoDB into 1.1 2013-01-09 22:23:46 +08:00
Oreste Panaia 9baae9c129 windows bug fixes 2013-01-09 22:23:35 +08:00
a-brandt 00a3d87bc4 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-01-08 10:43:28 +01:00
a-brandt 8f9e2e51f9 libicu is mandatory now 2013-01-08 10:39:19 +01:00
Jan Steemann 876cda6ce1 cppcheck 2013-01-07 22:37:52 +01:00
Jan Steemann d76920443d added tests and documentation for volatile collections 2013-01-07 10:55:25 +01:00
Frank Celler 89a7cac605 added listTree 2013-01-05 22:45:09 +01:00
Frank Celler 0549528325 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
	Makefile.in
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/v8-vocbase.cpp
	html/admin/js/master.js
	js/actions/system/api-collection.js
	js/common/bootstrap/errors.js
	js/server/version-check.js
	lib/BasicsC/errors.dat
	lib/BasicsC/logging.c
	lib/BasicsC/voc-errors.c
	lib/BasicsC/voc-errors.h
 2013-01-05 11:16:50 +01:00
Jan Steemann 51305de692 in-memory collections, seem to work now 
documentation and some helper functions are still missing
 2013-01-04 17:04:15 +01:00
Jan Steemann 0471ee8a0d memory collections, intermediate commit 2013-01-04 15:50:29 +01:00
Frank Celler f9dba124dd Merge remote-tracking branch 'origin/issue317' into 1.1 
Conflicts:
	js/common/bootstrap/modules.js
 2013-01-03 18:57:18 +01:00
Frank Celler 114de14816 fixed duplicate 2013-01-03 17:16:25 +01:00
Frank Celler 53364b7f15 updated error codes 2013-01-03 16:31:55 +01:00
Jan Steemann 63805cf84c a few small fixes for logging 2013-01-03 14:47:16 +01:00
Jan Steemann 132143289d a few small fixes for logging 2013-01-03 14:45:56 +01:00
Frank Celler 503e0ff8fe fixed merge conflicts 2013-01-02 18:07:57 +01:00
Frank Celler 9917ece449 added missing padding for 32bit 2013-01-02 16:17:38 +01:00
Jan Steemann 459f935d00 intptr_t to uintptr_t conversion 2013-01-02 15:00:59 +01:00
Frank Celler 1357ab6c54 Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1 2013-01-02 14:53:13 +01:00
Frank Celler dadcef3de3 renamed execute/load to executelocal and executeglobal 2013-01-02 14:52:55 +01:00
Jan Steemann 74f9ced94e issue #335 2013-01-02 14:37:46 +01:00
Jan Steemann 19f459331d issue #335 2013-01-02 14:25:19 +01:00
Jan Steemann ea48388726 issue #335 2013-01-02 14:12:44 +01:00
Jan Steemann 6085ef9619 fixed doxygen error, added comment 2013-01-02 13:40:47 +01:00
Jan Steemann 09e204651e issue #329 pt 2 2012-12-21 23:58:44 +01:00
Jan Steemann 8f5e50f750 do not execute scripts 2012-12-21 23:55:03 +01:00
Jan Steemann 8699262625 fixed compile warnings 2012-12-20 17:12:22 +01:00
Oreste Panaia fa3f3a41c8 windows binaries 2012-12-20 21:14:13 +08:00
Frank Celler d5f24ce13c Merge remote-tracking branch 'origin/windows' into HEAD 
Conflicts:
	CHANGELOG
	Documentation/InstallationManual/Installing.md
	Documentation/Makefile.files
	Documentation/Scripts/generateTOC.py
	Documentation/header.html
	Installation/OBS/clean-repo.sh
	Installation/OBS/create-repo.sh
	Installation/OBS/create-ymp.sh
	Installation/OBS/index.html
	Installation/OBS/load-repo.sh
	Makefile.in
	VERSION
	aclocal.m4
	arangod/Ahuacatl/ahuacatl-functions.c
	arangod/Documentation/user-manual.dox
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/collection.c
	arangod/VocBase/datafile.c
	arangosh/V8Client/arangosh.cpp
	config/compile
	config/config.guess
	config/config.sub
	config/depcomp
	config/install-sh
	config/missing
	configure
	configure.ac
	js/server/arango-upgrade.js
	js/server/modules/org/arangodb/actions.js
	lib/BasicsC/logging.c
	lib/Utilities/ScriptLoader.cpp
 2012-12-20 11:11:47 +01:00
Oreste Panaia 83ded3fc1f windows fixes 2012-12-20 17:17:30 +08:00
Jan Steemann 669fe4275a cppcheck 2012-12-18 16:44:06 +01:00
Frank Celler 621e4409bc Merge remote-tracking branch 'origin/1.1' into devel 
Conflicts:
	.gitignore
	CHANGELOG
	Documentation/Makefile.files
	Installation/build.sh
	Installation/epm/arangodb.list
	Makefile.in
	README
	README.md
	VERSION
	aclocal.m4
	arangod/HashIndex/hasharray.c
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	config/config.guess
	config/config.sub
	config/depcomp
	configure
	configure.ac
	html/admin/js/master.js
	js/server/arango-password.js
	js/server/version-check.js
	lib/BasicsC/files.c
	lib/BasicsC/logging.c
	utils/Makefile.files
 2012-12-18 13:37:34 +01:00
Jan Steemann 697d09a558 fixed race conditions in multi-threading that may happen in some environments. looks like va_copy etc. are not always thread safe... 2012-12-18 12:57:39 +01:00
Achim Brandt 143f7675ee avoid Valgrind warning 2012-12-18 12:33:43 +01:00
Jan Steemann 9155b400c2 some fixes for readline 2012-12-18 12:25:04 +01:00
Jan Steemann e5ad8f6612 ifdef for readline version 2012-12-18 11:43:11 +01:00
Jan Steemann b8ca0b2d4d fulltext index massive rewrite 2012-12-15 01:01:25 +01:00
Jan Steemann b5d0457f3a fixed some issues reported by cppcheck 2012-12-12 18:42:11 +01:00
Jan Steemann 473aaa8fd4 fixed typos 2012-12-11 18:57:50 +01:00
Jan Steemann bfb6398110 added (intentional) compile error for Windows 2012-12-10 15:51:48 +01:00
Jan Steemann 8e201eba20 added #error markers for Windows 2012-12-10 15:50:02 +01:00
Jan Steemann 6d8851d83c protect against some invalid cases 2012-12-10 15:43:51 +01:00
Jan Steemann 9a9e8c3214 added test case for absolute path 2012-12-10 15:39:57 +01:00
Jan Steemann b16f672902 fixed some log errors on startup & shutdown 2012-12-10 15:18:35 +01:00
Oreste Panaia 4ece32bed4 test 2012-12-10 19:42:50 +08:00