MonetDB: Dec2016 - thash and timprints can be 1 if they exist bu...

[Sjoerd Mullender]

Changeset: bd35b06375df for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bd35b06375df
Modified Files:
        monetdb5/mal/mal_resource.h
        sql/backends/monet5/sql.c
Branch: Dec2016
Log Message:

thash and timprints can be 1 if they exist but aren't loaded.


diffs (33 lines):

diff --git a/monetdb5/mal/mal_resource.h b/monetdb5/mal/mal_resource.h
--- a/monetdb5/mal/mal_resource.h
+++ b/monetdb5/mal/mal_resource.h
@@ -18,7 +18,7 @@
 
 //#define heapinfo(X,Id)       (((X) && (X)->base && ((X)->parentid == 0 || 
(X)->parentid == Id)) ? (X)->free : 0)
 #define heapinfo(X,Id) (((X) && (X)->base ) ? (X)->free : 0)
-#define hashinfo(X,Id) ( (X)? heapinfo((X)->heap, Id):0)
+#define hashinfo(X,Id) ((X) && (X) != (Hash *) 1 ? heapinfo((X)->heap, Id) : 0)
 
 #define USE_MAL_ADMISSION
 #ifdef USE_MAL_ADMISSION
diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -5150,7 +5150,7 @@ sql_storage(Client cntxt, MalBlkPtr mb, 
                                                                        bitval 
= bit_nil;
                                                                BUNappend(key, 
&bitval, FALSE);
 
-                                                               sz = 
bn->torderidx ? bn->torderidx->free : 0;
+                                                               sz = 
bn->torderidx && bn->torderidx != (Heap *) 1 ? bn->torderidx->free : 0;
                                                                BUNappend(oidx, 
&sz, FALSE);
                                                                
BBPunfix(bn->batCacheid);
                                                        }
@@ -5238,7 +5238,7 @@ sql_storage(Client cntxt, MalBlkPtr mb, 
                                                                        if 
(!bitval && bn->tnokey[0] == 0 && bn->tnokey[1] == 0)
                                                                                
bitval = bit_nil;
                                                                        
BUNappend(key, &bitval, FALSE);
-                                                                       sz = 
bn->torderidx ? bn->torderidx->free : 0;
+                                                                       sz = 
bn->torderidx && bn->torderidx != (Heap *) 1 ? bn->torderidx->free : 0;
                                                                        
BUNappend(oidx, &sz, FALSE);
                                                                        
BBPunfix(bn->batCacheid);
                                                                }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list