Support UNSIGNED TINYINT SMALLINT INT BIGINT

Author: jcwangxp

include/crossdb.h

@@ -204,9 +204,15 @@ xdb_column_bool (xdb_res_t *pRes, xdb_row_t *pRow, uint16_t iCol);
 int 
 xdb_column_int (xdb_res_t *pRes, xdb_row_t *pRow, uint16_t iCol);
 
+uint32_t 
+xdb_column_uint (xdb_res_t *pRes, xdb_row_t *pRow, uint16_t iCol);
+
 int64_t 
 xdb_column_int64 (xdb_res_t *pRes, xdb_row_t *pRow, uint16_t iCol);
 
+uint64_t 
+xdb_column_uint64 (xdb_res_t *pRes, xdb_row_t *pRow, uint16_t iCol);
+
 float
 xdb_column_float (xdb_res_t *pRes, xdb_row_t *pRow, uint16_t iCol);
 

src/admin/xdb_backup.c

@@ -29,12 +29,20 @@ xdb_row2sql (xdb_res_t *pRes, xdb_row_t *pRow, const char *tbl_name, char *buf,
 		case XDB_TYPE_TINYINT:
 			len += sprintf (buf+len, "%d,", xdb_column_int (pRes, pRow, i));
 			break;
+		case XDB_TYPE_UINT:
+		case XDB_TYPE_USMALLINT:
+		case XDB_TYPE_UTINYINT:
+			len += sprintf (buf+len, "%u,", xdb_column_int (pRes, pRow, i));
+			break;
 		case XDB_TYPE_BOOL:
 			len += sprintf (buf+len, "%s,", xdb_column_bool(pRes, pRow, i) ? "true" : "false");
 			break;
 		case XDB_TYPE_BIGINT:
 			len += sprintf (buf+len, "%"PRIi64",", xdb_column_int64 (pRes, pRow, i));
 			break;
+		case XDB_TYPE_UBIGINT:
+			len += sprintf (buf+len, "%"PRIu64",", xdb_column_int64 (pRes, pRow, i));
+			break;
 		case XDB_TYPE_TIMESTAMP:
 			*(buf + len++) = '\'';
 			len +=	xdb_timestamp_sprintf (xdb_column_int64 (pRes, pRow, i), buf+len, size - len);

src/admin/xdb_shell.c

@@ -92,12 +92,20 @@ xdb_get_row_len (xdb_res_t *pRes, xdb_row_t *pRow, int *pColLen)
 		case XDB_TYPE_TINYINT:
 			len = snprintf (buf, sizeof(buf), "%d", xdb_column_int (pRes, pRow, i));
 			break;
+		case XDB_TYPE_UINT:
+		case XDB_TYPE_USMALLINT:
+		case XDB_TYPE_UTINYINT:
+			len = snprintf (buf, sizeof(buf), "%u", xdb_column_int (pRes, pRow, i));
+			break;
 		case XDB_TYPE_BOOL:
 			len = snprintf (buf, sizeof(buf), "%s", xdb_column_bool(pRes, pRow, i) ? "true" : "false");
 			break;
 		case XDB_TYPE_BIGINT:
 			len = snprintf (buf, sizeof(buf), "%"PRIi64, xdb_column_int64 (pRes, pRow, i));
 			break;
+		case XDB_TYPE_UBIGINT:
+			len = snprintf (buf, sizeof(buf), "%"PRIu64, xdb_column_int64 (pRes, pRow, i));
+			break;
 		case XDB_TYPE_FLOAT:
 		case XDB_TYPE_DOUBLE:
 			len = snprintf (buf, sizeof(buf), "%f", xdb_column_double (pRes, pRow, i));
@@ -185,6 +193,13 @@ xdb_fprint_row_table (FILE *pFile, xdb_res_t *pRes, xdb_row_t *pRow, int *pColLe
 						plen = xdb_fprintf (pFile, "%d", xdb_column_int (pRes, pRow, i));
 					}
 					break;
+				case XDB_TYPE_UINT:
+				case XDB_TYPE_USMALLINT:
+				case XDB_TYPE_UTINYINT:
+					if (0 == n) {
+						plen = xdb_fprintf (pFile, "%u", xdb_column_int (pRes, pRow, i));
+					}
+					break;
 				case XDB_TYPE_BOOL:
 					if (0 == n) {
 						plen = xdb_fprintf (pFile, "%s", xdb_column_bool(pRes, pRow, i) ? "true" : "false");
@@ -195,6 +210,11 @@ xdb_fprint_row_table (FILE *pFile, xdb_res_t *pRes, xdb_row_t *pRow, int *pColLe
 						plen = xdb_fprintf (pFile, "%"PRIi64, xdb_column_int64 (pRes, pRow, i));
 					}
 					break;
+				case XDB_TYPE_UBIGINT:
+					if (0 == n) {
+						plen = xdb_fprintf (pFile, "%"PRIu64, xdb_column_int64 (pRes, pRow, i));
+					}
+					break;
 				case XDB_TYPE_FLOAT:
 				case XDB_TYPE_DOUBLE:
 					if (0 == n) {

src/core/xdb_common.h

@@ -19,7 +19,7 @@
 #define XDB_ROW_COL_CNT		4096
 
 typedef struct xdb_res_t {
-	uint32_t	len_type;		// MSB 4bit are type xdb_restype_t
+	uint32_t	len_type;		// MSB 4bit are type xdb_restype_e
 	uint16_t	errcode;		// 4
 	uint16_t	status;			// 6 xdb_status_t
 
@@ -75,16 +75,17 @@ typedef struct xdb_meta_t {
 } xdb_meta_t;
 
 typedef enum {
-	XDB_RET_ROW = 0,
-	XDB_RET_REPLY,
+	XDB_RET_ROW,
 	XDB_RET_META,
 	XDB_RET_MSG,
-	XDB_RET_COMPRESS,
-	XDB_RET_INSERT,	// (meta + row)
+	XDB_RET_REPLY = 4,	// (meta + rows)
+	XDB_RET_INITIAL, // (meta + row)
+	XDB_RET_INSERT, // (meta + row)
+	XDB_RET_UPDATE, // (msg is bitmap, meta + new row + old row)
 	XDB_RET_DELETE, // (meta + row)
-	XDB_RET_UPDATE, // (old meta, old row, set meta, set row)
+	XDB_RET_COMPRESS,
 	XDB_RET_EOF = 0xF,
-} xdb_restype_t;
+} xdb_restype_e;
 
 typedef enum {
 	XDB_STATUS_MORE_RESULTS 	= (1<<3),