Max Neunhoeffer
dbd973164b
Finish first version of JsonLegend, not activated in Makefile.
2014-05-20 13:24:29 +02:00
Jan Steemann
168fdcf6ef
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh
...
Conflicts:
UnitTests/Basics/bson-test.cpp
arangod/V8Server/v8-actions.cpp
lib/Basics/BsonHelper.h
2014-05-19 11:21:58 +02:00
Jan Steemann
2bc4aa90af
fixed issues found by scan-build
2014-05-15 10:09:06 +02:00
Jan Steemann
8a5c2438b9
removed tabs
2014-05-14 18:01:40 +02:00
Jan Steemann
9f7923ace3
fixed VS warnings
2014-05-13 13:39:42 +02:00
Jan Steemann
3f6d28de8d
fixed VS warnings
2014-05-13 12:44:00 +02:00
Jan Steemann
027ec2d3f4
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh
...
Conflicts:
arangod/V8Server/V8PeriodicTask.cpp
arangod/V8Server/V8PeriodicTask.h
arangod/V8Server/v8-actions.cpp
js/common/bootstrap/module-internal.js
js/server/server.js
lib/Dispatcher/ApplicationDispatcher.cpp
lib/Dispatcher/RequeueTask.cpp
lib/GeneralServer/GeneralListenTask.h
lib/Scheduler/ApplicationScheduler.cpp
lib/Scheduler/PeriodicTask.cpp
lib/Scheduler/Scheduler.cpp
lib/Scheduler/Scheduler.h
lib/Scheduler/Task.cpp
lib/Scheduler/Task.h
lib/Scheduler/TimerTask.cpp
lib/Scheduler/TimerTask.h
2014-05-12 16:49:20 +02:00
Max Neunhoeffer
8ce1b08183
Add a ClusterMethod to truncate a collection in a cluster.
2014-05-09 23:14:41 +02:00
Jan Steemann
2e17f4bcd7
cppcheck
2014-05-09 00:21:17 +02:00
Jan Steemann
20292af75c
throw different type of debug error to prevent bogus "out-of-memory" errors
2014-05-08 23:00:18 +02:00
Jan Steemann
8fa45ca181
added string task ids for periodic jobs
2014-05-08 22:59:36 +02:00
Jan Steemann
7b9ce7046f
added typecasts
2014-05-08 14:29:15 +02:00
Jan Steemann
7f9446f6bc
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-05-07 18:48:44 +02:00
Jan Steemann
7d28a03782
added AQL date functions
2014-05-07 18:17:46 +02:00
Max Neunhoeffer
a312d496a9
Finish server functionality for cluster dump.
2014-05-07 16:36:47 +02:00
Max Neunhoeffer
8ba8ffcbb1
Add a useful const.
2014-05-07 16:34:22 +02:00
Max Neunhoeffer
18b759ce32
Fix killing of processes unknown to arangod under Unix.
2014-05-06 11:41:55 +02:00
Jan Steemann
0a5e641f97
added index memory usage statistics
...
this also adds index memory usage to the output of the `figures` method
2014-05-02 22:05:29 +02:00
Jan Steemann
77d02b1235
fixed invalid typedef
2014-05-02 12:29:11 +02:00
Max Neunhoeffer
0dd2bfe38e
Cleanup 64-byte alignment for 32-bit compilation.
2014-04-24 11:08:28 +02:00
Jan Steemann
d3d3473013
fixed compile warning regarding ISOC90
2014-04-23 21:30:55 +02:00
Jan Steemann
f34d25381f
don't log if not properly initialised
2014-04-22 22:00:09 +02:00
Jan Steemann
341481ba66
fixed Windows compile errors and warnings
2014-04-22 14:49:00 +02:00
Frank Celler
8e9ad58f3b
added cancelation of asnyc jobs
...
Conflicts:
arangod/V8Server/ApplicationV8.cpp
arangod/V8Server/v8-actions.cpp
lib/Rest/Handler.h
2014-04-16 20:16:22 +02:00
Jan Steemann
b5cb711a47
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh
2014-04-11 13:01:13 +02:00
Frank Celler
fc0ffd40b6
added missing figures
2014-04-10 11:48:35 +02:00
Jan Steemann
0852dbb301
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh
2014-04-09 09:51:38 +02:00
Jan Steemann
f893a9e53e
typecast
2014-04-09 09:36:21 +02:00
Jan Steemann
c29cf874b5
transaction interface
2014-04-08 14:40:09 +02:00
Jan Steemann
de38d8c0ea
simplify serialisation of JSON into string-buffer
2014-04-07 21:31:23 +02:00
Jan Steemann
3cc2b59e74
size tests
2014-04-07 21:27:57 +02:00
Jan Steemann
87b31f9793
VS fixes
2014-04-07 11:50:52 +02:00
Jan Steemann
0f5ae9b4eb
use WorkingSetSize instead of PeakWorkingSetSize
2014-04-04 16:43:38 +02:00
Jan Steemann
282f510e34
fixed race conditions
2014-04-04 14:57:14 +02:00
Max Neunhoeffer
41befb9d85
Move BSON to C++.
2014-04-04 12:51:45 +02:00
Jan Steemann
6baeaf606d
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-04-03 16:14:19 +02:00
Jan Steemann
17bf8ebafb
fixed VS warnings
2014-04-03 16:13:56 +02:00
Max Neunhoeffer
5a2debd863
Add a first version (only 2 funcs) of tri-bson.h
2014-04-03 15:55:51 +02:00
Jan Steemann
23dffa05a7
change parameter name to avoid compiler warnings
2014-04-03 13:34:55 +02:00
Esteban Lombeyda
d9e9983286
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-04-02 16:29:10 +02:00
Esteban Lombeyda
df2ef651fe
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-04-02 16:27:57 +02:00
Esteban Lombeyda
dfd7eb7bae
implementation of thread number and process times for windows
2014-04-02 14:47:33 +02:00
Jan Steemann
50f2ffaaaf
fixed misbehaving memory barriers for Visual Studio 2013
...
seems we are affected by the issue described here:
http://lists.schmorp.de/pipermail/libev/2014q1/002318.html
2014-04-02 14:19:40 +02:00
Max Neunhoeffer
0b80d25c29
Fix bug in associative-multi-pointer hash.
...
Also finish unittest for it.
2014-04-01 20:28:58 +02:00
Esteban Lombeyda
4d9534280b
implementing process information for windows processes
2014-04-01 17:05:17 +02:00
Max Neunhoeffer
2970899e6c
More debug code to track down bug in hash table.
2014-04-01 16:22:54 +02:00
Max Neunhoeffer
5fb98df16e
Debugging output.
2014-04-01 15:54:51 +02:00
Max Neunhoeffer
4f0453e6f9
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
2014-04-01 14:50:52 +02:00
Max Neunhoeffer
8585d97c80
Fix a bug in multi pointer hash.
2014-04-01 14:50:29 +02:00
Jan Steemann
70f0c5c304
lol VS
2014-04-01 11:19:45 +02:00
Jan Steemann
086bfbe156
fix hash function call
2014-04-01 11:05:41 +02:00
Jan Steemann
e5b4bd8718
fix for VS
2014-04-01 10:50:08 +02:00
Max Neunhoeffer
a3596a6013
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
2014-04-01 10:09:10 +02:00
Max Neunhoeffer
43c0e8f166
Small improvement in lookup.
2014-04-01 10:01:56 +02:00
Jan Steemann
bc5428021f
changed function name
2014-04-01 09:20:27 +02:00
Jan Steemann
b9293dee2c
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-03-31 13:47:23 +02:00
Max Neunhoeffer
c2316ba473
Fix three bugs with memory management in associative-multi.c
2014-03-31 13:40:31 +02:00
Jan Steemann
5f3ea348bc
separated FNV hashing functions
2014-03-31 11:41:23 +02:00
Max Neunhoeffer
4ae51b42bf
Sort out internal statistics and polish future pair stuff.
2014-03-31 11:06:40 +02:00
Max Neunhoeffer
9dfbb0efdb
Use UNIX line endings in xxhash.
2014-03-31 09:25:05 +02:00
Max Neunhoeffer
4ed8230b3a
Merge branch 'devel' into associative_tests
2014-03-31 08:46:36 +02:00
Jan Steemann
3644a73554
speed up CRC calculation
...
measured speedup on an x86_64 Linux
-----------------------------------
clang, -O2, without patch:
* 5,000,000x CRC of a 256 byte buffer: TOOK: 0.858567
* 5,000,000x CRC of a 512 byte buffer: TOOK: 1.67744
* 5,000,000x CRC of a 1024 byte buffer: TOOK: 3.31552
* 5,000,000x CRC of a 2048 byte buffer: TOOK: 6.58735
* 5,000,000x CRC of a 4096 byte buffer: TOOK: 13.1924
clang, -O2, with patch
* 5,000,000x CRC of a 256 byte buffer: TOOK: 0.669745
* 5,000,000x CRC of a 512 byte buffer: TOOK: 1.3234
* 5,000,000x CRC of a 1024 byte buffer: TOOK: 2.63565
* 5,000,000x CRC of a 2048 byte buffer: TOOK: 5.26927
* 5,000,000x CRC of a 4096 byte buffer: TOOK: 10.6086
gcc, -O2, without patch:
* 5,000,000x CRC of a 256 byte buffer: TOOK: 0.752911
* 5,000,000x CRC of a 512 byte buffer: TOOK: 1.46402
* 5,000,000x CRC of a 1024 byte buffer: TOOK: 2.88934
* 5,000,000x CRC of a 2048 byte buffer: TOOK: 5.74819
* 5,000,000x CRC of a 4096 byte buffer: TOOK: 11.4839
gcc, -O2, with patch:
* 5,000,000x CRC of a 256 byte buffer: TOOK: 0.643093
* 5,000,000x CRC of a 512 byte buffer: TOOK: 1.20488
* 5,000,000x CRC of a 1024 byte buffer: TOOK: 2.39155
* 5,000,000x CRC of a 2048 byte buffer: TOOK: 4.75178
* 5,000,000x CRC of a 4096 byte buffer: TOOK: 9.34864
2014-03-28 20:26:56 +01:00
Jan Steemann
55f0dc5739
logfile opening/closing fixes
2014-03-28 16:45:06 +01:00
Max Neunhoeffer
f7476a36ef
Take out some diagnostics.
2014-03-28 16:25:13 +01:00
Max Neunhoeffer
7f11440402
Repair graphs with new edge index.
2014-03-28 16:21:18 +01:00
Max Neunhoeffer
078687fe00
Change edge index. Compiles but does not work yet.
2014-03-28 11:10:49 +01:00
Max Neunhoeffer
05c9e4fd54
Cleanup resizing of MultiPointerHash
2014-03-28 09:14:20 +01:00
Esteban Lombeyda
a0f6c9d138
Compiler Fix
2014-03-27 17:10:34 +01:00
Max Neunhoeffer
b4e80d5a26
Merge branch 'devel' into associative_tests
2014-03-27 16:32:56 +01:00
Max Neunhoeffer
650d852db9
Graph tests work again.
2014-03-27 16:32:24 +01:00
Esteban Lombeyda
c502f37c1b
Non used variables were commented out (Compiler warning C4101)
2014-03-27 16:06:13 +01:00
Jan Steemann
d48a2507fc
fixed wrong return type
2014-03-27 09:45:25 +01:00
Max Neunhoeffer
100e689fe9
Remove unused code for associative multi arrays.
...
If we ever need this, it will be better to copy the code for
associative multi pointer arrays.
2014-03-27 00:15:27 +01:00
Max Neunhoeffer
d7f78c8add
Finish deletion of entries from associative-multi hash.
2014-03-27 00:10:09 +01:00
Max Neunhoeffer
7b4f7f665c
Lookup compiles, deletion planned.
2014-03-26 16:21:50 +01:00
Max Neunhoeffer
c32f717a07
Merge branch 'devel' into associative_tests
2014-03-26 15:12:54 +01:00
Max Neunhoeffer
185d86c04f
Snapshot before moving to indices in associative-multi.
2014-03-26 15:12:36 +01:00
Max Neunhoeffer
2336b9f310
Try variants of TRI_IncModU64 and add TRI_DecModU64.
2014-03-26 09:15:57 +01:00
Max Neunhoeffer
fd76cd6fad
Experiments on hashing.
2014-03-25 16:24:27 +01:00
Frank Celler
d34832bbcf
added changePassword attribute for users
2014-03-25 11:40:13 +01:00
Jan Steemann
f60eae74e4
fix compiler warning
2014-03-24 16:13:20 +01:00
Max Neunhoeffer
5c63512bb5
If we run out of prime numbers, do not change value.
2014-03-24 14:07:31 +01:00
Max Neunhoeffer
523029e190
Use only hash lengths that are prime numbers.
2014-03-24 14:07:00 +01:00
Max Neunhoeffer
dde446fb28
Optimise hash tables by no longer using % for wraparound.
2014-03-24 14:04:24 +01:00
Jan Steemann
2aef412cd4
use sizeHint for hash index, too
2014-03-21 22:59:41 +01:00
Jan Steemann
c760272a7f
provide a sint hint to indexes when initially filling them
...
this may speed up building indexes when opening an existing collection
2014-03-17 11:29:13 +01:00
Jan Steemann
d10258594e
issue #772 : added diagnostic output for Foxx application upload
...
Conflicts:
CHANGELOG
2014-03-14 10:50:38 +01:00
Jan Steemann
1cd29e0bb4
fixed typo in comment
2014-03-13 23:02:51 +01:00
Jan Steemann
ff2198151b
fixed vector insert at end
2014-03-12 14:27:51 +01:00
Max Neunhoeffer
5110b45c26
Change Windows version to pass SOCKET handles to libev.
...
One has to use the corresponding change in the ArangoDB-Windows
repository as well, where libev is patched for this purpose.
2014-03-10 15:38:03 +01:00
Max Neunhoeffer
ccb037a4d9
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2014-03-07 16:48:46 +01:00
Max Neunhoeffer
cd0a33de9f
Seemingly fix behaviour on Windows.
...
Note: WSACleanup complains and we do not know a fix.
2014-03-07 16:48:21 +01:00
Max Neunhoeffer
6206f91d56
Yet another fix for process shutdown on Unix.
2014-03-07 16:20:12 +01:00
Max Neunhoeffer
101486c6af
Improve error handling in process startup in js testing framework.
2014-03-07 15:01:50 +01:00
Jan Steemann
910996529c
windows
2014-03-07 11:45:55 +01:00
Jan Steemann
6b42df078b
sockets fix
2014-03-06 17:17:31 +01:00
Jan Steemann
79defc2ef1
-Wunreachable-code reverted. Visual Studio doesn't like it
2014-03-06 11:36:58 +01:00
Jan Steemann
c5c294aa6b
-Wunreachable-code
2014-03-06 11:30:38 +01:00
Jan Steemann
84364a7601
fixed socket shutdown on Windows
2014-03-06 10:34:29 +01:00
Jan Steemann
e9d2d555af
renamed parameter to silence compilers
2014-03-06 10:34:13 +01:00
Frank Celler
0684d0bda4
added vista locks
...
Conflicts:
GNUmakefile
lib/BasicsC/locks-win32.c
lib/BasicsC/locks-win32.h
2014-03-05 14:22:27 +01:00
Max Neunhoeffer
63bcda3c78
Fix a typo for Windows.
2014-03-04 13:13:10 +01:00
Max Neunhoeffer
dcb2feccd0
Another try to fix process startup under Windows.
2014-03-04 12:31:14 +01:00
Max Neunhoeffer
e652d663bf
Fix socket closing under Windows.
2014-03-04 11:23:11 +01:00
Jan Steemann
c18055b284
fixed compiler warning
2014-03-04 10:41:55 +01:00
Max Neunhoeffer
1cb38c6aca
Fix compilation under windows.
2014-03-04 08:53:16 +01:00
Jan Steemann
9cdd453043
fixed compiler warning
2014-03-03 19:25:42 +01:00
Max Neunhoeffer
e280ea9e91
First try to cleanup process startup for good.
...
Unix: compiles and works.
Windows: tried to cleanup, did not try to compile yet.
2014-03-03 17:02:16 +01:00
Jan Steemann
3478c8bc74
cppcheck
2014-03-03 09:12:34 +01:00
Frank Celler
f4dd63e55d
Merge branch 'sharding' of github.com:triAGENS/ArangoDB into 2.0
2014-03-02 13:41:59 +01:00
Frank Celler
58ca2f9647
added windows mem function
2014-03-01 17:28:06 +01:00
Frank Celler
d37a5221ab
added pyhsical memory for linux
2014-03-01 17:23:20 +01:00
Frank Celler
e70c9bed21
added total memory for mac
2014-03-01 17:16:10 +01:00
Frank Celler
b888e8cfa6
Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding
...
Conflicts:
arangod/V8Server/V8PeriodicJob.cpp
js/apps/system/aardvark/api-docs.json
js/apps/system/aardvark/api-docs/batch.json
js/apps/system/aardvark/api-docs/collection.json
js/apps/system/aardvark/api-docs/cursor.json
js/apps/system/aardvark/api-docs/database.json
js/apps/system/aardvark/api-docs/document.json
js/apps/system/aardvark/api-docs/edge.json
js/apps/system/aardvark/api-docs/edges.json
js/apps/system/aardvark/api-docs/endpoint.json
js/apps/system/aardvark/api-docs/graph.json
js/apps/system/aardvark/api-docs/index.json
js/apps/system/aardvark/api-docs/job.json
js/apps/system/aardvark/api-docs/replication.json
js/apps/system/aardvark/api-docs/simple.json
js/apps/system/aardvark/api-docs/system.json
js/apps/system/aardvark/api-docs/traversal.json
2014-02-28 20:37:05 +01:00
Max Neunhoeffer
a264b55f32
Fight zombies.
2014-02-28 20:24:42 +01:00
Max Neunhoeffer
7a767b25ac
waitpid for a child even if we do no longer know it.
2014-02-28 20:20:43 +01:00
Esteban Lombeyda
751046e6f1
using white spaces instead tabulators
2014-02-28 19:01:35 +01:00
Frank Celler
1aa3a02167
changed default log level to warning
2014-02-28 12:25:30 +01:00
Esteban Lombeyda
85e824f1c8
Bug Fix: compiler error
...
: searching strategy for installation directory upgraded
2014-02-28 12:07:29 +01:00
Frank Celler
e8a638f1b5
only support programm suffix
2014-02-27 21:38:34 +01:00
Frank Celler
56536adb96
set log level as soon as possible
2014-02-27 18:47:16 +01:00
Max Neunhoeffer
2315bc2c87
Cleanup TRI_GetAbsolute code.
2014-02-24 09:25:52 +01:00
Max Neunhoeffer
4e847c508c
Fix a comment.
2014-02-21 15:15:40 +01:00
Max Neunhoeffer
e7730b6a16
Kill process under Unix even when it is not known.
2014-02-20 10:17:16 +01:00
Max Neunhoeffer
a58e261f16
Repair windows executeExternal.
2014-02-19 15:46:16 +01:00
Max Neunhoeffer
074ef1cb31
Unify process startup between Windows and not.
2014-02-19 15:01:37 +01:00
Max Neunhoeffer
6b3cfa1256
Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding
2014-02-19 11:13:16 +01:00
Max Neunhoeffer
c756f0bb04
Fix command line quoting for Windows.
2014-02-19 11:12:03 +01:00
Frank Celler
066abd777c
Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding
...
Conflicts:
js/apps/system/aardvark/frontend/js/routers/router.js
2014-02-19 10:21:00 +01:00
Frank Celler
da7d64bba9
removed wow6432 hack
2014-02-19 10:13:30 +01:00
Max Neunhoeffer
3a121b4082
First try to fix Windows command line arg quoting.
2014-02-19 09:58:20 +01:00
Max Neunhoeffer
c3c2cba69b
Build up command line arguments for windows process startup.
2014-02-18 15:34:29 +01:00
Max Neunhoeffer
bc99b765d0
Add wait argument to statusExternal.
...
Windows version untested.
2014-02-17 16:40:11 +01:00
Max Neunhoeffer
c2cb8c20cb
Fix casting bug.
2014-02-17 14:45:47 +01:00
Max Neunhoeffer
75eff02608
Please the compiler under Windows.
2014-02-17 14:27:46 +01:00
Max Neunhoeffer
dd3546ee40
Resolve socket bug under Windows.
2014-02-17 14:21:47 +01:00
Max Neunhoeffer
3d27a9f0ad
Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding
2014-02-14 14:44:45 +01:00
Max Neunhoeffer
076bc6e723
Cleanup socket abstraction for different OSes.
2014-02-14 14:44:27 +01:00
Frank Celler
6269c61aa7
Merge remote-tracking branch 'origin/devel' into sharding
2014-02-14 14:21:59 +01:00
Jan Steemann
f8476ce0b0
fixed tests
2014-02-13 18:14:53 +01:00
Esteban Lombeyda
6ccfa1aad2
starting and killing of windows process was implemented
2014-02-13 16:30:31 +01:00
Jan Steemann
bb0f591349
Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding
2014-02-13 15:33:39 +01:00
Frank Celler
739900fc2f
try to force abort
2014-02-13 12:06:52 +01:00
Jan Steemann
4fc8cae57d
index creation with ids
2014-02-13 11:00:08 +01:00
Jan Steemann
c4d52ff133
getIndexes, dropIndex
2014-02-12 17:09:47 +01:00
Jan Steemann
399ddebbd3
ensureIndex 1st
2014-02-10 14:36:32 +01:00
Jan Steemann
b4d9f10f17
fixed some database methods
2014-02-06 15:54:34 +01:00
Jan Steemann
57365cdcb0
Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding
2014-02-06 12:17:51 +01:00
Jan Steemann
b5550e17a6
updated tests and documentation
2014-02-06 12:11:17 +01:00
Max Neunhoeffer
91fc65ba8d
Change signal from SIGKILL to SIGTERM because it is more friendly.
2014-02-06 12:06:06 +01:00