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

Merge branch 'devel' of github.com:triAGENS/ArangoDB

This commit is contained in:
Frank Celler 2012-06-22 17:09:05 +02:00
parent f99409f146 e5632e4cd7
commit 06bc9cef35
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -7,6 +7,8 @@
* fixed issue #103: Should we cleanup the directory structure * fixed issue #103: Should we cleanup the directory structure
* fixed issue #112: do not accept document with duplicate attribute names
* added new MRuby version (2012-06-02) * added new MRuby version (2012-06-02)
* added --log.filter * added --log.filter

13
Makefile.unittests
View File

@ -47,6 +47,7 @@ VOCPORT := $(shell printf "3%04d" `expr $(PID) % 10000`)
VOCHOST := 127.0.0.1 VOCHOST := 127.0.0.1
SERVER_OPT := --javascript.startup-directory ./js --javascript.modules-path ./js/server/modules:./js/common/modules --javascript.action-directory ./js/actions/system SERVER_OPT := --javascript.startup-directory ./js --javascript.modules-path ./js/server/modules:./js/common/modules --javascript.action-directory ./js/actions/system
CLIENT_OPT := --javascript.startup-directory ./js --javascript.modules-path ./js/client/modules:./js/common/modules --no-colors --quiet CLIENT_OPT := --javascript.startup-directory ./js --javascript.modules-path ./js/client/modules:./js/common/modules --no-colors --quiet
STARTFILE := $(VOCDIR)/startup
.PHONY: start-server .PHONY: start-server
@ -65,14 +66,10 @@ start-server:
($(VALGRIND) @builddir@/bin/arangod "$(VOCDIR)" $(SERVER_OPT) --pid-file $(PIDFILE) --watch-process $(PID) --server.http-port $(VOCHOST):$(VOCPORT) && rm -rf "$(VOCDIR)") & ($(VALGRIND) @builddir@/bin/arangod "$(VOCDIR)" $(SERVER_OPT) --pid-file $(PIDFILE) --watch-process $(PID) --server.http-port $(VOCHOST):$(VOCPORT) && rm -rf "$(VOCDIR)") &
@curl -s http://$(VOCHOST):$(VOCPORT)/_api/version > /dev/null || sleep 2 while [ ! -s "$(STARTFILE)" ]; do curl -s "http://$(VOCHOST):$(VOCPORT)/_api/version" > "$(STARTFILE)" || sleep 2; done
@curl -s http://$(VOCHOST):$(VOCPORT)/_api/version > /dev/null || sleep 2 @rm "$(STARTFILE)"
@curl -s http://$(VOCHOST):$(VOCPORT)/_api/version > /dev/null || sleep 2 @echo "server has been started."
@curl -s http://$(VOCHOST):$(VOCPORT)/_api/version > /dev/null || sleep 2 @if [ "$(VALGRIND)" != "" ]; then echo "adding valgrind memorial time..."; sleep 30; else sleep 2; fi
curl -sS http://$(VOCHOST):$(VOCPORT)/_api/version
@if [ "$(VALGRIND)" != "" ]; then sleep 60; fi
@echo @echo
################################################################################ ################################################################################

11
README.md
View File

@ -2,9 +2,9 @@
We recently started a new open source project - a nosql database We recently started a new open source project - a nosql database
called AvocadoDB which became ArangoDB in May 2012. ArangoDB is called AvocadoDB which became ArangoDB in May 2012. ArangoDB is
currently pre-alpha. We want to have a version 1 ready by end of May currently available as an alpha version.
2012, a multi server version is planned for the third quarter of We want to have a stable version 1 ready soon. A multi server version is planned
2012. For details see the roadmap. for the third quarter of 2012. For details see the roadmap.
Key features include: Key features include:
@ -16,6 +16,7 @@ Key features include:
* Free index choice: use the correct index for your problem, be it a skip list or a n-gram search * Free index choice: use the correct index for your problem, be it a skip list or a n-gram search
* Configurable durability: let the application decide if it needs more durability or more performance * Configurable durability: let the application decide if it needs more durability or more performance
* No-nonsense storage: ArangoDB uses all of the power of modern storage hardware, like SSD and large caches * No-nonsense storage: ArangoDB uses all of the power of modern storage hardware, like SSD and large caches
* Powerful query language (AQL) to retrieve data
* It is open source (Apache Licence 2.0) * It is open source (Apache Licence 2.0)
For more in-depth information For more in-depth information
@ -48,7 +49,7 @@ The ArangoDB shell will be install as
Start the server: Start the server:
> mkdir /tmp/vocbase > mkdir /tmp/vocbase
> ./arangod /tmp/vocbase > bin/arangod /tmp/vocbase
2012-03-30T12:54:19Z [11794] INFO ArangoDB (version 0.x.y) is ready for business 2012-03-30T12:54:19Z [11794] INFO ArangoDB (version 0.x.y) is ready for business
2012-03-30T12:54:19Z [11794] INFO HTTP client port: 127.0.0.1:8529 2012-03-30T12:54:19Z [11794] INFO HTTP client port: 127.0.0.1:8529
2012-03-30T12:54:19Z [11794] INFO HTTP admin port: 127.0.0.1:8530 2012-03-30T12:54:19Z [11794] INFO HTTP admin port: 127.0.0.1:8530
@ -56,7 +57,7 @@ Start the server:
Start the shell in another windows: Start the shell in another windows:
> ./arangosh > bin/arangosh
_ _
__ _ _ __ __ _ _ __ __ _ ___ ___| |__ __ _ _ __ __ _ _ __ __ _ ___ ___| |__
/ _` | '__/ _` | '_ \ / _` |/ _ \/ __| '_ \ / _` | '__/ _` | '_ \ / _` |/ _ \/ __| '_ \