Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jobily
Questdb
提交
e79406e2
Q
Questdb
项目概览
jobily
/
Questdb
大约 1 年 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Q
Questdb
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e79406e2
编写于
11月 17, 2019
作者:
V
Vlad Ilyushchenko
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(cairo): removed unnecessary checked exception
上级
17e3fe2e
变更
14
隐藏空白更改
内联
并排
Showing
14 changed file
with
22 addition
and
36 deletion
+22
-36
core/src/main/java/io/questdb/cairo/ColumnType.java
core/src/main/java/io/questdb/cairo/ColumnType.java
+2
-2
core/src/main/java/io/questdb/cairo/DefaultCairoConfiguration.java
...main/java/io/questdb/cairo/DefaultCairoConfiguration.java
+1
-2
core/src/main/java/io/questdb/cairo/sql/WriterOutOfDateException.java
...n/java/io/questdb/cairo/sql/WriterOutOfDateException.java
+1
-1
core/src/main/java/io/questdb/cutlass/text/DefaultTextConfiguration.java
...ava/io/questdb/cutlass/text/DefaultTextConfiguration.java
+5
-2
core/src/main/java/io/questdb/griffin/engine/functions/date/TimestampSequenceFunctionFactory.java
...gine/functions/date/TimestampSequenceFunctionFactory.java
+1
-2
core/src/main/java/io/questdb/griffin/engine/functions/rnd/RndBinFunctionFactory.java
...b/griffin/engine/functions/rnd/RndBinFunctionFactory.java
+1
-2
core/src/main/java/io/questdb/griffin/engine/functions/rnd/RndByteFunctionFactory.java
.../griffin/engine/functions/rnd/RndByteFunctionFactory.java
+1
-2
core/src/main/java/io/questdb/griffin/engine/functions/rnd/RndDateFunctionFactory.java
.../griffin/engine/functions/rnd/RndDateFunctionFactory.java
+1
-2
core/src/main/java/io/questdb/griffin/engine/functions/rnd/RndFloatFunctionFactory.java
...griffin/engine/functions/rnd/RndFloatFunctionFactory.java
+1
-2
core/src/main/java/io/questdb/griffin/engine/functions/str/ConcatFunctionFactory.java
...b/griffin/engine/functions/str/ConcatFunctionFactory.java
+2
-3
core/src/main/java/io/questdb/griffin/engine/table/AbstractRecordListCursor.java
...uestdb/griffin/engine/table/AbstractRecordListCursor.java
+0
-5
core/src/main/java/io/questdb/griffin/model/QueryModel.java
core/src/main/java/io/questdb/griffin/model/QueryModel.java
+1
-1
core/src/test/java/io/questdb/cairo/pool/WriterPoolTest.java
core/src/test/java/io/questdb/cairo/pool/WriterPoolTest.java
+4
-9
core/src/test/java/io/questdb/griffin/engine/functions/catalogue/ClassCatalogueFunctionFactoryTest.java
...unctions/catalogue/ClassCatalogueFunctionFactoryTest.java
+1
-1
未找到文件。
core/src/main/java/io/questdb/cairo/ColumnType.java
浏览文件 @
e79406e2
...
...
@@ -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"
);
...
...
core/src/main/java/io/questdb/cairo/DefaultCairoConfiguration.java
浏览文件 @
e79406e2
...
...
@@ -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
);
}
...
...
core/src/main/java/io/questdb/cairo/sql/WriterOutOfDateException.java
浏览文件 @
e79406e2
...
...
@@ -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
();
}
core/src/main/java/io/questdb/cutlass/text/DefaultTextConfiguration.java
浏览文件 @
e79406e2
...
...
@@ -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
);
}
}
...
...
core/src/main/java/io/questdb/griffin/engine/functions/date/TimestampSequenceFunctionFactory.java
浏览文件 @
e79406e2
...
...
@@ -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
);
...
...
core/src/main/java/io/questdb/griffin/engine/functions/rnd/RndBinFunctionFactory.java
浏览文件 @
e79406e2
...
...
@@ -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
);
}
...
...
core/src/main/java/io/questdb/griffin/engine/functions/rnd/RndByteFunctionFactory.java
浏览文件 @
e79406e2
...
...
@@ -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
);
...
...
core/src/main/java/io/questdb/griffin/engine/functions/rnd/RndDateFunctionFactory.java
浏览文件 @
e79406e2
...
...
@@ -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
);
}
...
...
core/src/main/java/io/questdb/griffin/engine/functions/rnd/RndFloatFunctionFactory.java
浏览文件 @
e79406e2
...
...
@@ -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
);
}
...
...
core/src/main/java/io/questdb/griffin/engine/functions/str/ConcatFunctionFactory.java
浏览文件 @
e79406e2
...
...
@@ -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
);
...
...
core/src/main/java/io/questdb/griffin/engine/table/AbstractRecordListCursor.java
浏览文件 @
e79406e2
...
...
@@ -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
();
...
...
core/src/main/java/io/questdb/griffin/model/QueryModel.java
浏览文件 @
e79406e2
...
...
@@ -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
;
...
...
core/src/test/java/io/questdb/cairo/pool/WriterPoolTest.java
浏览文件 @
e79406e2
...
...
@@ -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
core/src/test/java/io/questdb/griffin/engine/functions/catalogue/ClassCatalogueFunctionFactoryTest.java
浏览文件 @
e79406e2
...
...
@@ -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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录