提交 e79406e2 编写于 作者: V Vlad Ilyushchenko

fix(cairo): removed unnecessary checked exception

上级 17e3fe2e
......@@ -48,8 +48,8 @@ public final class ColumnType {
private static final IntObjHashMap<String> typeNameMap = new IntObjHashMap<>();
private static final CharSequenceIntHashMap nameTypeMap = new CharSequenceIntHashMap();
private static final ThreadLocal<StringSink> caseConverterBuffer = ThreadLocal.withInitial(StringSink::new);
private static int[] TYPE_SIZE_POW2 = new int[ColumnType.PARAMETER + 1];
private static int[] TYPE_SIZE = new int[ColumnType.PARAMETER + 1];
private static final int[] TYPE_SIZE_POW2 = new int[ColumnType.PARAMETER + 1];
private static final int[] TYPE_SIZE = new int[ColumnType.PARAMETER + 1];
static {
typeNameMap.put(BOOLEAN, "BOOLEAN");
......
......@@ -23,7 +23,6 @@
package io.questdb.cairo;
import io.questdb.cutlass.json.JsonException;
import io.questdb.cutlass.text.DefaultTextConfiguration;
import io.questdb.cutlass.text.TextConfiguration;
import io.questdb.std.Chars;
......@@ -40,7 +39,7 @@ public class DefaultCairoConfiguration implements CairoConfiguration {
private final CharSequence root;
private final TextConfiguration textConfiguration = new DefaultTextConfiguration();
public DefaultCairoConfiguration(CharSequence root) throws JsonException {
public DefaultCairoConfiguration(CharSequence root) {
this.root = Chars.stringOf(root);
}
......
......@@ -24,5 +24,5 @@
package io.questdb.cairo.sql;
public class WriterOutOfDateException extends RuntimeException {
public static WriterOutOfDateException INSTANCE = new WriterOutOfDateException();
public static final WriterOutOfDateException INSTANCE = new WriterOutOfDateException();
}
......@@ -23,6 +23,7 @@
package io.questdb.cutlass.text;
import io.questdb.cairo.CairoError;
import io.questdb.cutlass.json.JsonException;
import io.questdb.cutlass.json.JsonLexer;
import io.questdb.cutlass.text.types.InputFormatConfiguration;
......@@ -34,11 +35,11 @@ import io.questdb.std.time.DateLocaleFactory;
public class DefaultTextConfiguration implements TextConfiguration {
private final InputFormatConfiguration inputFormatConfiguration;
public DefaultTextConfiguration() throws JsonException {
public DefaultTextConfiguration() {
this("/text_loader.json");
}
public DefaultTextConfiguration(String resourceName) throws JsonException {
public DefaultTextConfiguration(String resourceName) {
this.inputFormatConfiguration = new InputFormatConfiguration(
new DateFormatFactory(),
DateLocaleFactory.INSTANCE,
......@@ -48,6 +49,8 @@ public class DefaultTextConfiguration implements TextConfiguration {
try (JsonLexer lexer = new JsonLexer(1024, 1024)) {
inputFormatConfiguration.parseConfiguration(lexer, resourceName);
} catch (JsonException e) {
throw new CairoError(e);
}
}
......
......@@ -27,7 +27,6 @@ import io.questdb.cairo.CairoConfiguration;
import io.questdb.cairo.sql.Function;
import io.questdb.cairo.sql.Record;
import io.questdb.griffin.FunctionFactory;
import io.questdb.griffin.SqlException;
import io.questdb.griffin.engine.functions.TimestampFunction;
import io.questdb.griffin.engine.functions.constants.TimestampConstant;
import io.questdb.std.Numbers;
......@@ -40,7 +39,7 @@ public class TimestampSequenceFunctionFactory implements FunctionFactory {
}
@Override
public Function newInstance(ObjList<Function> args, int position, CairoConfiguration configuration) throws SqlException {
public Function newInstance(ObjList<Function> args, int position, CairoConfiguration configuration) {
final long start = args.getQuick(0).getTimestamp(null);
if (start == Numbers.LONG_NaN) {
return new TimestampConstant(args.getQuick(0).getPosition(), Numbers.LONG_NaN);
......
......@@ -27,7 +27,6 @@ import io.questdb.cairo.CairoConfiguration;
import io.questdb.cairo.sql.Function;
import io.questdb.cairo.sql.Record;
import io.questdb.griffin.FunctionFactory;
import io.questdb.griffin.SqlException;
import io.questdb.griffin.engine.functions.BinFunction;
import io.questdb.griffin.engine.functions.StatelessFunction;
import io.questdb.std.BinarySequence;
......@@ -41,7 +40,7 @@ public class RndBinFunctionFactory implements FunctionFactory {
}
@Override
public Function newInstance(ObjList<Function> args, int position, CairoConfiguration configuration) throws SqlException {
public Function newInstance(ObjList<Function> args, int position, CairoConfiguration configuration) {
return new FixLenFunction(position, configuration);
}
......
......@@ -27,7 +27,6 @@ import io.questdb.cairo.CairoConfiguration;
import io.questdb.cairo.sql.Function;
import io.questdb.cairo.sql.Record;
import io.questdb.griffin.FunctionFactory;
import io.questdb.griffin.SqlException;
import io.questdb.griffin.engine.functions.ByteFunction;
import io.questdb.griffin.engine.functions.StatelessFunction;
import io.questdb.std.ObjList;
......@@ -41,7 +40,7 @@ public class RndByteFunctionFactory implements FunctionFactory {
}
@Override
public Function newInstance(ObjList<Function> args, int position, CairoConfiguration configuration) throws SqlException {
public Function newInstance(ObjList<Function> args, int position, CairoConfiguration configuration) {
return new RndFunction(position, configuration);
......
......@@ -27,7 +27,6 @@ import io.questdb.cairo.CairoConfiguration;
import io.questdb.cairo.sql.Function;
import io.questdb.cairo.sql.Record;
import io.questdb.griffin.FunctionFactory;
import io.questdb.griffin.SqlException;
import io.questdb.griffin.engine.functions.DateFunction;
import io.questdb.griffin.engine.functions.StatelessFunction;
import io.questdb.std.ObjList;
......@@ -40,7 +39,7 @@ public class RndDateFunctionFactory implements FunctionFactory {
}
@Override
public Function newInstance(ObjList<Function> args, int position, CairoConfiguration configuration) throws SqlException {
public Function newInstance(ObjList<Function> args, int position, CairoConfiguration configuration) {
return new Func(position, configuration);
}
......
......@@ -27,7 +27,6 @@ import io.questdb.cairo.CairoConfiguration;
import io.questdb.cairo.sql.Function;
import io.questdb.cairo.sql.Record;
import io.questdb.griffin.FunctionFactory;
import io.questdb.griffin.SqlException;
import io.questdb.griffin.engine.functions.FloatFunction;
import io.questdb.griffin.engine.functions.StatelessFunction;
import io.questdb.std.ObjList;
......@@ -41,7 +40,7 @@ public class RndFloatFunctionFactory implements FunctionFactory {
}
@Override
public Function newInstance(ObjList<Function> args, int position, CairoConfiguration configuration) throws SqlException {
public Function newInstance(ObjList<Function> args, int position, CairoConfiguration configuration) {
return new RndFunction(position, configuration);
}
......
......@@ -28,7 +28,6 @@ import io.questdb.cairo.ColumnType;
import io.questdb.cairo.sql.Function;
import io.questdb.cairo.sql.Record;
import io.questdb.griffin.FunctionFactory;
import io.questdb.griffin.SqlException;
import io.questdb.griffin.engine.functions.StrFunction;
import io.questdb.std.ObjList;
import io.questdb.std.Transient;
......@@ -36,7 +35,7 @@ import io.questdb.std.str.CharSink;
import io.questdb.std.str.StringSink;
public class ConcatFunctionFactory implements FunctionFactory {
private static ObjList<TypeAdapter> adapterReferences = new ObjList<>();
private static final ObjList<TypeAdapter> adapterReferences = new ObjList<>();
@Override
public String getSignature() {
......@@ -44,7 +43,7 @@ public class ConcatFunctionFactory implements FunctionFactory {
}
@Override
public Function newInstance(@Transient ObjList<Function> args, int position, CairoConfiguration configuration) throws SqlException {
public Function newInstance(@Transient ObjList<Function> args, int position, CairoConfiguration configuration) {
final ObjList<Function> functions = new ObjList<>(args.size());
functions.addAll(args);
return new ConcatFunction(position, functions);
......
......@@ -37,11 +37,6 @@ abstract class AbstractRecordListCursor extends AbstractDataFrameRecordCursor {
this.rows = rows;
}
@Override
public void close() {
super.close();
}
@Override
public long size() {
return rows.size();
......
......@@ -92,7 +92,7 @@ public class QueryModel implements Mutable, ExecutionModel, AliasTranslator, Sin
private long tableVersion;
private Function tableNameFunction;
private ExpressionNode alias;
private ObjList<ExpressionNode> latestBy = new ObjList<>();
private final ObjList<ExpressionNode> latestBy = new ObjList<>();
private ExpressionNode timestamp;
private ExpressionNode sampleBy;
private JoinContext context;
......
......@@ -27,7 +27,6 @@ import io.questdb.cairo.*;
import io.questdb.cairo.pool.ex.EntryLockedException;
import io.questdb.cairo.pool.ex.EntryUnavailableException;
import io.questdb.cairo.pool.ex.PoolClosedException;
import io.questdb.cutlass.json.JsonException;
import io.questdb.std.Chars;
import io.questdb.std.FilesFacade;
import io.questdb.std.str.LPSZ;
......@@ -47,14 +46,6 @@ public class WriterPoolTest extends AbstractCairoTest {
private static final DefaultCairoConfiguration CONFIGURATION;
static {
try {
CONFIGURATION = new DefaultCairoConfiguration(root);
} catch (JsonException e) {
throw new RuntimeException(e);
}
}
@Before
public void setUpInstance() {
try (TableModel model = new TableModel(configuration, "z", PartitionBy.NONE).col("ts", ColumnType.DATE)) {
......@@ -801,4 +792,8 @@ public class WriterPoolTest extends AbstractCairoTest {
private interface PoolAwareCode {
void run(WriterPool pool) throws Exception;
}
static {
CONFIGURATION = new DefaultCairoConfiguration(root);
}
}
\ No newline at end of file
......@@ -81,7 +81,7 @@ public class ClassCatalogueFunctionFactoryTest extends AbstractGriffinTest {
printer.print(cursor, factory.getMetadata(), true);
TestUtils.assertEquals("relname\trelnamespace\trelkind\trelowner\toid\n", sink);
compiler.compile("create table xyz (a int)");
compiler.compile("create table xyz (a int)", sqlExecutionContext);
cursor.close();
cursor = factory.getCursor(sqlExecutionContext);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册