Windows port: ENODATA->TOKUDB_NO_DATA, disable unreachable code warning,...

Windows port: ENODATA->TOKUDB_NO_DATA, disable unreachable code warning, disabled trace_mem for windows

git-svn-id: file:///svn/toku/tokudb@20400 c7de825b-a66e-492c-adef-691d508d4ae1

buildheader/db.h_4_1

@@ -228,6 +228,7 @@ typedef enum {
 #define TOKUDB_DICTIONARY_TOO_NEW -100005
 #define TOKUDB_DICTIONARY_NO_HEADER -100006
 #define TOKUDB_CANCELED -100007
+#define TOKUDB_NO_DATA -100008
 /* LOADER flags */
 #define LOADER_USE_PUTS 1
 /* in wrap mode, top-level function txn_begin is renamed, but the field isn't renamed, so we have to hack it here.*/

buildheader/db.h_4_3

@@ -230,6 +230,7 @@ typedef enum {
 #define TOKUDB_DICTIONARY_TOO_NEW -100005
 #define TOKUDB_DICTIONARY_NO_HEADER -100006
 #define TOKUDB_CANCELED -100007
+#define TOKUDB_NO_DATA -100008
 /* LOADER flags */
 #define LOADER_USE_PUTS 1
 /* in wrap mode, top-level function txn_begin is renamed, but the field isn't renamed, so we have to hack it here.*/

buildheader/db.h_4_4

@@ -232,6 +232,7 @@ typedef enum {
 #define TOKUDB_DICTIONARY_TOO_NEW -100005
 #define TOKUDB_DICTIONARY_NO_HEADER -100006
 #define TOKUDB_CANCELED -100007
+#define TOKUDB_NO_DATA -100008
 /* LOADER flags */
 #define LOADER_USE_PUTS 1
 /* in wrap mode, top-level function txn_begin is renamed, but the field isn't renamed, so we have to hack it here.*/

buildheader/db.h_4_5

@@ -232,6 +232,7 @@ typedef enum {
 #define TOKUDB_DICTIONARY_TOO_NEW -100005
 #define TOKUDB_DICTIONARY_NO_HEADER -100006
 #define TOKUDB_CANCELED -100007
+#define TOKUDB_NO_DATA -100008
 /* LOADER flags */
 #define LOADER_USE_PUTS 1
 /* in wrap mode, top-level function txn_begin is renamed, but the field isn't renamed, so we have to hack it here.*/

buildheader/db.h_4_6

@@ -234,6 +234,7 @@ typedef enum {
 #define TOKUDB_DICTIONARY_TOO_NEW -100005
 #define TOKUDB_DICTIONARY_NO_HEADER -100006
 #define TOKUDB_CANCELED -100007
+#define TOKUDB_NO_DATA -100008
 /* LOADER flags */
 #define LOADER_USE_PUTS 1
 /* in wrap mode, top-level function txn_begin is renamed, but the field isn't renamed, so we have to hack it here.*/

buildheader/make_db_h.c

@@ -68,6 +68,7 @@ enum {
         TOKUDB_DICTIONARY_TOO_NEW   = -100005,
         TOKUDB_DICTIONARY_NO_HEADER = -100006,
         TOKUDB_CANCELED             = -100007,
+        TOKUDB_NO_DATA              = -100008,
 };
 
 static void print_defines (void) {
@@ -197,6 +198,7 @@ static void print_defines (void) {
     dodefine(TOKUDB_DICTIONARY_TOO_NEW);
     dodefine(TOKUDB_DICTIONARY_NO_HEADER);
     dodefine(TOKUDB_CANCELED);
+    dodefine(TOKUDB_NO_DATA);
 
     /* LOADER flags */
     printf("/* LOADER flags */\n");

buildheader/tdb.h

@@ -234,6 +234,7 @@ typedef enum {
 #define TOKUDB_DICTIONARY_TOO_NEW -100005
 #define TOKUDB_DICTIONARY_NO_HEADER -100006
 #define TOKUDB_CANCELED -100007
+#define TOKUDB_NO_DATA -100008
 /* LOADER flags */
 #define LOADER_USE_PUTS 1
 /* in wrap mode, top-level function txn_begin is renamed, but the field isn't renamed, so we have to hack it here.*/

include/db.h

@@ -234,6 +234,7 @@ typedef enum {
 #define TOKUDB_DICTIONARY_TOO_NEW -100005
 #define TOKUDB_DICTIONARY_NO_HEADER -100006
 #define TOKUDB_CANCELED -100007
+#define TOKUDB_NO_DATA -100008
 /* LOADER flags */
 #define LOADER_USE_PUTS 1
 /* in wrap mode, top-level function txn_begin is renamed, but the field isn't renamed, so we have to hack it here.*/

newbrt/Makefile

@@ -76,12 +76,15 @@ BRT_SOURCES = \
   ule \
   threadpool \
   toku_worker \
-  trace_mem \
   txn \
   x1764 \
   xids \
   ybt \
 # keep this line so I can have a \ on the previous line
+ifneq ($(OS_CHOICE),windows)
+    BRT_SOURCES += trace_mem #Windows does not handle 'empty' file
+endif
+
 
 TEST_NEWBRT = brt-test-helpers.$(OEXT)
 

newbrt/brtloader.c

@@ -610,7 +610,7 @@ static int bl_read_dbt_from_dbufio (/*in*/DBT *dbt, DBUFIO_FILESET bfs, int file
 	if (r!=0) {
 	    result = r;
 	} else if (n_read<sizeof(len)) {
-	    result = ENODATA; // must have run out of data prematurely.  This is not EOF, it's a real error.
+	    result = TOKUDB_NO_DATA; // must have run out of data prematurely.  This is not EOF, it's a real error.
 	}
     }
     if (result==0) {
@@ -630,7 +630,7 @@ static int bl_read_dbt_from_dbufio (/*in*/DBT *dbt, DBUFIO_FILESET bfs, int file
 	if (r!=0) {
 	    result = r;
 	} else if (n_read<len) {
-	    result = ENODATA; // must have run out of data prematurely.  This is not EOF, it's a real error.
+	    result = TOKUDB_NO_DATA; // must have run out of data prematurely.  This is not EOF, it's a real error.
 	} else {
 	    dbt->size = len;
 	}

newbrt/dbufio.c

@@ -17,7 +17,7 @@ struct dbufio_file {
 
     // consumers own these
     size_t offset_in_buf;
-    off_t  offset_in_file;
+    toku_off_t  offset_in_file;
 
     // need the mutex to modify these
     struct dbufio_file *next;

toku_include/Makefile.include

@@ -244,6 +244,7 @@ ifeq ($(CC),icc)
 	#Linux
         ICC_NOWARN=-diag-disable #Need the space
     endif
+    DISABLE_WARNING +=111# Unreachable code (i.e. assert(0) )
     DISABLE_WARNING +=271# Remove warnings about trailing comma being nonstandard
     DISABLE_WARNING +=424# Remove warnings about extra ';' being ignored
     DISABLE_WARNING +=810# Remove warnings about losing precision