Changeset: 422bf650f172 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=422bf650f172
Modified Files:
Branch: default
Log Message:
Merge with Oct2010 branch.
diffs (210 lines):
diff -r bda38c0d2d42 -r 422bf650f172 MonetDB/src/gdk/gdk_bbp.mx
--- a/MonetDB/src/gdk/gdk_bbp.mx Wed Sep 15 15:53:22 2010 +0200
+++ b/MonetDB/src/gdk/gdk_bbp.mx Tue Sep 28 10:24:53 2010 +0200
@@ -163,6 +163,7 @@
@{
@c
*/
+...@c
BBPrec *BBP = NULL; /* fixed base VM address of BBP array */
bat BBPmaxsize = BBPMAXSIZE; /* size of non-committed VM BBP array */
bat BBPlimit = 0; /* current committed VM BBP array */
@@ -407,6 +408,7 @@
held and it will allocate memory. This could trigger a BBPtrim, causing
deadlock.
@c
*/
+...@c
void
BBPextend(dbl factor, int buildhash)
{
@@ -951,6 +953,7 @@
@{
@c
*/
+...@c
void
BBPexit(void)
@@ -1035,6 +1038,7 @@
@{
@c
*/
+...@c
static int
new_bbpentry(stream *s, bat i)
{
@@ -1373,6 +1377,7 @@
BBP index lookup by BAT name:
@c
*/
+...@c
static INLINE bat
BBP_find(str nme, int lock)
{
@@ -1457,6 +1462,7 @@
An existing BAT is inserted into the BBP
@c
*/
+...@c
static INLINE str
BBPsubdir_recursive(str s, bat i)
{
@@ -1624,6 +1630,7 @@
used in BBPfree (bat swapped out) and BBPclear (bat destroyed forever).
@c
*/
+...@c
void
BBPuncacheit(bat i)
@@ -1661,6 +1668,7 @@
@%BBPclear@ removes a BAT from the BBP directory forever.
@c
*/
+...@c
static INLINE void
bbpclear(bat i, int idx, str lock)
{
@@ -1734,6 +1742,7 @@
@{
@c
*/
+...@c
int
BBPrename(bat bid, str nme)
{
@@ -2086,6 +2095,7 @@
[first step, initiate code change]
@c
*/
+...@c
void
BBPkeepref(bat i)
{
@@ -2153,6 +2163,7 @@
1 = unload failed (due to write-to-disk failure)
@c
*/
+...@c
int
BBPreclaim(BAT *b)
{
@@ -2174,6 +2185,7 @@
have at least one fix on the BAT before calling this.
@c
*/
+...@c
static BAT *
getBBPdescriptor(bat i, int lock)
{
@@ -2235,6 +2247,7 @@
that want to save or unload this BAT must spin lock on the BBP_status field.
@c
*/
+...@c
int
BBPsave(BAT *b)
{
@@ -2290,6 +2303,7 @@
unloaded (or even destroyed, if the BAT is not persistent).
@c
*/
+...@c
static int BBPaddtobin(BAT *b);
static int
BBPdestroy(BAT *b)
@@ -2440,6 +2454,7 @@
@{
@c
*/
+...@c
#define BBPMAXTRIM 40000
#define BBPSMALLBAT 1000
@@ -2827,6 +2842,7 @@
@{
@c
*/
+...@c
static int
complexatom(int t, int delaccess)
{
@@ -2895,6 +2911,7 @@
@{
@c
*/
+...@c
#define BATCACHE_NOTYPE(t) (ATOMstorage(t) > TYPE_str ||
BATatoms[t].atomFix != NULL)
#define BATCACHE_SIZE 1023 /* max size: 32767 */
#define BATCACHE_DIMS 6 /* 0,1,2,4,8 byte types + str */
@@ -3362,6 +3379,7 @@
@{
@c
*/
+...@c
static BAT *
dirty_bat(bat *i, int subcommit)
{
@@ -3394,6 +3412,7 @@
@{
@c
*/
+...@c
static int
file_move(str srcdir, str dstdir, str name, str e)
{
@@ -3488,6 +3507,7 @@
@{
@c
*/
+...@c
static int backup_files = 0, backup_dir = 0, backup_subdir = 0;
static int
@@ -3620,6 +3640,7 @@
@{
@c
*/
+...@c
int
BBPsync(int cnt, bat *subcommit)
{
@@ -3725,6 +3746,7 @@
@{
@c
*/
+...@c
static int
force_move(str srcdir, str dstdir, str name)
{
@@ -3869,6 +3891,7 @@
We do recognize moving back BBP.dir and set backed_up_subdir accordingly.
@c
*/
+...@c
int
BBPrecover_subdir(void)
{
@@ -3920,6 +3943,7 @@
@{
@c
*/
+...@c
static int
persistent_bat(bat bid)
{
diff -r bda38c0d2d42 -r 422bf650f172
java/src/nl/cwi/monetdb/client/JdbcClient.java
--- a/java/src/nl/cwi/monetdb/client/JdbcClient.java Wed Sep 15 15:53:22
2010 +0200
+++ b/java/src/nl/cwi/monetdb/client/JdbcClient.java Tue Sep 28 10:24:53
2010 +0200
@@ -358,7 +358,10 @@
// should not be possible to happen
if (fk == null || pk == null)
- throw new
AssertionError("Illegal table; table not found in list");
+ throw new
AssertionError("Illegal table '" +
+
tbl.getString("FKTABLE_SCHEM") + "." +
+
tbl.getString("FKTABLE_NAME") +
+ "': table not
found in list");
// add PK table dependancy to FK table
fk.addDependancy(pk);
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
