From 2d2db4631d950a622c5ea4d5200d9b4c7f6bca48 Mon Sep 17 00:00:00 2001 From: Martin Vahlensieck Date: Tue, 9 Apr 2024 13:53:00 +0200 Subject: [PATCH] Fix build --- .../statementProcessing/RelationalExecutor.java | 4 ++-- .../db/protointerface/utils/ProtoValueDeserializer.java | 3 +-- .../src/main/proto/polyprism/protointerface.proto | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/plugins/proto-interface/src/main/java/org/polypheny/db/protointerface/statementProcessing/RelationalExecutor.java b/plugins/proto-interface/src/main/java/org/polypheny/db/protointerface/statementProcessing/RelationalExecutor.java index 97d7c402ae..15b5dd74de 100644 --- a/plugins/proto-interface/src/main/java/org/polypheny/db/protointerface/statementProcessing/RelationalExecutor.java +++ b/plugins/proto-interface/src/main/java/org/polypheny/db/protointerface/statementProcessing/RelationalExecutor.java @@ -74,7 +74,7 @@ StatementResult executeAndGetResult( PIStatement piStatement ) { StatementResult.Builder resultBuilder = StatementResult.newBuilder(); if ( implementation.isDDL() || Kind.DML.contains( implementation.getKind() ) ) { try ( ResultIterator iterator = implementation.execute( statement, -1 ) ) { - resultBuilder.setScalar( PolyImplementation.getRowsChanged( statement, iterator.getIterator(), MonitoringType.NONE ) ); + resultBuilder.setScalar( PolyImplementation.getRowsChanged( statement, iterator.getIterator(), MonitoringType.from( implementation.getKind() ) ) ); } client.commitCurrentTransactionIfAuto(); return resultBuilder.build(); @@ -117,7 +117,7 @@ public StatementResult executeAndGetResult( PIStatement piStatement, int fetchSi } if ( Kind.DML.contains( implementation.getKind() ) ) { try ( ResultIterator iterator = implementation.execute( statement, -1 ) ) { - resultBuilder.setScalar( PolyImplementation.getRowsChanged( statement, iterator.getIterator(), MonitoringType.NONE ) ); + resultBuilder.setScalar( PolyImplementation.getRowsChanged( statement, iterator.getIterator(), MonitoringType.from( implementation.getKind() ) ) ); } client.commitCurrentTransactionIfAuto(); return resultBuilder.build(); diff --git a/plugins/proto-interface/src/main/java/org/polypheny/db/protointerface/utils/ProtoValueDeserializer.java b/plugins/proto-interface/src/main/java/org/polypheny/db/protointerface/utils/ProtoValueDeserializer.java index 6a521fe96d..b9372ff4ce 100644 --- a/plugins/proto-interface/src/main/java/org/polypheny/db/protointerface/utils/ProtoValueDeserializer.java +++ b/plugins/proto-interface/src/main/java/org/polypheny/db/protointerface/utils/ProtoValueDeserializer.java @@ -28,12 +28,10 @@ import org.polypheny.db.catalog.exceptions.GenericRuntimeException; import org.polypheny.db.protointerface.proto.IndexedParameters; import org.polypheny.db.protointerface.proto.ProtoBigDecimal; -import org.polypheny.db.protointerface.proto.ProtoDocument; import org.polypheny.db.protointerface.proto.ProtoValue; import org.polypheny.db.type.entity.PolyBinary; import org.polypheny.db.type.entity.PolyBoolean; import org.polypheny.db.type.entity.PolyList; -import org.polypheny.db.type.entity.PolyLong; import org.polypheny.db.type.entity.PolyNull; import org.polypheny.db.type.entity.PolyString; import org.polypheny.db.type.entity.PolyValue; @@ -43,6 +41,7 @@ import org.polypheny.db.type.entity.numerical.PolyDouble; import org.polypheny.db.type.entity.numerical.PolyFloat; import org.polypheny.db.type.entity.numerical.PolyInteger; +import org.polypheny.db.type.entity.numerical.PolyLong; import org.polypheny.db.type.entity.temporal.PolyDate; import org.polypheny.db.type.entity.temporal.PolyTime; import org.polypheny.db.type.entity.temporal.PolyTimestamp; diff --git a/plugins/proto-interface/src/main/proto/polyprism/protointerface.proto b/plugins/proto-interface/src/main/proto/polyprism/protointerface.proto index e7535ddac2..328c3e0c88 100644 --- a/plugins/proto-interface/src/main/proto/polyprism/protointerface.proto +++ b/plugins/proto-interface/src/main/proto/polyprism/protointerface.proto @@ -65,7 +65,7 @@ message Request { CommitRequest commit_request = 33; RollbackRequest rollback_request = 34; ConnectionPropertiesUpdateRequest connection_properties_update_request = 35; - CloseResultRequest close_result_response = 36; + CloseResultRequest close_result_request = 36; } }