Skip to content

Commit 467a3a2

Browse files
committed
remove logging
1 parent f0b029d commit 467a3a2

File tree

3 files changed

+0
-37
lines changed

3 files changed

+0
-37
lines changed

x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/Driver.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
package org.elasticsearch.compute.operator;
99

10-
import org.apache.logging.log4j.LogManager;
11-
import org.apache.logging.log4j.Logger;
1210
import org.elasticsearch.action.ActionListener;
1311
import org.elasticsearch.action.support.ContextPreservingActionListener;
1412
import org.elasticsearch.action.support.SubscribableListener;
@@ -17,7 +15,6 @@
1715
import org.elasticsearch.compute.Describable;
1816
import org.elasticsearch.compute.data.Page;
1917
import org.elasticsearch.compute.operator.exchange.ExchangeSinkOperator;
20-
import org.elasticsearch.compute.operator.topn.TopNOperator;
2118
import org.elasticsearch.core.Nullable;
2219
import org.elasticsearch.core.Releasable;
2320
import org.elasticsearch.core.Releasables;
@@ -251,8 +248,6 @@ public void abort(Exception reason, ActionListener<Void> listener) {
251248
}
252249
}
253250

254-
private static final Logger logger = LogManager.getLogger(Driver.class);
255-
256251
private IsBlockedResult runSingleLoopIteration() {
257252
driverContext.checkForEarlyTermination();
258253
boolean movedPage = false;
@@ -288,7 +283,6 @@ private IsBlockedResult runSingleLoopIteration() {
288283
page.releaseBlocks();
289284
throw e;
290285
}
291-
logger.warn("INPUTTING PAGE TO OPERATOR " + nextOp);
292286
nextOp.addInput(page);
293287
movedPage = true;
294288
}
@@ -333,15 +327,13 @@ private int closeEarlyFinishedOperators(ListIterator<Operator> operators) {
333327
while (finishedOperators.hasNext()) {
334328
Operator op = finishedOperators.next();
335329
statusOfCompletedOperators.add(new OperatorStatus(op.toString(), op.status()));
336-
logger.warn("CLOSING OPERATOR " + op);
337330
op.close();
338331
finishedOperators.remove();
339332
}
340333

341334
// Finish the next operator, which is now the first operator.
342335
if (activeOperators.isEmpty() == false) {
343336
Operator newRootOperator = activeOperators.get(0);
344-
logger.warn("FINISHING OPERATOR " + newRootOperator);
345337
newRootOperator.finish();
346338
}
347339
return index;

x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/operator/topn/TopNOperator.java

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77

88
package org.elasticsearch.compute.operator.topn;
99

10-
import org.apache.logging.log4j.LogManager;
11-
import org.apache.logging.log4j.Logger;
1210
import org.apache.lucene.util.Accountable;
1311
import org.apache.lucene.util.BytesRef;
1412
import org.apache.lucene.util.PriorityQueue;
@@ -49,8 +47,6 @@ public class TopNOperator implements Operator, Accountable {
4947
private static final byte SMALL_NULL = 0x01; // "null" representation for "nulls first"
5048
private static final byte BIG_NULL = 0x02; // "null" representation for "nulls last"
5149

52-
private static final Logger logger = LogManager.getLogger("TopNOperator");
53-
5450
/**
5551
* Internal row to be used in the PriorityQueue instead of the full blown Page.
5652
* It mirrors somehow the Block build in the sense that it keeps around an array of offsets and a count of values (to account for
@@ -126,20 +122,15 @@ public void clearRefCounters() {
126122
}
127123
}
128124

129-
130125
static final class BytesOrder implements Releasable, Accountable {
131126
private static final long BASE_RAM_USAGE = RamUsageEstimator.shallowSizeOfInstance(BytesOrder.class);
132127
private final CircuitBreaker breaker;
133128
final List<SortOrder> sortOrders;
134129
final int[] endOffsets;
135-
private static final Logger logger = LogManager.getLogger(BytesOrder.class);
136-
private boolean open = true;
137130

138131
BytesOrder(List<SortOrder> sortOrders, CircuitBreaker breaker, String label) {
139132
this.breaker = breaker;
140133
this.sortOrders = sortOrders;
141-
logger.warn("ADDED " + memoryUsed(sortOrders.size()));
142-
logger.warn("", new Throwable());
143134
breaker.addEstimateBytesAndMaybeBreak(memoryUsed(sortOrders.size()), label);
144135
this.endOffsets = new int[sortOrders.size()];
145136
}
@@ -169,10 +160,6 @@ public long ramBytesUsed() {
169160

170161
@Override
171162
public void close() {
172-
// assert open;
173-
open = false;
174-
logger.warn("REMOVING " + (-ramBytesUsed()));
175-
logger.warn("", new Throwable());
176163
breaker.addWithoutBreaking(-ramBytesUsed());
177164
}
178165
}
@@ -193,10 +180,6 @@ static final class RowFiller {
193180
page.getBlock(b)
194181
);
195182
}
196-
logger.warn("VALUE EXTRACTORS ARRAY LOOKS LIKE");
197-
for (var v : valueExtractors) {
198-
logger.warn("" + v);
199-
}
200183
keyFactories = new KeyFactory[sortOrders.size()];
201184
for (int k = 0; k < keyFactories.length; k++) {
202185
SortOrder so = sortOrders.get(k);
@@ -236,7 +219,6 @@ private void writeValues(int position, Row destination) {
236219
if (refCounted != null) {
237220
destination.setShardRefCountersAndShard(refCounted);
238221
}
239-
logger.warn("ENCODING VALUE FOR " + e + " AT OFFSET " + destination.values.length());
240222
e.writeValue(destination.values, position);
241223
}
242224
}
@@ -485,11 +467,6 @@ private Iterator<Page> toPages() {
485467
);
486468
}
487469
p = 0;
488-
489-
logger.warn("BUILDERS ARRAY LOOKS LIKE ");
490-
for (var b : builders) {
491-
logger.warn("" + b);
492-
}
493470
}
494471

495472
try (Row row = list.get(i)) {
@@ -502,7 +479,6 @@ private Iterator<Page> toPages() {
502479
}
503480
keys.offset++;
504481
keys.length--;
505-
logger.warn("DECODING KEY AT OFFSET " + keys.offset);
506482
builders[so.channel].decodeKey(keys);
507483
}
508484
if (keys.length != 0) {
@@ -512,7 +488,6 @@ private Iterator<Page> toPages() {
512488
BytesRef values = row.values.bytesRefView();
513489
for (ResultBuilder builder : builders) {
514490
builder.setNextRefCounted(row.shardRefCounter);
515-
logger.warn("DECODING VALUE FOR BUILDER " + builder + " AT OFFSET " + values.offset);
516491
builder.decodeValue(values);
517492
}
518493
if (values.length != 0) {
@@ -542,9 +517,6 @@ private Iterator<Page> toPages() {
542517
assert builders == null;
543518
success = true;
544519
return result.iterator();
545-
} catch (Throwable e) {
546-
logger.warn("THREW AN EXCEPTION: ", e);
547-
throw e;
548520
} finally {
549521
if (success == false) {
550522
List<Releasable> close = new ArrayList<>(list);

x-pack/plugin/esql/qa/server/multi-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/multi_node/GenerativeIT.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
package org.elasticsearch.xpack.esql.qa.multi_node;
99

10-
import com.carrotsearch.randomizedtesting.annotations.Seed;
1110
import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
1211

1312
import org.elasticsearch.common.settings.Settings;

0 commit comments

Comments
 (0)