fixed find with boolean

polypheny · Sep 25, 2023 · d763c08 · d763c08
1 parent e3042b4
commit d763c08
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/core/src/main/java/org/polypheny/db/runtime/functions/MqlFunctions.java b/core/src/main/java/org/polypheny/db/runtime/functions/MqlFunctions.java
@@ -781,6 +781,8 @@ private static Object transformBsonToPrimitive( BsonValue doc ) {
                 return doc.asDocument().entrySet().stream().collect( Collectors.toMap( Entry::getKey, e -> transformBsonToPrimitive( e.getValue() ) ) );
             case ARRAY:
                 return doc.asArray().stream().map( MqlFunctions::transformBsonToPrimitive ).collect( Collectors.toList() );
+            case BOOLEAN:
+                return doc.asBoolean().getValue();
             default:
                 return null;
         }

diff --git a/plugins/mqtt-stream/src/main/java/org/polypheny/db/mqtt/MqttStreamProcessor.java b/plugins/mqtt-stream/src/main/java/org/polypheny/db/mqtt/MqttStreamProcessor.java
@@ -78,9 +78,9 @@ private AlgRoot processMqlQuery() {
         } else if ( isNumber( msg ) ) {
             double value = Double.parseDouble( msg );
             msgDoc = new BsonDocument( "$$ROOT", new BsonDouble( value ) );
-        /*} else if ( isBoolean( msg ) ) {
+        } else if ( isBoolean( msg ) ) {
             boolean value = Boolean.parseBoolean( msg );
-            msgDoc = new BsonDocument( "$$ROOT", new BsonBoolean( value ) );*/
+            msgDoc = new BsonDocument( "$$ROOT", new BsonBoolean( value ) );
         } else {
             // msg is String
             msgDoc = new BsonDocument( "$$ROOT", new BsonString( msg ) );

diff --git a/plugins/mqtt-stream/src/test/java/org/polypheny/db/mqtt/MqttStreamProcessorTest.java b/plugins/mqtt-stream/src/test/java/org/polypheny/db/mqtt/MqttStreamProcessorTest.java
@@ -190,5 +190,17 @@ public void filterTestForJsonStringMessage2() {
         assertTrue( streamProcessor.applyFilter());
     }
 
+//TODO: remove this test:
+    @Test
+    public void nestedDoctest() {
+        Transaction transaction = TestHelper.getInstance().getTransaction();
+        Statement st = transaction.createStatement();
+        String filterQuery = "{\"mqtt.status\":\"online\"}";
+        MqttMessage mqttMessage = new MqttMessage( "{\"mqtt\":{\"status\":\"online\"}}", "button/battery");
+        FilteringMqttMessage filteringMqttMessage = new FilteringMqttMessage(mqttMessage, filterQuery );
+        MqttStreamProcessor streamProcessor = new MqttStreamProcessor( filteringMqttMessage, st );
+        assertTrue( streamProcessor.applyFilter());
+    }
+
 
 }