From 0d8dcfff476ee0ffcf83a7dd679283b47479f9e5 Mon Sep 17 00:00:00 2001 From: Anton Bragin Date: Thu, 27 Apr 2023 11:18:48 +0200 Subject: [PATCH] DS-4799 Thrift: table ranges added to command GitOrigin-RevId: ecdacd7ee991c5b53e8228ebd4f6f3bab316b2a8 --- .../python/console/protocol/ArrayData.java | 2 +- .../python/console/protocol/ArrayHeaders.java | 2 +- .../python/console/protocol/ColHeader.java | 2 +- .../console/protocol/CompletionOption.java | 2 +- .../protocol/CompletionOptionType.java | 2 +- .../python/console/protocol/DebugValue.java | 8 +- .../ExceedingArrayDimensionsException.java | 2 +- .../console/protocol/GetArrayResponse.java | 2 +- .../protocol/KeyboardInterruptException.java | 2 +- .../protocol/PythonConsoleBackendService.java | 402 ++++++++++++++---- .../PythonConsoleFrontendService.java | 6 +- .../protocol/PythonTableException.java | 2 +- .../protocol/PythonUnhandledException.java | 2 +- .../python/console/protocol/RowHeader.java | 2 +- .../UnsupportedArrayTypeException.java | 2 +- .../pydev/pydev_console/console.thrift | 2 +- .../console/PydevConsoleCommunication.java | 2 +- 17 files changed, 329 insertions(+), 115 deletions(-) diff --git a/python/gen/com/jetbrains/python/console/protocol/ArrayData.java b/python/gen/com/jetbrains/python/console/protocol/ArrayData.java index af57cdeabfaf..7a1150cd2bf8 100644 --- a/python/gen/com/jetbrains/python/console/protocol/ArrayData.java +++ b/python/gen/com/jetbrains/python/console/protocol/ArrayData.java @@ -7,7 +7,7 @@ package com.jetbrains.python.console.protocol; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)", date = "2022-02-22") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)", date = "2023-04-27") public class ArrayData implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ArrayData"); diff --git a/python/gen/com/jetbrains/python/console/protocol/ArrayHeaders.java b/python/gen/com/jetbrains/python/console/protocol/ArrayHeaders.java index 34a688db84df..6db86064e8ba 100644 --- a/python/gen/com/jetbrains/python/console/protocol/ArrayHeaders.java +++ b/python/gen/com/jetbrains/python/console/protocol/ArrayHeaders.java @@ -7,7 +7,7 @@ package com.jetbrains.python.console.protocol; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)", date = "2022-02-22") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)", date = "2023-04-27") public class ArrayHeaders implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ArrayHeaders"); diff --git a/python/gen/com/jetbrains/python/console/protocol/ColHeader.java b/python/gen/com/jetbrains/python/console/protocol/ColHeader.java index 137f5d4a9a18..04dbef05118f 100644 --- a/python/gen/com/jetbrains/python/console/protocol/ColHeader.java +++ b/python/gen/com/jetbrains/python/console/protocol/ColHeader.java @@ -7,7 +7,7 @@ package com.jetbrains.python.console.protocol; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)", date = "2022-02-22") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)", date = "2023-04-27") public class ColHeader implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ColHeader"); diff --git a/python/gen/com/jetbrains/python/console/protocol/CompletionOption.java b/python/gen/com/jetbrains/python/console/protocol/CompletionOption.java index 372ef64f0428..64a8562b3630 100644 --- a/python/gen/com/jetbrains/python/console/protocol/CompletionOption.java +++ b/python/gen/com/jetbrains/python/console/protocol/CompletionOption.java @@ -7,7 +7,7 @@ package com.jetbrains.python.console.protocol; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)", date = "2022-02-22") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)", date = "2023-04-27") public class CompletionOption implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CompletionOption"); diff --git a/python/gen/com/jetbrains/python/console/protocol/CompletionOptionType.java b/python/gen/com/jetbrains/python/console/protocol/CompletionOptionType.java index 291eba77a8e1..d2e6d7437aa0 100644 --- a/python/gen/com/jetbrains/python/console/protocol/CompletionOptionType.java +++ b/python/gen/com/jetbrains/python/console/protocol/CompletionOptionType.java @@ -10,7 +10,7 @@ package com.jetbrains.python.console.protocol; /** * Corresponds to completion types declared in "_pydev_bundle/_pydev_imports_tipper.py". */ -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)", date = "2022-02-22") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)", date = "2023-04-27") public enum CompletionOptionType implements org.apache.thrift.TEnum { IMPORT(0), CLASS(1), diff --git a/python/gen/com/jetbrains/python/console/protocol/DebugValue.java b/python/gen/com/jetbrains/python/console/protocol/DebugValue.java index cdaece28dc32..79f2b54f9d12 100644 --- a/python/gen/com/jetbrains/python/console/protocol/DebugValue.java +++ b/python/gen/com/jetbrains/python/console/protocol/DebugValue.java @@ -10,7 +10,7 @@ package com.jetbrains.python.console.protocol; /** * Corresponds to `PyDebugValue`. */ -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)", date = "2022-02-22") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)", date = "2023-04-27") public class DebugValue implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DebugValue"); @@ -153,7 +153,7 @@ public class DebugValue implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExceedingArrayDimensionsException"); diff --git a/python/gen/com/jetbrains/python/console/protocol/GetArrayResponse.java b/python/gen/com/jetbrains/python/console/protocol/GetArrayResponse.java index 18f986be9a4d..78a6738951b3 100644 --- a/python/gen/com/jetbrains/python/console/protocol/GetArrayResponse.java +++ b/python/gen/com/jetbrains/python/console/protocol/GetArrayResponse.java @@ -11,7 +11,7 @@ package com.jetbrains.python.console.protocol; * Corresponds to `ArrayChunk`. * */ -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)", date = "2022-02-22") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)", date = "2023-04-27") public class GetArrayResponse implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("GetArrayResponse"); diff --git a/python/gen/com/jetbrains/python/console/protocol/KeyboardInterruptException.java b/python/gen/com/jetbrains/python/console/protocol/KeyboardInterruptException.java index d2a45f00c0a4..dddc0f13d579 100644 --- a/python/gen/com/jetbrains/python/console/protocol/KeyboardInterruptException.java +++ b/python/gen/com/jetbrains/python/console/protocol/KeyboardInterruptException.java @@ -7,7 +7,7 @@ package com.jetbrains.python.console.protocol; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)", date = "2022-02-22") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)", date = "2023-04-27") public class KeyboardInterruptException extends org.apache.thrift.TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("KeyboardInterruptException"); diff --git a/python/gen/com/jetbrains/python/console/protocol/PythonConsoleBackendService.java b/python/gen/com/jetbrains/python/console/protocol/PythonConsoleBackendService.java index 249881f329c8..d308882b9e50 100644 --- a/python/gen/com/jetbrains/python/console/protocol/PythonConsoleBackendService.java +++ b/python/gen/com/jetbrains/python/console/protocol/PythonConsoleBackendService.java @@ -7,7 +7,7 @@ package com.jetbrains.python.console.protocol; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)", date = "2022-02-22") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)", date = "2023-04-27") public class PythonConsoleBackendService { public interface Iface { @@ -39,7 +39,7 @@ public class PythonConsoleBackendService { /** * Return Frame - * + * * @param type */ public java.util.List getFrame(int type) throws PythonUnhandledException, org.apache.thrift.TException; @@ -54,8 +54,8 @@ public class PythonConsoleBackendService { /** * Parameter is a serialized user type renderers. - * - * + * + * * @param renderers */ public boolean setUserTypeRenderers(java.lang.String renderers) throws PythonUnhandledException, org.apache.thrift.TException; @@ -96,7 +96,7 @@ public class PythonConsoleBackendService { */ public void loadFullValue(int seq, java.util.List variables) throws PythonUnhandledException, org.apache.thrift.TException; - public java.lang.String execTableCommand(java.lang.String command, java.lang.String commandType) throws PythonUnhandledException, PythonTableException, org.apache.thrift.TException; + public java.lang.String execTableCommand(java.lang.String tableVariable, java.lang.String commandType, java.lang.String startIndex, java.lang.String endIndex) throws PythonUnhandledException, PythonTableException, org.apache.thrift.TException; } @@ -134,7 +134,7 @@ public class PythonConsoleBackendService { public void loadFullValue(int seq, java.util.List variables, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void execTableCommand(java.lang.String command, java.lang.String commandType, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void execTableCommand(java.lang.String tableVariable, java.lang.String commandType, java.lang.String startIndex, java.lang.String endIndex, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; } @@ -553,17 +553,19 @@ public class PythonConsoleBackendService { return; } - public java.lang.String execTableCommand(java.lang.String command, java.lang.String commandType) throws PythonUnhandledException, PythonTableException, org.apache.thrift.TException + public java.lang.String execTableCommand(java.lang.String tableVariable, java.lang.String commandType, java.lang.String startIndex, java.lang.String endIndex) throws PythonUnhandledException, PythonTableException, org.apache.thrift.TException { - send_execTableCommand(command, commandType); + send_execTableCommand(tableVariable, commandType, startIndex, endIndex); return recv_execTableCommand(); } - public void send_execTableCommand(java.lang.String command, java.lang.String commandType) throws org.apache.thrift.TException + public void send_execTableCommand(java.lang.String tableVariable, java.lang.String commandType, java.lang.String startIndex, java.lang.String endIndex) throws org.apache.thrift.TException { execTableCommand_args args = new execTableCommand_args(); - args.setCommand(command); + args.setTableVariable(tableVariable); args.setCommandType(commandType); + args.setStartIndex(startIndex); + args.setEndIndex(endIndex); sendBase("execTableCommand", args); } @@ -1146,27 +1148,33 @@ public class PythonConsoleBackendService { } } - public void execTableCommand(java.lang.String command, java.lang.String commandType, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void execTableCommand(java.lang.String tableVariable, java.lang.String commandType, java.lang.String startIndex, java.lang.String endIndex, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - execTableCommand_call method_call = new execTableCommand_call(command, commandType, resultHandler, this, ___protocolFactory, ___transport); + execTableCommand_call method_call = new execTableCommand_call(tableVariable, commandType, startIndex, endIndex, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class execTableCommand_call extends org.apache.thrift.async.TAsyncMethodCall { - private java.lang.String command; + private java.lang.String tableVariable; private java.lang.String commandType; - public execTableCommand_call(java.lang.String command, java.lang.String commandType, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + private java.lang.String startIndex; + private java.lang.String endIndex; + public execTableCommand_call(java.lang.String tableVariable, java.lang.String commandType, java.lang.String startIndex, java.lang.String endIndex, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); - this.command = command; + this.tableVariable = tableVariable; this.commandType = commandType; + this.startIndex = startIndex; + this.endIndex = endIndex; } public void write_args(org.apache.thrift.protocol.TProtocol prot) throws org.apache.thrift.TException { prot.writeMessageBegin(new org.apache.thrift.protocol.TMessage("execTableCommand", org.apache.thrift.protocol.TMessageType.CALL, 0)); execTableCommand_args args = new execTableCommand_args(); - args.setCommand(command); + args.setTableVariable(tableVariable); args.setCommandType(commandType); + args.setStartIndex(startIndex); + args.setEndIndex(endIndex); args.write(prot); prot.writeMessageEnd(); } @@ -1689,7 +1697,7 @@ public class PythonConsoleBackendService { public execTableCommand_result getResult(I iface, execTableCommand_args args) throws org.apache.thrift.TException { execTableCommand_result result = new execTableCommand_result(); try { - result.success = iface.execTableCommand(args.command, args.commandType); + result.success = iface.execTableCommand(args.tableVariable, args.commandType, args.startIndex, args.endIndex); } catch (PythonUnhandledException unhandledException) { result.unhandledException = unhandledException; } catch (PythonTableException tableException) { @@ -2131,7 +2139,7 @@ public class PythonConsoleBackendService { public org.apache.thrift.async.AsyncMethodCallback getResultHandler(final org.apache.thrift.server.AbstractNonblockingServer.AsyncFrameBuffer fb, final int seqid) { final org.apache.thrift.AsyncProcessFunction fcall = this; - return new org.apache.thrift.async.AsyncMethodCallback() { + return new org.apache.thrift.async.AsyncMethodCallback() { public void onComplete(java.lang.Boolean o) { setUserTypeRenderers_result result = new setUserTypeRenderers_result(); result.success = o; @@ -2800,7 +2808,7 @@ public class PythonConsoleBackendService { } public void start(I iface, execTableCommand_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { - iface.execTableCommand(args.command, args.commandType,resultHandler); + iface.execTableCommand(args.tableVariable, args.commandType, args.startIndex, args.endIndex,resultHandler); } } @@ -6276,7 +6284,7 @@ public class PythonConsoleBackendService { public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(getFrame_args.class, metaDataMap); @@ -6495,7 +6503,7 @@ public class PythonConsoleBackendService { if (schemeField.type == org.apache.thrift.protocol.TType.I32) { struct.type = iprot.readI32(); struct.setTypeIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -8051,7 +8059,7 @@ public class PythonConsoleBackendService { public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.RENDERERS, new org.apache.thrift.meta_data.FieldMetaData("renderers", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.RENDERERS, new org.apache.thrift.meta_data.FieldMetaData("renderers", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setUserTypeRenderers_args.class, metaDataMap); @@ -8148,8 +8156,6 @@ public class PythonConsoleBackendService { @Override public boolean equals(java.lang.Object that) { - if (that == null) - return false; if (that instanceof setUserTypeRenderers_args) return this.equals((setUserTypeRenderers_args)that); return false; @@ -8192,7 +8198,7 @@ public class PythonConsoleBackendService { int lastComparison = 0; - lastComparison = java.lang.Boolean.valueOf(isSetRenderers()).compareTo(other.isSetRenderers()); + lastComparison = java.lang.Boolean.compare(isSetRenderers(), other.isSetRenderers()); if (lastComparison != 0) { return lastComparison; } @@ -8269,7 +8275,7 @@ public class PythonConsoleBackendService { while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { @@ -8277,7 +8283,7 @@ public class PythonConsoleBackendService { if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.renderers = iprot.readString(); struct.setRenderersIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -8425,9 +8431,9 @@ public class PythonConsoleBackendService { public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.SUCCESS, new org.apache.thrift.meta_data.FieldMetaData("success", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); - tmpMap.put(_Fields.UNHANDLED_EXCEPTION, new org.apache.thrift.meta_data.FieldMetaData("unhandledException", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.UNHANDLED_EXCEPTION, new org.apache.thrift.meta_data.FieldMetaData("unhandledException", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, PythonUnhandledException.class))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(setUserTypeRenderers_result.class, metaDataMap); @@ -8567,8 +8573,6 @@ public class PythonConsoleBackendService { @Override public boolean equals(java.lang.Object that) { - if (that == null) - return false; if (that instanceof setUserTypeRenderers_result) return this.equals((setUserTypeRenderers_result)that); return false; @@ -8622,7 +8626,7 @@ public class PythonConsoleBackendService { int lastComparison = 0; - lastComparison = java.lang.Boolean.valueOf(isSetSuccess()).compareTo(other.isSetSuccess()); + lastComparison = java.lang.Boolean.compare(isSetSuccess(), other.isSetSuccess()); if (lastComparison != 0) { return lastComparison; } @@ -8632,7 +8636,7 @@ public class PythonConsoleBackendService { return lastComparison; } } - lastComparison = java.lang.Boolean.valueOf(isSetUnhandledException()).compareTo(other.isSetUnhandledException()); + lastComparison = java.lang.Boolean.compare(isSetUnhandledException(), other.isSetUnhandledException()); if (lastComparison != 0) { return lastComparison; } @@ -8715,7 +8719,7 @@ public class PythonConsoleBackendService { while (true) { schemeField = iprot.readFieldBegin(); - if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { + if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { break; } switch (schemeField.id) { @@ -8723,7 +8727,7 @@ public class PythonConsoleBackendService { if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.success = iprot.readBool(); struct.setSuccessIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -8732,7 +8736,7 @@ public class PythonConsoleBackendService { struct.unhandledException = new PythonUnhandledException(); struct.unhandledException.read(iprot); struct.setUnhandledExceptionIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; @@ -16538,19 +16542,25 @@ public class PythonConsoleBackendService { public static class execTableCommand_args implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("execTableCommand_args"); - private static final org.apache.thrift.protocol.TField COMMAND_FIELD_DESC = new org.apache.thrift.protocol.TField("command", org.apache.thrift.protocol.TType.STRING, (short)1); + private static final org.apache.thrift.protocol.TField TABLE_VARIABLE_FIELD_DESC = new org.apache.thrift.protocol.TField("tableVariable", org.apache.thrift.protocol.TType.STRING, (short)1); private static final org.apache.thrift.protocol.TField COMMAND_TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("commandType", org.apache.thrift.protocol.TType.STRING, (short)2); + private static final org.apache.thrift.protocol.TField START_INDEX_FIELD_DESC = new org.apache.thrift.protocol.TField("startIndex", org.apache.thrift.protocol.TType.STRING, (short)3); + private static final org.apache.thrift.protocol.TField END_INDEX_FIELD_DESC = new org.apache.thrift.protocol.TField("endIndex", org.apache.thrift.protocol.TType.STRING, (short)4); private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new execTableCommand_argsStandardSchemeFactory(); private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new execTableCommand_argsTupleSchemeFactory(); - public @org.apache.thrift.annotation.Nullable java.lang.String command; // required + public @org.apache.thrift.annotation.Nullable java.lang.String tableVariable; // required public @org.apache.thrift.annotation.Nullable java.lang.String commandType; // required + public @org.apache.thrift.annotation.Nullable java.lang.String startIndex; // required + public @org.apache.thrift.annotation.Nullable java.lang.String endIndex; // required /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { - COMMAND((short)1, "command"), - COMMAND_TYPE((short)2, "commandType"); + TABLE_VARIABLE((short)1, "tableVariable"), + COMMAND_TYPE((short)2, "commandType"), + START_INDEX((short)3, "startIndex"), + END_INDEX((short)4, "endIndex"); private static final java.util.Map byName = new java.util.HashMap(); @@ -16566,10 +16576,14 @@ public class PythonConsoleBackendService { @org.apache.thrift.annotation.Nullable public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // COMMAND - return COMMAND; + case 1: // TABLE_VARIABLE + return TABLE_VARIABLE; case 2: // COMMAND_TYPE return COMMAND_TYPE; + case 3: // START_INDEX + return START_INDEX; + case 4: // END_INDEX + return END_INDEX; default: return null; } @@ -16614,10 +16628,14 @@ public class PythonConsoleBackendService { public static final java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); - tmpMap.put(_Fields.COMMAND, new org.apache.thrift.meta_data.FieldMetaData("command", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.TABLE_VARIABLE, new org.apache.thrift.meta_data.FieldMetaData("tableVariable", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.COMMAND_TYPE, new org.apache.thrift.meta_data.FieldMetaData("commandType", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.START_INDEX, new org.apache.thrift.meta_data.FieldMetaData("startIndex", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.END_INDEX, new org.apache.thrift.meta_data.FieldMetaData("endIndex", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(execTableCommand_args.class, metaDataMap); } @@ -16626,24 +16644,34 @@ public class PythonConsoleBackendService { } public execTableCommand_args( - java.lang.String command, - java.lang.String commandType) + java.lang.String tableVariable, + java.lang.String commandType, + java.lang.String startIndex, + java.lang.String endIndex) { this(); - this.command = command; + this.tableVariable = tableVariable; this.commandType = commandType; + this.startIndex = startIndex; + this.endIndex = endIndex; } /** * Performs a deep copy on other. */ public execTableCommand_args(execTableCommand_args other) { - if (other.isSetCommand()) { - this.command = other.command; + if (other.isSetTableVariable()) { + this.tableVariable = other.tableVariable; } if (other.isSetCommandType()) { this.commandType = other.commandType; } + if (other.isSetStartIndex()) { + this.startIndex = other.startIndex; + } + if (other.isSetEndIndex()) { + this.endIndex = other.endIndex; + } } public execTableCommand_args deepCopy() { @@ -16652,32 +16680,34 @@ public class PythonConsoleBackendService { @Override public void clear() { - this.command = null; + this.tableVariable = null; this.commandType = null; + this.startIndex = null; + this.endIndex = null; } @org.apache.thrift.annotation.Nullable - public java.lang.String getCommand() { - return this.command; + public java.lang.String getTableVariable() { + return this.tableVariable; } - public execTableCommand_args setCommand(@org.apache.thrift.annotation.Nullable java.lang.String command) { - this.command = command; + public execTableCommand_args setTableVariable(@org.apache.thrift.annotation.Nullable java.lang.String tableVariable) { + this.tableVariable = tableVariable; return this; } - public void unsetCommand() { - this.command = null; + public void unsetTableVariable() { + this.tableVariable = null; } - /** Returns true if field command is set (has been assigned a value) and false otherwise */ - public boolean isSetCommand() { - return this.command != null; + /** Returns true if field tableVariable is set (has been assigned a value) and false otherwise */ + public boolean isSetTableVariable() { + return this.tableVariable != null; } - public void setCommandIsSet(boolean value) { + public void setTableVariableIsSet(boolean value) { if (!value) { - this.command = null; + this.tableVariable = null; } } @@ -16706,13 +16736,63 @@ public class PythonConsoleBackendService { } } + @org.apache.thrift.annotation.Nullable + public java.lang.String getStartIndex() { + return this.startIndex; + } + + public execTableCommand_args setStartIndex(@org.apache.thrift.annotation.Nullable java.lang.String startIndex) { + this.startIndex = startIndex; + return this; + } + + public void unsetStartIndex() { + this.startIndex = null; + } + + /** Returns true if field startIndex is set (has been assigned a value) and false otherwise */ + public boolean isSetStartIndex() { + return this.startIndex != null; + } + + public void setStartIndexIsSet(boolean value) { + if (!value) { + this.startIndex = null; + } + } + + @org.apache.thrift.annotation.Nullable + public java.lang.String getEndIndex() { + return this.endIndex; + } + + public execTableCommand_args setEndIndex(@org.apache.thrift.annotation.Nullable java.lang.String endIndex) { + this.endIndex = endIndex; + return this; + } + + public void unsetEndIndex() { + this.endIndex = null; + } + + /** Returns true if field endIndex is set (has been assigned a value) and false otherwise */ + public boolean isSetEndIndex() { + return this.endIndex != null; + } + + public void setEndIndexIsSet(boolean value) { + if (!value) { + this.endIndex = null; + } + } + public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable java.lang.Object value) { switch (field) { - case COMMAND: + case TABLE_VARIABLE: if (value == null) { - unsetCommand(); + unsetTableVariable(); } else { - setCommand((java.lang.String)value); + setTableVariable((java.lang.String)value); } break; @@ -16724,18 +16804,40 @@ public class PythonConsoleBackendService { } break; + case START_INDEX: + if (value == null) { + unsetStartIndex(); + } else { + setStartIndex((java.lang.String)value); + } + break; + + case END_INDEX: + if (value == null) { + unsetEndIndex(); + } else { + setEndIndex((java.lang.String)value); + } + break; + } } @org.apache.thrift.annotation.Nullable public java.lang.Object getFieldValue(_Fields field) { switch (field) { - case COMMAND: - return getCommand(); + case TABLE_VARIABLE: + return getTableVariable(); case COMMAND_TYPE: return getCommandType(); + case START_INDEX: + return getStartIndex(); + + case END_INDEX: + return getEndIndex(); + } throw new java.lang.IllegalStateException(); } @@ -16747,10 +16849,14 @@ public class PythonConsoleBackendService { } switch (field) { - case COMMAND: - return isSetCommand(); + case TABLE_VARIABLE: + return isSetTableVariable(); case COMMAND_TYPE: return isSetCommandType(); + case START_INDEX: + return isSetStartIndex(); + case END_INDEX: + return isSetEndIndex(); } throw new java.lang.IllegalStateException(); } @@ -16768,12 +16874,12 @@ public class PythonConsoleBackendService { if (this == that) return true; - boolean this_present_command = true && this.isSetCommand(); - boolean that_present_command = true && that.isSetCommand(); - if (this_present_command || that_present_command) { - if (!(this_present_command && that_present_command)) + boolean this_present_tableVariable = true && this.isSetTableVariable(); + boolean that_present_tableVariable = true && that.isSetTableVariable(); + if (this_present_tableVariable || that_present_tableVariable) { + if (!(this_present_tableVariable && that_present_tableVariable)) return false; - if (!this.command.equals(that.command)) + if (!this.tableVariable.equals(that.tableVariable)) return false; } @@ -16786,6 +16892,24 @@ public class PythonConsoleBackendService { return false; } + boolean this_present_startIndex = true && this.isSetStartIndex(); + boolean that_present_startIndex = true && that.isSetStartIndex(); + if (this_present_startIndex || that_present_startIndex) { + if (!(this_present_startIndex && that_present_startIndex)) + return false; + if (!this.startIndex.equals(that.startIndex)) + return false; + } + + boolean this_present_endIndex = true && this.isSetEndIndex(); + boolean that_present_endIndex = true && that.isSetEndIndex(); + if (this_present_endIndex || that_present_endIndex) { + if (!(this_present_endIndex && that_present_endIndex)) + return false; + if (!this.endIndex.equals(that.endIndex)) + return false; + } + return true; } @@ -16793,14 +16917,22 @@ public class PythonConsoleBackendService { public int hashCode() { int hashCode = 1; - hashCode = hashCode * 8191 + ((isSetCommand()) ? 131071 : 524287); - if (isSetCommand()) - hashCode = hashCode * 8191 + command.hashCode(); + hashCode = hashCode * 8191 + ((isSetTableVariable()) ? 131071 : 524287); + if (isSetTableVariable()) + hashCode = hashCode * 8191 + tableVariable.hashCode(); hashCode = hashCode * 8191 + ((isSetCommandType()) ? 131071 : 524287); if (isSetCommandType()) hashCode = hashCode * 8191 + commandType.hashCode(); + hashCode = hashCode * 8191 + ((isSetStartIndex()) ? 131071 : 524287); + if (isSetStartIndex()) + hashCode = hashCode * 8191 + startIndex.hashCode(); + + hashCode = hashCode * 8191 + ((isSetEndIndex()) ? 131071 : 524287); + if (isSetEndIndex()) + hashCode = hashCode * 8191 + endIndex.hashCode(); + return hashCode; } @@ -16812,12 +16944,12 @@ public class PythonConsoleBackendService { int lastComparison = 0; - lastComparison = java.lang.Boolean.compare(isSetCommand(), other.isSetCommand()); + lastComparison = java.lang.Boolean.compare(isSetTableVariable(), other.isSetTableVariable()); if (lastComparison != 0) { return lastComparison; } - if (isSetCommand()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.command, other.command); + if (isSetTableVariable()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.tableVariable, other.tableVariable); if (lastComparison != 0) { return lastComparison; } @@ -16832,6 +16964,26 @@ public class PythonConsoleBackendService { return lastComparison; } } + lastComparison = java.lang.Boolean.compare(isSetStartIndex(), other.isSetStartIndex()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetStartIndex()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startIndex, other.startIndex); + if (lastComparison != 0) { + return lastComparison; + } + } + lastComparison = java.lang.Boolean.compare(isSetEndIndex(), other.isSetEndIndex()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetEndIndex()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.endIndex, other.endIndex); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -16853,11 +17005,11 @@ public class PythonConsoleBackendService { java.lang.StringBuilder sb = new java.lang.StringBuilder("execTableCommand_args("); boolean first = true; - sb.append("command:"); - if (this.command == null) { + sb.append("tableVariable:"); + if (this.tableVariable == null) { sb.append("null"); } else { - sb.append(this.command); + sb.append(this.tableVariable); } first = false; if (!first) sb.append(", "); @@ -16868,6 +17020,22 @@ public class PythonConsoleBackendService { sb.append(this.commandType); } first = false; + if (!first) sb.append(", "); + sb.append("startIndex:"); + if (this.startIndex == null) { + sb.append("null"); + } else { + sb.append(this.startIndex); + } + first = false; + if (!first) sb.append(", "); + sb.append("endIndex:"); + if (this.endIndex == null) { + sb.append("null"); + } else { + sb.append(this.endIndex); + } + first = false; sb.append(")"); return sb.toString(); } @@ -16911,10 +17079,10 @@ public class PythonConsoleBackendService { break; } switch (schemeField.id) { - case 1: // COMMAND + case 1: // TABLE_VARIABLE if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.command = iprot.readString(); - struct.setCommandIsSet(true); + struct.tableVariable = iprot.readString(); + struct.setTableVariableIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -16927,6 +17095,22 @@ public class PythonConsoleBackendService { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 3: // START_INDEX + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.startIndex = iprot.readString(); + struct.setStartIndexIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 4: // END_INDEX + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.endIndex = iprot.readString(); + struct.setEndIndexIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; default: org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -16942,9 +17126,9 @@ public class PythonConsoleBackendService { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); - if (struct.command != null) { - oprot.writeFieldBegin(COMMAND_FIELD_DESC); - oprot.writeString(struct.command); + if (struct.tableVariable != null) { + oprot.writeFieldBegin(TABLE_VARIABLE_FIELD_DESC); + oprot.writeString(struct.tableVariable); oprot.writeFieldEnd(); } if (struct.commandType != null) { @@ -16952,6 +17136,16 @@ public class PythonConsoleBackendService { oprot.writeString(struct.commandType); oprot.writeFieldEnd(); } + if (struct.startIndex != null) { + oprot.writeFieldBegin(START_INDEX_FIELD_DESC); + oprot.writeString(struct.startIndex); + oprot.writeFieldEnd(); + } + if (struct.endIndex != null) { + oprot.writeFieldBegin(END_INDEX_FIELD_DESC); + oprot.writeString(struct.endIndex); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -16970,33 +17164,53 @@ public class PythonConsoleBackendService { public void write(org.apache.thrift.protocol.TProtocol prot, execTableCommand_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol oprot = (org.apache.thrift.protocol.TTupleProtocol) prot; java.util.BitSet optionals = new java.util.BitSet(); - if (struct.isSetCommand()) { + if (struct.isSetTableVariable()) { optionals.set(0); } if (struct.isSetCommandType()) { optionals.set(1); } - oprot.writeBitSet(optionals, 2); - if (struct.isSetCommand()) { - oprot.writeString(struct.command); + if (struct.isSetStartIndex()) { + optionals.set(2); + } + if (struct.isSetEndIndex()) { + optionals.set(3); + } + oprot.writeBitSet(optionals, 4); + if (struct.isSetTableVariable()) { + oprot.writeString(struct.tableVariable); } if (struct.isSetCommandType()) { oprot.writeString(struct.commandType); } + if (struct.isSetStartIndex()) { + oprot.writeString(struct.startIndex); + } + if (struct.isSetEndIndex()) { + oprot.writeString(struct.endIndex); + } } @Override public void read(org.apache.thrift.protocol.TProtocol prot, execTableCommand_args struct) throws org.apache.thrift.TException { org.apache.thrift.protocol.TTupleProtocol iprot = (org.apache.thrift.protocol.TTupleProtocol) prot; - java.util.BitSet incoming = iprot.readBitSet(2); + java.util.BitSet incoming = iprot.readBitSet(4); if (incoming.get(0)) { - struct.command = iprot.readString(); - struct.setCommandIsSet(true); + struct.tableVariable = iprot.readString(); + struct.setTableVariableIsSet(true); } if (incoming.get(1)) { struct.commandType = iprot.readString(); struct.setCommandTypeIsSet(true); } + if (incoming.get(2)) { + struct.startIndex = iprot.readString(); + struct.setStartIndexIsSet(true); + } + if (incoming.get(3)) { + struct.endIndex = iprot.readString(); + struct.setEndIndexIsSet(true); + } } } diff --git a/python/gen/com/jetbrains/python/console/protocol/PythonConsoleFrontendService.java b/python/gen/com/jetbrains/python/console/protocol/PythonConsoleFrontendService.java index 701e557ff401..bdc54368bdab 100644 --- a/python/gen/com/jetbrains/python/console/protocol/PythonConsoleFrontendService.java +++ b/python/gen/com/jetbrains/python/console/protocol/PythonConsoleFrontendService.java @@ -7,7 +7,7 @@ package com.jetbrains.python.console.protocol; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)", date = "2022-02-22") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)", date = "2023-04-27") public class PythonConsoleFrontendService { public interface Iface { @@ -1214,7 +1214,7 @@ public class PythonConsoleFrontendService { java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new java.util.EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); tmpMap.put(_Fields.NEEDS_MORE_INPUT, new org.apache.thrift.meta_data.FieldMetaData("needsMoreInput", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); - tmpMap.put(_Fields.EXCEPTION_OCCURRED, new org.apache.thrift.meta_data.FieldMetaData("exceptionOccurred", org.apache.thrift.TFieldRequirementType.DEFAULT, + tmpMap.put(_Fields.EXCEPTION_OCCURRED, new org.apache.thrift.meta_data.FieldMetaData("exceptionOccurred", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); metaDataMap = java.util.Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(notifyFinished_args.class, metaDataMap); @@ -1508,7 +1508,7 @@ public class PythonConsoleFrontendService { if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.exceptionOccurred = iprot.readBool(); struct.setExceptionOccurredIsSet(true); - } else { + } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; diff --git a/python/gen/com/jetbrains/python/console/protocol/PythonTableException.java b/python/gen/com/jetbrains/python/console/protocol/PythonTableException.java index 5f479319c24d..b17116333ce5 100644 --- a/python/gen/com/jetbrains/python/console/protocol/PythonTableException.java +++ b/python/gen/com/jetbrains/python/console/protocol/PythonTableException.java @@ -7,7 +7,7 @@ package com.jetbrains.python.console.protocol; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)", date = "2022-02-22") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)", date = "2023-04-27") public class PythonTableException extends org.apache.thrift.TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PythonTableException"); diff --git a/python/gen/com/jetbrains/python/console/protocol/PythonUnhandledException.java b/python/gen/com/jetbrains/python/console/protocol/PythonUnhandledException.java index 464366cdb951..c23071600d07 100644 --- a/python/gen/com/jetbrains/python/console/protocol/PythonUnhandledException.java +++ b/python/gen/com/jetbrains/python/console/protocol/PythonUnhandledException.java @@ -7,7 +7,7 @@ package com.jetbrains.python.console.protocol; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)", date = "2022-02-22") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)", date = "2023-04-27") public class PythonUnhandledException extends org.apache.thrift.TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("PythonUnhandledException"); diff --git a/python/gen/com/jetbrains/python/console/protocol/RowHeader.java b/python/gen/com/jetbrains/python/console/protocol/RowHeader.java index e9c348a8c842..93c954958744 100644 --- a/python/gen/com/jetbrains/python/console/protocol/RowHeader.java +++ b/python/gen/com/jetbrains/python/console/protocol/RowHeader.java @@ -7,7 +7,7 @@ package com.jetbrains.python.console.protocol; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)", date = "2022-02-22") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)", date = "2023-04-27") public class RowHeader implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RowHeader"); diff --git a/python/gen/com/jetbrains/python/console/protocol/UnsupportedArrayTypeException.java b/python/gen/com/jetbrains/python/console/protocol/UnsupportedArrayTypeException.java index a5248190f89e..c4dc580af1a5 100644 --- a/python/gen/com/jetbrains/python/console/protocol/UnsupportedArrayTypeException.java +++ b/python/gen/com/jetbrains/python/console/protocol/UnsupportedArrayTypeException.java @@ -7,7 +7,7 @@ package com.jetbrains.python.console.protocol; @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"}) -@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)", date = "2022-02-22") +@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler (0.16.0)", date = "2023-04-27") public class UnsupportedArrayTypeException extends org.apache.thrift.TException implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("UnsupportedArrayTypeException"); diff --git a/python/helpers/pydev/pydev_console/console.thrift b/python/helpers/pydev/pydev_console/console.thrift index 7e77ef550998..972e6d9e0a61 100644 --- a/python/helpers/pydev/pydev_console/console.thrift +++ b/python/helpers/pydev/pydev_console/console.thrift @@ -201,7 +201,7 @@ service PythonConsoleBackendService { */ void loadFullValue(1: LoadFullValueRequestSeq seq, 2: list variables) throws (1: PythonUnhandledException unhandledException), - string execTableCommand(1: string command, 2: string commandType) throws (1: PythonUnhandledException unhandledException, 2: PythonTableException tableException) + string execTableCommand(1: string tableVariable, 2: string commandType, 3: string startIndex, 4: string endIndex) throws (1: PythonUnhandledException unhandledException, 2: PythonTableException tableException) } exception KeyboardInterruptException { diff --git a/python/src/com/jetbrains/python/console/PydevConsoleCommunication.java b/python/src/com/jetbrains/python/console/PydevConsoleCommunication.java index 468ea45ae686..66bf7b32143a 100644 --- a/python/src/com/jetbrains/python/console/PydevConsoleCommunication.java +++ b/python/src/com/jetbrains/python/console/PydevConsoleCommunication.java @@ -347,7 +347,7 @@ public abstract class PydevConsoleCommunication extends AbstractConsoleCommunica return executeBackgroundTask( () -> { try { - return getPythonConsoleBackendClient().execTableCommand(command, commandType.name()); + return getPythonConsoleBackendClient().execTableCommand(command, commandType.name(), "", ""); } catch (PythonTableException e) { throw new PyDebuggerException(e.message);