CSHARP-1409: added bit operators to the query builders.

Author: craiggwilson

MongoDB.Driver/Builders/QueryBuilder.cs

@@ -102,6 +102,50 @@ public static IMongoQuery And(params IMongoQuery[] queries)
             return And((IEnumerable<IMongoQuery>)queries);
         }
 
+        /// <summary>
+        /// Tests that the value of the named element has all of the specified bits clear.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="bitmask">The bitmask.</param>
+        /// <returns>An IMongoQuery.</returns>
+        public static IMongoQuery BitsAllClear(string name, long bitmask)
+        {
+            return new QueryDocument(name, new BsonDocument("$bitsAllClear", bitmask));
+        }
+
+        /// <summary>
+        /// Tests that the value of the named element has all of the specified bits set.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="bitmask">The bitmask.</param>
+        /// <returns>An IMongoQuery.</returns>
+        public static IMongoQuery BitsAllSet(string name, long bitmask)
+        {
+            return new QueryDocument(name, new BsonDocument("$bitsAllSet", bitmask));
+        }
+
+        /// <summary>
+        /// Tests that the value of the named element has any of the specified bits clear.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="bitmask">The bitmask.</param>
+        /// <returns>An IMongoQuery.</returns>
+        public static IMongoQuery BitsAnyClear(string name, long bitmask)
+        {
+            return new QueryDocument(name, new BsonDocument("$bitsAnyClear", bitmask));
+        }
+
+        /// <summary>
+        /// Tests that the value of the named element has any of the specified bits set.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="bitmask">The bitmask.</param>
+        /// <returns>An IMongoQuery.</returns>
+        public static IMongoQuery BitsAnySet(string name, long bitmask)
+        {
+            return new QueryDocument(name, new BsonDocument("$bitsAnySet", bitmask));
+        }
+
         /// <summary>
         /// Tests that at least one item of the named array element matches a query (see $elemMatch).
         /// </summary>
@@ -1072,6 +1116,50 @@ public static IMongoQuery All<TValue>(Expression<Func<TDocument, IEnumerable<TVa
             return new QueryBuilder<TDocument>().All(memberExpression, values);
         }
 
+        /// <summary>
+        /// Tests that the value of the named element has all of the specified bits clear.
+        /// </summary>
+        /// <param name="memberExpression">The member expression.</param>
+        /// <param name="bitmask">The bitmask.</param>
+        /// <returns>An IMongoQuery.</returns>
+        public static IMongoQuery BitsAllClear(Expression<Func<TDocument, object>> memberExpression, long bitmask)
+        {
+            return new QueryBuilder<TDocument>().BitsAllClear(memberExpression, bitmask);
+        }
+
+        /// <summary>
+        /// Tests that the value of the named element has all of the specified bits set.
+        /// </summary>
+        /// <param name="memberExpression">The member expression.</param>
+        /// <param name="bitmask">The bitmask.</param>
+        /// <returns>An IMongoQuery.</returns>
+        public static IMongoQuery BitsAllSet(Expression<Func<TDocument, object>> memberExpression, long bitmask)
+        {
+            return new QueryBuilder<TDocument>().BitsAllSet(memberExpression, bitmask);
+        }
+
+        /// <summary>
+        /// Tests that the value of the named element has any of the specified bits clear.
+        /// </summary>
+        /// <param name="memberExpression">The member expression.</param>
+        /// <param name="bitmask">The bitmask.</param>
+        /// <returns>An IMongoQuery.</returns>
+        public static IMongoQuery BitsAnyClear(Expression<Func<TDocument, object>> memberExpression, long bitmask)
+        {
+            return new QueryBuilder<TDocument>().BitsAnyClear(memberExpression, bitmask);
+        }
+
+        /// <summary>
+        /// Tests that the value of the named element has any of the specified bits set.
+        /// </summary>
+        /// <param name="memberExpression">The member expression.</param>
+        /// <param name="bitmask">The bitmask.</param>
+        /// <returns>An IMongoQuery.</returns>
+        public static IMongoQuery BitsAnySet(Expression<Func<TDocument, object>> memberExpression, long bitmask)
+        {
+            return new QueryBuilder<TDocument>().BitsAnySet(memberExpression, bitmask);
+        }
+
         /// <summary>
         /// Tests that at least one item of the named array element matches a query (see $elemMatch).
         /// </summary>
@@ -1660,6 +1748,74 @@ public IMongoQuery And(params IMongoQuery[] queries)
             return And((IEnumerable<IMongoQuery>)queries);
         }
 
+        /// <summary>
+        /// Tests that the value of the named element has all of the specified bits clear.
+        /// </summary>
+        /// <param name="memberExpression">The member expression.</param>
+        /// <param name="bitmask">The bitmask.</param>
+        /// <returns>An IMongoQuery.</returns>
+        public IMongoQuery BitsAllClear(Expression<Func<TDocument, object>> memberExpression, long bitmask)
+        {
+            if (memberExpression == null)
+            {
+                throw new ArgumentNullException("memberExpression");
+            }
+
+            var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
+            return Query.BitsAllClear(serializationInfo.ElementName, bitmask);
+        }
+
+        /// <summary>
+        /// Tests that the value of the named element has all of the specified bits set.
+        /// </summary>
+        /// <param name="memberExpression">The member expression.</param>
+        /// <param name="bitmask">The bitmask.</param>
+        /// <returns>An IMongoQuery.</returns>
+        public IMongoQuery BitsAllSet(Expression<Func<TDocument, object>> memberExpression, long bitmask)
+        {
+            if (memberExpression == null)
+            {
+                throw new ArgumentNullException("memberExpression");
+            }
+
+            var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
+            return Query.BitsAllSet(serializationInfo.ElementName, bitmask);
+        }
+
+        /// <summary>
+        /// Tests that the value of the named element has any of the specified bits clear.
+        /// </summary>
+        /// <param name="memberExpression">The member expression.</param>
+        /// <param name="bitmask">The bitmask.</param>
+        /// <returns>An IMongoQuery.</returns>
+        public IMongoQuery BitsAnyClear(Expression<Func<TDocument, object>> memberExpression, long bitmask)
+        {
+            if (memberExpression == null)
+            {
+                throw new ArgumentNullException("memberExpression");
+            }
+
+            var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
+            return Query.BitsAnyClear(serializationInfo.ElementName, bitmask);
+        }
+
+        /// <summary>
+        /// Tests that the value of the named element has any of the specified bits set.
+        /// </summary>
+        /// <param name="memberExpression">The member expression.</param>
+        /// <param name="bitmask">The bitmask.</param>
+        /// <returns>An IMongoQuery.</returns>
+        public IMongoQuery BitsAnySet(Expression<Func<TDocument, object>> memberExpression, long bitmask)
+        {
+            if (memberExpression == null)
+            {
+                throw new ArgumentNullException("memberExpression");
+            }
+
+            var serializationInfo = _serializationInfoHelper.GetSerializationInfo(memberExpression);
+            return Query.BitsAnySet(serializationInfo.ElementName, bitmask);
+        }
+
         /// <summary>
         /// Tests that at least one item of the named array element matches a query (see $elemMatch).
         /// </summary>

MongoDB.DriverUnitTests/Builders/QueryBuilderTests.cs

@@ -196,6 +196,46 @@ public void TestAndXNE1YNE2()
             Assert.AreEqual(NegateArbitraryQuery(expected), Query.Not(query).ToJson());
         }
 
+        [Test]
+        public void TestBitsAllClear()
+        {
+            var query = Query.BitsAllClear("x", 3);
+            var expected = "{ \"x\" : { \"$bitsAllClear\" : NumberLong(3) } }";
+            var negated = "{ \"x\" : { \"$not\" : { \"$bitsAllClear\" : NumberLong(3) } } }";
+            Assert.AreEqual(expected, query.ToJson());
+            Assert.AreEqual(negated, Query.Not(query).ToJson());
+        }
+
+        [Test]
+        public void TestBitsAllSet()
+        {
+            var query = Query.BitsAllSet("x", 3);
+            var expected = "{ \"x\" : { \"$bitsAllSet\" : NumberLong(3) } }";
+            var negated = "{ \"x\" : { \"$not\" : { \"$bitsAllSet\" : NumberLong(3) } } }";
+            Assert.AreEqual(expected, query.ToJson());
+            Assert.AreEqual(negated, Query.Not(query).ToJson());
+        }
+
+        [Test]
+        public void TestBitsAnyClear()
+        {
+            var query = Query.BitsAnyClear("x", 3);
+            var expected = "{ \"x\" : { \"$bitsAnyClear\" : NumberLong(3) } }";
+            var negated = "{ \"x\" : { \"$not\" : { \"$bitsAnyClear\" : NumberLong(3) } } }";
+            Assert.AreEqual(expected, query.ToJson());
+            Assert.AreEqual(negated, Query.Not(query).ToJson());
+        }
+
+        [Test]
+        public void TestBitsAnySet()
+        {
+            var query = Query.BitsAnySet("x", 3);
+            var expected = "{ \"x\" : { \"$bitsAnySet\" : NumberLong(3) } }";
+            var negated = "{ \"x\" : { \"$not\" : { \"$bitsAnySet\" : NumberLong(3) } } }";
+            Assert.AreEqual(expected, query.ToJson());
+            Assert.AreEqual(negated, Query.Not(query).ToJson());
+        }
+
         [Test]
         public void TestElementMatch()
         {

MongoDB.DriverUnitTests/Builders/QueryBuilderTypedTests.cs

@@ -112,6 +112,38 @@ public void TestAnd_NotExpression()
             Assert.AreEqual(expected, query.ToJson());
         }
 
+        [Test]
+        public void TestBitsAllClear()
+        {
+            var query = Query<A>.BitsAllClear(x => x.X, 3);
+            var expected = "{ \"x\" : { \"$bitsAllClear\" : NumberLong(3) } }";
+            Assert.AreEqual(expected, query.ToJson());
+        }
+
+        [Test]
+        public void TestBitsAllSet()
+        {
+            var query = Query<A>.BitsAllSet(x => x.X, 3);
+            var expected = "{ \"x\" : { \"$bitsAllSet\" : NumberLong(3) } }";
+            Assert.AreEqual(expected, query.ToJson());
+        }
+
+        [Test]
+        public void TestBitsAnyClear()
+        {
+            var query = Query<A>.BitsAnyClear(x => x.X, 3);
+            var expected = "{ \"x\" : { \"$bitsAnyClear\" : NumberLong(3) } }";
+            Assert.AreEqual(expected, query.ToJson());
+        }
+
+        [Test]
+        public void TestBitsAnySet()
+        {
+            var query = Query<A>.BitsAnySet(x => x.X, 3);
+            var expected = "{ \"x\" : { \"$bitsAnySet\" : NumberLong(3) } }";
+            Assert.AreEqual(expected, query.ToJson());
+        }
+
         [Test]
         public void TestBooleanExpressionTrueForMethods()
         {