Update of /cvsroot/monetdb/sql/src/storage
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv4885/src/storage
Modified Files:
sql_storage.h
Log Message:
propagated changes of Thursday Jun 05 2008 - Friday Jun 06 2008
from the SQL_2-24 branch to the development trunk
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/05 - romulog:
src/test/BugTracker/Tests/schema_from_declared_table.SF-1983341.sql,1.1.2.2
Improve test to cover another bug...
With one select the mserver does not crash; However, if I repeat the select
again I get a crash:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/05 - stmane: src/storage/bat/bat_logger.mx,1.47.2.1
src/storage/bpm/bpm_logger.mx,1.4.2.1
src/storage/restrict/restrict_logger.mx,1.2.2.1
Step 0 of my (not yet finished/successful) attempt to fix
[ 1976341 ] XQ: leftovers after deleting document
https://sourceforge.net/tracker/index.php?func=detail&aid=1976341&group_id=56967&atid=482468
0.a)
Changes the logger's internal "changes" counter
from type "unsigned int" to "size_t",
maily because that seems more natural for "changes"
counter that basically counts affected BUNs/tuples;
moreover, it simplifies part (b) below.
The logger's internal "logger_changes()" function
now also returns a "size_t" instead of an "unsigned int".
However, all it's wrapper functions (in MIL, in MAL,
and the "bl_changes()" & "ro_changes()" functions for the
"logger_functions" in SQL) still return an int ---
now properly casted and with "overflow protection".
0.b)
Made "logger_add_bat()" and "logger_del_bat()" increase
the "changes" by the BATcount() of the respective BAT
(plus 1 to handle empty BATs) to make sure that
BATs that hold shredded documents in Pathfinder are
(eventually) handled properly.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/06 - nielsnes:
src/test/BugTracker/Tests/set_a_new_user_password.SF-1844050.py,1.1.2.3
src/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.py,1.1.2.3
src/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287_drop.sql,1.1.2.2
added sleep in server.stop. This makes sure the server is really gone before
we start the next
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/06 - nielsnes:
src/test/BugTracker/Tests/proc_insert_into.SF-1958572.sql,1.1.2.2
src/test/BugTracker/Tests/proc_insert_into.SF-1958572.stable.out,1.1.2.2
make test independend of other tests
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/06 - nielsnes: src/test/Skyserver/Skyserver_import.sql,1.1.2.2
src/test/Skyserver/Tests/Skyserver.stable.out,1.1.14.2
made test less dependend on architecture. (0 vs -0 diffs)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/06 - nielsnes: src/test/BugTracker/Tests/All,1.93.2.10
python_escape depends on MonetSQLdb, ie we need PYTHON and SWIG
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/06 - nielsnes:
src/test/BugTracker/Tests/schema_from_declared_table.SF-1983341.stable.out,1.1.2.2
new output
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2008/06/06 - nielsnes: src/storage/sql_storage.h,1.46.4.3
fixing the schema declared table problem
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: sql_storage.h
===================================================================
RCS file: /cvsroot/monetdb/sql/src/storage/sql_storage.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- sql_storage.h 5 Jun 2008 09:23:38 -0000 1.48
+++ sql_storage.h 6 Jun 2008 11:54:22 -0000 1.49
@@ -26,9 +26,11 @@
#define isNew(x) (x->base.flag == TR_NEW)
#define isTemp(x) (isNew(x)||x->t->persistence!=SQL_PERSIST)
#define isTempTable(x) (x->persistence!=SQL_PERSIST)
-#define isGlobalTable(x) (x->persistence!=SQL_LOCAL_TEMP)
-#define isGlobalTemp(x) (x->persistence==SQL_GLOBAL_TEMP)
-#define isTempSchema(x) (strcmp(x->base.name,"tmp") == 0)
+#define isGlobalTable(x) (x->persistence!=SQL_LOCAL_TEMP && \
+ x->persistence!=SQL_DECLARED_TABLE)
+#define isGlobalTemp(x) (x->persistence==SQL_GLOBAL_TEMP)
+#define isTempSchema(x) (strcmp(x->base.name,"tmp") == 0 || \
+ strcmp(x->base.name,"%dt%") == 0)
#define isDeclaredTable(x) (x->persistence==SQL_DECLARED_TABLE)
typedef enum store_type {
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
