Merge pull request #4 from truongsinh/master

read/write binary data (bytea)
EnterpriseDB · Oct 2, 2014 · 486e7d6 · 486e7d6
2 parents da603d5 + 8e6ca32
commit 486e7d6
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 0 deletions.
diff --git a/mongo_fdw.c b/mongo_fdw.c
@@ -1227,6 +1227,14 @@ ColumnTypesCompatible(BSON_TYPE bsonType, Oid columnTypeId)
 			}
 			break;
 		}
+		case BYTEAOID:
+		{
+			if (bsonType == BSON_TYPE_BINDATA)
+			{
+				compatibleTypes = true;
+			}
+			break;
+		}
 		case NAMEOID:
 		{
 			/*
@@ -1432,6 +1440,16 @@ ColumnValue(BSON_ITERATOR *bsonIterator, Oid columnTypeId, int32 columnTypeMod)
 											  Int32GetDatum(columnTypeMod));
 			break;
 		}
+		case BYTEAOID:
+		{
+			int value_len = BsonIterBinLen(bsonIterator);
+			const char *value = BsonIterBinData(bsonIterator);
+			bytea *result = (bytea *)palloc(value_len + VARHDRSZ);
+			memcpy(VARDATA(result), value, value_len);
+			SET_VARSIZE(result, value_len + VARHDRSZ);
+			columnValue = PointerGetDatum(result);
+			break;
+		}
 		case DATEOID:
 		{
 			int64 valueMillis = BsonIterDate(bsonIterator);

diff --git a/mongo_fdw.h b/mongo_fdw.h
@@ -75,6 +75,7 @@
 	#define BSON_TYPE_INT32 BSON_INT
 	#define BSON_TYPE_INT64 BSON_LONG
 	#define BSON_TYPE_DOUBLE BSON_DOUBLE
+	#define BSON_TYPE_BINDATA BSON_BINDATA
 	#define BSON_TYPE_BOOL BSON_BOOL
 	#define BSON_TYPE_UTF8 BSON_STRING
 	#define BSON_TYPE_OID BSON_OID

diff --git a/mongo_query.c b/mongo_query.c
@@ -449,6 +449,21 @@ AppenMongoValue(BSON *queryDocument, const char *keyName, Datum value, bool isnu
 			status = BsonAppendUTF8(queryDocument, keyName, outputString);
 			break;
 		}
+		case BYTEAOID:
+		{
+			int len;
+			char *data;
+			char *result = DatumGetPointer(value);
+			if (VARATT_IS_1B(result)) {
+				len = VARSIZE_1B(result) - VARHDRSZ_SHORT;
+				data = VARDATA_1B(result);
+			} else {
+				len = VARSIZE_4B(result) - VARHDRSZ;
+				data = VARDATA_4B(result);
+			}
+			status = BsonAppendBinary(queryDocument, keyName, data, len);
+			break;
+		}
 		case NAMEOID:
 		{
 			char *outputString = NULL;

diff --git a/mongo_wrapper.c b/mongo_wrapper.c
@@ -202,6 +202,15 @@ BsonIterString(BSON_ITERATOR *it)
 	return bson_iterator_string(it);
 }
 
+const char* BsonIterBinData(BSON_ITERATOR *it)
+{
+	return bson_iterator_bin_data(it);
+}
+
+int BsonIterBinLen(BSON_ITERATOR *it)
+{
+	return bson_iterator_bin_len(it);
+}
 const bson_oid_t *
 BsonIterOid(BSON_ITERATOR *it)
 {
@@ -294,6 +303,10 @@ BsonAppendUTF8(BSON *b, const char* key, char *v)
 	return (bson_append_string(b, key, v) == MONGO_OK);
 }
 
+bool BsonAppendBinary(BSON *b, const char* key, char *v, size_t len)
+{
+	return (bson_append_binary(b, key, BSON_BIN_BINARY, v, len) == MONGO_OK);
+}
 bool
 BsonAppendDate(BSON *b, const char* key, time_t v)
 {

diff --git a/mongo_wrapper.h b/mongo_wrapper.h
@@ -47,6 +47,8 @@ int64_t BsonIterInt64(BSON_ITERATOR *it);
 double BsonIterDouble(BSON_ITERATOR *it);
 bool BsonIterBool(BSON_ITERATOR *it);
 const char* BsonIterString(BSON_ITERATOR *it);
+const char* BsonIterBinData(BSON_ITERATOR *it);
+int BsonIterBinLen(BSON_ITERATOR *it);
 const bson_oid_t * BsonIterOid(BSON_ITERATOR *it);
 time_t BsonIterDate(BSON_ITERATOR *it);
 const char* BsonIterKey(BSON_ITERATOR *it);
@@ -63,6 +65,7 @@ bool BsonAppendInt32(BSON *b, const char* key, int v);
 bool BsonAppendInt64(BSON *b, const char* key, int64_t v);
 bool BsonAppendDouble(BSON *b, const char* key, double v);
 bool BsonAppendUTF8(BSON *b, const char* key, char *v);
+bool BsonAppendBinary(BSON *b, const char* key, char *v, size_t len);
 bool BsonAppendDate(BSON *b, const char* key, time_t v);
 bool BsonAppendStartArray(BSON *b, const char* key, BSON* c);
 bool BsonAppendFinishArray(BSON *b, BSON *c);