Support LoadScope for Peons + Access Modifier Updates (#12640)

* Support LoadScope for Peons

* Update access modifiers for GroupByEngineV2
This commit is contained in:
Rohan Garg 2022-06-15 10:22:50 +05:30 committed by GitHub
parent 283249c51b
commit 28f2c8e112
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions

View File

@ -95,9 +95,9 @@ import java.util.stream.Stream;
*/
public class GroupByQueryEngineV2
{
private static final GroupByStrategyFactory STRATEGY_FACTORY = new GroupByStrategyFactory();
public static final GroupByStrategyFactory STRATEGY_FACTORY = new GroupByStrategyFactory();
private static GroupByColumnSelectorPlus[] createGroupBySelectorPlus(
public static GroupByColumnSelectorPlus[] createGroupBySelectorPlus(
ColumnSelectorPlus<GroupByColumnSelectorStrategy>[] baseSelectorPlus,
int dimensionStart
)
@ -451,7 +451,7 @@ public class GroupByQueryEngineV2
}
}
private abstract static class GroupByEngineIterator<KeyType> implements Iterator<ResultRow>, Closeable
public abstract static class GroupByEngineIterator<KeyType> implements Iterator<ResultRow>, Closeable
{
protected final GroupByQuery query;
protected final GroupByQueryConfig querySpecificConfig;
@ -615,13 +615,13 @@ public class GroupByQueryEngineV2
}
}
private static class HashAggregateIterator extends GroupByEngineIterator<ByteBuffer>
public static class HashAggregateIterator extends GroupByEngineIterator<ByteBuffer>
{
private static final Logger LOGGER = new Logger(HashAggregateIterator.class);
private final int[] stack;
private final Object[] valuess;
private final ByteBuffer keyBuffer;
protected final ByteBuffer keyBuffer;
private int stackPointer = Integer.MIN_VALUE;
private boolean currentRowWasPartiallyAggregated = false;

View File

@ -26,6 +26,7 @@ import com.github.rvesse.airline.annotations.Option;
import com.github.rvesse.airline.annotations.restrictions.Required;
import com.google.common.base.Throwables;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Binder;
import com.google.inject.Inject;
import com.google.inject.Injector;
@ -34,7 +35,6 @@ import com.google.inject.Module;
import com.google.inject.Provides;
import com.google.inject.TypeLiteral;
import com.google.inject.multibindings.MapBinder;
import com.google.inject.multibindings.Multibinder;
import com.google.inject.name.Named;
import com.google.inject.name.Names;
import io.netty.util.SuppressForbidden;
@ -301,7 +301,7 @@ public class CliPeon extends GuiceRunnable
public void run()
{
try {
Injector injector = makeInjector();
Injector injector = makeInjector(ImmutableSet.of(NodeRole.PEON));
try {
final Lifecycle lifecycle = initLifecycle(injector);
final Thread hook = new Thread(
@ -419,7 +419,6 @@ public class CliPeon extends GuiceRunnable
.in(LazySingleton.class);
binder.bind(NodeRole.class).annotatedWith(Self.class).toInstance(NodeRole.PEON);
Multibinder.newSetBinder(binder, NodeRole.class, Self.class).addBinding().toInstance(NodeRole.PEON);
}
static void bindTaskConfigAndClients(Binder binder)