SERVER-58612 Add Column as BSON Binary Subtype 7

Author: henrikedin

src/mongo/bson/bsontypes.cpp

@@ -187,6 +187,8 @@ const char* typeName(BinDataType type) {
             return "MD5";
         case Encrypt:
             return "encrypt";
+        case Column:
+            return "column";
         case bdtCustom:
             return "Custom";
         default:
@@ -203,6 +205,7 @@ bool isValidBinDataType(int type) {
         case newUUID:
         case MD5Type:
         case Encrypt:
+        case Column:
         case bdtCustom:
             return true;
         default:

src/mongo/bson/bsontypes.h

@@ -193,6 +193,7 @@ enum BinDataType {
     newUUID = 4,             /* language-independent UUID format across all drivers */
     MD5Type = 5,
     Encrypt = 6, /* encryption placeholder or encrypted data */
+    Column = 7,  /* compressed column */
     bdtCustom = 128
 };
 

src/mongo/db/matcher/expression_type_test.cpp

@@ -257,6 +257,14 @@ TEST(ExpressionBinDataSubTypeTest, MatchesBinDataEncryptType) {
     ASSERT_FALSE(type.matchesSingleElement(notMatch["a"]));
 }
 
+TEST(ExpressionBinDataSubTypeTest, MatchesBinDataColumnType) {
+    BSONObj match = BSON("a" << BSONBinData(nullptr, 0, BinDataType::Column));
+    BSONObj notMatch = BSON("a" << BSONBinData(nullptr, 0, BinDataType::newUUID));
+    InternalSchemaBinDataSubTypeExpression type("", BinDataType::Column);
+    ASSERT_TRUE(type.matchesSingleElement(match["a"]));
+    ASSERT_FALSE(type.matchesSingleElement(notMatch["a"]));
+}
+
 TEST(ExpressionBinDataSubTypeTest, MatchesBinDataBdtCustom) {
     BSONObj match = BSON("a" << BSONBinData(nullptr, 0, BinDataType::bdtCustom));
     BSONObj notMatch = BSON("a" << BSONBinData(nullptr, 0, BinDataType::Function));

src/mongo/dbtests/jsontests.cpp

@@ -834,6 +834,7 @@ TEST(FromJsonTest, BinDataTypes) {
         {0x04, newUUID},
         {0x05, MD5Type},
         {0x06, Encrypt},
+        {0x07, Column},
         {0x80, bdtCustom},
     };
     for (const auto& ts : specs) {