merge with SVN, fixed issue #43

arangodb · Apr 10, 2012 · a5e4fa7 · a5e4fa7
1 parent ed1e603
commit a5e4fa7
Show file tree

Hide file tree

Showing 29 changed files with 3,871 additions and 96 deletions.
diff --git a/BasicsC/voc-errors.c b/BasicsC/voc-errors.c
@@ -107,6 +107,8 @@ void TRI_InitialiseErrorMessages (void) {
   REG_ERROR(SIMPLE_CLIENT_COULD_NOT_WRITE, "could not write to server");
   REG_ERROR(SIMPLE_CLIENT_COULD_NOT_READ, "could not read from server");
   REG_ERROR(ERROR_AVOCADO_INDEX_PQ_INSERT_FAILED, "priority queue insert failure");
+  REG_ERROR(ERROR_AVOCADO_INDEX_PQ_REMOVE_FAILED, "priority queue remove failure");
+  REG_ERROR(ERROR_AVOCADO_INDEX_PQ_REMOVE_ITEM_MISSING, "priority queue remove failure - item missing in index");
 }
 
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/BasicsC/voc-errors.h b/BasicsC/voc-errors.h
@@ -232,6 +232,12 @@ extern "C" {
 /// - 3100: @CODE{priority queue insert failure}
 ///   Will be raised when an attempt to insert a document into a priority queue
 ///   index fails for some reason.
+/// - 3110: @CODE{priority queue remove failure}
+///   Will be raised when an attempt to remove a document from a priority queue
+///   index fails for some reason.
+/// - 3111: @CODE{priority queue remove failure - item missing in index}
+///   Will be raised when an attempt to remove a document from a priority queue
+///   index fails when document can not be located within the index.
 ////////////////////////////////////////////////////////////////////////////////
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -1234,6 +1240,28 @@ void TRI_InitialiseErrorMessages (void);
 
 #define TRI_ERROR_AVOCADO_INDEX_PQ_INSERT_FAILED                          (3100)
 
+////////////////////////////////////////////////////////////////////////////////
+/// @brief 3110: ERROR_AVOCADO_INDEX_PQ_REMOVE_FAILED
+///
+/// priority queue remove failure
+///
+/// Will be raised when an attempt to remove a document from a priority queue
+/// index fails for some reason.
+////////////////////////////////////////////////////////////////////////////////
+
+#define TRI_ERROR_AVOCADO_INDEX_PQ_REMOVE_FAILED                          (3110)
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief 3111: ERROR_AVOCADO_INDEX_PQ_REMOVE_ITEM_MISSING
+///
+/// priority queue remove failure - item missing in index
+///
+/// Will be raised when an attempt to remove a document from a priority queue
+/// index fails when document can not be located within the index.
+////////////////////////////////////////////////////////////////////////////////
+
+#define TRI_ERROR_AVOCADO_INDEX_PQ_REMOVE_ITEM_MISSING                    (3111)
+
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @}

diff --git a/.../api-collection-identifier-parameter-sync → ...api-collection-identifier-properties-sync b/.../api-collection-identifier-parameter-sync → ...api-collection-identifier-properties-sync
@@ -1,4 +1,4 @@
-> curl --data @- -X PUT --dump - http://localhost:8529/_api/collection/70109828/parameter
+> curl --data @- -X PUT --dump - http://localhost:8529/_api/collection/70109828/properties
 { "waitForSync" : true }
 
 HTTP/1.1 200 OK

diff --git a/Doxygen/Examples.Durham/admin1 b/Doxygen/Examples.Durham/admin1
@@ -1,4 +1,4 @@
-avocado> db.examples.parameter();
+avocado> db.examples.properties();
 {
  "waitForSync" : false,
  "journalSize" : 134217728 

diff --git a/Doxygen/Examples.Durham/admin2 b/Doxygen/Examples.Durham/admin2
@@ -1,4 +1,4 @@
-avocado> db.examples.parameter({ waitForSync : true });
+avocado> db.examples.properties({ waitForSync : true });
 {
  "waitForSync" : true,
  "journalSize" : 134217728

diff --git a/Makefile.files b/Makefile.files
@@ -135,6 +135,8 @@ avocado_SOURCES = \
 	HttpsServer/HttpsAsyncCommTask.cpp \
 	HttpsServer/HttpsServer.cpp \
 	HttpsServer/HttpsServerImpl.cpp \
+	PriorityQueue/pqueueindex.c \
+	PriorityQueue/priorityqueue.c \
 	QL/ast-query.c \
 	QL/formatter.c \
 	QL/optimize.c \

diff --git a/Makefile.in b/Makefile.in
@@ -239,7 +239,9 @@ am_avocado_OBJECTS = Admin/ApplicationAdminServer.$(OBJEXT) \
 	HttpsServer/ApplicationHttpsServerImpl.$(OBJEXT) \
 	HttpsServer/HttpsAsyncCommTask.$(OBJEXT) \
 	HttpsServer/HttpsServer.$(OBJEXT) \
-	HttpsServer/HttpsServerImpl.$(OBJEXT) QL/ast-query.$(OBJEXT) \
+	HttpsServer/HttpsServerImpl.$(OBJEXT) \
+	PriorityQueue/pqueueindex.$(OBJEXT) \
+	PriorityQueue/priorityqueue.$(OBJEXT) QL/ast-query.$(OBJEXT) \
 	QL/formatter.$(OBJEXT) QL/optimize.$(OBJEXT) \
 	QL/parser.$(OBJEXT) QL/tokens.$(OBJEXT) \
 	RestHandler/RestActionHandler.$(OBJEXT) \
@@ -688,6 +690,8 @@ avocado_SOURCES = \
 	HttpsServer/HttpsAsyncCommTask.cpp \
 	HttpsServer/HttpsServer.cpp \
 	HttpsServer/HttpsServerImpl.cpp \
+	PriorityQueue/pqueueindex.c \
+	PriorityQueue/priorityqueue.c \
 	QL/ast-query.c \
 	QL/formatter.c \
 	QL/optimize.c \
@@ -1448,6 +1452,16 @@ HttpsServer/HttpsServer.$(OBJEXT): HttpsServer/$(am__dirstamp) \
 	HttpsServer/$(DEPDIR)/$(am__dirstamp)
 HttpsServer/HttpsServerImpl.$(OBJEXT): HttpsServer/$(am__dirstamp) \
 	HttpsServer/$(DEPDIR)/$(am__dirstamp)
+PriorityQueue/$(am__dirstamp):
+	@$(MKDIR_P) PriorityQueue
+	@: > PriorityQueue/$(am__dirstamp)
+PriorityQueue/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) PriorityQueue/$(DEPDIR)
+	@: > PriorityQueue/$(DEPDIR)/$(am__dirstamp)
+PriorityQueue/pqueueindex.$(OBJEXT): PriorityQueue/$(am__dirstamp) \
+	PriorityQueue/$(DEPDIR)/$(am__dirstamp)
+PriorityQueue/priorityqueue.$(OBJEXT): PriorityQueue/$(am__dirstamp) \
+	PriorityQueue/$(DEPDIR)/$(am__dirstamp)
 QL/$(am__dirstamp):
 	@$(MKDIR_P) QL
 	@: > QL/$(am__dirstamp)
@@ -1744,6 +1758,8 @@ mostlyclean-compile:
 	-rm -f Logger/LoggerInfo.$(OBJEXT)
 	-rm -f Logger/LoggerStream.$(OBJEXT)
 	-rm -f Logger/LoggerTiming.$(OBJEXT)
+	-rm -f PriorityQueue/pqueueindex.$(OBJEXT)
+	-rm -f PriorityQueue/priorityqueue.$(OBJEXT)
 	-rm -f ProgramOptions/program-options.$(OBJEXT)
 	-rm -f QL/ast-query.$(OBJEXT)
 	-rm -f QL/formatter.$(OBJEXT)
@@ -1944,6 +1960,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@Logger/$(DEPDIR)/LoggerInfo.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Logger/$(DEPDIR)/LoggerStream.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@Logger/$(DEPDIR)/LoggerTiming.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@PriorityQueue/$(DEPDIR)/pqueueindex.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@PriorityQueue/$(DEPDIR)/priorityqueue.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@ProgramOptions/$(DEPDIR)/program-options.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@QL/$(DEPDIR)/ast-query.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@QL/$(DEPDIR)/formatter.Po@am__quote@
@@ -2371,6 +2389,8 @@ distclean-generic:
 	-rm -f JsonParserX/$(am__dirstamp)
 	-rm -f Logger/$(DEPDIR)/$(am__dirstamp)
 	-rm -f Logger/$(am__dirstamp)
+	-rm -f PriorityQueue/$(DEPDIR)/$(am__dirstamp)
+	-rm -f PriorityQueue/$(am__dirstamp)
 	-rm -f ProgramOptions/$(DEPDIR)/$(am__dirstamp)
 	-rm -f ProgramOptions/$(am__dirstamp)
 	-rm -f QL/$(DEPDIR)/$(am__dirstamp)
@@ -2419,7 +2439,7 @@ clean-am: clean-binPROGRAMS clean-generic clean-local \
 
 distclean: distclean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf Admin/$(DEPDIR) ApplicationServer/$(DEPDIR) Basics/$(DEPDIR) BasicsC/$(DEPDIR) Dispatcher/$(DEPDIR) GeneralServer/$(DEPDIR) GeoIndex/$(DEPDIR) HashIndex/$(DEPDIR) HttpServer/$(DEPDIR) HttpsServer/$(DEPDIR) JsonParser/$(DEPDIR) JsonParserX/$(DEPDIR) Logger/$(DEPDIR) ProgramOptions/$(DEPDIR) QL/$(DEPDIR) Rest/$(DEPDIR) RestHandler/$(DEPDIR) RestServer/$(DEPDIR) ResultGenerator/$(DEPDIR) Scheduler/$(DEPDIR) ShapedJson/$(DEPDIR) SimpleHttpClient/$(DEPDIR) SkipLists/$(DEPDIR) UnitTests/$(DEPDIR) UnitTests/Jutland/$(DEPDIR) UnitTests/Philadelphia/$(DEPDIR) V8/$(DEPDIR) V8Client/$(DEPDIR) Variant/$(DEPDIR) VocBase/$(DEPDIR)
+	-rm -rf Admin/$(DEPDIR) ApplicationServer/$(DEPDIR) Basics/$(DEPDIR) BasicsC/$(DEPDIR) Dispatcher/$(DEPDIR) GeneralServer/$(DEPDIR) GeoIndex/$(DEPDIR) HashIndex/$(DEPDIR) HttpServer/$(DEPDIR) HttpsServer/$(DEPDIR) JsonParser/$(DEPDIR) JsonParserX/$(DEPDIR) Logger/$(DEPDIR) PriorityQueue/$(DEPDIR) ProgramOptions/$(DEPDIR) QL/$(DEPDIR) Rest/$(DEPDIR) RestHandler/$(DEPDIR) RestServer/$(DEPDIR) ResultGenerator/$(DEPDIR) Scheduler/$(DEPDIR) ShapedJson/$(DEPDIR) SimpleHttpClient/$(DEPDIR) SkipLists/$(DEPDIR) UnitTests/$(DEPDIR) UnitTests/Jutland/$(DEPDIR) UnitTests/Philadelphia/$(DEPDIR) V8/$(DEPDIR) V8Client/$(DEPDIR) Variant/$(DEPDIR) VocBase/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-hdr distclean-tags
@@ -2467,7 +2487,7 @@ installcheck-am:
 maintainer-clean: maintainer-clean-am
 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -rf Admin/$(DEPDIR) ApplicationServer/$(DEPDIR) Basics/$(DEPDIR) BasicsC/$(DEPDIR) Dispatcher/$(DEPDIR) GeneralServer/$(DEPDIR) GeoIndex/$(DEPDIR) HashIndex/$(DEPDIR) HttpServer/$(DEPDIR) HttpsServer/$(DEPDIR) JsonParser/$(DEPDIR) JsonParserX/$(DEPDIR) Logger/$(DEPDIR) ProgramOptions/$(DEPDIR) QL/$(DEPDIR) Rest/$(DEPDIR) RestHandler/$(DEPDIR) RestServer/$(DEPDIR) ResultGenerator/$(DEPDIR) Scheduler/$(DEPDIR) ShapedJson/$(DEPDIR) SimpleHttpClient/$(DEPDIR) SkipLists/$(DEPDIR) UnitTests/$(DEPDIR) UnitTests/Jutland/$(DEPDIR) UnitTests/Philadelphia/$(DEPDIR) V8/$(DEPDIR) V8Client/$(DEPDIR) Variant/$(DEPDIR) VocBase/$(DEPDIR)
+	-rm -rf Admin/$(DEPDIR) ApplicationServer/$(DEPDIR) Basics/$(DEPDIR) BasicsC/$(DEPDIR) Dispatcher/$(DEPDIR) GeneralServer/$(DEPDIR) GeoIndex/$(DEPDIR) HashIndex/$(DEPDIR) HttpServer/$(DEPDIR) HttpsServer/$(DEPDIR) JsonParser/$(DEPDIR) JsonParserX/$(DEPDIR) Logger/$(DEPDIR) PriorityQueue/$(DEPDIR) ProgramOptions/$(DEPDIR) QL/$(DEPDIR) Rest/$(DEPDIR) RestHandler/$(DEPDIR) RestServer/$(DEPDIR) ResultGenerator/$(DEPDIR) Scheduler/$(DEPDIR) ShapedJson/$(DEPDIR) SimpleHttpClient/$(DEPDIR) SkipLists/$(DEPDIR) UnitTests/$(DEPDIR) UnitTests/Jutland/$(DEPDIR) UnitTests/Philadelphia/$(DEPDIR) V8/$(DEPDIR) V8Client/$(DEPDIR) Variant/$(DEPDIR) VocBase/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic