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

1315 Commits

Author SHA1 Message Date
Max Neunhoeffer 4a66d69ad5 Add stealConnection to SimpleHttpClient. 2014-01-14 09:42:50 +01:00
Michael Hackstein 9f3479f5b6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	utils/Makefile.files
 2014-01-10 17:41:52 +01:00
Jan Steemann 5b965b2a21 added initialised() method 2014-01-07 17:50:52 +01:00
Jan Steemann bb7f550f7a for Michael... 2014-01-07 16:46:18 +01:00
Jan Steemann 9ce78430ac create collections, v0.0.0 2014-01-07 16:28:12 +01:00
Max Neunhoeffer 11e018e6b2 Make global ArangoClusterComm object in each thread. 2014-01-07 11:50:05 +01:00
Max Neunhoeffer bbf28e3501 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/Cluster/v8-cluster.cpp
 2014-01-07 11:45:43 +01:00
Jan Steemann 3183e6d402 created global cluster object variables 2014-01-07 11:34:42 +01:00
Jan Steemann 3309743c1a moved some collection parameters around 2014-01-07 11:02:49 +01:00
Max Neunhoeffer 33d063d6d6 Start to move ClusterComm to JavaScript. 2014-01-06 16:18:24 +01:00
Jan Steemann 5571698555 serialize/unserialize collection data from agency 2014-01-03 19:04:50 +01:00
Max Neunhoeffer eb2afb2f04 Implement case distinction for create collection between cluster and not. 2014-01-03 16:17:34 +01:00
Max Neunhoeffer 6c36c268f0 Improve debugging output of ClusterComm asynchronous requests. 2014-01-03 09:36:37 +01:00
Jan Steemann d1bee4cf58 added functions to query the server state 2014-01-02 15:13:44 +01:00
Frank Celler 8dbdf55165 Merge remote-tracking branch 'origin/1.4' into devel 
Conflicts:
	CHANGELOG
	arangosh/ArangoShell/ArangoClient.cpp
 2013-12-30 17:27:17 +01:00
Frank Celler 9928cd645f added local config 2013-12-30 17:20:39 +01:00
Max Neunhoeffer 5d51d7b3ba Get rid of many debugging messages. 2013-12-30 14:49:14 +01:00
Max Neunhoeffer 3415e3c0c8 Some cleanup in asyncRequest setup. 2013-12-30 10:22:21 +01:00
Frank Celler 84507cfc44 merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
Max Neunhoeffer fec0c20012 Sort out one more allocation/deallocation issue. 2013-12-27 14:29:25 +01:00
Max Neunhoeffer 62976629f0 Various memory leaks and callback improvements. 2013-12-27 13:15:52 +01:00
Frank Celler 995a3b06da work-around for program-suffix 2013-12-23 18:02:06 +01:00
Max Neunhoeffer c9b2884def Full round trip implemented but not yet working. 2013-12-23 16:19:59 +01:00
Frank Celler a3ecc7cd5b fixed wrong type 2013-12-23 16:03:30 +01:00
Frank Celler f5759fa1b6 Merge branch '1.4' of github.com:triAGENS/ArangoDB into 1.4 2013-12-23 12:56:06 +01:00
Frank Celler 0a47caa535 fixed open mode for files 2013-12-23 12:12:13 +01:00
Frank Celler 36f29a573c fixed TRI_Basename 2013-12-22 23:57:42 +01:00
Frank Celler 2f28530bcc wrong prototype, wrong destroy 2013-12-22 15:41:15 +01:00
Frank Celler 9ac2e751c6 fixed wrong ifdefs and missing constructor for Logger 2013-12-22 14:58:51 +01:00
Frank Celler e30725e22d more file path normalisation 2013-12-22 13:27:33 +01:00
Frank Celler 9b49d60b0a fixed concatenate files 2013-12-22 12:45:54 +01:00
Frank Celler 2d5a8eb5ca added service functions 2013-12-22 00:48:31 +01:00
Frank Celler 87cc2c4104 Merge branch '1.4' of github.com:triAGENS/ArangoDB into 1.4 2013-12-21 13:10:15 +01:00
Frank Celler 12fcc9a025 added TRI_LocateInstallDirectory 2013-12-21 13:09:44 +01:00
Frank Celler 1ef596733d arangosh now uses config file name corresponding to binary name 2013-12-20 23:49:16 +01:00
Jan Steemann 16e16f705c some bugfixes for asyncRequest etc 2013-12-20 18:03:55 +01:00
Jan Steemann b903d9080d Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	js/apps/system/aardvark/test/karma/karma.conf.js
 2013-12-20 15:35:50 +01:00
Jan Steemann 8bc1692d54 fixed issue #711, #687 2013-12-20 15:13:23 +01:00
Jan Steemann 55deb10126 fixed issue #711, #687 2013-12-20 15:12:21 +01:00
Frank Celler 2651f7bae5 added TRI_LocateInstallDirectory and TRI_LocateConfigDirectory 2013-12-20 10:39:50 +01:00
Frank Celler b2d60817dd added NL and CH 2013-12-19 17:18:29 +01:00
Frank Celler 56a8f0277f use home directory function 2013-12-19 16:32:08 +01:00
Frank Celler b0a43ea575 added move constructor 2013-12-19 16:27:02 +01:00
Max Neunhoeffer a79c5801d8 Fix documentation of timeout unit. 2013-12-19 12:16:30 +01:00
Frank Celler a82ef8b1ea fixed lock files for Windows 2013-12-19 11:26:38 +01:00
Frank Celler f7bf96846b Merge branch '1.4' of github.com:triAGENS/ArangoDB into 1.4 2013-12-19 09:33:02 +01:00
Jan Steemann 8fa172f03c added callbacks for async requests 2013-12-17 13:51:07 +01:00
Jan Steemann 7c4944de83 added --server.ssl-protocol option for client tools 
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
	lib/GeneralServer/SslAsyncCommTask.h
 2013-12-13 17:58:24 +01:00
Jan Steemann e7ba403998 added --server.ssl-protocol option for client tools 2013-12-13 17:53:51 +01:00
Jan Steemann 67f72b26fa split big group of statistics into 2 separate groups 
Conflicts:
	CHANGELOG
 2013-12-13 16:08:58 +01:00
Jan Steemann 1010d515bb added detailed HTTP request statistics 
Conflicts:
	CHANGELOG
 2013-12-13 16:00:02 +01:00
Jan Steemann ed927d26c8 split big group of statistics into 2 separate groups 2013-12-13 15:58:59 +01:00
Jan Steemann f0184d2786 not sure about the restshardhandler yet 2013-12-12 17:51:45 +01:00
Jan Steemann 8eccb0a35f added dispatcher to shardhandler 2013-12-12 16:42:25 +01:00
Jan Steemann 13bcc2bf7a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2013-12-11 18:39:10 +01:00
Jan Steemann 5e5a5fb32b added JS bindings for agency 2013-12-11 09:56:54 +01:00
Jan Steemann 9e21cf9b7e added configure option --enable-cluster 2013-12-10 14:46:16 +01:00
Frank Celler ef7e85053c added missing file 2013-12-07 19:16:38 +01:00
Frank Celler 86b7fea992 Vs2013 2013-12-07 18:55:55 +01:00
Frank Celler f6b40b3395 added memchr and timezone for windows 2013-12-07 18:55:51 +01:00
Jan Steemann 2965accb05 add current state to agency 2013-12-06 14:23:02 +01:00
Jan Steemann d3acf530da re-added stuff that got lost yesterday 2013-12-05 10:26:21 +01:00
Jan Steemann 1306e0e651 committed generated file 2013-12-04 23:10:22 +01:00
Jan Steemann 44b3237882 moved server-only tests to js/server/tests 
this hopefully removes some future confusion about the tests
also moved some graph stuff into js/common as client-side graphs did not fully work

make logfile path accessible
 2013-12-04 22:05:00 +01:00
Jan Steemann 52f514b163 fixed doxygen error 2013-12-02 13:16:06 +01:00
Jan Steemann 3edd6a0251 issue #694: added tests for configuration files 2013-12-02 09:39:27 +01:00
Frank Celler 64bf0088b4 hopefully fixing wrong include ordering 2013-11-27 20:55:29 +01:00
Frank Celler 533a33d344 va_copy and inline are defined in 2013 2013-11-25 18:30:03 +01:00
Max Neunhoeffer 317304542a Remove index garbage collector. 2013-11-25 10:57:23 +01:00
Jan Steemann 9a1aa7a4cc removed superfluous error codes 2013-11-22 13:49:05 +01:00
Jan Steemann 0eeac02a91 removed unused error codes 2013-11-22 13:23:23 +01:00
Jan Steemann ff648799fe Fix a forgotten malloc and replace it with TRI_Allocate. 2013-11-22 12:28:07 +01:00
Max Neunhoeffer 3aa1b12a45 Merge branch 'skiplist-cleanup' into devel 
This implements a considerable cleanup of the skip list index code:
  - Replace implementation of skip lists by a generic one using
    callbacks for comparisons
  - The new implementation resides in lib/BasicsC/skip-list.*
  - It uses a singly linked list (unidirectional) as opposed to the
    previous implementation which used a doubly linked list
  - Adjust skip list index code in arangod/SkipLists/skiplistIndex.* to
    use the generic skip list implementation
  - Unify unique skip lists and non-unique ones into one code base
  - Cleanup in skip list index code, in particular with respect to
    iterators
  - Prepare the scene for sparse skip list indices
 2013-11-22 10:47:04 +01:00
Jan Steemann e79134799c mini optimisations for shaping 2013-11-22 02:41:39 +01:00
Jan Steemann edb356f403 print warning message w/ reason 2013-11-21 23:57:51 +01:00
Jan Steemann 999fbaee23 added newline to log message 2013-11-21 16:42:16 +01:00
Jan Steemann 610f9a3cd7 added newline to log message 2013-11-21 16:16:09 +01:00
Jan Steemann cbd2bbf2b1 fixed some multi-thread issues 2013-11-21 15:14:46 +01:00
Jan Steemann 1bdf666da2 fixed multi-threading issues found during commando 2013-11-21 15:12:49 +01:00
Frank Celler 01532b024e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-11-20 13:50:14 +01:00
Frank Celler 6e293d9dce fixed wrong error message on parse error 2013-11-20 13:50:08 +01:00
Jan Steemann cf219d92d3 added debugSegfault 2013-11-20 13:15:45 +01:00
Max Neunhoeffer 822f9d37bd Rename method name to TRI_SkipListGetNrUsed. 2013-11-20 11:09:28 +01:00
Max Neunhoeffer 1c56e87222 Export entry count for generic skip lists. 2013-11-20 11:07:31 +01:00
Frank Celler 914bd38cfc added check-sever 2013-11-20 09:21:22 +01:00
Frank Celler f35347098b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-11-20 09:20:51 +01:00
Frank Celler 7738a5b35d cosmetics 2013-11-20 09:20:26 +01:00
Jan Steemann 4e1028d791 fixed doxygen error 2013-11-20 01:50:53 +01:00
Jan Steemann 920d08d855 removed redundant startup options 2013-11-20 01:50:27 +01:00
Jan Steemann 95c341e910 issue #662: ArangoDB on Windows hanging 2013-11-19 16:35:14 +01:00
Jan Steemann af6da9a652 issue #662: ArangoDB on Windows hanging 2013-11-19 16:27:26 +01:00
Max Neunhoeffer 971ab55cdd Add keys to the generic skip list implementation. 2013-11-19 15:02:20 +01:00
Max Neunhoeffer 95e6ebc3ac Add a cmpdata entry for comparisons. 2013-11-19 11:54:45 +01:00
Frank Celler 9f8f4cd4fd destroy can only be called if initialised 2013-11-18 18:40:13 +01:00
Frank Celler b58347138f destroy can only be called if initialised 2013-11-18 18:39:18 +01:00
Max Neunhoeffer c8b8af36b2 Follow coding style guidelines a bit more. Add nrUsed count. 2013-11-18 16:46:56 +01:00
Max Neunhoeffer 8955b0fda0 Fix compilation of new skip-list.c 2013-11-18 15:09:24 +01:00
Max Neunhoeffer 3464f31bf1 Add generic skip list functionality. 2013-11-18 14:55:52 +01:00
Max Neunhoeffer e9b583e6c2 Remove old and unused skip-list.* from lib. 2013-11-18 13:59:33 +01:00
Jan Steemann bfbc96d3e8 don't complain upon usage of obsolete --database.force-sync-shapes option 2013-11-14 01:25:55 +01:00