Skip to content

Commit 947a445

Browse files
committed
Rename the thread local var
Signed-off-by: Lantao Jin <ltjin@amazon.com>
1 parent 6f36b62 commit 947a445

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

core/src/main/java/org/opensearch/sql/calcite/CalcitePlanContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public class CalcitePlanContext {
3636
public final QueryType queryType;
3737
public final Integer querySizeLimit;
3838

39-
public static final ThreadLocal<Boolean> isExplain = ThreadLocal.withInitial(() -> false);
39+
public static final ThreadLocal<Boolean> skipEncoding = ThreadLocal.withInitial(() -> false);
4040

4141
@Getter @Setter private boolean isResolvingJoinCondition = false;
4242
@Getter @Setter private boolean isResolvingSubquery = false;

opensearch/src/main/java/org/opensearch/sql/opensearch/executor/OpenSearchExecutionEngine.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ public void explain(
172172
try (Hook.Closeable closeable = getPhysicalPlanInHook(physical, level)) {
173173
if (format == ExplainFormat.EXTENDED) {
174174
getCodegenInHook(javaCode);
175-
CalcitePlanContext.isExplain.set(true);
175+
CalcitePlanContext.skipEncoding.set(true);
176176
}
177177
// triggers the hook
178178
AccessController.doPrivileged(
@@ -186,7 +186,7 @@ public void explain(
186186
} catch (Exception e) {
187187
listener.onFailure(e);
188188
} finally {
189-
CalcitePlanContext.isExplain.remove();
189+
CalcitePlanContext.skipEncoding.remove();
190190
}
191191
});
192192
}

opensearch/src/main/java/org/opensearch/sql/opensearch/storage/serde/RelJsonSerializer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public String serialize(
9595
ObjectOutputStream objectOutput = new ObjectOutputStream(output);
9696
objectOutput.writeObject(envelope);
9797
objectOutput.flush();
98-
return CalcitePlanContext.isExplain.get()
98+
return CalcitePlanContext.skipEncoding.get()
9999
? rexNodeJson
100100
: Base64.getEncoder().encodeToString(output.toByteArray());
101101
} catch (Exception e) {

0 commit comments

Comments
 (0)