Skip to content

Commit 306e8a8

Browse files
committed
refactor: split distributed package into merge and worker sub-packages
distributed/ (4 orchestration files): DistributedScanExecutor, QueryAnalyzer, FilePartitioner, NodeDiscovery distributed/merge/ (5 files): ResultMerger, AggregationReducer, TopKMerger, ResultSerializer, MergeStrategy distributed/worker/ (6 files): WorkerQueryExecutor, WorkerCredentialResolver, WorkerQueryTransportAction, WorkerQueryAction, WorkerQueryRequest, WorkerQueryResponse
1 parent 7201acb commit 306e8a8

28 files changed

Lines changed: 76 additions & 23 deletions

sandbox/plugins/lakehouse-iceberg/src/main/java/org/opensearch/lakehouse/LakehousePlugin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import org.opensearch.lakehouse.action.LakehousePplRestAction;
2222
import org.opensearch.lakehouse.action.LakehouseSqlRestAction;
2323
import org.opensearch.lakehouse.distributed.NodeDiscovery;
24-
import org.opensearch.lakehouse.distributed.WorkerQueryAction;
25-
import org.opensearch.lakehouse.distributed.WorkerQueryTransportAction;
24+
import org.opensearch.lakehouse.distributed.worker.WorkerQueryAction;
25+
import org.opensearch.lakehouse.distributed.worker.WorkerQueryTransportAction;
2626
import org.opensearch.lakehouse.schema.IcebergSchemaContributor;
2727
import org.opensearch.action.ActionRequest;
2828
import org.opensearch.core.action.ActionResponse;

sandbox/plugins/lakehouse-iceberg/src/main/java/org/opensearch/lakehouse/distributed/DistributedScanExecutor.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@
1818
import org.opensearch.core.action.ActionListener;
1919
import org.opensearch.core.common.io.stream.StreamInput;
2020
import org.opensearch.lakehouse.LakehousePlugin;
21+
import org.opensearch.lakehouse.distributed.merge.MergeStrategy;
22+
import org.opensearch.lakehouse.distributed.merge.ResultMerger;
23+
import org.opensearch.lakehouse.distributed.merge.ResultSerializer;
24+
import org.opensearch.lakehouse.distributed.worker.WorkerQueryAction;
25+
import org.opensearch.lakehouse.distributed.worker.WorkerQueryExecutor;
26+
import org.opensearch.lakehouse.distributed.worker.WorkerQueryRequest;
27+
import org.opensearch.lakehouse.distributed.worker.WorkerQueryResponse;
2128
import org.opensearch.threadpool.ThreadPool;
2229
import org.opensearch.transport.TransportException;
2330
import org.opensearch.transport.TransportResponseHandler;

sandbox/plugins/lakehouse-iceberg/src/main/java/org/opensearch/lakehouse/distributed/QueryAnalyzer.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import org.apache.calcite.rel.core.Sort;
1717
import org.apache.calcite.rex.RexLiteral;
1818
import org.apache.calcite.sql.SqlKind;
19+
import org.opensearch.lakehouse.distributed.merge.MergeStrategy;
1920

2021
import java.util.List;
2122

sandbox/plugins/lakehouse-iceberg/src/main/java/org/opensearch/lakehouse/distributed/AggregationReducer.java renamed to sandbox/plugins/lakehouse-iceberg/src/main/java/org/opensearch/lakehouse/distributed/merge/AggregationReducer.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
* compatible open source license.
77
*/
88

9-
package org.opensearch.lakehouse.distributed;
9+
package org.opensearch.lakehouse.distributed.merge;
10+
11+
import org.opensearch.lakehouse.distributed.worker.WorkerQueryResponse;
1012

1113
import java.util.List;
1214

sandbox/plugins/lakehouse-iceberg/src/main/java/org/opensearch/lakehouse/distributed/MergeStrategy.java renamed to sandbox/plugins/lakehouse-iceberg/src/main/java/org/opensearch/lakehouse/distributed/merge/MergeStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* compatible open source license.
77
*/
88

9-
package org.opensearch.lakehouse.distributed;
9+
package org.opensearch.lakehouse.distributed.merge;
1010

1111
/**
1212
* Merge strategy for combining partial results from distributed worker nodes.

sandbox/plugins/lakehouse-iceberg/src/main/java/org/opensearch/lakehouse/distributed/ResultMerger.java renamed to sandbox/plugins/lakehouse-iceberg/src/main/java/org/opensearch/lakehouse/distributed/merge/ResultMerger.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
* compatible open source license.
77
*/
88

9-
package org.opensearch.lakehouse.distributed;
9+
package org.opensearch.lakehouse.distributed.merge;
1010

1111
import org.apache.calcite.sql.SqlKind;
12+
import org.opensearch.lakehouse.distributed.worker.WorkerQueryResponse;
1213

1314
import java.util.ArrayList;
1415
import java.util.Collections;

sandbox/plugins/lakehouse-iceberg/src/main/java/org/opensearch/lakehouse/distributed/ResultSerializer.java renamed to sandbox/plugins/lakehouse-iceberg/src/main/java/org/opensearch/lakehouse/distributed/merge/ResultSerializer.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
* compatible open source license.
77
*/
88

9-
package org.opensearch.lakehouse.distributed;
9+
package org.opensearch.lakehouse.distributed.merge;
10+
11+
import org.opensearch.lakehouse.distributed.worker.WorkerQueryResponse;
1012

1113
import java.util.ArrayList;
1214
import java.util.List;

sandbox/plugins/lakehouse-iceberg/src/main/java/org/opensearch/lakehouse/distributed/TopKMerger.java renamed to sandbox/plugins/lakehouse-iceberg/src/main/java/org/opensearch/lakehouse/distributed/merge/TopKMerger.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
* compatible open source license.
77
*/
88

9-
package org.opensearch.lakehouse.distributed;
9+
package org.opensearch.lakehouse.distributed.merge;
10+
11+
import org.opensearch.lakehouse.distributed.worker.WorkerQueryResponse;
1012

1113
import java.util.ArrayList;
1214
import java.util.Comparator;
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
/*
2+
* SPDX-License-Identifier: Apache-2.0
3+
*
4+
* The OpenSearch Contributors require contributions made to
5+
* this file be licensed under the Apache-2.0 license or a
6+
* compatible open source license.
7+
*/
8+
9+
/**
10+
* Result merging strategies for distributed query execution.
11+
* <p>
12+
* Contains the merge dispatcher, aggregation reducer, top-K merger,
13+
* result serializer, and merge strategy enum.
14+
*/
15+
package org.opensearch.lakehouse.distributed.merge;

sandbox/plugins/lakehouse-iceberg/src/main/java/org/opensearch/lakehouse/distributed/WorkerCredentialResolver.java renamed to sandbox/plugins/lakehouse-iceberg/src/main/java/org/opensearch/lakehouse/distributed/worker/WorkerCredentialResolver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* compatible open source license.
77
*/
88

9-
package org.opensearch.lakehouse.distributed;
9+
package org.opensearch.lakehouse.distributed.worker;
1010

1111
import org.apache.logging.log4j.LogManager;
1212
import org.apache.logging.log4j.Logger;

0 commit comments

Comments
 (0)